diff -Nru xiphos-4.0.0+dfsg1/ChangeLog xiphos-4.0.4+dfsg1/ChangeLog --- xiphos-4.0.0+dfsg1/ChangeLog 2014-12-18 23:22:23.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ChangeLog 2015-08-30 16:16:08.000000000 +0000 @@ -1,3 +1,69 @@ +2015-08-30 karl + + * 4.0.3 release. + +2015-08-17 karl + + * change language_set to grow dynamically, no limit. + * improve abbrev support: use abbrev in parallel page, parallel + dialog/tab, main window non-Bible (comm/book/dict), bookmarks. + * fixed module installation messages' display, so they're not lost. + * update language abbreviations to eliminate more unknowns. + * added gtk3 maximization detection. + +2015-08-06 karl + + * survivability fix: increase LANGSET_COUNT to 2000 (eBible repo). + * updated French translation. + * added Korean translation. + * 4.0.3 release. + +2015-06-15 karl + + * fixed detached parallel "close" button visual overreach. + * updated Slovenian translation (marjan savli). + * add toolkit identifications to "about xiphos." + * generic, all-purpose makeDistro.sh; deleted makeDistro3.sh. + +2015-04-15 karl + + * emergency fix mem alloc error in editor. + * 4.0.2 release. + +2015-03-29 karl + + * 4.0.1 release. + +2015-02-20 karl + + * consequent to use of cppcheck, made many updates for efficiency, + scope reduction, and waste elimination. + cppcheck complains about many functions "never used," but this + is generally false, they are simply callbacks in gtkbuilder files. + +2015-02-02 karl + + * feat.req#204: merged webkit2 (webkit2gtk-4.0) changes. + +2015-01-24 karl + + * bug#524: immediate cause fixed long ago, but uncovered a + different bug in url.cc: no verse list for non-bible module. + +2014-12-26 karl + + * added support for Abbreviation conf directive: + module lists, parallel list, tab headings. + * added deletion of obsolete modules when installing what supercedes. + * added scanned deletion of obsolete modules on demand (i.e. audit). + * added OSISGlosses module support. + * additions to "about modules" display. + * added OSISMorphSegmentation module support. + +2014-12-24 karl + + * 4.0.0 release. + 2014-12-16 karl * fixed gtk3 prefs->parallel->module selector geometry & filling. diff -Nru xiphos-4.0.0+dfsg1/.clang-format xiphos-4.0.4+dfsg1/.clang-format --- xiphos-4.0.0+dfsg1/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/.clang-format 2015-02-11 23:48:34.000000000 +0000 @@ -0,0 +1,7 @@ +BasedOnStyle: LLVM +IndentWidth: 8 +UseTab: Always +BreakBeforeBraces: Linux +AllowShortIfStatementsOnASingleLine: false +IndentCaseLabels: false +ColumnLimit: 0 diff -Nru xiphos-4.0.0+dfsg1/debian/changelog xiphos-4.0.4+dfsg1/debian/changelog --- xiphos-4.0.0+dfsg1/debian/changelog 2015-10-20 03:30:01.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/changelog 2015-10-20 10:41:38.000000000 +0000 @@ -1,20 +1,38 @@ -xiphos (4.0.0+dfsg1-0ubuntu2) wily; urgency=medium +xiphos (4.0.4+dfsg1-1) unstable; urgency=medium - * No change rebuild for gcc5 transition (LP: #1506627) - - -- Micah Gersten Mon, 19 Oct 2015 22:19:00 -0500 - -xiphos (4.0.0+dfsg1-0ubuntu1) vivid; urgency=medium - - * New upstream release. (LP: #1434944) + [ Unit 193 ] + * New upstream release. (Closes: #783556) + - Fixes many GTK3 incompatibilities. (Closes: #770713, #769940) + * Bump Standards-Version to 3.9.6. + * wrap-and-sort. + * d/control: + - Drop gsettings-desktop-schemas-dev | gconf2-common, and libgtkhtml* + Closes: #799018 + - Add docbook-utils, libbiblesync-dev, and libgtk-3-dev. + - Bump libsword-dev min dep to 1.7.3. + - Add myself to uploaders. * d/rules: - During repack, also remove build-win32/ and debian/ - - Set the debug level to 'release' - * d/control: Bump the libsword-dev dep to 1.7.3. + - Remove the builddeb override, not needed. + - Install upstream changelog. + - Enable --verbose build. + - Pass --enable-webkit-editor, --gtk=3 and --debug-level=release. + - Set DEB_LDFLAGS_MAINT_APPEND to only link as needed. + - Don't remove src/examples/ipc-interface.xml in the cleaning stage. + * d/Debian, d/clean, d/README.*: Drop. + * d/source.lintian-overrides: Remove debian-watch-file-should-mangle-version. + * d/watch: Update to find new releases, and filter out testing releases. * d/xiphos.install: Install usr/bin/xiphos-nav - * d/xiphos-data.install: Install xiphos.appdata.xml. + * d/xiphos-data.install: Install xiphos.appdata.xml. + + [ Daniel Glassey ] + * d/control: Vcs now pkg-crosswire git + add myself as uploader + remove xnox and Jonathan from uploaders + type in xiphos-dbg description + * New release for sword transition. (Closes: #801891) - -- Unit 193 Fri, 13 Feb 2015 14:50:57 -0500 + -- Daniel Glassey Mon, 19 Oct 2015 21:31:23 +0100 xiphos (3.2.2+dfsg1-1) unstable; urgency=medium diff -Nru xiphos-4.0.0+dfsg1/debian/clean xiphos-4.0.4+dfsg1/debian/clean --- xiphos-4.0.0+dfsg1/debian/clean 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/clean 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -waffles/*.pyc diff -Nru xiphos-4.0.0+dfsg1/debian/control xiphos-4.0.4+dfsg1/debian/control --- xiphos-4.0.0+dfsg1/debian/control 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/control 2015-10-20 10:41:38.000000000 +0000 @@ -1,32 +1,31 @@ Source: xiphos +Section: gnome +Priority: optional +Maintainer: CrossWire Packages +Uploaders: Unit 193 , + Daniel Glassey Build-Depends: debhelper (>= 9), - libsword-dev (>=1.7.3), - gsettings-desktop-schemas-dev | gconf2-common, - rarian-compat, - libgtkhtml-4.0-dev | libgtkhtml3.14-dev, - libgtkhtml-editor-4.0-dev | libgtkhtml-editor-3.14-dev | libgtkhtml-editor-dev | gtkhtml3.14, - libwebkitgtk-3.0-dev | libwebkitgtk-dev, - libgtkhtml-4.0-0 | libglade2-dev, - libgconf2-dev, + docbook-utils, gnome-doc-utils, intltool, - libdbus-glib-1-dev, - libgsf-1-dev, - uuid-dev, - libxml2-dev -Section: gnome -Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: CrossWire Packages -Uploaders: Dimitri John Ledkov , Jonathan Marsden -Standards-Version: 3.9.5 -Vcs-Bzr: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main -Vcs-Browser: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main/files + libbiblesync-dev, + libdbus-glib-1-dev, + libgconf2-dev, + libgsf-1-dev, + libgtk-3-dev, + libsword-dev (>= 1.7.3), + libwebkitgtk-3.0-dev | libwebkitgtk-dev, + libxml2-dev, + rarian-compat, + uuid-dev +Standards-Version: 3.9.6 +Vcs-Git: git://anonscm.debian.org/pkg-crosswire/xiphos.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-crosswire/xiphos.git/ Homepage: http://xiphos.org Package: xiphos Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xiphos-data (= ${source:Version}) +Depends: xiphos-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Replaces: xiphos-data Conflicts: xiphos-svn Provides: sword-frontend @@ -49,7 +48,7 @@ Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xiphos (= ${binary:Version}), +Depends: xiphos (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Conflicts: xiphos-svn Provides: sword-frontend Suggests: sword-text @@ -58,12 +57,12 @@ SWORD Project by the CrossWire Bible Society, a framework for developing Bible study tools and of associated texts such as commentaries and dictionaries. . - This package contains debugging symbols that are necessary to procude + This package contains debugging symbols that are necessary to produce stacktraces of Xiphos. Package: xiphos-data Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: xiphos-svn Suggests: xiphos Description: data files for Xiphos Bible study software diff -Nru xiphos-4.0.0+dfsg1/debian/Debian/Debhelper/Buildsystem/waf.pm xiphos-4.0.4+dfsg1/debian/Debian/Debhelper/Buildsystem/waf.pm --- xiphos-4.0.0+dfsg1/debian/Debian/Debhelper/Buildsystem/waf.pm 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/Debian/Debhelper/Buildsystem/waf.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -# A debhelper build system class for handling Waf based projects. -# Copyright: 2009 Ryan Niebur -# 2009 Dmitrijs Ledkovs -# License: GPL-2+ - -package Debian::Debhelper::Buildsystem::waf; - -use strict; -use base 'Debian::Debhelper::Buildsystem'; - -sub DESCRIPTION { - "waf using system-installed script"; -} - -sub DEFAULT_BUILD_DIRECTORY { - my $this=shift; - return $this->canonpath($this->get_sourcepath("build")); -} - -sub check_auto_buildable { - my ( $this, $step ) = @_; - return -e $this->get_sourcepath("wscript") ? 1 : 0; -} - -sub new { - my $class = shift; - my $this = $class->SUPER::new(@_); - # Out of source tree building is prefered. - $this->prefer_out_of_source_building(@_); - return $this; -} - -sub _do_waf { - my $this = shift; - return $this->doit_in_sourcedir( "/usr/bin/waf", "--nocache", @_ ); -} - -sub configure { - my $this = shift; - $this->_do_waf( "configure", - "--prefix=/usr", - "-b", $this->get_build_rel2sourcedir(), - @_ ); -} - -sub test { - my $this = shift; - #waf documentation suggestes to perform tests in the shutdown procedure - #which is run unconditionally on sucessful builds. - $this->_do_waf( @_ ); -} - -sub install { - my $this = shift; - my $destdir = shift; - $this->_do_waf( "install", "--destdir", $destdir, @_ ); -} - -sub build { - my $this = shift; - $this->_do_waf( "build", @_ ); -} - -sub clean { - my $this = shift; - $this->_do_waf( "distclean", @_ ); -} - -1; diff -Nru xiphos-4.0.0+dfsg1/debian/Debian/Debhelper/Buildsystem/waf_src.pm xiphos-4.0.4+dfsg1/debian/Debian/Debhelper/Buildsystem/waf_src.pm --- xiphos-4.0.0+dfsg1/debian/Debian/Debhelper/Buildsystem/waf_src.pm 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/Debian/Debhelper/Buildsystem/waf_src.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# A debhelper build system class for handling Waf based projects. -# Copyright: © 2009 Dmitrijs Ledkovs -# License: GPL-2+ - -package Debian::Debhelper::Buildsystem::waf_src; - -use strict; -use base "Debian::Debhelper::Buildsystem::waf"; - -sub DESCRIPTION { - "waf using source directory script"; -} - -sub check_auto_buildable { - my ( $this, $step ) = @_; - #TODO check that waf is executable or run as "python waf"? - return -e $this->get_sourcepath("waf") && -e $this->get_sourcepath("wscript") ? 1 : 0; -} - -sub _do_waf { - my $this = shift; - return $this->doit_in_sourcedir( "./waf", "--nocache", @_ ); -} - -1 diff -Nru xiphos-4.0.0+dfsg1/debian/README.Debian xiphos-4.0.4+dfsg1/debian/README.Debian --- xiphos-4.0.0+dfsg1/debian/README.Debian 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -How to: Rebuild a Xiphos Package --------------------------------- - -Warning: The intended audience is Xiphos developers. If you -are a regular user of Xiphos, please install the binary packages -provided by your distribution. - -If you have deb-src line enabled for crosswire-ppa or debian testing run: - -$ sudo apt-get build-dep xiphos - -to install all necessary build dependencies. - -Additionally you need the following dev packages installed on your system: - -[a] build-essential - Installs gcc, make and all other needed tools for building - Xiphos. - -[b] devscripts - Package building tools for Debian (install all recommeds) - -Build the package (at the source top-level) - -$ debuild -us -uc - -Now wait a while, as compiling will take time. -To install the newly-built package, enter: - -$ sudo dpkg -i ../xiphos-svn_version-revision_arch.deb - - -- Jonathan Marsden , Fri, 12 Nov 2010 18:11:00 -0800 diff -Nru xiphos-4.0.0+dfsg1/debian/README.source xiphos-4.0.4+dfsg1/debian/README.source --- xiphos-4.0.0+dfsg1/debian/README.source 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -This package is maintained to generate either 1.0 or 3.0 source formats at build -time. bzr-builddeb will take care of everything. Otherwise run - -$ ./debian/rules clean - -before building to generate correct ./debian/source/format. - -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -This package uses quilt in a standard way. For futher details see -/usr/share/doc/quilt/README.source - -The source tree is maintained with NO PATCHES APPLIED. - - -- Dmitrijs Ledkovs , Sat, 13 Nov 2010 23:28:54 +0000 diff -Nru xiphos-4.0.0+dfsg1/debian/rules xiphos-4.0.4+dfsg1/debian/rules --- xiphos-4.0.0+dfsg1/debian/rules 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/rules 2015-10-20 10:41:38.000000000 +0000 @@ -1,28 +1,34 @@ #!/usr/bin/make -f -ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ + override_dh_auto_configure: - ./waf configure --nocache --prefix=/usr --debug-level=release + ./waf configure --nocache --prefix=/usr --enable-webkit-editor --gtk=3 --debug-level=release + override_dh_auto_build: - ./waf build --nocache + ./waf build --nocache --verbose + override_dh_auto_install: ./waf install --nocache --destdir=debian/tmp + override_dh_install: dh_install --list-missing + override_dh_installchangelogs: dh_installchangelogs ChangeLog + override_dh_strip: dh_strip --dbg-package=xiphos-dbg + override_dh_auto_clean: ./waf distclean --nocache + override_dh_clean: find . -name '*.pyc' -delete - rm -f src/examples/ipc-interface.xml dh_clean -override_dh_builddeb: - dh_builddeb $(if $(ppa),-- -Zlzma) # get-orig-source to drop waf upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg\d+)?.*$$/\1/p') diff -Nru xiphos-4.0.0+dfsg1/debian/source.lintian-overrides xiphos-4.0.4+dfsg1/debian/source.lintian-overrides --- xiphos-4.0.0+dfsg1/debian/source.lintian-overrides 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# http://wiki.debian.org/UnpackWaf -# -# ....or provide alternative dfsg version of tarball -# genarated using upstream ./waf dist_dfsg command & upload it somewhere. -# -# To be honest, I disagree with FTP teams decision. But I am complying. -# -# Some additional food for though: -# -# http://lintian.debian.org/tags/source-contains-prebuilt-binary.html -# http://lintian.debian.org/tags/source-contains-prebuilt-windows-binary.html -# -xiphos source: debian-watch-file-should-mangle-version diff -Nru xiphos-4.0.0+dfsg1/debian/watch xiphos-4.0.4+dfsg1/debian/watch --- xiphos-4.0.0+dfsg1/debian/watch 2015-04-14 21:26:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/debian/watch 2015-10-20 10:41:38.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\+dfsg\d+$// \ -http://sf.net/gnomesword/xiphos-(.+)\.tar\.gz +http://sf.net/gnomesword/xiphos-([\d\.]+)(?:-[\d]+)?\.tar\.gz diff -Nru xiphos-4.0.0+dfsg1/INSTALL xiphos-4.0.4+dfsg1/INSTALL --- xiphos-4.0.0+dfsg1/INSTALL 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/INSTALL 2015-03-29 17:01:08.000000000 +0000 @@ -24,7 +24,11 @@ Now to compile the GTK3 version of Xiphos you need to make sure you have these packages installed: - $ sudo yum install gcc-c++ intltool gtk3-devel dbus-glib-devel gtkhtml3-devel webkitgtk3-devel libxml2-devel libgsf-devel gconfmm26-devel sword-devel libuuid-devel gnome-doc-utils rarian rarian-compat + $ sudo yum install gcc-c++ intltool gtk3-devel dbus-glib-devel gtkhtml3-devel webkitgtk4-devel libxml2-devel libgsf-devel gconfmm26-devel sword-devel libuuid-devel gnome-doc-utils rarian rarian-compat biblesync-devel + +Or for ubuntu, both GTK3 and GTK2 versions, install: + + $ sudo apt-get install cpp intltool libgtk-3-dev libdbus-glib-1-dev libgtkhtml3.14-dev libwebkitgtk-3.0-dev libxml2-dev libgsf-1-dev libgconfmm-2.6-dev libsword-dev uuid-dev gnome-doc-utils rarian-compat libgtkhtml-editor-dev libwebkit-dev libglade2-dev libgtkhtml-4.0-dev libgtkhtml-editor-4.0-dev Next we need to configure everything: diff -Nru xiphos-4.0.0+dfsg1/po/ar.po xiphos-4.0.4+dfsg1/po/ar.po --- xiphos-4.0.0+dfsg1/po/ar.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/ar.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 3.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-30 00:09+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Arabic \n" @@ -16,298 +16,266 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"Xiphos الفشل : \"لا يمكن أن يحدث\" ، display_mod : فارغة الرجاء الإبلاغ عن " +"هذا. sword_main.cc : set_treekey ماذا كنت تفعل عندما حدث هذا؟" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "التكوين لم يتم العثور على" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "هل أنت متأكد أنك تريد حذف ملاحظة للحصول على" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "فتح" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "بدون عنوان الوثيقة" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "حفظ التغييرات إلى المستند" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "قبل أن يغلق؟" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "إذا لم يكن لحفظ ، سيتم فقدان التغييرات بشكل دائم." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "ملف" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "ملاحظة المحرر" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "قائمة الصلاة / محرر مجلة" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "حول وحدة السيف" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "كله وحدة" +msgid "Module name: " +msgstr "مدير وحدة" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "خيارات" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s فشلت" - -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +msgid "Type: " +msgstr "نطاق" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Xiphos الفشل : \"لا يمكن أن يحدث\" ، display_mod : فارغة الرجاء الإبلاغ عن " -"هذا. sword_main.cc : set_treekey ماذا كنت تفعل عندما حدث هذا؟" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "صحيفة عبادي" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "التكوين لم يتم العثور على" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "خرائط" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "د من الصفحة %d %d" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "الصور" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "فتح" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "المسارد" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "حفظ باسم" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "بدون عنوان الوثيقة" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "الكتاب المقدس" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "هل أنت متأكد أنك تريد حذف ملاحظة للحصول على" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "تعليق" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "أتش تي أم أل الإخراج" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "أتش تي أم أل المصدر" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "سهل المصدر" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "القاموس" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Print..." +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "كتب عامة" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "طباعة Pre_view" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "إعادة تسمية التعليق" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Quit" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DailyJournal" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "ا _ فتح" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Save" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "غير معروف" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "_As حفظ..." +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "قوائم وحدة" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "جديد" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "نطاقات" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "فتح وثيقة جديدة" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "حذف" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "تثبيت المصدر" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "ملاحظة حذف الحالي" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "نافذة الوحدات الرئيسية" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_file" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "تنسيق" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "أتش تي أم أل _Output" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML المصدر" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Plain المصدر" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_View" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "العناوين" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "حفظ" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "الحواشي" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "إدراج ارتباط" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "إحالات" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "حفظ التغييرات إلى المستند" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "قوية وأرقام" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "قبل أن يغلق؟" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "العلامات المورفولوجية" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "إذا لم يكن لحفظ ، سيتم فقدان التغييرات بشكل دائم." +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemmas" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "ملف" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "كلام المسيح في الأحمر" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "اليونانية اللكنات" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "ملاحظة المحرر" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "نقاط العبرية حرف العلة" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "قائمة الصلاة / محرر مجلة" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "العبرية Cantillation" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "فتح" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "التحضير للطباعة" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "غير معتمد الطباعة على هذه الطابعة" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "الحروف" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "الطابعة%s لا يدعم بوستسكريبت الطباعة." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "الطبعة" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "في انتظار طباعة" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "حدث خطأ أثناء الطباعة" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morpheme الإنقسام" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "ولم يكن من الممكن لطباعة المستند : %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "حول وحدة السيف" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "السمة" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "وحدة لا يوجد لديه حول المعلومات." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "خيارات" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -324,42 +292,44 @@ "باستخدام العديد من الواجهات هذا الإطار. من كتب قد تكون مشتركة إن تثبيت تعيين " "بين جميع الواجهات باستخدام الإطار. التحميل كتب يمكن من مشروع السيف." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "السيف المشروع" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "هل تحب استخدام Xiphos لدراسة الكتاب المقدس؟ هل تريد أن ترى شاشته باستخدام " "لغتك الأم؟ هل يمكن ترجمة Xiphos! نحن نبحث دائما عن مساهمات جديدة من Xiphos " "ترجمة إلى لغات أخرى. إذا كنت قادرا على ترجمة بالنسبة لنا ، يرجى الاطلاع على " "الرابط أدناه ، الاتصال بنا ، والتورط مع جهودنا." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "حول الترجمة Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "انظر الترجمة ، كوميديا في Xiphos مصدر" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos التنمية" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "حقوق الطبع والنشر 2000-2009 فريق التطوير Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "حقوق الطبع والنشر 2000-2015 فريق التطوير Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -371,233 +341,233 @@ "قدموا لنا مشروع السيف." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "المرجعية" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "أدخل اسم المجلد" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "اسم المجلد" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "المجلد :" -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "العلامات حدد الملف" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "تحرير" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "اسم المجلد :" -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "المرجعية الاسم :" -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "الآية :" -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "الوحدة :" -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "إزالة المجلد المحدد" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(وجميع محتوياته؟" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "إزالة العلامة المحددة" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "أضف" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "الشركة المنتجة :" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "نتيجة بحث : %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "العلامات" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "الشفرات الرئيسية ليالي الوحدة %s " -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "ل :" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "مفتاح الدخول :" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "إغلاق بدون الحفظ" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos :" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "إغلاق _without إنقاذ" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "الآية قائمة" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "VerseList" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "SearchResults" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "يرجى التحقق من حقوق التأليف والنشر قبل تصدير!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "البحث" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "أدخل كلمة أو عبارة" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "البحث الى الوراء" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "بحث عن التالي" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "مجموعة الخط الوحدة" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "تغيير الخط" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "وحدة" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "الخط الحالي :" -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "استخدام الخط الافتراضي لهذه الوحدة" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "علة! Xiphos على وشك أن تحطم بسبب خطأ \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "الرجاء الإبلاغ عن هذا الخطأ لفريق Xiphos مع :" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "علة! Xiphos على وشك أن تحطم نتيجة لخطأ في \"السلسلة\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "في الوحدات النمطية التي لديها أرقام سترونغ" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos :" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos -- دراسة الكتاب المقدس البرمجيات" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "فتح علامة تبويب جديدة" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "عرض قياسي" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "تعليق الصورة" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "عرض كتاب" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "مرحبا بكم في Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -613,33 +583,33 @@ "محتويات هذا التعليق ، وبالتالي إعادة تسمية الشخصية التعليق غير متوفر في بيئة " "ويندوز." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "إعادة تسمية التعليق" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "اختيار اسم التعليق" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "اسم جديد" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "الاسم :" -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "يجب أن تكون أسماء وحدة نمطية تحتوي على [ألف زا - z0 - 9_] فقط." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos يعرف بالفعل وحدة بهذا الاسم." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -648,7 +618,7 @@ "فشلت في خلق التكوين الجديد : \n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -656,7 +626,7 @@ "التكوين بناء الخطأ :\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -723,20 +693,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "إزالة هذه الوحدات؟" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "تستعد لازالة" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "إزالة" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "إزالة" @@ -756,77 +726,81 @@ msgid "Install" msgstr "تثبيت" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "الأرشيف هذه الوحدات؟" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "تستعد لالأرشيف" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "أرشفة" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "الأرشيف" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "بناء فهرس البحث السريع لهذه الوحدات (قد يستغرق دقائق / وحدة)؟" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "تستعد للمؤشر" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "فهرسة" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "مؤشر" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "حذف سريع في البحث عن الرقم القياسي لهذه الوحدات؟" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "تستعد لحذف فهرس" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "حذف فهرس" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "شطب" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "وحدة لا يوجد لديه حول المعلومات." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "اسم الوحدة" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "على تحديد وسائل تم بالفعل تثبيت هذه الوحدة" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "انقر فوق مربع للعمل في هذه الوحدة" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "انقر فوق المربع لتحديد هذه الوحدة من أجل تثبيت / تحديث" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "تثبيت" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -834,7 +808,7 @@ "رمز مؤشر يعني أنك قد بنيت فهرس الأمثل ('وسين') لهذه الوحدة من أجل " "البحث السريع (انظر الجزء الصيانة لهذه المهمة)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -842,13 +816,13 @@ "رمز القفل وسائل هذه الوحدة مشفرة ، ويتطلب أن تقوم بشراء فتح المفتاح من مالك " "المحتوى" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "حول" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -856,52 +830,52 @@ "رمز التحديث يعني وحدة المثبت أقدم من وحدة الأحدث المتوفرة : يجب عليك تحديث " "وحدة" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "متاح" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "حجم" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "الوصف" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "المؤرشفة في :\n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "لا يمكن المجلات وقوائم الصلاة وفهرستها." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s فشلت" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "انتهى" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "غير معروف" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -910,369 +884,370 @@ "مستودع : \n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "مصنفة حسب نوع الوحدة" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "نصوص الكتاب المقدس" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "التعليقات" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "القواميس" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "المسارد" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "يوميا دفوأيشنلس" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "كتب عامة" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "خرائط" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "الصور" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "عبادة / غير تقليدي" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "مصنفة حسب توفر" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "تحديثات" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "إلغاء" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "قائمة الصلاة / مجلة" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "منعش من مصدر بعيد" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "لم يتم العثور على مصدر البعيد" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "تكوين" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "نوع" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "شرح" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "مصدر" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "الدليل" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "المستخدم" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "كلمة السر" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "الأوصاف الفريدة" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "مصادر الوحدة" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "إضافة / إزالة" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "اختر" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "وحدات" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "تثبيت / تحديث" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "الصيانة" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "يرجى تحديث" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "قائمة الوحدة النمطية الخاص بك لا يصل حتى الآن!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "إلغاء لديك الخاص بالموقع الكتاب المقدس. Xiphos يتطلب واحد على الأقل." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "لا توجد حتى الآن تثبيت الاناجيل. Xiphos لا يمكن ان يستمر من دون واحدة." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "تم تحميلها المصادر الاعتيادية البعيدة." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "لا يمكن تحميل المصادر القياسية من CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "إزالة مصدر مختارة" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "أدخل مصدر بعيد" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "التعليق :" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "النوع :" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "المضيف :" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "الدليل :" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "المستخدم (اختياري) :" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "كلمة السر (اختياري) :" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "مصدر هذا الاسم موجود مسبقا." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "حذف مصدر بعيد" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "كله وحدة" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "الذهاب إلى الخارج ، إلى المقطع تحتوي على هذا واحد" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "الذهاب إلى العنصر السابق" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "الذهاب إلى البند التالي" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "الذهاب إلى الداخل ، إلى الفرع الأول" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "تزامن هذا الإطار في التمرير مع النافذة الرئيسية" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "مواز" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "فصل / إرفاق" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "خيارات الوحدة" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "عرض مواز" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "قراءة بصوت عال التحديد" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "الشخصية" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- اختر --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "واللغة نافذة المفعول بعد إعادة التشغيل." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "تفضيلات" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "العام" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "خيارات" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "الكتاب المقدس" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "حرة" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "اللون" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "الأحجام وجوه" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "خاص" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "قائمة واضحة؟" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "هل أنت متأكد أنك تريد مسح قائمة وحدة؟" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "إزالة وحدة؟" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "هل أنت متأكد أنك تريد إزالة الوحدة المختارة؟" @@ -1291,20 +1266,20 @@ msgid "found in " msgstr "وجدت في" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "قائمة جديدة %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "قد لا يكون وحدة قائمة الماضي حذف" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "حذف القائمة؟" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "هل أنت متأكد أنك تريد حذف :" @@ -1324,7 +1299,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1379,7 +1354,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1407,123 +1382,113 @@ "على سبيل المثال ن محامون بلا حدود عن \"الاسم ، النصب المفرد المؤنث\" -- انظر " "وحدة روبنسون للحصول على تفاصيل." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "هذا هو شاملة (\"و\") البحث : البحث عن مباريات عرض جميع الكلمات." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "_Advanced البحث" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 #, fuzzy msgid "Open the separate Advanced Search dialog." msgstr "فتح مربع الحوار بحث متقدم ، لتشغيل استعلامات معقدة" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "نموذج البحث" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "الكتاب المقدس" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "تعليق" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "نوع البحث" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "كلمة متعددة" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "التعبير العادية" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "بالضبط مثل العبارة" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "خيارات البحث" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "حالة المباراة" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "نطاق البحث" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "لا مجال" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "استخدام حدود" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "البحث بالموقع" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "حدود" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "انخفاض" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "أعلى" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "فتح في محرر" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "تفضيلات" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "البحث" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "الشريط الجانبي" @@ -1531,73 +1496,73 @@ msgid "Powered by the SWORD Project" msgstr "بدعم من مشروع السيف" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "لا يمكن إنشاء علامات دير." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "قائمة الصلاة / البند مجلة" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "اسم جديد" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "إزالة العنصر المحدد" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "كانون الثاني / يناير" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "شباط / فبراير" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "آذار / مارس" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "نيسان / أبريل" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "قد" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "حزيران / يونيو" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "تموز / يوليو" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "آب / أغسطس" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "أيلول / سبتمبر" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "تشرين الأول / أكتوبر" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "تشرين الثاني / نوفمبر" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "كانون الأول / ديسمبر" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1605,7 +1570,98 @@ "لا يمكن ان حجم ملف صورة يتم تحديدها بعد. Xiphos لا يمكن تغيير حجم الصور " "لتناسب النافذة." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "كله وحدة" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "انقر فوق مربع للعمل في هذه الوحدة" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "متاح" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "خلاص" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1614,248 +1670,271 @@ "ترميز غير صحيح تسمية الشخصية الشرح : \n" "%s" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "الفصل" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos لا يفهم أكثر من وسيطة واحدة." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "بدء أبو بريص" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "بناء واجهة" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "بدءا السيف" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "تحميل إعدادات" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "عرض Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "المعاين" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "حاشية" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "الصليب المرجعي" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "مورفولوجيا" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "العودة إلى" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "قوية وأرقام" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "الحواشي" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "العلامات المورفولوجية" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "نقاط العبرية حرف العلة" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "العبرية Cantillation" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "اليونانية اللكنات" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "إحالات" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmas" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "العناوين" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morpheme الإنقسام" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "كلام المسيح في الأحمر" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "الحروف" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "المتغيرات النصية" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "القراءة الأولية" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "الثانوية القراءة" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "جميع قراءات" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "الحروف" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "المسارد" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "عرض السياق" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "النمو" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "من أجل تحقيق النمو
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "خلاص" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "للإنقاذ
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "الصحة" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "للصحة
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "متفرقات" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "متفرقات
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "نقطة العاشر" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(خ)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "ذ نقطة" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(ذ)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "نقطة ض" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(ض)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "طفيفة المواضيع 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "الموضوع الفرعي 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "القاصر الموضوع 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "الموضوع الفرعي 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "القاصر الموضوع 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "الموضوع الفرعي 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "القاصر الموضوع 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "الموضوع الفرعي 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "اسم القائمة الجديدة لصلاة أو مجلة" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos يرى أن الصلاة القائمة بالفعل." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1864,19 +1943,19 @@ "يمكن Xiphos لم يخلق لمسار الوحدة\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "قائمة الصلاة الأساسية.\\par \\par الوحدة التي أنشأتها Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "BasicPrayerList" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MyPrayerList" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1884,102 +1963,102 @@ "الناس :
بوب
سام
سو

الكنيسة :
المقصورات
زمالة
الاناجيل عن المبشرين


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "الصلاة قائمة على أساس الموضوع.\\par\\par الوحدة التي أنشأتها Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubjectPrayerList" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "بوب
سام
سو
جون
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "النمو الروحي" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "مايك
ستيف
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "سو
جون
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "قائمة الصلاة شهريا. \\par\\par الوحدة التي أنشأتها Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonthlyPrayerList" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "اليومية. \\par\\par الوحدة التي أنشأتها Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DailyJournal" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "موضوعا المبين (خطبة مثلا). \\par\\par الوحدة التي أنشأتها Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OutlinedTopic" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "المواضيع الرئيسية و" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "المواضيع الرئيسية و
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "المواضيع الرئيسية باء" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "المواضيع الرئيسية باء
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "المواضيع الرئيسية جيم" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "المواضيع الرئيسية جيم
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "مستخدم التعليق" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "%s نتيجة البحث : %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "حذف النطاق؟" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "هل أنت متأكد أنك تريد حذف هذا النطاق؟" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "البحث :" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1990,16 +2069,16 @@ " : تثبيت وحدة ، هي ليست\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "الرجاء ضبط قائمة الوحدات." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "لا مؤشر سريع البحث وجود ل %s%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2007,7 +2086,7 @@ "\n" "بحث في هذا النموذج هو الآن `كلمة متعددة." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2015,48 +2094,46 @@ "\n" "راجع مدير وحدة ، صيانة جزء." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "الانتهاء من البحث" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "المباريات" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "لم يتم تعيين المنزل $!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" +"يمكن Xiphos لم يخلق لمسار الوحدة\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "لا يمكن إنشاء" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" "قد تكون معلومات ملف إعدادات فارغ فقد حاول -- استرداد بعض النسخ الاحتياطي." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "إعدادات ملف فارغ -- أي النسخ الاحتياطي؟!؟ فقدان المعلومات!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2066,11 +2143,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "الكتاب المقدس تركيب وحدة كاملة." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2080,36 +2157,36 @@ msgid "verse" msgstr "آية" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "الفصل" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "في ملف Xiphos للغة الاختصارات مفقود." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "اختصار الملف لا يمكن للغة Xiphos يمكن فتح." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "لا يمكن Xiphos تخصيص مساحة للغة الاختصارات." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "لا يمكن Xiphos قراءة الملف اختصار اللغة." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2118,11 +2195,11 @@ "وجدت مطابقة للغة لا سيصدره '%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "قد لا أسماء الكتاب والقوائم يمكن ترجمتها." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2130,7 +2207,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2138,11 +2215,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "وطلب اليومية تعبدي ، ولكن هناك شيء مثبت." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2161,89 +2238,94 @@ "صفحة الويب التي أكدت الشراء ، أو ربما ترسل عبر البريد الإلكتروني بعد شراء " "الرجاء إدخال المفتاح في الحوار." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "مسح المحفوظات" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "الآية قائمة" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "لم يتم العثور على عنوان الموقع :" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos تعذر تنفيذ %s." -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "عارض الخطأ \n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "إظهار %s الإطار الرئيسي ليالي" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "لا مستند تم إنشاؤه بنجاح.\n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "ماذا يجب أن أفعل لكي أخلص؟" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "أعمال 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "أف 2:8،9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "رومية 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "ما هو الإنجيل؟" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 كو 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "تحليل الوثيقة لا بنجاح.\n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "وثيقة فارغة\n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "نوع الخطأ ، والعقدة الجذر! = %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2252,7 +2334,7 @@ "\n" msgstr "الفصل" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2261,101 +2343,101 @@ "\n" msgstr "الفصل" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "العهد القديم" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "الجنرال -- المال" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "العهد الجديد" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "حصيرة -- القس" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "عينة قائمة الوحدات" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "نوع الخطأ ، والعقدة الجذر! = %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "تحاول العودة الى انقاذ السابقة." @@ -2369,13 +2451,13 @@ msgstr "المرجعية حوار" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "إنشاء مجلد جديد" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "مجلد جديد" @@ -2384,7 +2466,7 @@ msgstr "جديد..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "إلغاء المرجعية" @@ -2397,22 +2479,22 @@ msgstr "تسمية الدخول" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "الآية :" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "الآية الدخول" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "الوحدة :" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "وحدة الدخول" @@ -2420,6 +2502,10 @@ msgid "Bookmark Folder Treeview" msgstr "المرجعية مجلد تريفيف" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "إدراج ارتباط" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2475,6 +2561,12 @@ msgid "_Delete Personal Comment" msgstr "_Delete التعليق الشخصية" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_file" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "حفظ المذكرة الحالية" @@ -2483,6 +2575,14 @@ msgid "_Save (Personal Comment)" msgstr "_Save (تعليق شخصي)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "طباعة Pre_view" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Print..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "E_xit" @@ -2491,6 +2591,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "حفظ" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "طباعة هذه الوثيقة" @@ -2528,7 +2633,7 @@ msgstr "مستند جديد" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "نسخة ممر للتصدير /" @@ -2565,7 +2670,7 @@ msgstr "تصدير الكتاب كاملة" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "كتاب" @@ -2680,8 +2785,8 @@ msgid "Open about dialog" msgstr "فتح في الحوار" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2724,13 +2829,17 @@ msgid "Delete selection" msgstr "حذف مجموعة مختارة" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "حذف" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "إزالة العنصر المحدد" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "حذف البند" @@ -2905,6 +3014,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "جديد" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3039,123 +3152,87 @@ msgid "_Edit" msgstr "_Edit" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Help" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #, fuzzy msgid "Normal" msgstr "نص عادي" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "حذف القائمة؟" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "الآية قائمة" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "العلامة آية عدم تحديد /" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "مارك" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "عدم تحديد" @@ -3227,31 +3304,39 @@ msgstr "حذف فهرس البحث السريع من وحدات مختارة." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "مواصلة" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "سيف" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "مدير وحدة" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "تحذير : إذا كنت تعيش في بلد يضطهد استخدام بعناية." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "إضافة وإزالة مصادر" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "المحلية المصادر الحالية" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3259,15 +3344,15 @@ "إضافة مجلد المحلية كمصدر للتثبيت ، وعادة على محرك قرص مدمج أو فلاش. هذا " "المجلد يحتوي على مجلدات فرعية \"mods.d\" و \"الوحدات\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "إزالة واحد من المجلدات المحلية كمصدر تثبيت." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "مصادر التيار البعيد" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3275,43 +3360,43 @@ "أضف مخصص مصدر تثبيت البعيد. يجب أن تعرف اسم المضيف ، والمجلد حيث يعيشون على " "المخزون." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "إزالة مصدر تثبيت البعيد." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "تثبيت المصدر" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "المحلية" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "بعيد" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "تثبيت الوجهة" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "الشخصية المنطقة ، للاستخدام الخاص فقط :" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "الصفحة الرئيسية دير" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "نظام المناطق ، لكافة المستخدمين :" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "سيف دير تميز الكلية" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3319,10 +3404,14 @@ "تحذير : إذا كنت تعيش في بلد واضطهاد لا ترغب في الكشف عن المخاطر الذي " "تستخدمه ليس الميزة التثبيت عن بعد!" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "المحلية تثبيت مجلد" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "قطرة إلى أسفل قائمة التاريخ" @@ -3331,11 +3420,11 @@ msgid "Choose book to display" msgstr "اختيار الكتاب لعرض" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "كتاب محدد زر" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "الوحي من جون" @@ -3344,11 +3433,11 @@ msgid "Choose chapter to display" msgstr "اختيار الكتاب لعرض" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "تبديل الفصل زر" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3495,11 +3584,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "وحدات" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3571,12 +3661,12 @@ msgid "BSP privacy button" msgstr "الآية زر الراديو" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "خلاص" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3608,11 +3698,12 @@ msgid "BSP nav verse list radio button" msgstr "وحدة قائمة زر راديو" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "اسم قائمة" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3655,7 +3746,12 @@ msgid "BSP listen none radio button" msgstr "راديو عادي نص الزر" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "خاص" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3841,193 +3937,192 @@ msgstr "قوائم الصلاة تمكين خانة" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "الآية رقم" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "أرقام الآية العرض في النص" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "الآية رقم حجم" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "تغيير حجم الصور مربع" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "الوصف" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "_Numbers إظهار الآية" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "الآية رقم حجم" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "StudyPad الدليل الافتراضي التحرير والسرد" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "تحديد دليل" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudyPad الدليل الافتراضي التحرير والسرد" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "متفرقات عامة" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "نافذة الوحدات الرئيسية" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "نص الكتاب المقدس" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "تغيير النص الانجيلي كومبو" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "تغيير التعليق كومبو" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "القاموس" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "تغيير قاموس كومبو" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "تغيير كتاب كومبو" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "وحدات" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "واضح من جميع وحدات قائمة" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "واضحة وحدات من قائمة زر" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "إزالة وحدة مختارة من قائمة" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "حذف وحدة مختارة من قائمة زر" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "فتح الحوار لتحديد وحدات" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "إضافة وحدات" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "اختيار زر فتح حوار" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "وحدات متوازية" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "وحدات للاستعمالات الخاصة" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "صحيفة عبادي" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "يوميا عبادي كومبو" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "معجم العبرية" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "معجم العبرية كومبو" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "معجم اليونانية" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "معجم اليونانية كومبو" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "القاموس الافتراضي" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "تغيير القاموس الافتراضي كومبو" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "ملاحظات شخصية" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "تغيير الملاحظات الشخصية كومبو" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "وحدات متفرقات" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "اختيار وحدة" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4058,6 +4153,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "بحث متقدم" @@ -4265,11 +4364,11 @@ msgid "Found" msgstr "وجدت" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "نتيجة موجز نافذة" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "نتيجة موجز الجدول" @@ -4461,6 +4560,11 @@ msgid "Attribute Search" msgstr "السمة البحث" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "اختيار وحدة" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4554,6 +4658,10 @@ msgid "_Module Manager" msgstr "مدير _Module" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_View" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "معاينة الولاء _Daily" @@ -4698,27 +4806,27 @@ msgid "Learn about Xiphos" msgstr "معرفة Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "تعليم الآية" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "فتح وحدة نمطية" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "ملاحظة" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "فتح في محرر" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "الآية لكل خط" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4726,267 +4834,276 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "المتغيرات" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "صورة المحتوى" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "احترام الخط وجوه" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "التعليق من الفصل" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Doublespace" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "بحث التحديد" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "قاموس الاستخدام الحالي" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "استعراض في BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "فتح هذه الوحدة" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "عرض كتاب عنوان" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "عرض عنوان الفصل" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "إعادة تسمية Pers.Comm." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "تفريغ Pers.Comm." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "قراءة بصوت عال التحديد" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "حفظ هذه النتائج كعلامة واحدة" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "حفظ كعلامة قائمة واحدة" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "حفظ هذه النتائج على شكل سلسلة من العلامات الموجودة في مجلد الخاصة" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "حفظ قائمة على شكل سلسلة من العلامات" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "الآية قائمة" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "قطرة إلى أسفل قائمة التاريخ" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "تصدير قائمة" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "فتح هذه الإشارة المرجعية في علامة تبويب جديدة" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "فتح في علامة تبويب جديدة" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "فتح هذا مرجعية في الحوار" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "فتح في الحوار" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "إضافة مجلد جديد إلى المجلد المحدد" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "تضاف علامة جديدة هنا" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "إدراج إشارة مرجعية" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "تحرير المرجعية البند" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Edit السلعة" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "حذف البند" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "توسيع جميع المجموعات المرجعية" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "توسيع الكل" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "انهيار جميع المجموعات المرجعية" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "طي الكل" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "يمكن نقلها السماح للعناصر من مجلد واحد إلى آخر" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "تتيح إعادة ترتيب" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "تحميل الملف الإشارات الأخرى (الافتراضي : من BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "استيراد الإشارات المرجعية" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "إزالة مجلد وحفظه" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "تصدير مجلد" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "فتح وحدة مختارة في علامة تبويب جديدة" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "فتح وحدة مختارة في] نافذة منفصلة ['الحوار' أ" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "فتح في إطار منفصل" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "إنشاء قائمة جديدة صلاة بسيطة" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "بسيطة" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "إنشاء قائمة جديدة موضوع الصلاة" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "الموضوع" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "إنشاء مجلة شهرية جديدة" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "شهريا" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "إنشاء مجلة جديدة كل يوم" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "يوميا" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "إنشاء موضوع جديد المبينة" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "أوجز" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "فتح في إطار منفصل" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "إضافة البند الفرعي" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "إضافة البند الفرعي" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "إضافة عنصر" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "إضافة عنصر" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "إزالة هذا البند" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "تحرير هذا البند" @@ -4998,6 +5115,80 @@ msgid "Study the Bible" msgstr "دراسة الكتاب المقدس" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "كله وحدة" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s فشلت" + +#~ msgid "Page %d of %d" +#~ msgstr "د من الصفحة %d %d" + +#~ msgid "Save As" +#~ msgstr "حفظ باسم" + +#~ msgid "HTML Output" +#~ msgstr "أتش تي أم أل الإخراج" + +#~ msgid "HTML Source" +#~ msgstr "أتش تي أم أل المصدر" + +#~ msgid "Plain Source" +#~ msgstr "سهل المصدر" + +#~ msgid "_Quit" +#~ msgstr "_Quit" + +#~ msgid "_Open" +#~ msgstr "ا _ فتح" + +#~ msgid "_Save" +#~ msgstr "_Save" + +#~ msgid "Save _As..." +#~ msgstr "_As حفظ..." + +#~ msgid "Open new document" +#~ msgstr "فتح وثيقة جديدة" + +#~ msgid "Delete current note" +#~ msgstr "ملاحظة حذف الحالي" + +#~ msgid "HTML _Output" +#~ msgstr "أتش تي أم أل _Output" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML المصدر" + +#~ msgid "_Plain Source" +#~ msgstr "_Plain المصدر" + +#~ msgid "Unlock " +#~ msgstr "فتح" + +#~ msgid "Preparing to print" +#~ msgstr "التحضير للطباعة" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "غير معتمد الطباعة على هذه الطابعة" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "الطابعة%s لا يدعم بوستسكريبت الطباعة." + +#~ msgid "Printing" +#~ msgstr "الطبعة" + +#~ msgid "Waiting to print" +#~ msgstr "في انتظار طباعة" + +#~ msgid "An error occurred while printing" +#~ msgstr "حدث خطأ أثناء الطباعة" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "ولم يكن من الممكن لطباعة المستند : %s" + #~ msgid "Tabs" #~ msgstr "علامات" diff -Nru xiphos-4.0.0+dfsg1/po/bg.po xiphos-4.0.4+dfsg1/po/bg.po --- xiphos-4.0.0+dfsg1/po/bg.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/bg.po 2015-06-16 17:44:26.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Xiphos-1.0-0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-03-15 22:44+0000\n" "Last-Translator: svilborg \n" "Language-Team: Xiphos Project\n" @@ -17,294 +17,240 @@ "X-Launchpad-Export-Date: 2010-03-21 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" - -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" - -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" - -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" - -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" - -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" msgstr "" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" msgstr "" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Îòâîðè" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" msgstr "" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" msgstr "" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" msgstr "" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." msgstr "" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Ôàéë" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" msgstr "" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" msgstr "" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Îòâîðè" - -#: ../src/editor/slib-editor.c:435 -msgid "Save As" +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:421 +msgid "Type: " msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" +#: ../src/gnome2/about_modules.c:423 +msgid "Daily Devotion" msgstr "" -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" msgstr "" -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" msgstr "" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "êîìåíòàð" -#: ../src/editor/slib-editor.c:739 -msgid "_Save" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" msgstr "" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." +#: ../src/gnome2/about_modules.c:446 +msgid "General Book" msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "íîâ" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "êîìåíòàð" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" +#: ../src/gnome2/about_modules.c:457 +msgid "Unknown type" msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " msgstr "" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" msgstr "" -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " msgstr "" -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" msgstr "" -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" msgstr "" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Ñúõðàíè" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "çàãëàâèÿ" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Бележки под страница" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Ïðåäïî÷èòàíèÿ" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" msgstr "" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" msgstr "" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Ôàéë" - -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -316,37 +262,38 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" msgstr "" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -355,234 +302,234 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Ðåäàêòèðà èçáðàíàòà îòìåòêà" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "" # src/gs_viewtext_dlg.c -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Äîáàâè" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "íàìåðè" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "âúâåäåòå äóìà èëè ôðàçà" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "íàìåðè ñëåäâàù" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "" -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -594,46 +541,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "" -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -700,20 +647,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "" @@ -733,514 +680,519 @@ msgid "Install" msgstr "" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Êîìåíòàðè" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "çàêà÷è/îòêà÷è" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Îïöèè íà ìîäóëà" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Ïðîâåðè ìàðêèðàíîòî" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "ëè÷íè" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Ïðåäïî÷èòàíèÿ" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Ñèíõðîíèçèðàíå" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1259,20 +1211,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, fuzzy, c-format msgid "New List %s" msgstr "çàïàçè ñïèñúêà" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1292,7 +1244,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1337,7 +1289,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1355,120 +1307,110 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "êîìåíòàð" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "äîëía" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Ïðåäïî÷èòàíèÿ" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Òúðñåíå" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "" @@ -1476,446 +1418,554 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +msgid "Unknown module " +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Бележки под страница" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "çàãëàâèÿ" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Ðàçíè" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1923,68 +1973,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -1994,11 +2040,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2008,47 +2054,47 @@ msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2056,7 +2102,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2064,11 +2110,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2082,89 +2128,93 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "ïîêàæè %s â ãëàâíèÿ ïðîçîðåö" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2173,7 +2223,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2182,101 +2232,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2290,13 +2340,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "" @@ -2305,7 +2355,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2318,22 +2368,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2341,6 +2391,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2396,6 +2450,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2404,6 +2464,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "" + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "" @@ -2412,6 +2480,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Ñúõðàíè" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "" @@ -2449,7 +2522,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2486,7 +2559,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2594,8 +2667,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2636,13 +2709,17 @@ msgid "Delete selection" msgstr "" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Ïðîâåðè ìàðêèðàíîòî" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2799,6 +2876,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "íîâ" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "" @@ -2919,120 +3000,84 @@ msgid "_Edit" msgstr "_ðåäàêòèðàé" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3103,96 +3148,108 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3201,11 +3258,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3213,11 +3270,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3359,11 +3416,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3430,11 +3487,11 @@ msgid "BSP privacy button" msgstr "" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3462,11 +3519,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3506,7 +3563,11 @@ msgid "BSP listen none radio button" msgstr "" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3684,185 +3745,184 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Åâðåéñêè ëåêñèêîí" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Ãðúöêè ëåêñèêîí" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -3891,6 +3951,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "" @@ -4096,11 +4160,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4292,6 +4356,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4384,6 +4453,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4528,27 +4601,27 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4556,265 +4629,273 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Ïðîâåðè ìàðêèðàíîòî" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Îòêëþ÷è òîçè ìîäóë" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +msgid "Preload history from verse list" +msgstr "" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Ðåäàêòèðà èçáðàíàòà îòìåòêà" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Expand all bookmarks groups" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "îòâîðè âñè÷êè" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "çàòâîðè âñè÷êè ãðóïè îòìåòêè" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "çàòâîðè âñè÷êè" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "ðàçðåøè ïðåíàðåæäàíå" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" diff -Nru xiphos-4.0.0+dfsg1/po/cs.po xiphos-4.0.4+dfsg1/po/cs.po --- xiphos-4.0.0+dfsg1/po/cs.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/cs.po 2015-06-16 17:44:26.000000000 +0000 @@ -1,362 +1,286 @@ -# Czech translation for Xiphos -# Copyright (C) 2006,2008 Free Software Foundation, Inc. -# Contributions are welcome. -# Translation Notes (Any comment welcome) -# --------------------------------------- -# SWORD Project -> Projekt SWORD -# SWORD Bible Framework -> SWORD Bible Framework -# Bookmark -> Záložka -# Morphological Tags -> Morfologické značky -# Cantillation -> vokalizace -# Hebrew Vowel Points -> Punktuace hebrejských samohlásek -# Lookup -> Vyhledávání -# Books -> Knihy -# Biblical Text -> Biblické texty -# Pin Tabs -> Stejný verš v panelech -# Lemmas -> Lemmata -# Daily Devotion -> Dnešní čtení -# (text k zamyšlení ke konkrétnímu datu) -# Daily Devotional -> Čtení na každý den -# (kniha s texty k zamyšlení pro celý rok) -# Journal -> Deník -# Percomm -> Osobní komentáře -# subject-based prayer list -> Modlitební seznam s náměty -# StudyPad -> Poznámkový blok -# splash screen -> úvodní obrazovka -# Range -> Rozsah -# verse range -> rozsah veršů -# Verse Ranges -> rozsahy veršů -# -# Checkbox -> Zaškrtávací pole -# Combo (Combobox) -> Roletové menu -# Entry -> Položka -# Index -> Rejstřík -# Label -> Popisek -# Radiobutton -> výběrové pole -# Repository -> zdroj -# Treeview -> stromový pohled -# -# Sidebar -> Postranní lišta -# Framework -> programové vybavení -# Tab -> karta -# -# Learn about -> více informací o -# Glossaries -> slovníky -# Attribute-based search -> vyhledávání ve vlastnostech -# -# Martin Zibricky , 2008-2010 -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Martin Zibricky , 2014 msgid "" msgstr "" -"Project-Id-Version: Xiphos 3.1.4\n" +"Project-Id-Version: Xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" -"PO-Revision-Date: 2010-10-01 15:46+0100\n" -"Last-Translator: \n" -"Language-Team: Xiphos Translation Team\n" -"Language: \n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" +"PO-Revision-Date: 2014-12-26 20:52+0000\n" +"Last-Translator: Martin Zibricky \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/xiphos/language/" +"cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 14:28+0000\n" -"X-Generator: Launchpad (build Unknown)\n" -"X-Poedit-Country: CZECH REPUBLIC\n" -"X-Poedit-Language: Czech\n" - -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"Xiphos selhal: \"nemůže nastat\", display_mod: null\n" +"Prosím nahlašte to. sword_main.cc:set_treekey\n" +"Co jste dělal(a), když aplikace selhala?" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Konfigurace nebyla nenalezena" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Jste si jist, že chcete odstranit poznámku k" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Otevřít" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Nepojmenovaný dokument" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Uložit změny do dokumentu" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "před uzavřením?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Jestliže neuložíte, změny budou nenávratně ztraceny." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Soubor" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Poznámkový blok" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Editor poznámek" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Editor pro Modlitební seznam/deník" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "O modulu" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Celý modul" +msgid "Module name: " +msgstr "Správce modulů" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Možnosti" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s se nezdařilo" +msgid "Type: " +msgstr "Rozsah" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Čtení na každý den" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Xiphos selhal: \"nemůže nastat\", display_mod: null\n" -"Prosím nahlašte to. sword_main.cc:set_treekey\n" -"Co jste dělal(a), když aplikace selhala?" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapy" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Konfigurace nebyla nenalezena" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Obrázky" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Stránka %d z %d" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Slovníky" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Otevřít" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Uložit jako" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bible" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Nepojmenovaný dokument" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Komentář" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Jste si jist, že chcete odstranit poznámku k" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Slovník" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Výstup HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Zdroj HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Čistý zdroj" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Knihy obecně" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Tisk…" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Přejmenovat komentář" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Ná_hled tisku" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Denik" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Konec" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Otevřít" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Uložit" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Uložit _jako…" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Neznámý" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nový" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Seznam modulů" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Otevřít nový dokument" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Rozsah" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Smazat" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Smazat aktuální poznámku" - -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Soubor" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Přidat zdroj" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Výstup HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "Zdroj _HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Prostý zdroj" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Zobrazit" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Hlavní okno modulů" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Uložit" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formát" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Vložit odkaz" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Nadpisy" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Uložit změny do dokumentu" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Poznámky pod čarou" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "před uzavřením?" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Křížové odkazy" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Jestliže neuložíte, změny budou nenávratně ztraceny." +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strongova čísla" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Soubor" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologické značky" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Poznámkový blok" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemmata" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Editor poznámek" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Ježíšova slova v červené barvě" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Editor pro Modlitební seznam/deník" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Řecké přízvuky" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Odemknout " +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Punktuace hebrejských samohlásek" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Připravuje se tisk" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebrejská vokalizace" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Tisk na této tiskárně není podporován" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Tiskárna %s nepodporuje tisk technologií PostScript." +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transkripce formulářů" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Tisk" +#: ../src/gnome2/about_modules.c:583 +#, fuzzy +msgid "* Enumerations" +msgstr "Vyjmenování" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Čeká se na tisk" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Při tisku došlo k chybě" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Členění morfémů" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Nebylo možné vytisknout váš dokument: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "O modulu" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Parametr" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Informace o modulu nejsou k dispozici." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Možnosti" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -375,18 +299,20 @@ "\n" " Knihy je možno stáhnout ze stránek projektu SWORD." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Projekt SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Používáte rád(a) Xiphos při studiu Bible? Chtěl(a) byste vidět Xiphos ve " "svém rodném jazyce? Můžete vytvořit překlad aplikace Xiphos! \n" @@ -395,24 +321,23 @@ "(schopna) vytvořit překlad, podívejte se na odkaz níže, kontaktujte nás a " "připojte se k našemu úsilí." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "O překladu aplikace" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Viz TRANSLATION-HOWTO u zdrojového kódu Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Vývoj aplikace Xiphos" -#: ../src/gnome2/about_xiphos.c:122 -#, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2010 Vývojářský tým Xiphos" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Xiphos Vývojový tým" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -425,233 +350,233 @@ "vybavení projektu SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Záložka" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Vložte jméno složky" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Název složky" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Složka: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Určit soubor se záložkami" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Úpravy" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Jméno složky: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Jméno záložky: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Verš: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Odstranit vybranou složku" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(a všechno, co obsahuje)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Odstranit zvolenou záložku" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Přidat" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Popisek " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Výsledky hledání: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" +"Otevření záložky s více odkazy v samostatných kartách není podporováno." -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Záložky" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Šifrovací klíč pro modul %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "pro:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Vložit klíč: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Zavřít bez uložení" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Zavřít _bez uložení" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Verše" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Obrátit list" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Výsledky vyhledávání" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Před exportováním prosím prověřte autorská práva!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Hledat" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Zadejte slovo nebo výraz" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Hledat nazpět" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Hledat následující" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Nastavit písmo modulu" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Změnit písmo pro" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Aktuální písmo: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Použít výchozí písmo pro modul" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "CHYBA! Aplikace Xiphos havarovala chybou typu \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Prosím nahlašte tuto chybu týmu Xiphos společně s následujícím:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "CHYBA! Aplikace Xiphos havarovala chybou typu \"STRING\"." -#: ../src/gnome2/main_window.c:570 -#, fuzzy, c-format +#: ../src/gnome2/main_window.c:583 +#, c-format msgid "Module has no support for %s." -msgstr "V modulech, co obsahují Strongova čísla" +msgstr "Modul nepodporuje %s." -#: ../src/gnome2/main_window.c:640 -#, fuzzy +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." -msgstr "Xiphos:" +msgstr "Xiphos: Žádná okna." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." -msgstr "" +msgstr "BibleSync: Současná navigace poslána." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." -msgstr "" +msgstr "BibleSync: Žádné mluvení." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - software pro studium Bible" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standardní pohled" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Komentář/Výklad" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Kniha" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Vítá vás Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -670,33 +595,33 @@ "tohoto komentáře. Proto přejmenování osobního\n" "komentáře není dostupné v prostředí Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Přejmenovat komentář" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Vybrat jméno komentáře" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nový název" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Název: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Jméno smí obsahovat jen znaky [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Modul s tímto jménem už exituje." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -705,7 +630,7 @@ "Nepodařilo se vytvořit novou konfiguraci:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -713,9 +638,9 @@ "Chyba během vytváření konfigurace:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." -msgstr "" +msgstr "Žádný modul na této stránce." #. ***************************************************************************** #. * defines @@ -831,20 +756,20 @@ "\n" "Obě okna s instrukcemi a také okno s obecným úvodem je možné kdykoliv zavřít." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Odstranit následující moduly?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Příprava pro odstranění" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Odstranění" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Odstranit" @@ -864,23 +789,23 @@ msgid "Install" msgstr "Instalovat" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Vytvořit archiv z následujících modulů?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Příprava pro vytvoření archivu" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archivování" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Zabalit" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -888,55 +813,59 @@ "Vytvořit rejstřík pro rychlé vyhledávání\n" "u následujících modulů (může trvat minuty/modul)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Příprava pro vytvoření rejstříku" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Tvorba rejstříku" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Rejstřík" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Smazat rejstřík pro rychlé vyhledávání u následujících modulů?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Příprava pro odstranění rejstříku" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Mazání rejstříku" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Smazání" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Informace o modulu nejsou k dispozici." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Jméno modulu" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Odškrtnutá fajfka znamená, ze modul je již nainstalován" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Pro práci s tímto modulem klepněte na rámeček" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Klepněte na pole pro výběr modulu k instalaci/aktualizaci" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Instalováno" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -944,7 +873,7 @@ "Ikona rejstříku značí, že jste vytvořily optimalizovaný ('lucene') index pro " "tento modul. To umožňuje rychlé vyhledávání (viz \" -" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -952,13 +881,13 @@ "Ikona se zámkem znamená, že tento modul je šifrován, a je potřeba pořídit si " "klíč pro odemčení od vlastníka tohoto modulu" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "O" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -966,19 +895,19 @@ "Ikona pro obnovení značí, že instalovaný modul je starší, než nejnovější " "dostupná verze: Měl byste modul aktualizovat" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "K dispozici" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Velikost" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Popisek" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -987,33 +916,33 @@ "`mkdir %s' se nezdařilo:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " archivováno v: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Pro Deník a Modlitební seznam není možno vytvořit rejstřík." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s se nezdařilo" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Hotovo" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Neznámý" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -1022,7 +951,7 @@ "Zdroj:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -1030,54 +959,44 @@ "Tříděné podle\n" "typu modulu" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Biblické texty" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Komentáře/Výklady" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Slovníky" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Slovníky" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Čtení na každý den" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Knihy obecně" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Mapy" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Obrázky" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kult/Neortodoxní" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1085,95 +1004,95 @@ "Tříděné podle\n" "dostupnosti" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Aktualizace" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Odinstalováno" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Modlitební seznam/Žurnál" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Obnovit ze vzdáleného zdroje" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Vzdálený zdroj nebyl nalezen" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Nastavit" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Typ" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Popisek" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Zdroj" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Složka" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Uživatel" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Heslo" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Zdroje modulů" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Přidat/Odstranit" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Zvolit" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduly" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Přidat/Aktualizovat" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Údržba" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Prosím obnovit" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Váš seznam modulů není aktuální!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1181,7 +1100,7 @@ "Byla odinstalovány zbývající Bible.\n" "Xiphos vyžaduje alespoň jednu." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1190,210 +1109,220 @@ "Xiphos nemůže bez žádné pokračovat\n" "v činnosti." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standardní vzdálené zdroje jsou načteny." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Nedaří se načít standardní zdroje z CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Odstranit vybraný zdroj" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Zadat vzdálený zdroj" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Popisek:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Typ:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Počítač:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Adresář:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Uživatel (volitelné)" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Heslo (volitelné):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Zdroj s tímto jménem už existuje." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Smazat vzdálený zdroj" -#: ../src/gnome2/mod_mgr.c:3430 -#, fuzzy +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" -msgstr "Celý modul" +msgstr "[žádný modul]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Jít ven, na sekci obsahující tuto položku" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Jdi na předchozí položku" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Jdi na následující položku" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Jít dovnitř, na první podsekci" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synchronizovat rolování okna s hlavním oknem" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Souběžně" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Uvolnit/Ukotvit" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Nastavení modulů" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Souběžný pohled" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" -msgstr "" +msgstr "BibleSync heslo sezení" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" -msgstr "" +msgstr "Fráze:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" +"Výběr režimu selhal.\n" +"Nastavte \"Hledání chyb\" a zkuste to znovu, aby se zjistilo proč." -#: ../src/gnome2/preferences_dialog.c:1008 -#, fuzzy +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" -msgstr "Číst výběr na_hlas" +msgstr "Výběr režimu selhal.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." -msgstr "" +msgstr "BibleSync: %s (heslo \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" -msgstr "" +msgstr "Zakázáno" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Osobní" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" -msgstr "" +msgstr "Řečník" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" -msgstr "" +msgstr "Posluchači" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Vybrat --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Změna jazyka se projeví až po opětovném spuštění." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Nastavení" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Všeobecné" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Nastavení" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 -#, fuzzy msgid "BibleSync" -msgstr "Bible" +msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Typy písma" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Barva" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Velikosti a Vzhled" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Zvláštní" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Vyprázdnit seznam?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Jste si jist, že chcete vyprázdnit seznam modulů?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Smazat modul?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Jste si jist, že chcete smazat vybraný modul?" @@ -1412,20 +1341,20 @@ msgid "found in " msgstr "nalezeno v " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nový seznam %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Poslední seznam modulů nesmí být smazán" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Odstranit seznam?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Jste si jist, že chcete odstranit:" @@ -1445,7 +1374,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1517,7 +1446,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1552,15 +1481,15 @@ "\"podstatné jméno (noun), akuzativ jetnotné číslo ženský (accusative " "singular feminine)\" -- pro podrobnosti viz modul Robinson." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" -msgstr "" +msgstr "Module není ani Bible ani komentář" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." -msgstr "" +msgstr "BibleSync není aktivní pro přenos." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1568,109 +1497,95 @@ "Toto je hledání zahrnující (\"AND\"):\n" "Najít výskyty, obsahující všechna slova." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 -#, fuzzy +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" -msgstr "_Pokročilé vyhledávání" +msgstr "_Otevřít Pokročilé vyhledávání" -#: ../src/gnome2/search_sidebar.c:198 -#, fuzzy +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." -msgstr "Otevřít dialog pokročilého vyhledávání pro komplexní dotazy query" +msgstr "Otevřít samostatný dialog Pokročilé vyhledávání." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Hledat modul" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Bible" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Komentář" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Druh vyhledávání" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Více slov" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulární výraz" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Přesný výraz" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Možnosti hledání" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Rozlišovat malá/VELKÁ" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Volnost hledání" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Žádná volnost" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Použít meze" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Poslední hledání" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Meze" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Dolní" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Horní" -#: ../src/gnome2/sidebar.c:850 -#, fuzzy +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" -msgstr "Otevřít v editoru" +msgstr "Otevřít modul v editoru?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." -msgstr "" +msgstr "Pokud ne, otevře se jen pro zobrazení." -#: ../src/gnome2/sidebar.c:952 -#, fuzzy +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" -msgstr "Nastavit volby uživatele" +msgstr "Vložit odkazy na verš" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" -msgstr "" +msgstr "Seznam:" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Hledání" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Boční panel" @@ -1678,73 +1593,73 @@ msgid "Powered by the SWORD Project" msgstr "Powered by the SWORD Project" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Nelze vytvořit složku pro karty." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Položka Modlitebního seznamu/Žurnálu" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nový název" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Odstranit zvolenou položku" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Leden" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Únor" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Březen" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Duben" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Květen" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Červen" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Červenec" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Srpen" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Září" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Říjen" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Listopad" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Prosinec" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1752,7 +1667,109 @@ "Nelze určit velikost souboru s obrázkem.\n" "Xiphos není schopen přizpůsobit obrázek velikosti okna." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" +"Nevhodný paket\n" +"\n" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" +"Oznámení o přítomnosti:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" +"Navigační paket:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:179 +msgid "Unknown module " +msgstr "Neznámý modul" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" +".\n" +"Nepřímá navigace použitím seznamu veršů." + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "CHYBA: neznámý BibleSync ukazatel: " + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "Další ukazatelé jsou:" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "Zaškrtněte políško pro poslech tohoto řečníka" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "Dostupní řečníci" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "Poslední navigace byla přímá nebo nepřímá" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "Poslední navigace" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "UUID" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "IP adresa:" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" +"\n" +"Aplikace: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" +"\n" +"Zařízení: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" +"\n" +"UUID: " + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" +"

Tento modul nemá v tomto stavu žádný obsah.
" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1761,248 +1778,269 @@ "Improperly encoded personal annotation label:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapitola" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nerozezná více než jeden argument." -#: ../src/main/main.c:245 -#, fuzzy +#: ../src/main/main.c:240 msgid "Initiating HTML" -msgstr "Inicializuji Gecko" +msgstr "Spouštím HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Vytvářím rozhraní" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Spouštím Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Načítám nastavení" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Zobrazuji Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Náhled" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Poznámka pod čarou" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Odkaz" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongův" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologie" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Zpět k " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "Neznámý souběžný modul:" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongova čísla" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Poznámky pod čarou" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologické značky" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Punktuace hebrejských samohlásek" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrejská vokalizace" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Řecké přízvuky" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Křížové odkazy" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmata" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Nadpisy" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Členění morfémů" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Ježíšova slova v červené barvě" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Přepis" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Varianty textu" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Prvořadé čtení" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Pomocné čtení" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Všechna čtení" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "Transkripce formulářů" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "Vyjmenování" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Slovníky" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "zobrazit souvislosti" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Růst" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Za růst
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Spasení" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Za spasení
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Zdraví" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Za zdraví
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Různé" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Různé
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Bod x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Bod y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Bod z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Vedlejší téma 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Podtéma 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Vedlejší téma 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Podtéma 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Vedlejší téma 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Podtéma 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Vedlejší téma 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Podtéma 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Jméno pro nový modlitební seznam nebo žurnál" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos už takový modlitební seznam našel." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -2011,19 +2049,19 @@ "Xiphos nemůže vytvořit pro moduly cest:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Základní modlitební seznam. \\par\\par Modul vytvořil Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ZakladniSeznam" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MujModlitebniSeznam" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -2031,102 +2069,102 @@ "Lidé:
Bob
Sam
Sue

Církev:
lavice
společenství
Bible pro misionáře


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Modlitební seznam s předměty. \\par\\par Modul vytvořil Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "PredmetovySeznam" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Duchovní růst" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Měsíční modlitební seznam. \\par\\par Modul vytvořil Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MesicniSeznam" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Deník. \\par\\par Modul vytvořil Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Denik" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Navržené (např. kázání). \\par\\par Modul vytvořil Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "NastineneTema" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Hlavní téma A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Hlavní téma A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Hlavní téma B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Hlavní téma B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Hlavní téma C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Hlavní téma C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Komentáře uživatele" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Výsledky hledání %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Smazat rozsah?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Jste si jist, že chcete odstranit tento rozsah?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Hledat: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2137,16 +2175,16 @@ "Takový modul není k dispozici.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Prosím nastavte seznam modulů." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Rejstříky pro rychlé vyhledávání neexistují u %s. %s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2154,7 +2192,7 @@ "\n" "Hledání v modulu je nyní víceslovné." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2162,42 +2200,33 @@ "\n" "Viz Správce modulů, panel Udržování" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Hledání dokončeno" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "nálezů" -#: ../src/main/search_sidebar.cc:207 -#, fuzzy +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." -msgstr "Počet modulů Komentáře/Výklady" +msgstr "Žádný modul s komentáři." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME není nastaveno!" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "" -"Xiphos nemůže vytvořit .xiphos:\n" -"%s\n" -"\n" -"Xiphos nemůže pokračovat." +msgid "Xiphos can not create directory " +msgstr "Xiphos nemůže vytvořit složku" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nemohu vytvořit " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2205,11 +2234,11 @@ "Prázdný soubor s nastavením -- pokus o obnovu ze zálohy.\n" "Mohlo dojít ke ztrátě některých informací." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Prázdný soubor s nastavením -- žádná záloha?!? Ztráta informací!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2224,25 +2253,28 @@ "Bez modulu s Biblí nemůže Xiphospokračovat ve své činnosti.\n" "Proto se teď ukončí." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Přidávání modulů s Biblemi je hotové." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" msgstr "" +"Chyba modulu: Nepoužitelné xref kódování.\n" +"Prosím nahlašte to, se jménem a verzí modulu\n" +"Please report this, with module & verse" #: ../src/main/sidebar.cc:411 msgid "verse" msgstr "verš" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "kapitola" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2250,7 +2282,7 @@ "Schází soubor se zkratkami\n" "jazyků pro Xiphos." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2258,7 +2290,7 @@ "Nelze otevřít soubor se zkratkami\n" "jazyků pro Xiphos." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2266,7 +2298,7 @@ "Aplikace Xiphos nemůže přidělit\n" "místo pro zkratky jazyků." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2275,7 +2307,7 @@ "soubor se zkratkami jazyků." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2284,31 +2316,38 @@ "Nebyl nalezen překlad pro jazyk `%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Je možné, že nabídky a jména knih nebudou přeloženy." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" "%s.\n" "Would you like to open these as well?%s" msgstr "" +"Modul %s má doprovodné moduly:\n" +"%s.\n" +"Přejete si otevřít i tyto?%s" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" "The first will open in the main window\n" "and others in separate windows." msgstr "" +"\n" +"\n" +"První se otevře v hlavním okně\n" +"a ostatní v samostatných oknech." -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Čtení na každý den bylo požadováno, ale žádné není nainstalované." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2332,194 +2371,208 @@ "\n" "Klíč prosím zadejte do dialogového okna." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Vyčistit historii" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "Historie ➛ Seznam veršů" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nenalezeno:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nemůže spustit %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Chyba prohlížeče:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Zobrazit %s hlavním okně" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokument nebyl správně vytvořen. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Co musím udělat, abych byl zachráněn?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Skutky 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Římanům 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Co je to evangelium?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1. Korintským 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokument nebyl správně rozparsován. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "prázdný dokument \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "chybný typ, root nod != SwordBookmarks\n" -#: ../src/main/xml.c:426 -#, fuzzy, c-format +#: ../src/main/xml.c:421 +#, c-format msgid "wrong type, root node != Copy_Export\n" -msgstr "chybný typ, root node != %s\n" +msgstr "chybný typ, root node != Copy_Export\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" -msgstr "" +msgstr "%s
%s
Kapitola %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" -msgstr "" +msgstr "
Kapitola %d

" -#: ../src/main/xml.c:497 -#, fuzzy, c-format +#: ../src/main/xml.c:505 +#, c-format msgid "" "%s\n" "\n" "Chapter %d\n" "\n" -msgstr "Kapitola" +msgstr "" +"%s\n" +"\n" +"Kapitola %d\n" +"\n" -#: ../src/main/xml.c:498 -#, fuzzy, c-format +#: ../src/main/xml.c:508 +#, c-format msgid "" "\n" "\n" "Chapter %d\n" "\n" -msgstr "Kapitola" +msgstr "" +"\n" +"\n" +"Kapitola %d\n" +"\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" -msgstr "" +msgstr "%s%s: %s Kapitola %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" +"%s: %s Kapitola %d\n" +"\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" -msgstr "" +msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" -msgstr "" +msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" -msgstr "" +msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " -msgstr "" +msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" -msgstr "" +msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" -msgstr "" +msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" -msgstr "" +msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" -msgstr "" +msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" -msgstr "" +msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" -msgstr "" +msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Starý zákon" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Genesis - Malachiáš" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nový zákon" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mt - Zj" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Příklad seznamu modulů" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "chybný typ, root node != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2528,7 +2581,7 @@ "Uložení nastavení selhalo! stat %d, velikost %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Pokus o návrat k předchozímu uložení." @@ -2542,13 +2595,13 @@ msgstr "Okno se záložkami" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Vytvořit novou složku" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nová složka" @@ -2557,7 +2610,7 @@ msgstr "Nový..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Zrušit záložku" @@ -2570,22 +2623,22 @@ msgstr "Položka Popisek" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Verš:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Položka Verš" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Položka Modul" @@ -2593,28 +2646,30 @@ msgid "Bookmark Folder Treeview" msgstr "Stromový pohled Složku záložek" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Vložit odkaz" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" msgstr "Verš" #: ../ui/editor_link_dialog.xml.h:4 -#, fuzzy msgid "Link Text" -msgstr "Obyčejný text" +msgstr "Text odkazu" #: ../ui/editor_link_dialog.xml.h:5 msgid "Link directly" -msgstr "" +msgstr "Přímý odkaz" #: ../ui/editor_link_dialog.xml.h:6 msgid "Link via verse list" -msgstr "" +msgstr "Odkaz přes seznam veršů" #: ../ui/editor_link_dialog.xml.h:7 -#, fuzzy msgid "Test Link" -msgstr "Vložit odkaz" +msgstr "Testovací odkaz" #: ../ui/editor_note.xml.h:1 ../ui/editor_studypad.xml.h:1 msgid "Exit the program" @@ -2648,6 +2703,12 @@ msgid "_Delete Personal Comment" msgstr "_Odstranit osobní komentář" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Soubor" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Uložit aktuální poznámku" @@ -2656,6 +2717,14 @@ msgid "_Save (Personal Comment)" msgstr "_Uložit (Osobní komentář)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Ná_hled tisku" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Tisk…" + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "K_onec" @@ -2664,6 +2733,11 @@ msgid "For_mat" msgstr "_Formát" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Uložit" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Tiskt dokumentu" @@ -2701,7 +2775,7 @@ msgstr "Nový dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopírovat/Exportovat pasáž" @@ -2738,7 +2812,7 @@ msgstr "Exportovat celou knihu" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Kniha" @@ -2791,44 +2865,40 @@ "Indicates whether verse numbers should appear inline in the text for more " "than 1 verse." msgstr "" +"Označuje zda se mají čísla veršů zobrazovat v řádku textu pro více než jeden " +"verš." #: ../ui/export-dialog.glade.h:26 ../ui/export-dialog.gtkbuilder.h:25 -#, fuzzy msgid "_Verse numbers in text" -msgstr "Velikost čísla u verše" +msgstr "Čísla _veršů v textu" #: ../ui/export-dialog.glade.h:27 ../ui/export-dialog.gtkbuilder.h:27 -#, fuzzy msgid "Verse Number button" -msgstr "Číslo verše" +msgstr "Tlačítko Číslo verše" #: ../ui/export-dialog.glade.h:28 ../ui/export-dialog.gtkbuilder.h:29 msgid "Indicates whether reference is placed first or last." -msgstr "" +msgstr "Označuje zda je odkaz umístěn jako první nebo poslední." #: ../ui/export-dialog.glade.h:29 ../ui/export-dialog.gtkbuilder.h:28 -#, fuzzy msgid "Reference last" -msgstr "Položka Odkazy" +msgstr "Odkaz na poslední" #: ../ui/export-dialog.glade.h:30 ../ui/export-dialog.gtkbuilder.h:30 -#, fuzzy msgid "Reference last button" -msgstr "Položka Odkazy" +msgstr "Tlačítko Odkaz na poslední" #: ../ui/export-dialog.glade.h:31 ../ui/export-dialog.gtkbuilder.h:32 msgid "Indicates whether or not version name is included in reference." -msgstr "" +msgstr "Označuje zda se má být jméno verze zahrnuto v odkazu." #: ../ui/export-dialog.glade.h:32 -#, fuzzy msgid "Include Version" -msgstr "Verze Sword" +msgstr "Zahrnout Verzi" #: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 -#, fuzzy msgid "Version button" -msgstr "Výběrové pole Verš" +msgstr "Tlačítko Verze" #: ../ui/export-dialog.glade.h:34 msgid "Save Export As" @@ -2836,32 +2906,28 @@ #: ../ui/export-dialog.gtkbuilder.h:26 msgid "Indicates whether verse numbers should appear inline in the text." -msgstr "" +msgstr "Označuje zda se mají čísla veršů zobrazovat na řádku v textu." #: ../ui/export-dialog.gtkbuilder.h:31 -#, fuzzy msgid "Include version" -msgstr "Verze Sword" +msgstr "Zahrnout verzi" #: ../ui/gtk2_webedit.ui.h:1 ../ui/gtk_webedit.ui.h:1 -#, fuzzy msgid "About Studypad" -msgstr "Otevřít Poznámkový _blok" +msgstr "O aplikaci Poznámkový blok" #: ../ui/gtk2_webedit.ui.h:3 ../ui/gtk_webedit.ui.h:3 -#, fuzzy msgid "Open about dialog" -msgstr "Otevřít v okně" +msgstr "Otevtíř dialog O aplikaci" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" -msgstr "" +msgstr "Tučné" #: ../ui/gtk2_webedit.ui.h:5 ../ui/gtk_webedit.ui.h:5 -#, fuzzy msgid "Make selection bold" -msgstr "Číst výběr na_hlas" +msgstr "Udělat výběr tučný" #: ../ui/gtk2_webedit.ui.h:6 ../ui/gtk_webedit.ui.h:6 msgid "Copy" @@ -2869,235 +2935,218 @@ #: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 msgid "Copy selection to clipboard" -msgstr "" +msgstr "Kopírovat výběr do schránky" #: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 msgid "Cut" -msgstr "" +msgstr "Vyjmout" #: ../ui/gtk2_webedit.ui.h:9 ../ui/gtk_webedit.ui.h:9 -#, fuzzy msgid "Cut selection" -msgstr "Výběr modulu" +msgstr "Vyjmout výběr" #: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 msgid "Decrease indent" -msgstr "" +msgstr "Zmenšit odsazení" #: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 msgid "Decrease" -msgstr "" +msgstr "Zmenšit" #: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 msgid "Decrease paragraph indent" -msgstr "" +msgstr "Zmenšit odsazení odstavce" #: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 -#, fuzzy msgid "Delete selection" -msgstr "Odstranit vybraný rozsah" +msgstr "Smazat výběr" + +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Smazat" #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 -#, fuzzy msgid "Remove selection" -msgstr "Odstranit zvolenou položku" +msgstr "Odstranit výběr" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Smazat položku" #: ../ui/gtk2_webedit.ui.h:17 ../ui/gtk_webedit.ui.h:17 -#, fuzzy msgid "Delete current item" -msgstr "Smazat aktuální poznámku" +msgstr "Odstranit současnou položku" #: ../ui/gtk2_webedit.ui.h:19 ../ui/gtk_webedit.ui.h:19 -#, fuzzy msgid "Search current document" -msgstr "Prohledat modul úplně" +msgstr "Hledat v současném dokumentu" #: ../ui/gtk2_webedit.ui.h:20 ../ui/gtk_webedit.ui.h:20 -#, fuzzy msgid "Font" -msgstr "Typy písma" +msgstr "Písmo" #: ../ui/gtk2_webedit.ui.h:21 ../ui/gtk_webedit.ui.h:21 -#, fuzzy msgid "Change font" -msgstr "Změnit písmo pro" +msgstr "Změnit písmo" #: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 msgid "Increase indent" -msgstr "" +msgstr "Zvětšit odsazení" #: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 msgid "Increase" -msgstr "" +msgstr "Zvětšit" #: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 msgid "Increase paragraph indent" -msgstr "" +msgstr "Zvětšit odsazení odstavce" #: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 -#, fuzzy msgid "Insert emoticon" -msgstr "Vložit odkaz" +msgstr "Vložit emotikon" #: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 msgid "Emoticon" -msgstr "" +msgstr "Emotikony" #: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 -#, fuzzy msgid "Insert an emoticon" -msgstr "Vložit odkaz" +msgstr "Vložit emotikon" #: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 -#, fuzzy msgid "Insert image" -msgstr "Vložit odkaz" +msgstr "Vložit obrázek" #: ../ui/gtk2_webedit.ui.h:29 ../ui/gtk_webedit.ui.h:29 -#, fuzzy msgid "Image" -msgstr "Obrázky" +msgstr "Obrázek" #: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 msgid "Insert image at cursor" -msgstr "" +msgstr "Vložit obrázek ke kurzoru" #: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 -#, fuzzy msgid "Insert link" msgstr "Vložit odkaz" #: ../ui/gtk2_webedit.ui.h:32 ../ui/gtk_webedit.ui.h:32 -#, fuzzy msgid "Link" -msgstr "Odkazy" +msgstr "Odkaz" #: ../ui/gtk2_webedit.ui.h:33 ../ui/gtk_webedit.ui.h:33 -#, fuzzy msgid "Insert a link" msgstr "Vložit odkaz" #: ../ui/gtk2_webedit.ui.h:34 ../ui/gtk_webedit.ui.h:34 -#, fuzzy msgid "Insert Outline" -msgstr "Vložit odkaz" +msgstr "Vložit osnovu" #: ../ui/gtk2_webedit.ui.h:35 ../ui/gtk_webedit.ui.h:35 -#, fuzzy msgid "Outline" -msgstr "Souhrnný" +msgstr "Osnova" #: ../ui/gtk2_webedit.ui.h:36 ../ui/gtk_webedit.ui.h:36 -#, fuzzy msgid "Insert outline" -msgstr "Vložit odkaz" +msgstr "Vložit osnovu" #: ../ui/gtk2_webedit.ui.h:37 ../ui/gtk_webedit.ui.h:37 -#, fuzzy msgid "Insert rule" -msgstr "Vložit odkaz" +msgstr "Vložit oddělovač" #: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 msgid "Rule" -msgstr "" +msgstr "Oddělovač" #: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 msgid "Insert horizontal rule" -msgstr "" +msgstr "Vložit vodorovný oddělovač" #: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 -#, fuzzy msgid "Xiphos Link" -msgstr "Xiphos:" +msgstr "Odkaz na Xiphos" #: ../ui/gtk2_webedit.ui.h:41 ../ui/gtk_webedit.ui.h:41 -#, fuzzy msgid "Xiphos" -msgstr "Xiphos:" +msgstr "Xiphos" #: ../ui/gtk2_webedit.ui.h:42 ../ui/gtk_webedit.ui.h:42 -#, fuzzy msgid "Insert a link to a sword module" -msgstr "Přidat následujících moduly?" +msgstr "Vložit odkaz na sword modul" #: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 -#, fuzzy msgid "Insert table" -msgstr "Vložit odkaz" +msgstr "Vložit tabulku" #: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 msgid "Table" -msgstr "" +msgstr "Tabulka" #: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 msgid "Insert a table" -msgstr "" +msgstr "Vložit tabulku" #: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 msgid "Italic" -msgstr "" +msgstr "Kurzíva" #: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 msgid "Change selection to italic font" -msgstr "" +msgstr "Změnit výběr na kurzívu" #: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 msgid "Center" -msgstr "" +msgstr "Na střed" #: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 msgid "Center justify paragraph" -msgstr "" +msgstr "Zarovnat odstavec na střed" #: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 msgid "Full" -msgstr "" +msgstr "Do bloku" #: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 msgid "full justify" -msgstr "" +msgstr "Zarovnat odstavec do bloku" #: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 msgid "Left" -msgstr "" +msgstr "Vlevo" #: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 msgid "Left justify paragraph" -msgstr "" +msgstr "Zarovnat odstavec vlebo" #: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 msgid "Right" -msgstr "" +msgstr "Vpravo" #: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 msgid "Right justify paragraph" -msgstr "" +msgstr "Zarovnat odstavec vpravo" + +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nový" #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 -#, fuzzy msgid "Create new file" -msgstr "Vytvořit novou složku" +msgstr "Vytvořit nový soubor" #: ../ui/gtk2_webedit.ui.h:59 ../ui/gtk_webedit.ui.h:59 -#, fuzzy msgid "Open file" -msgstr "Otevřít soubor..." +msgstr "Otevřít soubor" #: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 msgid "Paste" -msgstr "" +msgstr "Vložit" #: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 msgid "Paste clipboard at cursor." -msgstr "" +msgstr "Vložit obsah schránky ke kurzoru." #: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 -#, fuzzy msgid "Print Document" msgstr "Tiskt dokumentu" @@ -3106,227 +3155,177 @@ msgstr "Tisk" #: ../ui/gtk2_webedit.ui.h:64 ../ui/gtk_webedit.ui.h:64 -#, fuzzy msgid "Print the current document" -msgstr "Tiskt dokumentu" +msgstr "Tisk současného dokumentu" #: ../ui/gtk2_webedit.ui.h:65 ../ui/gtk_webedit.ui.h:65 msgid "Print Preview" msgstr "Náhled tisku" #: ../ui/gtk2_webedit.ui.h:66 ../ui/gtk_webedit.ui.h:66 -#, fuzzy msgid "Preview" -msgstr "_Náhled" +msgstr "Náhled" #: ../ui/gtk2_webedit.ui.h:67 ../ui/gtk_webedit.ui.h:67 -#, fuzzy msgid "Print preview of current document" -msgstr "Tiskt dokumentu" +msgstr "Náhled tisku současného dokumentu" #: ../ui/gtk2_webedit.ui.h:68 ../ui/gtk_webedit.ui.h:68 -#, fuzzy msgid "Quit" -msgstr "_Konec" +msgstr "Ukončit" #: ../ui/gtk2_webedit.ui.h:69 ../ui/gtk_webedit.ui.h:69 -#, fuzzy msgid "Shut down editor" -msgstr "Otevřít v editoru" +msgstr "Vypnout editor" #: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 msgid "Redo" -msgstr "" +msgstr "Znovu" #: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 msgid "Redo last undo" -msgstr "" +msgstr "Znovu poslední Zpět" #: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 msgid "Find and replace" -msgstr "" +msgstr "Najít a nahradit" #: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 msgid "Replace" -msgstr "" +msgstr "Nahradit" #: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 -#, fuzzy msgid "Search and replace" -msgstr "Hledat podle kritérií" +msgstr "Hledat a nahradit" #: ../ui/gtk2_webedit.ui.h:76 ../ui/gtk_webedit.ui.h:76 -#, fuzzy msgid "Save changes to file" -msgstr "Uložit změny do dokumentu" +msgstr "Uložit změny do souboru" #: ../ui/gtk2_webedit.ui.h:77 ../ui/gtk_webedit.ui.h:77 -#, fuzzy msgid "Save as" msgstr "Uložit jako" #: ../ui/gtk2_webedit.ui.h:78 ../ui/gtk_webedit.ui.h:78 -#, fuzzy msgid "Save file as ..." -msgstr "Uložit jako..." +msgstr "Uložit soubor jako …" #: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 msgid "Strikethrough" -msgstr "" +msgstr "Přeškrtnuté" #: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 msgid "Strikethrough selection" -msgstr "" +msgstr "Přeškrtnout výběr" #: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 msgid "Underline" -msgstr "" +msgstr "Podtržené" #: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 -#, fuzzy msgid "Underline selection" -msgstr "Výběr modulu" +msgstr "Podtrhnout výběr" #: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 msgid "Undo" -msgstr "" +msgstr "Zpět" #: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 msgid "Undo last change" -msgstr "" +msgstr "Zpět poslední změnu" #: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 -#, fuzzy msgid "Editor" -msgstr "Úpravy" +msgstr "Editor" #: ../ui/gtk2_webedit.ui.h:87 ../ui/gtk_webedit.ui.h:87 -#, fuzzy msgid "Recent files" -msgstr "Uložit aktuální soubor jako" +msgstr "Naposledy použité soubory" #: ../ui/gtk2_webedit.ui.h:88 ../ui/gtk_webedit.ui.h:88 #: ../ui/xi-menus.glade.h:9 ../ui/xi-menus.gtkbuilder.h:6 msgid "_Edit" msgstr "Ú_pravy" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Nápověda" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 -#, fuzzy +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" -msgstr "Běžný text" +msgstr "Normální" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" -msgstr "" +msgstr "Nadpis 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" -msgstr "" +msgstr "Nadpis 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" -msgstr "" +msgstr "Nadpis 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" -msgstr "" +msgstr "Nadpis 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" -msgstr "" +msgstr "Nadpis 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" -msgstr "" +msgstr "Nadpis 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" -msgstr "" +msgstr "Adresa" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" -msgstr "" +msgstr "Psací stroj" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 -#, fuzzy +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" -msgstr "Odstranit seznam?" +msgstr "Odrážkový seznam" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" -msgstr "" +msgstr "Seznam s římskými čísli" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 -#, fuzzy +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" -msgstr "Verše" +msgstr "Číslovaný seznam" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" -msgstr "" +msgstr "Abecední seznam" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Přeškrtnuté" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." -msgstr "" +msgstr "Nastavit barvu písma u vybraného textu." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" +msgstr "Zvýraznit vybraný text nastavením barvy pozadí." #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Označit/Odznačit verš" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Označit" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Zrušit označení" @@ -3401,33 +3400,41 @@ msgstr "Smazat u vybraných modulů index pro rychlé vyhledávání." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Pokračovat" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Správce modulů" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "VAROVÁNÍ: Pokud nežijete ve svobodné zemi,\n" "používejte obezřetně." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Přidat a odstranit zdroje" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Současné lokální zdroje" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3435,15 +3442,15 @@ "Přidat místní složku jako zdroj pro přidání modulů. Může se jednat o cdrom " "nebo flash disk. Taková složka obsahuje podsložky \"mods.d\" and \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Odstranit místní složku ze zdrojů instalace." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Současné vzdálené zdroje" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3451,43 +3458,43 @@ "Přidat vlastní vzdálený zdroj pro instalaci. Je nutno znát jméno vzdáleného " "stroje a složku, kde jsou moduly uloženy." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Odstranit zdroj pro vzdálenou instalaci." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Přidat zdroj" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokální" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Vzdálený" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Přidat cíl" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Osobní oblast, jen pro Vás:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Domovský adresář" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Systémová oblast, pro všechny uživatele:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Systémový adresář pro Sword" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3495,10 +3502,14 @@ "Varování: Pokud nežijete ve svobodné zemi a nepřejete si riskovat " "odhalení, NEMĚLI byste používat instalaci modulů přes Internet! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Adresář lokální instalace" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Vysunout seznam s historií" @@ -3507,31 +3518,29 @@ msgid "Choose book to display" msgstr "Vybrat knihu k zobrazení" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Tlačítko Výběr knih" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Zjevení Janovo" #: ../ui/navbar_versekey.glade.h:5 -#, fuzzy msgid "Choose chapter to display" -msgstr "Vybrat knihu k zobrazení" +msgstr "Vybrat kapitolu k zobrazení" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Tlačítko Změnit Kapitolu" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" #: ../ui/navbar_versekey.glade.h:8 -#, fuzzy msgid "Choose Verse to display" -msgstr "Vybrat knihu k zobrazení" +msgstr "Vybrat verš k zobrazení" #: ../ui/navbar_versekey.glade.h:9 ../ui/navbar_versekey.gtkbuilder.h:6 msgid "Toggle Verse Button" @@ -3558,9 +3567,8 @@ msgstr "Pozadí" #: ../ui/prefs.glade.h:5 ../ui/prefs.gtkbuilder.h:13 -#, fuzzy msgid " " -msgstr ": " +msgstr " " #: ../ui/prefs.glade.h:6 ../ui/prefs.gtkbuilder.h:14 msgid "Foreground" @@ -3656,16 +3664,15 @@ #: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 msgid "Language Font Combo" -msgstr "" +msgstr "Kombinované pole písmo jazyka" #: ../ui/prefs.glade.h:32 ../ui/prefs.gtkbuilder.h:32 msgid "Font Misc" msgstr "Písmo - různé" #: ../ui/prefs.glade.h:33 ../ui/prefs.gtkbuilder.h:33 -#, fuzzy msgid "BibleSync" -msgstr "Rozsah" +msgstr "BibleSync" #: ../ui/prefs.glade.h:34 ../ui/prefs.gtkbuilder.h:34 msgid "" @@ -3678,216 +3685,216 @@ "audience's Bible programs to follow along; Audience, to receive the " "speaker's navigation." msgstr "" +"Aplikace Xiphos je první aplikací pro studium Bible, která implementuje " +"BibleSync. BibleSync je synchronizační program pro aplikace pro studium " +"Bible. Pokud pracujete s více programy pro studium Bible, nebo pokud " +"pracujete v týmu, nebo pokud se ve třídě sdílíte při různých aktivitách, " +"BibleSync může být vhodný nástroj. BibleSync funguje v 1 ze 3 režimů: " +"Osobní, synchronizuje více vašich aplikací pro studium Bible nebo pří práci " +"v týmu; Řečník, kdy se při lekci navigují programy posluchačů, aby sledovali " +"lekci; Posluchači, kdy se přijímá navigace od řečníka." + +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" +msgstr "Režim:" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" - -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." -msgstr "" +msgstr "Vybrat režim ve kterém bude BibleSync pracovat" #: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 msgid "_Off" -msgstr "" +msgstr "_Vypnuto" #: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." -msgstr "" +msgstr "Zakázat BibleSync." #: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 -#, fuzzy msgid "BSP off radio button" -msgstr "Výběrové pole Kniha" +msgstr "BSP přepínač vypnout" #: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 msgid "_Speaker" -msgstr "" +msgstr "Ř_ečník" #: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 msgid "Enable BibleSync as the speaker." -msgstr "" +msgstr "Povolit BibleSync jako řečník." #: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 -#, fuzzy msgid "BSP speaker radio button" -msgstr "Výběrové pole Přesný výraz" +msgstr "BSP přepínač řečník" #: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 msgid "_Audience" -msgstr "" +msgstr "_Posluchači" #: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 msgid "Enable BibleSync as a member of the audience." -msgstr "" +msgstr "Povolit BibleSync jako člen posluchačů." #: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 -#, fuzzy msgid "BSP audience radio button" -msgstr "Výběrové pole Prostý text" +msgstr "BSP přepínač posluchači" #: ../ui/prefs.glade.h:46 ../ui/prefs.gtkbuilder.h:46 -#, fuzzy msgid "_Personal" -msgstr "Osobní" +msgstr "_Osobní" #: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 msgid "Enable BibleSync for personal or team use." -msgstr "" +msgstr "Povolit BibleSync pro osobní nebo skupinové použití" #: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 -#, fuzzy msgid "BSP personal radio button" -msgstr "Výběrové pole Regulární výraz" +msgstr "BSP přepínač osobní" #: ../ui/prefs.glade.h:49 ../ui/prefs.gtkbuilder.h:49 msgid "Private" -msgstr "" +msgstr "Soukromé" #: ../ui/prefs.glade.h:50 ../ui/prefs.gtkbuilder.h:50 msgid "" "When in Personal mode, only programs running on this machine will hear your " "navigation." msgstr "" +"V režimu Osobní uslyší Vaši navigaci jen programy spuštěné na tomto stroji." #: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 -#, fuzzy msgid "BSP privacy button" -msgstr "Výběrové pole Verš" +msgstr "BSP přepínač soukromé" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -#, fuzzy -msgid "Navigate" -msgstr "Spasení" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" +msgstr "Navigovat:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." -msgstr "" +msgstr "Vybrat jak reagovat na příchozí synchronizaci navigace." #: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 -#, fuzzy msgid "_Direct" -msgstr "Složka" +msgstr "_Přímé" #: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 msgid "BibleSync navigation will send Xiphos directly to the verse indicated." -msgstr "" +msgstr "BibleSync navigace nastaví Xiphos přímo na odkazovaný verš." #: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 -#, fuzzy msgid "BSP nav direct radio button" -msgstr "Výběrové pole Samotný modul" +msgstr "BSP přepínač přímá navigace" #: ../ui/prefs.glade.h:57 ../ui/prefs.gtkbuilder.h:57 -#, fuzzy msgid "_Verse list" -msgstr "Verše" +msgstr "_Seznam veršů" #: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 msgid "BibleSync navigation will use Xiphos' sidebar verse list." msgstr "" +"BibleSync navigace použije seznam veršů v postraní liště aplikace Xiphos." #: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 -#, fuzzy msgid "BSP nav verse list radio button" -msgstr "Výběrové pole Seznam modulů" +msgstr "BSP přepínač nav. seznam veršů" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" +msgstr "Poslouchat:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." -msgstr "" +msgstr "Xiphos bude poslouchat Řečníky podle výběru zde." #: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" -msgstr "" +msgstr "Výběrové" #: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." -msgstr "" +msgstr "Vybrat řečníka, kterého sledovat." #: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 -#, fuzzy msgid "BSP listen some radio button" -msgstr "Výběrové pole Prostý text" +msgstr "BSP přepínač poslouchat některé" #: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 msgid "All" -msgstr "" +msgstr "Všechny" #: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 msgid "All Speakers will be followed." -msgstr "" +msgstr "Sledovat všechny řečníky." #: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 -#, fuzzy msgid "BSP listen all radio button" -msgstr "Výběrové pole Regulární výraz" +msgstr "BSP přepínač poslouchat všechny" #: ../ui/prefs.glade.h:68 ../ui/prefs.gtkbuilder.h:68 msgid "None" -msgstr "" +msgstr "Žádný" #: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." -msgstr "" +msgstr "Nesledovat žádného řečníka." #: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 -#, fuzzy msgid "BSP listen none radio button" -msgstr "Výběrové pole Prostý text" +msgstr "BSP přepínač pouslouchat nikoho" + +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "Další:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " "chatty. Also, decide whether to allow group parameter as Xiphos' tab number." msgstr "" +"Pro BibleSync lze další sledování povolit zapnutím Přítomný, Neshoda a " +"Hledání chyb. Také je potřeba rozhodnout, jestli dovolit používat skupinový " +"parametr jako číslo panelu aplikace Xiphos." #: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 -#, fuzzy msgid "Presence" -msgstr "Nastavení" +msgstr "Přítomný" #: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 msgid "Presence announcements will be shown in dialogs." -msgstr "" +msgstr "Oznámení o přítomnosti se budou zobrazovat v dialogovém okně." #: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 -#, fuzzy msgid "BSP presence button" -msgstr "Výběrové pole Verš" +msgstr "BSP přepínač přítomnost" #: ../ui/prefs.glade.h:76 ../ui/prefs.gtkbuilder.h:76 -#, fuzzy msgid "Mismatch" -msgstr "nálezů" +msgstr "Neshoda" #: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 msgid "Mismatches from your session will be shown in dialogs." -msgstr "" +msgstr "Neshody z Vašeho sezení se budou zobrazovat v dialogovém okně." #: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 msgid "BSP mismatch button" -msgstr "" +msgstr "BSP přepínač neshoda" #: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 msgid "Debug" -msgstr "" +msgstr "Hledání chyb" #: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." -msgstr "" +msgstr "Sledování paketů." #: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 msgid "BSP event debug button" -msgstr "" +msgstr "BSP přepínač debug události" #: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 msgid "_Group as tab" -msgstr "" +msgstr "_Skupina jako panel" #: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 msgid "" @@ -3895,11 +3902,13 @@ "Disabling this may be necessary if some Speakers' use of group number is not " "appropriate as a tab number." msgstr "" +"Interpretovat parametr protokolu \"skupinové číslo\" jako číslo panelu " +"aplikace Xiphos. Může být nezbytné toto vypnout v případě, kdy použití " +"skupinových čísel Řečníkem je nevhodné pro čísla panelů." #: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 -#, fuzzy msgid "BSP event group-as-tab button" -msgstr "Výběrové pole Samotný modul" +msgstr "BSP tlačítko událost skupina-jako-panel" #: ../ui/prefs.glade.h:86 ../ui/prefs.gtkbuilder.h:86 msgid "General" @@ -3918,7 +3927,7 @@ #: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 msgid "Special Locale Combo" -msgstr "" +msgstr "Kombinované pole Další volby" #: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 msgid "Show splash screen at start up" @@ -3950,7 +3959,7 @@ #: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 msgid "Use default Dictionary Checkbox" -msgstr "" +msgstr "Zaškrtávací pole použít výchozí slovník" #: ../ui/prefs.glade.h:96 ../ui/prefs.gtkbuilder.h:96 msgid "Scroll to Previous/Next Chapter" @@ -3964,7 +3973,7 @@ #: ../ui/prefs.glade.h:98 ../ui/prefs.gtkbuilder.h:98 msgid "Scroll to Previous/Next Chapter Checkbox" -msgstr "" +msgstr "Zaškrtávací pole Rolováním na předchozí/další kapitolu" #: ../ui/prefs.glade.h:99 ../ui/prefs.gtkbuilder.h:99 msgid "Resize images" @@ -3976,7 +3985,7 @@ #: ../ui/prefs.glade.h:101 ../ui/prefs.gtkbuilder.h:101 msgid "Resize images checkbox" -msgstr "" +msgstr "Zaškrtávací pole Změnit velikot obrázku" #: ../ui/prefs.glade.h:102 ../ui/prefs.gtkbuilder.h:102 msgid "Highlight current verse" @@ -3990,7 +3999,7 @@ #: ../ui/prefs.glade.h:104 ../ui/prefs.gtkbuilder.h:104 msgid "Highlight current verse check box" -msgstr "" +msgstr "Zaškrtávací pole zvýraznit aktuální verš" #: ../ui/prefs.glade.h:105 ../ui/prefs.gtkbuilder.h:105 msgid "Highlight user annotations" @@ -4002,7 +4011,7 @@ #: ../ui/prefs.glade.h:107 ../ui/prefs.gtkbuilder.h:107 msgid "Highlight user annotations check box" -msgstr "" +msgstr "Zaškrtávací pole zvýraznit anotace uživatelů" #: ../ui/prefs.glade.h:108 ../ui/prefs.gtkbuilder.h:108 msgid "Cross-references in verse list" @@ -4014,7 +4023,7 @@ #: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 msgid "Xrefs in verse list check box" -msgstr "" +msgstr "Zaškrtávací pole Reference v seznamu veršů" #: ../ui/prefs.glade.h:111 ../ui/prefs.gtkbuilder.h:111 msgid "Enable Prayer Lists" @@ -4029,193 +4038,184 @@ msgstr "Zaškrtávací pole Zapnout Modlitební seznamy" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 -#, fuzzy +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Číslo verše" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" -msgstr "" +msgstr "Vyrovnat číslo verše několika způsoby" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 -#, fuzzy +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" -msgstr "Zobrazit čísla veršů v textu" +msgstr "Zobrazit číslo verše kurzívou" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 -#, fuzzy +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" -msgstr "Velikost čísla u verše" +msgstr "Zaškrtávací pole číslo verše kurzívou" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" -msgstr "" +msgstr "Závorky" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" -msgstr "" +msgstr "Zobrazit číslo verše s [obklopujícími závorkami]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 -#, fuzzy +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" -msgstr "Zaškrtávací pole Použít jeden verš na řádek" +msgstr "Zaškrtávací pole číslo verše závorky" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 -#, fuzzy +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" -msgstr "Popisek" +msgstr "Horní index" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 -#, fuzzy +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" -msgstr "Čísla ve_ršů" +msgstr "Zobrazit číslo verše jako horní index" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 -#, fuzzy +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" -msgstr "Velikost čísla u verše" +msgstr "Zaškrtávací pole číslo verše horní index" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 -#, fuzzy +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" -msgstr "Roletové menu Výchozí adresář pro Poznámkový blok" +msgstr "Výchozí adresář pro Poznámkový blok" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Vybrat složku" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Roletové menu Výchozí adresář pro Poznámkový blok" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Obecně různé" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Hlavní okno modulů" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblický text" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Roletové menu Změnit Biblický text" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Roletové menu Změnit komentáře" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Slovník" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Roletové menu Změnit slovník" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Roletové menu Změnit knihu" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduly" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Vyčistit seznam modulů" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Tlačítko Smazat moduly ze seznamu" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Odstranit vybraný modul ze seznamu" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Tlačítko Odstranit vybraný modul ze seznamu" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Otevřít dialog pro výběr modulů" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Přidat moduly" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Tlačítko Otevřít dialog pro výběr" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Souběžné moduly" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Ostatní moduly" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Čtení na každý den" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Roletové menu Čtení na každý den" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebrejský lexikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" -msgstr "" +msgstr "Kombinované pole Hebrejský lexikon" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Řecký lexikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" -msgstr "" +msgstr "Kombinované pole Řecký lexikon" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Výchozí slovník" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Roletové menu Změnit výchozí slovník" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Osobní poznámky" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Roletové menu Změnit osobní poznámky" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Různé moduly" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Výběr modulu" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4244,6 +4244,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Povolit BibleSync jako řečník." + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Pokročilé vyhledávání" @@ -4454,11 +4459,11 @@ msgid "Found" msgstr "Nalezeno" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Okno Souhrnné výsledky" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabulka Souhrnné výsledky" @@ -4650,10 +4655,14 @@ msgid "Attribute Search" msgstr "Parametry hledání" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Výběr modulu" + #: ../ui/search-dialog.gtkbuilder.h:6 -#, fuzzy msgid "search module" -msgstr "Druh hledání" +msgstr "hledat v modulu" #: ../ui/xi-export-bookmarks.glade.h:1 msgid "Export Bookmark Folder" @@ -4743,6 +4752,10 @@ msgid "_Module Manager" msgstr "Správce _modulů" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Zobrazit" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Náhled _Dnešní čtení" @@ -4887,216 +4900,227 @@ msgid "Learn about Xiphos" msgstr "Více informací o aplikaci" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Přidat komentář k verši" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Otevřít modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Poznámka" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Otevřít v editoru" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Verš na řádek" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" -msgstr "" +msgstr "Značky pro křížové odkazy/poznámky pod čarou." #: ../ui/xi-menus.glade.h:74 msgid "Show non-anonymous markers e.g. \"*n23\"" -msgstr "" +msgstr "Zobrazit neanonymní značky např. \"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianty" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Obsah obrazu" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respektovat písma" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Komentář/Výklad podle kapitol" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Dvojitá mezera" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Výběr vyhledávání" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Použít aktuální slovník" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Prohlížet na BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Odemknout tento modul" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Zobraz nadpis knihy" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Zobraz nadpis kapitoly" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Přejmenovat Osobní komentáře" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Exportovat osobní komentáře" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Číst výběr na_hlas" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Uložit výsledky jako záložku" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Uložit seznam jako záložku" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Uložit výsledky do vlastní složky jako série záložek" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Uložit seznam jako sérii záložek" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" +"Poskytuje dialogové okno, ve kterém lze naplnit seznam veršů vložením řádky " +"s odkazy na verše." -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 -#, fuzzy +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" -msgstr "Verše" +msgstr "Naplnit seznam veršů" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "Protlačit celý obsah seznamu veršů přímo do seznamu historie." + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +msgid "Preload history from verse list" +msgstr "Přednačíst historii ze seznamu veršů" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" +"Poslat tento seznam veršů přes BibleSync dalším, pokud jste v režimu Osobní " +"nebo Řečník." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" -msgstr "" +msgstr "Poslat seznam přes BibleSync" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exportovat seznam" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Otevřít tuto záložku v nové kartě" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Otevřít v nové kartě" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Otevřít tuto záložku v okně" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Otevřít v okně" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Přidat novou složku do vybrané složky" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Vložit zde novou záložku" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Vložit záložku" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Upravit položku v záložkách" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Upravit položku" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Smazat položku" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Rozbalit všechny skupiny záložek" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Rozbalit vše" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Zasunout všechny skupiny záložek" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Svinout vše" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Povolit přesun položek z jedné složky do druhé" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Povolit přeuspořádání" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Načíst jiný soubor se záložkami (výchozí: z BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importovat záložky" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Odstranit složku a uložit ji" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Export složky" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Otevřít vybraný modul v nové kartě" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5104,80 +5128,79 @@ "Otevře vybraný modul v samostatném\n" "\t ['dialogovém'] okně." -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Otevřít v samostatném okně" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Vytvoří nový jednoduchý modlitební seznam" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Jednoduché" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Vytvoří nový modlitební seznam s předměty" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Předmět" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Vytvoří nový měsíčník" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Měsíčně" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Vytvoří nový deník" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Denně" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Vytvoří nové souhrnné téma" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Souhrnný" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" -msgstr "" +msgstr "Otevřít modul v editoru nebo zobrazit v okně" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 -#, fuzzy +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Otevřít v samostatném okně" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Přidá podpoložku" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Přidat podpoložku" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Přidat položku" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Přidat položku" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Odstranit tuto položku" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Upravit tuto položku" @@ -5189,532 +5212,62 @@ msgid "Study the Bible" msgstr "Studium Bible" -#~ msgid "Tabs" -#~ msgstr "Karty" - -#~ msgid "Use tabbed browsing" -#~ msgstr "Použít prohlížení v jednotlivých kartách" - -#~ msgid "" -#~ "Single selection of Bible+commentary+book+dictionary, or many sets of " -#~ "such selections in a tabbed interface" -#~ msgstr "" -#~ "Jetnotlivý výběr Bible+komentář+kniha+slovník nebo mnoho skupin " -#~ "takovýchto výběrů v rozhraní s kartami." - -#~ msgid "Show" -#~ msgstr "Ukázat" - -#~ msgid "Bible Texts" -#~ msgstr "Biblické texty" - -#~ msgid "Bible Texts Checkbox" -#~ msgstr "Zaškrtávací pole Biblické texty" - -#~ msgid "Commentaries Checkbox" -#~ msgstr "Zaškrtávací pole Komentáře/Výklady" - -#~ msgid "Dictionary/Lexicon" -#~ msgstr "Slovník/Lexikon" - -#~ msgid "Dictionary/Lexicon Checkbox" -#~ msgstr "Zaškrtávací pole Slovník/Lexikon" - -#~ msgid "Parallel View in a tab" -#~ msgstr "Souběžný pohled v nové kartě" - -#~ msgid "Tabs and Panes" -#~ msgstr "Karty a pole" - -#~ msgid "Scripture Cross-references" -#~ msgstr "Odkazy do písma" - -#~ msgid "StudyPad default directory" -#~ msgstr "Výchozí adresář pro Poznámkový blok" - -#~ msgid "" -#~ "URL references using \"sword://\" (similar to web page\n" -#~ "references) can be used by programs to look up\n" -#~ "scripture references. Your system currently has no\n" -#~ "program set to handle these references.\n" -#~ "\n" -#~ "Would you like Xiphos to set itself as the\n" -#~ "program to handle these references?" -#~ msgstr "" -#~ "URL odkazy, používající \"sword://\" (podobné odkazům\n" -#~ "u www stránek), mohou aplikace využít pro hledání odkazů\n" -#~ "v Bibli. Ve Vašem systému není v současné době nastaven\n" -#~ "program pro obsluhu těchto odkazů.\n" -#~ "\n" -#~ "Přejete si, aby aplikace Xiphos nastavila sebe pro\n" -#~ "obsluhu těchto odkazů?" - -#~ msgid "" -#~ "Xiphos has successfully set itself\n" -#~ "as the handler of sword:// and bible:// URLs.\n" -#~ "\n" -#~ "You may wish to run the program \"gconf-editor\"\n" -#~ "to examine keys under /desktop/gnome/url-handlers,\n" -#~ "if you need to change these." -#~ msgstr "" -#~ "Xiphos úspěšně nastavil sebe\n" -#~ "pro obsluhu URL sword:// a bible://.\n" -#~ "\n" -#~ "Možná bude potřeba spustit program \"gconf-editor\"\n" -#~ "pro prohlížení klíčů v /desktop/gnome/url-handlers,\n" -#~ "pokud je potřeba klíče změnit." - -#~ msgid "" -#~ "Xiphos failed to complete handler init for key #%d:\n" -#~ "%s" -#~ msgstr "" -#~ "Xiphos selhal při nastavení obsluhy pro klíč #%d:\n" -#~ "%s" - -#~ msgid "Go to " -#~ msgstr "Přejít na " - -#~ msgid "Main" -#~ msgstr "Hlavní" - -#~ msgid "Modules Main" -#~ msgstr "Hlavní moduly" - -#~ msgid "" -#~ "Without any Bible modules to display,\n" -#~ "Xiphos cannot proceed,\n" -#~ "and will now exit." -#~ msgstr "" -#~ "Bez žádného modulu s Biblí\n" -#~ "Xiphos nemůže pokračovat\n" -#~ "ve své činnosti a proto se ukončí." - -#~ msgid "Choose to enable Prayer lists " -#~ msgstr "Zaškrtnout pro zapnutí Modlitební seznamy " - -#~ msgid "About the SWORD Project" -#~ msgstr "O aplikaci SWORD Project" - -#~ msgid "Books can be downloaded from the SWORD Project" -#~ msgstr "Knihy lze stáhnout ze stránek aplikace SWORD Project" - -#~ msgid "Cipher Key?" -#~ msgstr "Šifrovací klíč?" - -#~ msgid "Xiphos could not execute archiver" -#~ msgstr "Xiphos nemůže spustit archivátor" - -#~ msgid "" -#~ " archival result:\n" -#~ "\n" -#~ msgstr "" -#~ " výsledek vytváření archivu:\n" -#~ "\n" +#~ msgid "network setup errors." +#~ msgstr "Chyba v nastavení sítě." -#~ msgid "" -#~ "\n" -#~ "Archive in " -#~ msgstr "" -#~ "\n" -#~ "Archivovat do " - -#~ msgid "Sources" -#~ msgstr "Zdroje" - -#~ msgid "Change parallel 1" -#~ msgstr "Změnit souběžně 1" - -#~ msgid "Change parallel 2" -#~ msgstr "Změnit souběžně 2" - -#~ msgid "Change parallel 3" -#~ msgstr "Změnit souběžně 3" - -#~ msgid "Change parallel 4" -#~ msgstr "Změnit souběžně 4" - -#~ msgid "Change parallel 5" -#~ msgstr "Změnit souběžně 5" +#~ msgid " client socket" +#~ msgstr "klient socket" -#~ msgid "Text" -#~ msgstr "Text" +#~ msgid " server socket" +#~ msgstr "server socket" -#~ msgid "Text to render" -#~ msgstr "Text k vykreslení" +#~ msgid "bad protocol version" +#~ msgstr "špatná verze protokolu" -#~ msgid "Pixbuf Object" -#~ msgstr "Pixbuf objekt" +#~ msgid "bad msg type" +#~ msgstr "špatný typ zprávy" -#~ msgid "The pixbuf to render." -#~ msgstr "Poskytnutý pixbuf." +#~ msgid "bad packet count" +#~ msgstr "špatný počet paketů" -#~ msgid "Sizes" -#~ msgstr "Velikosti" +#~ msgid "bad packet index" +#~ msgstr "špatný index paketu" -#~ msgid "Open in a new tab" -#~ msgstr "Otevřít v novém panelu" +#~ msgid "bad body format" +#~ msgstr "špatný typ zprávy" -#~ msgid "Open selected module in a separate ['dialog'] window" -#~ msgstr "Otevřít vybraný modul v samostatném dialogovém okně" +#~ msgid "missing required header " +#~ msgstr "chybějící požadovaná hlavička zprávy" -#~ msgid "View information about the selected dialog" -#~ msgstr "Zobrazit informace o vybraném dialogovém okně" +#~ msgid "Spoof stopped: " +#~ msgstr "Manipulace zastavena: " -#~ msgid "Daily Journal" -#~ msgstr "Deník" +#~ msgid "Ignoring echo." +#~ msgstr "Ignoruji echo." -#~ msgid "Outlined Topic" -#~ msgstr "Navržené téma" +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Doména není 'BIBLE-VERSE': " -#~ msgid "Open selected module in a dialog" -#~ msgstr "Otevřít vybraný modul v dialogovém okně" +#~ msgid "Invalid group: " +#~ msgstr "Neplatná skupina:" -#~ msgid "Add Child" -#~ msgstr "Přidat potomka" +#~ msgid " present at " +#~ msgstr "přítomno na" -#~ msgid "Add Sibling" -#~ msgstr "Přidat souseda" +#~ msgid " using " +#~ msgstr "používající" -#~ msgid "" -#~ "Welcome to Xiphos.\n" -#~ "\n" -#~ "There are no Bible modules installed. In order to initialize, Xiphos " -#~ "needs you to install at least one Bible.\n" -#~ "\n" -#~ "With your permission, Xiphos will invoke the Module Manager so that you " -#~ "may install from Crosswire:\n" -#~ "1. Configure remote install.\n" -#~ "2. Connect.\n" -#~ "3. Select a Bible text of your language preference.\n" -#~ "4. Click `install'.\n" -#~ "Close the Module Manager when you are done.\n" -#~ "\n" -#~ "Warning: If you live in a persecuted country, use with care.\n" -#~ "\n" -#~ "May Xiphos invoke the Module Manager so that you may install a Bible?" -#~ msgstr "" -#~ "Vítá vás Xiphos.\n" -#~ "\n" -#~ "Nemáte nainstalovaný žádný modul s Biblickými texty. Xiphos potřebuje pro " -#~ "správnou funkčnost alespoň jeden takový modul.\n" -#~ "\n" -#~ "S vaším svolením, Xiphos spustí Správce modulů, aby bylo možno instalovat " -#~ "Crosswire moduly:\n" -#~ "1. Nastavení vzdálené instalace.\n" -#~ "2. Obnovit.\n" -#~ "3. Vyberte si Bibli v požadovaném jazyce.\n" -#~ "4. Klikněte `přidat'.\n" -#~ "Zavřete Správce modulů, pokud budete hotov.\n" -#~ "\n" -#~ "Varování: Pokud nežijete ve svobodné zemi, používejte obezřetně.\n" -#~ "\n" -#~ "Smí Xiphos spustit Správce modulů, aby jste mohl přidat Bible?" +#~ msgid "[no dump ready]" +#~ msgstr "[žádný dump nepřipraven]" -#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos" -#~ msgstr "Xiphos přejmenoval .xiphos-2.0 na .xiphos" +#~ msgid "Transmit failed.\n" +#~ msgstr "Přenos selhal.\n" #~ msgid "" -#~ "Xiphos can not rename .xiphos-2.0 to .xiphos:\n" -#~ "%s\n" -#~ "\n" -#~ "Xiphos cannot continue." +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." #~ msgstr "" -#~ "Xiphos nemůže přejmenovat .xiphos-2.0 na .xiphos:\n" -#~ "%s\n" -#~ "\n" -#~ "Xiphos nemůže pokračovat." - -#~ msgid "H_istory/" -#~ msgstr "H_istorie/" - -#~ msgid "H_istory/C_lear" -#~ msgstr "H_istorie/V_yčistit" - -#~ msgid "Open the file in Studypad" -#~ msgstr "Otevřít soubor v Poznámkovém bloku" - -#~ msgid "Parallel View" -#~ msgstr "Souběžný pohled" - -#~ msgid "Parallel 1" -#~ msgstr "Souběžně 1" - -#~ msgid "Parallel 1 Combo" -#~ msgstr "Roletové menu Souběžně 1" - -#~ msgid "Parallel 2" -#~ msgstr "Souběžně 2" - -#~ msgid "Parallel 2 Combo" -#~ msgstr "Roletové menu Souběžně 2" - -#~ msgid "Parallel 3" -#~ msgstr "Souběžně 3" - -#~ msgid "Parallel 3 Combo" -#~ msgstr "Roletové menu Souběžně 3" - -#~ msgid "Parallel 4" -#~ msgstr "Souběžně 4" - -#~ msgid "Parallel 4 Combo" -#~ msgstr "Roletové menu Souběžně 4" - -#~ msgid "Parallel 5" -#~ msgstr "Souběžně 5" - -#~ msgid "Parallel 5 Combo" -#~ msgstr "Roletové menu Souběžně 5" - -#~ msgid "Use Verse Per Line" -#~ msgstr "Zobrazovat každý verš na samostatný řádek" - -#~ msgid "Import Bibletime Bookmarks" -#~ msgstr "Import záložek z Bibletime" - -#~ msgid "Remove - Restore" -#~ msgstr "Odstranit - Obnovit" - -#~ msgid "Remove Folder" -#~ msgstr "Odstranit složku" - -#~ msgid "Restore Folder" -#~ msgstr "Obnovit složku" - -#~ msgid "Restore saved folder" -#~ msgstr "Obnovit uloženou složku" - -#~ msgid "_Show/Hide Sidebar" -#~ msgstr "_Zobrazit/Skrýt postranní lištu" - -#~ msgid "Move backwards through history" -#~ msgstr "Pohyb v historii pozpátku" - -#~ msgid "Move foward through history" -#~ msgstr "Pohyb v historii dopředu" - -#~ msgid "Select a Book of the Bible" -#~ msgstr "Výběr knihy z Bible" - -#~ msgid "Change Chapter" -#~ msgstr "Změna kapitoly" - -#~ msgid "Dictionary/_Lexicon" -#~ msgstr "Slovník/_Lexikon" - -#~ msgid "_Bible Text" -#~ msgstr "_Biblické texty" - -#~ msgid "Open StudyPad File" -#~ msgstr "Otevřít soubor pro Poznámkový blok" - -#~ msgid "Save StudyPad File" -#~ msgstr "Uložit soubor pro Poznámkový blok" - -#~ msgid "item1" -#~ msgstr "položka1" - -#~ msgid "item2" -#~ msgstr "položka2" - -#~ msgid "_Module Options" -#~ msgstr "_Volby modulu" - -#~ msgid "Sync with main" -#~ msgstr "Synchronizovat s hlavním oknem" - -#~ msgid "Stay in sync" -#~ msgstr "Zůstat při synchronizaci" - -#~ msgid "Failed to print the document" -#~ msgstr "Nezdařil se tisk dokumentu" - -#~ msgid "_Modules" -#~ msgstr "_Moduly" - -#~ msgid "_Bookmarks" -#~ msgstr "_Záložky" - -#~ msgid "Verse _List" -#~ msgstr "Seznam _veršů" - -#~ msgid "%s not found" -#~ msgstr "%s nenalezeno" - -#~ msgid "has been modified. Do you wish to save it?" -#~ msgstr "byl změněm. Přejete si změny uložit?" - -#~ msgid "not loaded" -#~ msgstr "nenačten" - -#~ msgid "Open the StudyPad editor" -#~ msgstr "Otevřít Poznámkový blok" - -#~ msgid "Save the current session to a file" -#~ msgstr "Uložit současné sezení do souboru" - -#~ msgid "_Copy" -#~ msgstr "_Kopírovat" - -#~ msgid "Copy highlighted text from main window" -#~ msgstr "Kopírovat zvýrazněný text z hlavního okna" - -#~ msgid "Search using the shortcut bar" -#~ msgstr "Hledat s použitím tabulky zkratek" - -#~ msgid "Advanced search using the search dialog" -#~ msgstr "Pokročilé hledání s použitím tabulky zkratek" - -#~ msgid "C_lear" -#~ msgstr "_Vymazat" - -#~ msgid "Clear history list" -#~ msgstr "Vymazat historii" - -#~ msgid "Show the Daily Devotion for today" -#~ msgstr "Zobrazit Dnešní čtení pro dnešní datum" - -#~ msgid "Show or hide Bible texts window" -#~ msgstr "Zobrazit/Skrýt okno Biblické texty" - -#~ msgid "Show or hide Preview window" -#~ msgstr "Zobrazit/Skrýt okno Náhled" - -#~ msgid "Show or hide commentaries" -#~ msgstr "Zobrazit/Skrýt komentáře/výklady" - -#~ msgid "Show or hide - dictionaries and lexicons" -#~ msgstr "Zobrazit/Skrýt - slovníky a lexikony" - -#~ msgid "Chat with other users and developers" -#~ msgstr "Komunikace s dalšími uživateli a vývojáři" - -#~ msgid "Report bug to SourceForge" -#~ msgstr "Nahlásit chybu na SourceForge" - -#~ msgid "More information about the SWORD Project" -#~ msgstr "Více informací o aplikace The SWORD Project" - -#~ msgid "About this application" -#~ msgstr "O této aplikaci" - -#~ msgid "Hi_story" -#~ msgstr "_Historie" - -#~ msgid "1 Cor 15:1" -#~ msgstr "1. Korintským 15:1" - -#~ msgid "Name for new prayer list" -#~ msgstr "Jméno nového modlitebního seznamu" - -#~ msgid "can not create path\n" -#~ msgstr "nemohu vytvořit cestu\n" - -#~ msgid "Prayer list already exist\n" -#~ msgstr "Modlitební seznam už existuje\n" - -#~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos" -#~ msgstr "\\par\\par Můj modlitební seznam \\par\\par Modul vytvořil Xiphos" - -#~ msgid "-3" -#~ msgstr "-3" - -#~ msgid "Starting" -#~ msgstr "Startuji" - -#~ msgid "Building Xiphos interface" -#~ msgstr "Vytvářím rozhraní Xiphos" - -#~ msgid "Initiating Xiphos" -#~ msgstr "Inicializuji Xiphos" - -#~ msgid "done" -#~ msgstr "hotovo" - -#~ msgid "Xiphos is shutdown" -#~ msgstr "Xiphos je zastaven" - -#~ msgid "Initiating SWORD" -#~ msgstr "Zavádím SWORD" - -#~ msgid "path to sword" -#~ msgstr "cesta k sword" - -#~ msgid "System locale is" -#~ msgstr "Systémová lokalizace je" - -#~ msgid "SWORD locale is" -#~ msgstr "SWORD lokalizace je" - -#~ msgid "SWORD is shutdown" -#~ msgstr "SWORD je zastaven" - -#~ msgid "Number of Text modules" -#~ msgstr "Počet modulů Biblické texty" - -#~ msgid "Number of Dict/lex modules" -#~ msgstr "Počet modulů Slovníky" - -#~ msgid "Number of Book modules" -#~ msgstr "Počet modulů Knihy" - -#~ msgid "Number of Percomm modules" -#~ msgstr "Počet modulů Osobní komentáře" - -#~ msgid "Number of Devotion modules" -#~ msgstr "Počet modulů Čtení na každý den" - -#~ msgid "Number of Prayer modules" -#~ msgstr "Počet modulů s Modlitbami" - -#~ msgid "" -#~ "\n" -#~ "First Run: need to create settings!\n" -#~ msgstr "" -#~ "\n" -#~ "První spuštění: potřeba vytvořit nastavení!\n" - -#~ msgid "can not create .sword" -#~ msgstr "nelze vytvořit .sword" - -#~ msgid "can not create .sword/mods.d" -#~ msgstr "nelze vytvořit .sword/mods.d" - -#~ msgid "can not create .sword/modules" -#~ msgstr "nelze vytvořit .sword/modules" - -#~ msgid "Select Local Source" -#~ msgstr "Vybrat lokální zdroj" - -#~ msgid "It will be lost permanently!" -#~ msgstr "Bude trvale ztracen!" - -#~ msgid "Open in dialog" -#~ msgstr "Otevřít v samostatném okně" - -#~ msgid "" -#~ "For multi-word search, use\n" -#~ "+FirstWord +SecondWord" -#~ msgstr "" -#~ "Pro víceslovné hledání použijte\n" -#~ "+PrvníSlovo +DruhéSlovo" - -#~ msgid "_About the SWORD Project ..." -#~ msgstr "O aplikaci _SWORD Project ..." - -#~ msgid "Select the modules you want" -#~ msgstr "Vyberte modul, který chcete" - -#~ msgid "" -#~ "There is currently no program set as your\n" -#~ "handler for \"sword://\" and similar URLs.\n" -#~ "Would you like Xiphos to install itself\n" -#~ "as the program to handle these URLs?" -#~ msgstr "" -#~ "V současné době není nastaven program\n" -#~ "pro obsluhu URL \"sword://\" a podobných.\n" -#~ "Přejete si, aby se Xiphos používal\n" -#~ "pro obsluhu těchto URL?" - -#~ msgid "Font Miscellaneous" -#~ msgstr "Písmo - různé" +#~ "Skupinové vysílání (multicast) nefunguje; BibleSync je teď vypnut. Pokud " +#~ "se změnilo nastavení sítě během toho, co je tento program aktivní, může " +#~ "postačit jen znovu zapnout." diff -Nru xiphos-4.0.0+dfsg1/po/cy.po xiphos-4.0.4+dfsg1/po/cy.po --- xiphos-4.0.0+dfsg1/po/cy.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/cy.po 2015-06-16 17:44:26.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Xiphos 3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-29 21:07+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Gnomesword-developers \n" @@ -19,296 +19,263 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Methu ffeindio’r ffurfweddiad" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Ydych chi’n siwr eich bod eisiau dileu’r nodyn" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Agor" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Dogfen ddi-deitl" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Cadw’r newidiadau" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "cyn cau?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Os na gadwch y newidiadau, byddwch yn eu colli’n barhaol." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Ffeil" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "PadAstudio" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Golygydd Nodiadau" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Golygydd Dyddlyfr/ Rhestr Weddi" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Am y Modiwl SWORD" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Modiwl cyfan" +msgid "Module name: " +msgstr "Rheolydd Modiwlau" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Dewisiadau" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s wedi methu" +msgid "Type: " +msgstr "Cwmpas" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Defosiwn Dyddiol" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapiau" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Methu ffeindio’r ffurfweddiad" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Lluniau" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Tud %d o %d" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Agor" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Cadw fel" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Beibl" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Dogfen ddi-deitl" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Esboniad" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Ydych chi’n siwr eich bod eisiau dileu’r nodyn" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Geiriadur" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Allbwn HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Côd HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Côd plaen" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Llyfrau" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Argraffu..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Ailenwi’r Esboniad" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Rhagolwg Argraffu" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Dyddlyfr" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Ymadael" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Anhysbys" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Agor" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Cadw" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Cadw_fel..." +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Rhestrau’r Modiwlau" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Newydd" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Dewisiadau" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Gosod ffynhonnell" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr " Prif Fodiwlau’r Ffenestr " -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Ffeil" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Fformadu" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "Allbwn _HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_Cod HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Cod plaen" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Gweld" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Teitlau" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Cadw" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Troednodiadau" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Mewnosod Dolen" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Croesgyfeiriadau" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Cadw’r newidiadau" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Rhifau Strong" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "cyn cau?" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Tagiau Morffolegol" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Os na gadwch y newidiadau, byddwch yn eu colli’n barhaol." +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemata" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Ffeil" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Geiriau Iesu mewn coch" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "PadAstudio" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Acenion y Roeg" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Golygydd Nodiadau" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Llafarnodau Hebraeg" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Golygydd Dyddlyfr/ Rhestr Weddi" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Llafarganu Hebraeg" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Datgloi " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Paratoi i argraffu" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Yr argraffydd hwn ddim yn gymwys i argraffu" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "%s Argraffydd ddim yn gallu argraffu ôl-nodiadau." +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Trawslythreniad" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Argraffu" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Disgwyl i argraffu" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Bu gwall wrth argraffu" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Ni fu’n bosibl argraffu eich dogfen: %s" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Segmentiad Morffemau" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Am y Modiwl SWORD" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Does gan y modiwl ddim gwybodaeth Amdani" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Priodoledd" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Dewisiadau" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -320,40 +287,42 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Prosiect SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Ydych chi’n defnyddio Xiphos i astudio’r Beibl? Hoffech weld ei ymddangosiad " "gan ddefnyddio’ch iaith frodorol? Gallech chi gyfieithu Xiphos!" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Am Gyfieithu Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "gw. SUT_I-GYFIEITHU yn ffynhonnell Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Datblygiad Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Hawlfraint 2000-2009 Tîm Datblygu Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Hawlfraint 2000-2015 Tîm Datblygu Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -366,235 +335,235 @@ "ni." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Nod Tudalen" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Teipiwch Enw’r Ffolder" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Enw’r Ffolder" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Ffolder: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Golygu Eitem Nod Tudalen" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Golygu" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Enw Ffolder: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Enw Nod Tudalen: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Adnod: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modiwl: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Diddymu’r ffolder ddewiswyd" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(a’i holl gynnwys)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Diddymu’r Nod Tudalen a ddewiswyd" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Ychwanegu" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Label: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Canlyniadau’r Chwiliad: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Nodau Tudalen" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, fuzzy, c-format msgid "Cipher key for module %s" msgstr "Gwiro am Fodiwlau SWORD" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "i:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Teipio Allwedd Seiffr: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Cau heb Gadw" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Cau _heb gadw" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Rhestr Adnodau" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Darganfod" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Teipio Gair neu Gymal" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Chwilio yn ôl" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Darganfod Nesaf" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Gosod ffont y Modiwl" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Newid ffont i" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modiwl" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Ffont cyfredol: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Defnyddio’r ffont diofyn i’r modiwl" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "Mewn modiwlau sydd a rhifau Strong" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos – Meddalwedd Astudio’r Beibl" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Agor tab newydd" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Golwg Safonol" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Golwg Esboniad" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Golwg Llyfr" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Croeso i Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -614,33 +583,33 @@ "Felly, ni ellir ailenwi esboniad personol\n" "yn amgylchedd Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Ailenwi’r Esboniad" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Dewis enw i’r Esboniad" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Enw Newydd" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Enw: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Dylai enwau Modiwlau gynnwys llythrennau a rhifau yn unig." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Mae Xiphos eisoes yn gwybod am Fodiwl gyda’r enw yna." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -649,7 +618,7 @@ "Methwyd creu ffurfwedd newydd:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -657,7 +626,7 @@ "Gwall creu ffurfwedd:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 #, fuzzy msgid "No module in this pane." msgstr "Canfod yn y nodyn hwn" @@ -725,20 +694,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Paratoi i ddileu" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Dileu" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Dileu" @@ -758,77 +727,81 @@ msgid "Install" msgstr "Gosod" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Paratoi i archifo" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archifo" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archifo" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Paratoi i greu mynegai" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Creu Mynegai" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Mynegai" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Paratoi i ddileu mynegai" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Dileu Mynegai" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Dilewyd" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Does gan y modiwl ddim gwybodaeth Amdani" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Enw’r Modiwl" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Mae marc gwiro yn golygu fod y modiwl hwn wedi ei osod eisoes" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Clicio'r bocs i weithio ar y modiwl" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Clicio'r bocs i ddewis y modiwl hwn i'w osod/ddiweddaru" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Gosodwyd" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -837,7 +810,7 @@ "wedi ei optimeiddio i'r modiwl hwn ar gyfer chwilio cyflym (gweler y cwarel " "Cynnal a Chadw ar gyfe y swyddogaeth yma)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -845,13 +818,13 @@ "Mae'r eicon clo yn golygu fod y modiwl hwn wedi ei amgryptio, a bod angen i " "chi brynu allwedd gan berchennog y cynnwys" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Am" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -859,19 +832,19 @@ "Mae'r eicon adnewyddu yn golygu fod y modiwl yn hyn na'r modiwl newydd sydd " "ar gael: Mae angen diweddaru'r modiwl" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Ar gael" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Maint" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Disgrifiad" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -880,40 +853,40 @@ "`mkdir %s' wedi methu:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Ni ellir creu mynegai i Ddyddlyfrau a rhestrau gweddi" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s wedi methu" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Wedi gorffen" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Anhysbys" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -921,54 +894,44 @@ "Dosbarthwyd yn ôl\n" "Math o Fodiwl" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Testunau Beiblaidd" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Esboniadau" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Geiriaduron" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Defosiwn Dyddiol" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Llyfrau" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Mapiau" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Lluniau" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -976,311 +939,322 @@ "Dosbarthwyd yn ôl\n" "Argaeledd" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Diweddariadau" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Dadosodwyd" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Rhestr Weddi/Dyddlyfr" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Ffurfweddu" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Teip" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Pennawd" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Ffynhonnell" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Cyfeiriadur" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modiwlau" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Gosod/Diweddariad" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Cynhaliaeth" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Adnewyddwch" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Nid yw eich rhestr modiwlau wedi’i diweddaru!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Diddymu’r Ffynhonnell ddewiswyd" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Agor ffynhonell cyrchiad pell" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Pennawd:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Teip:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Gwesteiwr:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Cyfeiriadur:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Mae ffynhonell o’r enw hwnnw yn bod eisoes." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Modiwl cyfan" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Mynd allan, i’r adran sy’n cynnwys hwn." -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "I’r eitem flaenorol" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "I’r eitem nesaf" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Mynd i mewn, i’r isadran gyntaf" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Gwahanu/Atodi" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Dewis Modiwl" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Golwg Paralel" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Troi’r testun yn drwm" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personol" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Dewis --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Dewisiadau" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Cyffredinol" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Dewisiadau" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Beibl" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Ffontiau" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Lliw" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Tabiau a cwareli" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Arbennig" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Clirio Rhestr?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Ydych chi’n siŵr eich bod am glirio’r rhestr?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Dileu’r Modiwl?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Ydych chi’n siwr eich bod am ddileu y modiwl a ddewiswyd?" @@ -1299,20 +1273,20 @@ msgid "found in " msgstr "darganfuwyd yn " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, fuzzy, c-format msgid "New List %s" msgstr "Cadw rhestr" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Ni ellir diddymu'r rhestr modiwlau diwethaf" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Dileu’r rhestr?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Ydych chi’n siŵr eich bod am ddileu:" @@ -1332,7 +1306,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1377,7 +1351,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1395,15 +1369,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1411,108 +1385,98 @@ "Mae hon yn chwiliad cynhwysol (\"A\"):\n" "Darganfod y rhai sy'n dangos pob gair." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "_Chwilio Manwl" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Chwilio Modiwl" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Beibl" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Esboniad" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Chwilio Teip" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Aml-eiriau" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Ymadrodd cyson" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Union gymal" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Dewisiadau Chwilio" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Cydweddu" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Cwmpas y Chwilio" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Dim Cwmpas" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Defnyddio ffiniau" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Chwiliad diwethaf" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Ffiniau" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Isaf" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Uchaf" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Agor yn Golygydd" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Dewisiadau" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Chwilio" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Bar ochr" @@ -1520,73 +1484,73 @@ msgid "Powered by the SWORD Project" msgstr "Gyrrir gan Brosiect SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Eitem Rhestr Weddi/Dyddlyfr" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Enw Newydd" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Diddymu’r eitem ddewiswyd" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Ionawr" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Chwefror" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Mawrth" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Ebrill" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mai" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Mehefin" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Gorffennaf" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Awst" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Medi" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Hydref" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Tachwedd" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Rhagfyr" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1597,278 +1561,393 @@ "(Neu efallai fod y ddelwedd yn fath gwahanol i bmp/gif/jpg/png.)\n" "All Xiphos ddim newid maint delweddau i ffitio’r ffenestr." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Modiwl cyfan" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Clicio'r bocs i weithio ar y modiwl" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Ar gael" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Achubiaeth" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "IP address: " +msgstr "Cyfeiriad" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "Am y cymhwysiad hwn" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Pennod" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Nid yw Xiphos yn deall mwy nag un ddadl." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Dechrau Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Adeiladu Rhyngwyneb" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Dechrau Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Llwytho Gosodiadau" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Arddangos Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Rhagolygwr" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Troednodyn" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Croesgyfeiriad" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morffoleg" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Yn ôl i " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Rhifau Strong" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Troednodiadau" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Tagiau Morffolegol" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Llafarnodau Hebraeg" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Llafarganu Hebraeg" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Acenion y Roeg" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Croesgyfeiriadau" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemata" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Teitlau" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentiad Morffemau" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Geiriau Iesu mewn coch" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Trawslythreniad" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Amrywiadau Testunol" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Prif Ddarlleniad" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Darlleniad eilradd" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Pob darlleniad" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Trawslythreniad" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "gweld cyd-destun" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Tyfiant" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "I Dyfu
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Achubiaeth" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "I Achub
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Iechyd" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "I fod yn Iach
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Amryw" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "Amrywiol
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Pwynt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Pwynt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Pwynt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Pwnc bach 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Is-bwnc 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Pwnc bach 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr " Is-bwnc 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Pwnc bach 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr " Is-bwnc 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Pwnc bach 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr " Is-bwnc 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Enw rhestr weddi neu ddyddlyfr newydd" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Mae Xiphos wedi darganfod y rhestr weddi yna eisoes." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "Xiphos yn methu creu’r llwybr modiwl.%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Rhestr weddi sylfaenol. \\par\\par Modiwl wedi ei greu gan Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "RhestrWeddiSylfaenol" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "FyRhestrWeddi" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1876,103 +1955,103 @@ "Pobl:
Bob
Sam
Sue

Eglwys:
seddi
cymdeithas
Beiblau i genhadon


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Rhestr pynciau gweddi. \\par\\par Modiwl wedi ei greu gan Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "RhestrPynciauGweddi" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Tyfiant Ysbrydol" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Rhestr weddi fisol. \\par\\par Modiwl wedi ei greu gan Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "RhestrWeddiFisol" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Dyddlyfr. \\par\\par Modiwl wedi ei greu gan Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Dyddlyfr" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Amlinelliad o bwnc (e.g. pregeth). \\par\\par Modiwl wedi ei greu gan Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "AmlinelliadPwnc" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Prif Bwnc A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr " Prif Bwnc A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Prif Bwnc B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr " Prif Bwnc B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Prif Bwnc C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr " Prif Bwnc C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Canlyniad chwiliad %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Dileu Amrediad?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Ydych chi’n siwr eich bod am ddileu’r amrediad hwn?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Chwilio: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1983,16 +2062,16 @@ "Y modiwl heb ei osod.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Newidiwch y rhestr modiwlau." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Nid oes mynegai chwilio cyflym i %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2000,7 +2079,7 @@ "\n" "Mae'r chwiliad ar y modiwl hwn yn `aml-air'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2008,52 +2087,44 @@ "\n" "Gweler y Rheolydd Modiwlau, Cwarel Cynnal a Chadw." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Chwilio ar ben" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "canlyniadau" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 #, fuzzy msgid "There is no commentary module." msgstr "Nifer y Modiwlau Esboniad" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" -msgstr "$HOME heb ei osod!" - -#: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "" -"All Xiphos ddim creu .xiphos:\n" -"%s\n" -"\n" -"All Xiphos ddim parhau." +msgstr "$HOME heb ei osod!" + +#: ../src/main/settings.c:120 +#, fuzzy, c-format +msgid "Xiphos can not create directory " +msgstr "Xiphos yn methu creu’r llwybr modiwl.%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "methu creu " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2068,11 +2139,11 @@ "All Xiphos ddim mynd ymlaen\n" "a bydd yn allanu." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Gosod Modiwl Beibl wedi ei gwblhau." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2082,11 +2153,11 @@ msgid "verse" msgstr "adnod" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "pennod" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2094,13 +2165,13 @@ "Ffeil Xiphos i’r talfyriadau\n" "iaith yn eisiau." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2108,7 +2179,7 @@ "Ni all Xiphos fapio’r\n" "ffeil talfyriadau iaith." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2117,18 +2188,18 @@ "ffeil talfyriadau iaith." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2136,7 +2207,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2144,11 +2215,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Gofynnwyd am y defosiwn dyddiol, ond does dim wedi eu gosod." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2162,89 +2233,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Clirio Hanes" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Rhestr Adnodau" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "methu dod o hyd i’r URL:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos yn methu gweithredu %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Gwall gweld:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Dangos %s yn y prif ffenestr" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Methu creu’r ddogfen. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Beth sydd raid i mi ei wneud i gael fy achub?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Actau 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Rhuf 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Beth ydy’r Efengyl?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Methu dosrannu’r ddogfen. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "dogfen wag \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "math anghywir, cwgn gwreiddyn != DalennodauSword\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "math anghywir, cwgn gwreiddyn != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2253,7 +2329,7 @@ "\n" msgstr "Pennod" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2262,101 +2338,101 @@ "\n" msgstr "Pennod" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Hen Destament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Testament Newydd" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Math - Dat" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Sampl o Restr Modiwlau" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "math anghywir, cwgn gwreiddyn != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2370,13 +2446,13 @@ msgstr "Deialog Nod Tudalen" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Creu Ffolder Newydd" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Ffolder Newydd" @@ -2385,7 +2461,7 @@ msgstr "Newydd ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Canslo Nod Tudalen" @@ -2398,22 +2474,22 @@ msgstr "Cofnod Label:" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Adnod:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "_Cofnod Adnod" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modiwl:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Cofnod Modiwl:" @@ -2421,6 +2497,10 @@ msgid "Bookmark Folder Treeview" msgstr "Canghennau Ffolder Nod Tudalen" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Mewnosod Dolen" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2476,6 +2556,12 @@ msgid "_Delete Personal Comment" msgstr "_Dileu’r Sylw Personol" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Ffeil" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Cadw’r nodyn cyfredol" @@ -2484,6 +2570,14 @@ msgid "_Save (Personal Comment)" msgstr "_Cadw (Sylw Personol)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Rhagolwg Argraffu" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Argraffu..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "A_llanu" @@ -2492,6 +2586,11 @@ msgid "For_mat" msgstr "Ffor_madu" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Cadw" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Argraffu’r ddogfen hon" @@ -2529,7 +2628,7 @@ msgstr "Dogfen Newydd" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copio/Allfudo’r darn" @@ -2566,7 +2665,7 @@ msgstr "Allfudo Llyfr cyfan" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Llyfr" @@ -2681,8 +2780,8 @@ msgid "Open about dialog" msgstr "Agor mewn deialog" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Trwm" @@ -2725,13 +2824,17 @@ msgid "Delete selection" msgstr "Diddymu dewisiadau detholedig" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Methu symud" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Dileu Eitem" @@ -2911,6 +3014,10 @@ msgid "Right justify paragraph" msgstr "Unioni’r paragraffau ar y dde" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Newydd" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3046,122 +3153,87 @@ msgid "_Edit" msgstr "_Golygu" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Help" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Pennawd 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Pennawd 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Pennawd 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Pennawd 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Pennawd 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Pennawd 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Cyfeiriad" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 #, fuzzy msgid "Preformatted" msgstr "Rhagfformatio" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Rhestr â bwledi" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 #, fuzzy msgid "Roman Numeral List" msgstr "Rhestr â rhifau" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Rhestr â rhifau" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Rhestr yn nhrefn yr Wyddor" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Taro" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3237,90 +3309,98 @@ msgstr "Dileu’r mynegai chwilio cyflym i’r modiwlau hyn:" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Parhau" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Rheolydd Modiwlau" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "RHYBUDD: Byddwch yn ofalus os ydych yn byw mewn gwlad ble mae " "erledigaeth." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Ychwanegu a diddymu ffynonellau" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Ffynnonellau Lleol Cyfredol" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Ffynnonellau Pell Cyfredol" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Diddymu’r Ffynhonnell ddewiswyd" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Gosod ffynhonnell" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lleol" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Pell" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Gosod Cyrchfan" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Adran bersonol, i'ch defnydd chi yn unig:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Cyfeiriadur Cartref" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Adran y System, at ddefnydd pawb:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "cyfeiriadur system SWORD" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3328,10 +3408,14 @@ "RHYBUDD: Os ydych yn byw mewn gwlad ble mae erledigaeth a ddim am " "fentro cael eich canfod, NI ddylech ddefnyddio’r nodwedd gosod pell! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Gosod Ffolder Lleol" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Rhestr hanes llusgo lawr" @@ -3340,11 +3424,11 @@ msgid "Choose book to display" msgstr "Dewiswch lyfr i'w ddangos" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Botwm Dewis Llyfr" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Datguddiad Ioan" @@ -3353,11 +3437,11 @@ msgid "Choose chapter to display" msgstr "Dewiswch lyfr i'w ddangos" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Botwm Toglo Pennod" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3513,11 +3597,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Modiwlau" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3589,12 +3674,12 @@ msgid "BSP privacy button" msgstr "Botwm Dewis Adnod" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Achubiaeth" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3626,11 +3711,12 @@ msgid "BSP nav verse list radio button" msgstr "Botwm Dewis Rhestr Modiwlau" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Enw’r rhestr" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3673,7 +3759,12 @@ msgid "BSP listen none radio button" msgstr "Borwm Radio Testun Plaen" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Arbennig" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3865,194 +3956,193 @@ msgstr "Galluogi Bocs Ticio rhestrau gweddi" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Maint ffont rhif yr adnod" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "Dangos Rhifau_Adnodau" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Maint ffont rhif yr adnod" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Defnyddio Bocs Ticio Adnod i bob Llinnell" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Disgrifiad" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Dangos Rhifau_Adnodau" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Maint ffont rhif yr adnod" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Cyfeiriadur diofyn PadAstudio" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Dewiswch Gyfeiriadur" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Cyfeiriadur diofyn PadAstudio" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Cyffredionol amrywiol" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr " Prif Fodiwlau’r Ffenestr " -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Testun Beiblaidd" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Newid Testun Beiblaidd" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Newid Esboniad" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Geiriadur" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Newid Geiriadur" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Newid Llyfr" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modiwlau" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Dileu pob modiwl o’r rhestr" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Botwm dileu pob modiwl o’r rhestr" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Symudwch y modiwl dewisedig o’r rhestr" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "Agorwch ddeialog i ddewis modiwlau i ychwanegu at y rhestr" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Ychwanegu Modiwlau" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "botwm Agor Dewis Deialog" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modiwlau Paralel" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Modiwlau Pwrpas Arbennig" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Defosiwn Dyddiol" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Defosiwn Dyddiol" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Geiriadur Hebraeg" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Geiriadur Hebraeg" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Geiriadur Groeg" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Geiriadur Groeg" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Geiriadur Diofyn" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Newid Geiriadur Diofyn" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Nodiadau Personol" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Newid Nodiadau Personol" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modiwlau Amrywiol" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Dewisiad modiwlau" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4081,6 +4171,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Chwiliad Manwl" @@ -4290,11 +4384,11 @@ msgid "Found" msgstr "Canfuwyd" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "ffenestr Crynhoi'r Canlyniadau" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabl Crynhoi'r Canlyniadau" @@ -4486,6 +4580,11 @@ msgid "Attribute Search" msgstr "Chwiliad Priodoledd" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Dewisiad modiwlau" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4582,6 +4681,10 @@ msgid "_Module Manager" msgstr "_Rheolydd Modiwl" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Gweld" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4731,28 +4834,28 @@ msgid "Learn about Xiphos" msgstr "Am _Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Agor Modiwl" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Nodyn" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Agor yn Golygydd" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "_Adnod y llinnell" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4760,270 +4863,279 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Amrywiadau" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Cynnwys y ddelwedd" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Parchu Wyneb teip y ffont" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Esboniad bob yn bennod" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" msgstr "Testun Bylchu-Dwbl" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Edrych ar y dewisiad" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Defnyddio’r Geiriadur Cyfredol" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Datgloi’r Modiwl" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Dangos Teitl y Llyfr" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Dangos Teitl y bennod" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Ailenwi Esboniad Personol." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Dympio Esboniad Personol." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Darllen y dewisiad yn uchel" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Cadw’r canlyniadau chwilio fel un nod dalen" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Cadwch y rhestr fel nod tudalen" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Cadw’r canlyniadau chwilio fel nodau dalen yn eu ffolder eu hunain" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Cadw’r rhestr fel nodau dalen" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Rhestr Adnodau" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Clirio’r rhestr hanes" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Agor y Nod Tudalen mewn tab newydd" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Agor mewn tab newydd" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Agor y Nod Tudalen mewn deialog" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Agor mewn deialog" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Ychwanegu ffolder newyd i’r ffolder a ddewiswyd" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Mewnosod Nod Tudalen yma" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Mewnosod Nod Tudalen" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Golygu Eitem Nod Tudalen" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Golygu Eitem" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Dileu Eitem" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Ehangu pob grwp Nod Tudalen" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Ehangu’r cwbl" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Dymchwel pob grwp Nod Tudalen" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Dymchwel y cwbl" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Caniatau symud eitemau o un ffolder i’r llall" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Caniatau Ad-drefnu" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Llwytho Nodau Tudalen o Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Mewnosod Nod Tudalen" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Diddymu ffolder a’i gadw" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Agor i modiwl ddewiswyd mewn tab newydd" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Agor mewn ffenestr arall" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Creu rhestr weddi syml newydd" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Syml" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Pwnc" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Misol" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Agor mewn ffenestr arall" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Ychwanegu Eitem" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Diddymu’r eitem hon" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Golygu’r eitem hon" @@ -5035,6 +5147,85 @@ msgid "Study the Bible" msgstr "Astudio’r Beibl" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Modiwl cyfan" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s wedi methu" + +#~ msgid "Page %d of %d" +#~ msgstr "Tud %d o %d" + +#~ msgid "Save As" +#~ msgstr "Cadw fel" + +#~ msgid "HTML Output" +#~ msgstr "Allbwn HTML" + +#~ msgid "HTML Source" +#~ msgstr "Côd HTML" + +#~ msgid "Plain Source" +#~ msgstr "Côd plaen" + +#~ msgid "_Quit" +#~ msgstr "_Ymadael" + +#~ msgid "_Open" +#~ msgstr "_Agor" + +#~ msgid "_Save" +#~ msgstr "_Cadw" + +#~ msgid "Save _As..." +#~ msgstr "Cadw_fel..." + +#~ msgid "HTML _Output" +#~ msgstr "Allbwn _HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_Cod HTML" + +#~ msgid "_Plain Source" +#~ msgstr "_Cod plaen" + +#~ msgid "Unlock " +#~ msgstr "Datgloi " + +#~ msgid "Preparing to print" +#~ msgstr "Paratoi i argraffu" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Yr argraffydd hwn ddim yn gymwys i argraffu" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "%s Argraffydd ddim yn gallu argraffu ôl-nodiadau." + +#~ msgid "Printing" +#~ msgstr "Argraffu" + +#~ msgid "Waiting to print" +#~ msgstr "Disgwyl i argraffu" + +#~ msgid "An error occurred while printing" +#~ msgstr "Bu gwall wrth argraffu" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Ni fu’n bosibl argraffu eich dogfen: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "All Xiphos ddim creu .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "All Xiphos ddim parhau." + #~ msgid "Tabs" #~ msgstr "Tabiau" @@ -5482,9 +5673,6 @@ #~ msgid "C_lear" #~ msgstr "_Clirio" -#~ msgid "Clear history list" -#~ msgstr "Clirio’r rhestr hanes" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "Dangos Defosiwn Dyddiol heddiw" @@ -5509,9 +5697,6 @@ #~ msgid "About _Xiphos ..." #~ msgstr "Am_Xiphos ..." -#~ msgid "About this application" -#~ msgstr "Am y cymhwysiad hwn" - #~ msgid "Hi_story" #~ msgstr "Hanes" diff -Nru xiphos-4.0.0+dfsg1/po/da.po xiphos-4.0.4+dfsg1/po/da.po --- xiphos-4.0.0+dfsg1/po/da.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/da.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-04-11 02:43+0000\n" "Last-Translator: AJenbo \n" "Language-Team: Danish \n" @@ -18,295 +18,250 @@ "X-Launchpad-Export-Date: 2010-04-12 04:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Konfiguration ikke fundet" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" msgstr "" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Åbn" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Unavngivet dokument" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Gem ændringerne til dokumentet" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" msgstr "" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Hvis du ikke gemmer, vil ændringer være permanent tabt." -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Fil" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" msgstr "" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Om Sword-modul" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Modul navn" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Indstillinger" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Indstillinger" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:423 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s fejlede" +msgid "Daily Devotion" +msgstr "Andagt" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Kort" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Billeder" + +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Konfiguration ikke fundet" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bibel" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Side %d af %d" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Kommentar" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Åbn" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Ordbog" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Gem som" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Generelle bøger" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Unavngivet dokument" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Omdøb kommentar" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML-uddata" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Ukendt" -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML-kildetekst" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "For frelse
" -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Udskriv..." - -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "_Vis udskrift" - -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Afslut" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Åben" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Gem" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Gem _som..." - -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Åben nyt dokument" - -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Slet" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Skriftstørrelser" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fil" - -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML-_uddata" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML-kilde" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Skriftstørrelser" -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" msgstr "" -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "V_is" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Fodnoter" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Gem" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Kryds-referencer" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Indsæt henvisning" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Gem ændringerne til dokumentet" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologiske mærker" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" msgstr "" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Hvis du ikke gemmer, vil ændringer være permanent tabt." +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Fil" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Lås op " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Forbereder udskrift" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Udskrift er ikke understøttet på denne printer" +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Printer %s understøtter ikke PostScript udskrivning" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Udskrivning" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Venter på at udskrive" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Der opstod en fejl under udskrivning" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Det var ikke muligt at udskrive dit dokument: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Om Sword-modul" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Modulet har ingen Om information." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Indstillinger" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -318,38 +273,39 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD projektet" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Om Xiphos oversættelse" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos udvikling" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Ophavsret 2000-2010 Xiphos udviklinger holdet" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Ophavsret 2000-2015 Xiphos udviklinger holdet" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -358,233 +314,233 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Indtast mappenavn" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Mappenavn" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mappe: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Rediger" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Mappe navn: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Bogmærke navn: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Fjern den valgte mappe" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(og alt dens indhold)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Fjern det markerede bogmærke" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Tilføj" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etikette: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Søgeresultat: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Bogmærker" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Luk uden at gemme" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Luk _uden at gemme" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Versliste" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Indtast ord eller sætning" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Søg bagud" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Find næste" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Nuværende skrifttype: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "Fejl! Xiphos er ved at lukke ned på grund af en \"STRDUP\" fejl." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Vær venlig at rapportere fejl til Xiphos-holdet med:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "Fejl! Xiphos er ved at lukke ned på grund af en \"STRING\" fejl." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "Modulet har ingen Om information." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standart visning" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Kommentar visning" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Bog visning" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Velkommen til Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -596,46 +552,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Omdøb kommentar" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nyt navn" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Navn: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -702,20 +658,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Fjern disse moduler?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Fjerner" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Fjern" @@ -735,113 +691,117 @@ msgid "Install" msgstr "Installér" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Klargør indeksering" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indekserer" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeks" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Klargør sletning af indeks" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Sletter indeks" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Sletning" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Modulet har ingen Om information." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modul navn" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installeret" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Om" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Tilgængelig" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Størrelse" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Beskrivelse" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -850,402 +810,403 @@ "mkdir %s' fejlede:\n" "%s" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " gemt i: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s fejlede" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Gennemført" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Ukendt" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bibelske tekster" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Kommentarere" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Ordbøger" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Andagter" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Generelle bøger" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Kort" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Billeder" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Opdateringer" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurer" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Type" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Kilde" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Katalog" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Bruger" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Adgangskode" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Tilføj/Fjern" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Vælg" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduler" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Installer/opdater" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Vedligeholdelse" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Fjern den valgte kilde" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Indtast en fjern kilde" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Type:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Vært:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Katalog:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Bruger (valgfrit):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Adgangskode (valgfrit):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Slet en fjern kilde" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Fjern den valgte mappe" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personlig" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Vælg --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Indstillinger" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Indstillinger" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Bibel" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Skrifttyper" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Farve" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Faneblade og paneler" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Speciel" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Ryd liste?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Er du sikker på at du vil rydde listen over moduler?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Fjern modul?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Er du sikker på at du vil fjerne det valgte modul?" @@ -1264,20 +1225,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Slet liste?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Er du sikker på at du vil slette:" @@ -1297,7 +1258,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1342,7 +1303,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1360,121 +1321,111 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Avanceret søgning" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Bibel" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Kommentar" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Søgetype" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulært udtryk" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Søgeindstillinger" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Sidste søgning" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Indstillinger" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Søg" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sidepanel" @@ -1482,357 +1433,468 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nyt navn" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januar" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februar" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marts" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Maj" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juni" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juli" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Oktober" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Ukendt" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Tilgængelig" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Frelse" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapitel" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Initialiserer Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Bygger brugerflade" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Starter Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Læser indstillinger" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Viser Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Forhåndsviser" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Fodnote" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Krydsreference" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologi" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Fodnoter" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologiske mærker" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Kryds-referencer" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 -msgid "Textual Variants" +#: ../src/main/parallel_view.cc:512 +msgid "Textual Variants" +msgstr "" + +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 +msgid "Primary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 +msgid "Secondary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 +msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 -msgid "Primary Reading" +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 -msgid "Secondary Reading" +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 -msgid "All Readings" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Vækst" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "For vækst
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Frelse" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "For frelse
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Helbred" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "For helbred
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Diverse" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "Diverse
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punkt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 #, fuzzy msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punkt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 #, fuzzy msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punkt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 #, fuzzy msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 #, fuzzy msgid "Subtopic 1
" msgstr "Underemne 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 #, fuzzy msgid "Subtopic 2
" msgstr "Underemne 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 #, fuzzy msgid "Subtopic 3
" msgstr "Underemne 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 #, fuzzy msgid "Subtopic 4
" msgstr "Underemne 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 #, fuzzy msgid "" "People:
Bob
Sam
Sue

Church:
pews
Mennesker:
Jens
Peter
Anne

Kirke:
medlemmer
fællesskab
Bibler til missionærere


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 #, fuzzy msgid "Bob
Sam
Sue
John
" msgstr "Jens
Frederik
Anne
Peter
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Åndelig vækst" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 #, fuzzy msgid "Mike
Steve
" msgstr "Mikael
Svend
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 #, fuzzy msgid "Sue
John
" msgstr "Susanne
Peter
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 #, fuzzy msgid "Major Topic A
" msgstr "Underemne 1
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 #, fuzzy msgid "Major Topic B
" msgstr "Underemne 1
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 #, fuzzy msgid "Major Topic C
" msgstr "Underemne 1
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Søg: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1950,68 +2012,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "resultater" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "" +#, fuzzy, c-format +msgid "Xiphos can not create directory " +msgstr "Xiphos kunne ikke udføre %s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2021,11 +2079,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2035,47 +2093,47 @@ msgid "verse" msgstr "vers" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "kapitel" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2083,7 +2141,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2091,11 +2149,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2109,89 +2167,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Ryd historik" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Versliste" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos kunne ikke udføre %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Hvad skal jeg gøre for at blive frelst?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apg 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romerne 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Hvad er evangeliet?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1. Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "tomt dokument \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2200,7 +2263,7 @@ "\n" msgstr "Kapitel" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2209,101 +2272,101 @@ "\n" msgstr "Kapitel" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Gamle testamente" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "1. Mos - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nye testamente" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Åb" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2317,13 +2380,13 @@ msgstr "Bogmærke dialog" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Opret ny mappe" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Ny mappe" @@ -2332,7 +2395,7 @@ msgstr "Ny ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2345,22 +2408,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2368,6 +2431,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Indsæt henvisning" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2423,6 +2490,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fil" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2431,6 +2504,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "_Vis udskrift" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Udskriv..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "A_fslut" @@ -2439,6 +2520,11 @@ msgid "For_mat" msgstr "For_matér" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Gem" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Udskriv dette dokument" @@ -2476,7 +2562,7 @@ msgstr "Nyt dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2513,7 +2599,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Bog" @@ -2625,8 +2711,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2668,13 +2754,17 @@ msgid "Delete selection" msgstr "Sletning" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Slet" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Fjern den valgte mappe" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2846,6 +2936,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -2978,122 +3072,86 @@ msgid "_Edit" msgstr "" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Slet liste?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Versliste" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Markér/afmarkér vers" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Markér" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Afmarkér" @@ -3170,97 +3228,109 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Fortsæt" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Tilføj og fjern kilder" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Aktuelle lokale kilder" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Aktuelle fjerne kilder" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Slet en fjern kilde" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Fjern" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Hjemme mappe" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3269,11 +3339,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Bog vælger knap" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Johannes Åbenbaring" @@ -3281,11 +3351,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3437,11 +3507,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3510,12 +3580,12 @@ msgid "BSP privacy button" msgstr "_Vers per linje" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Frelse" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3545,11 +3615,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3592,7 +3662,12 @@ msgid "BSP listen none radio button" msgstr "_Vers per linje" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Speciel" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3773,187 +3848,186 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Vers:" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Beskrivelse" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Bibelsk tekst" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Ordbog" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Andagt" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebraisk leksikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Græsk leksikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Personlige noter" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -3984,6 +4058,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Avanceret søgning" @@ -4189,11 +4267,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4385,6 +4463,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4477,6 +4560,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "V_is" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4622,28 +4709,28 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "_Vers per linje" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4651,267 +4738,276 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Versliste" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Versliste" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Bogmærker" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4923,6 +5019,67 @@ msgid "Study the Bible" msgstr "Studer Bibelen" +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s fejlede" + +#~ msgid "Page %d of %d" +#~ msgstr "Side %d af %d" + +#~ msgid "Save As" +#~ msgstr "Gem som" + +#~ msgid "HTML Output" +#~ msgstr "HTML-uddata" + +#~ msgid "HTML Source" +#~ msgstr "HTML-kildetekst" + +#~ msgid "_Quit" +#~ msgstr "_Afslut" + +#~ msgid "_Open" +#~ msgstr "_Åben" + +#~ msgid "_Save" +#~ msgstr "_Gem" + +#~ msgid "Save _As..." +#~ msgstr "Gem _som..." + +#~ msgid "Open new document" +#~ msgstr "Åben nyt dokument" + +#~ msgid "HTML _Output" +#~ msgstr "HTML-_uddata" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML-kilde" + +#~ msgid "Unlock " +#~ msgstr "Lås op " + +#~ msgid "Preparing to print" +#~ msgstr "Forbereder udskrift" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Udskrift er ikke understøttet på denne printer" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Printer %s understøtter ikke PostScript udskrivning" + +#~ msgid "Printing" +#~ msgstr "Udskrivning" + +#~ msgid "Waiting to print" +#~ msgstr "Venter på at udskrive" + +#~ msgid "An error occurred while printing" +#~ msgstr "Der opstod en fejl under udskrivning" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Det var ikke muligt at udskrive dit dokument: %s" + #~ msgid "Show" #~ msgstr "Vis" diff -Nru xiphos-4.0.0+dfsg1/po/de.po xiphos-4.0.4+dfsg1/po/de.po --- xiphos-4.0.0+dfsg1/po/de.po 2014-12-19 13:53:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/de.po 2015-06-16 17:44:26.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Xiphos 3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-16 20:28+0100\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-19 12:06+0100\n" "Last-Translator: Eicke Godehardt \n" "Language-Team: Xiphos Translation Team \n" @@ -22,95 +22,6 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Poedit 1.5.4\n" -#: ../src/biblesync/biblesync.cc:130 -msgid "network setup errors." -msgstr "Fehler in den Netzwerkeinstellungen." - -#: ../src/biblesync/biblesync.cc:176 -msgid " client socket" -msgstr " Klient Socket" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr " Server Socket" - -#: ../src/biblesync/biblesync.cc:371 -msgid "bad magic" -msgstr "" - -#: ../src/biblesync/biblesync.cc:375 -msgid "bad protocol version" -msgstr "unpassende Protokollversion" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad msg type" -msgstr "unpassender Nachrichtentyp" - -#: ../src/biblesync/biblesync.cc:385 -msgid "bad packet count" -msgstr "unpassender Paketzähler" - -#: ../src/biblesync/biblesync.cc:389 -msgid "bad packet index" -msgstr "unpassender Paketindex" - -#: ../src/biblesync/biblesync.cc:433 -msgid "bad body format" -msgstr "unpassendes Nachrichtenformat" - -#: ../src/biblesync/biblesync.cc:447 -msgid "missing required header " -msgstr "verpflichtende Kopfinformationen fehlen" - -#: ../src/biblesync/biblesync.cc:474 -msgid "Spoof stopped: " -msgstr "Manipulation gestoppt: " - -#: ../src/biblesync/biblesync.cc:505 -msgid "Ignoring echo." -msgstr "Ignoriere Echo." - -#: ../src/biblesync/biblesync.cc:534 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domäne ist nicht 'BIBLE-VERSE': " - -#: ../src/biblesync/biblesync.cc:542 -msgid "Invalid group: " -msgstr "Ungültige Gruppe:" - -#: ../src/biblesync/biblesync.cc:572 -msgid " present at " -msgstr "" - -#: ../src/biblesync/biblesync.cc:574 -msgid " using " -msgstr "" - -#: ../src/biblesync/biblesync.cc:692 -msgid "[no dump ready]" -msgstr "[kein dump bereit]" - -#: ../src/biblesync/biblesync.cc:700 -msgid "select < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:711 -msgid "recvfrom < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:801 -msgid "Transmit failed.\n" -msgstr "Übertragung fehlgeschlagen.\n" - -#: ../src/biblesync/biblesync.cc:802 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" -"Gruppenruf (Multicast) funktioniert nicht; BibleSync wird jetzt deaktiviert. " -"Wenn ihre Netzwerkverbindung sich verändert hat, während dieses Programm " -"aktiv war, könnte es reichen, dies einfach wieder zu aktivieren." - #: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" @@ -121,7 +32,7 @@ "Bitte melden Sie dies. sword_main.cc:set_treekey\n" "Was haben Sie getan, als das Problem auftrat?" -#: ../src/backend/sword_main.cc:1155 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Konfiguration nicht gefunden" @@ -129,53 +40,249 @@ msgid "Are you sure you want to delete the note for" msgstr "Soll die Notiz zu folgendem Vers gelöscht werden" -#: ../src/editor/webkit_editor.c:593 ../ui/editor_studypad.xml.h:9 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 #: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Öffnen" -#: ../src/editor/webkit_editor.c:685 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Unbenanntes Dokument" -#: ../src/editor/webkit_editor.c:1227 ../src/editor/webkit_editor.c:1270 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Änderungen im Dokument speichern" -#: ../src/editor/webkit_editor.c:1228 ../src/editor/webkit_editor.c:1271 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "vor dem Beenden?" -#: ../src/editor/webkit_editor.c:1235 ../src/editor/webkit_editor.c:1278 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "Wenn sie nicht speichern, werden alle Änderungen verloren gehen." -#: ../src/editor/webkit_editor.c:1269 ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "Datei" -#: ../src/editor/webkit_editor.c:1319 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "Notizbuch" -#: ../src/editor/webkit_editor.c:1334 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Notiz-Editor" -#: ../src/editor/webkit_editor.c:1349 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Gebetsliste-/Tagebuch-Editor" -#: ../src/gnome2/about_modules.c:148 +#: ../src/gnome2/about_modules.c:138 msgid "About Sword Module" msgstr "Über das Sword-Modul" -#: ../src/gnome2/about_modules.c:358 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Das Modul hat keine Informationen." +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "Schließen" + +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Modulverwaltung" + +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Optionen" + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "" + +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Rahmen" + +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Tageslosung" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Karten" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Bilder" + +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Glossare" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bibel" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Kommentare" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Wörterbuch" + +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Allgemeine Bücher" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Kommentare umbenennen" + +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Tagebuch" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Unbekannt" + +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Modulliste" + +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Bereiche" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" + +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Installationsquelle" + +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Hauptfenster Module" + +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Format" + +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Überschriften" + +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Fußnoten" + +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Querverweise" + +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strongs Nummern" + +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morphologische Markierungen" + +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemmata" + +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Christi Worte in Rot" + +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Griechische Akzente" + +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Hebräische Vokalpunkte" + +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebräische Kantillation" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteration" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" + +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morphem-Zerlegung" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" + +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Attribute" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Optionen" + +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -195,18 +302,20 @@ "\n" "Bücher können vom SWORD Projekt heruntergeladen werde." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Das SWORD-Projekt" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Magst Du Xiphos, um damit die Bibel zu studieren? Möchtest Du es in Deiner " "Sprache sehen? Du kannst Xiphos übersetzen! \n" @@ -215,23 +324,23 @@ "Sprachen. Wenn Du für uns übersetzen kannst, verwende bitte den Link weiter " "unten, um uns zu kontaktieren und unterstütze damit unsere Arbeit." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Info zum Übersetzen von Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Siehe TRANSLATION-HOWTO in den Xiphos Quellen" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos Entwicklung" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright © 2000-2014 Xiphos Entwickler-Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Xiphos Entwickler-Team" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -244,79 +353,79 @@ "gegeben haben." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:370 -#: ../src/gnome2/bookmarks_menu.c:670 ../src/gnome2/bookmarks_menu.c:769 -#: ../src/gnome2/bookmarks_treeview.c:135 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Lesezeichen" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:771 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Ordnername eingeben" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:773 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Ordnername" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:774 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Ordner: " -#: ../src/gnome2/bookmarks_menu.c:208 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Datei für Lesezeichen festlegen" -#: ../src/gnome2/bookmarks_menu.c:356 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Bearbeiten" -#: ../src/gnome2/bookmarks_menu.c:373 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Ordnername: " -#: ../src/gnome2/bookmarks_menu.c:376 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Lesezeichenname: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:678 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:380 ../src/gnome2/bookmarks_menu.c:679 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:502 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Ausgewählten Ordner entfernen" -#: ../src/gnome2/bookmarks_menu.c:504 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(und den gesamten Inhalt)?" -#: ../src/gnome2/bookmarks_menu.c:507 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Auswähltes Lesezeichen entfernen" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Hinzufügen" -#: ../src/gnome2/bookmarks_menu.c:677 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Beschriftung: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Suchergebnis: %s" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -324,89 +433,89 @@ "Das Öffnen eines Lesezeichens mit mehreren Referenzen\n" "in unterschiedliche Reiter wird nicht unterstützt." -#: ../src/gnome2/bookmarks_treeview.c:867 ../src/gnome2/sidebar.c:1506 -#: ../src/gnome2/sidebar.c:1539 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Schlüssel für das Modul %s" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "nach:" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Chiffrierschlüssel eingeben: " -#: ../src/gnome2/dialog.c:286 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Schließen ohne zu Speichern" -#: ../src/gnome2/dialog.c:715 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:851 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Schließen _ohne zu Speichern" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1518 ../src/gnome2/sidebar.c:1555 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Versliste" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "VersListe" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "SuchErgebnisse" -#: ../src/gnome2/export_dialog.c:324 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Bitte überprüfe das Copyright vor dem Export!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:361 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Suchen" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Wort oder Phrase eingeben" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Rückwärts suchen" -#: ../src/gnome2/find_dialog.c:277 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Schriftart wählen" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Ändere Schriftart für" -#: ../src/gnome2/font_dialog.c:342 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Module" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Aktuelle Schriftart: " -#: ../src/gnome2/font_dialog.c:378 ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" @@ -415,65 +524,65 @@ msgid "Use the default font for this module" msgstr "Standardschriftart für dieses Modul verwenden" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" "BUG! Xiphos steht kurz vor dem Absturz Aufgrund eines \"STRDUP\" Fehlers." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Bitte melden Sie diesen Fehler dem Xiphos Team mit:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" "BUG! Xiphos steht kurz vor dem Absturz Aufgrund eines \"STRING\" Fehlers." -#: ../src/gnome2/main_window.c:568 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Modul bietet keinen Unterstützung für %s." -#: ../src/gnome2/main_window.c:638 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Keine Fenster." -#: ../src/gnome2/main_window.c:694 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Aktuelle Navigation gesendet." -#: ../src/gnome2/main_window.c:698 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Spricht nicht." -#: ../src/gnome2/main_window.c:882 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Software zum Bibelstudium" -#: ../src/gnome2/main_window.c:945 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Neuen Reiter öffnen" -#: ../src/gnome2/main_window.c:1025 ../src/gnome2/sidebar.c:621 -#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standardansicht" -#: ../src/gnome2/main_window.c:1086 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Kommentaransicht" -#: ../src/gnome2/main_window.c:1102 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Buchansicht" -#: ../src/gnome2/main_window.c:1129 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Willkommen bei Xiphos" -#: ../src/gnome2/menu_popup.c:1203 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -492,33 +601,33 @@ "Darum ist es unmöglich den persönlichen Kommentar\n" "in Windows umzubennnen." -#: ../src/gnome2/menu_popup.c:1222 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Kommentare umbenennen" -#: ../src/gnome2/menu_popup.c:1225 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Kommentarname wählen" -#: ../src/gnome2/menu_popup.c:1227 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Neuer Name" -#: ../src/gnome2/menu_popup.c:1228 ../src/gnome2/treekey-editor.c:141 -#: ../src/gnome2/treekey-editor.c:204 ../src/gnome2/treekey-editor.c:300 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Name: " -#: ../src/gnome2/menu_popup.c:1238 ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modulnamen dürfen nur aus [A-Za-z0-9_] bestehen." -#: ../src/gnome2/menu_popup.c:1245 ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos kennt schon ein Modul mit diesem Namen." -#: ../src/gnome2/menu_popup.c:1286 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -527,7 +636,7 @@ "Erstellen der Konfiguration fehlgeschlagen:\n" "%s" -#: ../src/gnome2/menu_popup.c:1295 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -535,7 +644,7 @@ "Fehler beim Erstellen der Konfiguration:\n" "\n" -#: ../src/gnome2/menu_popup.c:1881 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Kein Modul in dieser Seite." @@ -656,20 +765,20 @@ "Beide Dialoge, dieser und die allgemeine Einführung zum Modulmanager kann " "jederzeit geschloßen werden. " -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Entferne diese Module?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Bereite Entfernung vor" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Entferne" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:150 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Entfernen" @@ -689,23 +798,23 @@ msgid "Install" msgstr "Installieren" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archiviere diese Module?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Bereite Archivierung vor" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archiviere" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archiv" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -713,57 +822,61 @@ "Erstelle schnellen Such-Index für diese\n" "Module (kann einige Minuten/Modul dauern)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Bereite Indexierung vor" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexierung" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Index" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Lösche den Schnellsuch-Index für diese Module?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Bereite Entfernung des Index vor" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Lösche Index" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Löschen" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Das Modul hat keine Informationen." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modulname" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Ein Häkchen bedeutet, dass dieses Module bereits installiert ist" -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Kontrollkästchen aktivieren, um an diesem Modul zu arbeiten" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Kontrollkästchen aktivieren, um dieses Modul zum installieren/aktualisieren " "auszuwählen" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installiert" -#: ../src/gnome2/mod_mgr.c:628 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -772,7 +885,7 @@ "('lucene') Index des Moduls erstellt wurde (siehe Pflegeseite zu dieser " "Funktion)" -#: ../src/gnome2/mod_mgr.c:646 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -780,13 +893,13 @@ "Das Schlosssymbol bedeutet, dass das Modul verschlüsselt ist und der " "Schlüssel bei dem Rechtebesitzer erworben werden muss" -#: ../src/gnome2/mod_mgr.c:663 ../src/main/biblesync_glue.cc:627 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 #: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Über" -#: ../src/gnome2/mod_mgr.c:689 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -794,19 +907,19 @@ "Das Aktualisierungssymbol bedeutet, dass von dem installierten Modul eine " "neuere Version verfügbar ist: Sie sollten das Modul aktualisieren" -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Verfügbar" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Größe" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Beschreibung" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -815,33 +928,33 @@ "`mkdir %s' fehlgeschlagen:\n" "%s." -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " archiviert in: \n" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Tagebücher und Gebetslisten können nicht indexiert werden." -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: ../src/gnome2/mod_mgr.c:1000 ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Fertig" -#: ../src/gnome2/mod_mgr.c:1168 ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Unbekannt" -#: ../src/gnome2/mod_mgr.c:1495 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -850,7 +963,7 @@ "Quelle:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -858,54 +971,44 @@ "Kategorisiert nach\n" "Moduletyp" -#: ../src/gnome2/mod_mgr.c:1513 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bibeltexte" -#: ../src/gnome2/mod_mgr.c:1517 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Kommentare" -#: ../src/gnome2/mod_mgr.c:1521 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Wörterbücher" -#: ../src/gnome2/mod_mgr.c:1525 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glossare" -#: ../src/gnome2/mod_mgr.c:1529 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Tageslosungen" -#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Allgemeine Bücher" -#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "Karten" - -#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "Bilder" - -#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kult/Unorthodox" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -913,57 +1016,57 @@ "Kategorisiert nach\n" "Verfügbarkeit" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Aktualisierungen" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Deinstalliert" -#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/sidebar.c:637 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Gebetsliste/Tagebuch" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Aktualisiere von ferner Quelle" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Ferne Quelle nicht gefunden" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurieren" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Typ" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Überschrift" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Quelle" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Verzeichnis" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Benutzer" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Passwort" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" @@ -975,12 +1078,12 @@ msgid "Add/Remove" msgstr "Hinzufügen/Entfernen" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Auswählen" -#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2066 -#: ../src/gnome2/sidebar.c:1524 ../src/gnome2/sidebar.c:1563 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Module" @@ -988,19 +1091,20 @@ msgid "Install/Update" msgstr "Installieren/Aktualisieren" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Pflege" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Bitte aktualisieren" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Ihre Moduleliste ist veraltet!" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1008,7 +1112,7 @@ "Du hast deine letzte Bibel deinstalliert.\n" "Xiphos benötigt mindestens eine." -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1016,111 +1120,123 @@ "Es sind noch immer keine Bibeln installiert.\n" "Xiphos kann ohne einer nicht fortgesetzt" -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Ferne Standardquellen wurde geladen." -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Konnte Standardquellen von CrossWire nicht laden." -#: ../src/gnome2/mod_mgr.c:2787 ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Ausgewählte Quelle entfernen" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Geben sie eine ferne Quelle an" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Überschrift:" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Typ:" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Verzeichnis:" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Benutzer (optional):" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Passwort (optional):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Quelle mit diesem Namen existiert bereits" -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Geben sie eine Quelle im Internet an" -#: ../src/gnome2/mod_mgr.c:3552 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[kein Modul]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Nach außen, zum Abschnitt, der diesen enthält" -#: ../src/gnome2/navbar_book.c:385 ../src/gnome2/navbar_book_dialog.c:325 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Gehe zu vorigem Eintrag" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:344 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Gehe zu nächstem Eintrag" -#: ../src/gnome2/navbar_book.c:428 ../src/gnome2/navbar_book_dialog.c:364 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Nach innen, zum ersten Unterabschnitt" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:853 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synchronisiere das Scrollen in diesem Fenster mit dem Hauptfenster" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2073 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Anheften/Abtrennen" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Moduloptionen" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:620 -#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:250 -#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Parallelansicht" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "BibleSync Sitzungspasswort" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Phrase:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1129,96 +1245,96 @@ "Nach dem Aktivieren der \"Fehlersuche\" erneut versuchen, um zu die Ursache " "zu sehen." -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Modusauswahl fehlgeschlagen.\n" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (Passwort \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/gnome2/preferences_dialog.c:1021 ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Persönlich" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Sprecher" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Zuhörer" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1926 -#: ../src/gnome2/preferences_dialog.c:2403 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Auswahl --" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Lokalisierung wird nach einem Neustart wirksam." -#: ../src/gnome2/preferences_dialog.c:1961 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Einstellungen" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Allgemein" -#: ../src/gnome2/preferences_dialog.c:2049 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Einstellungen" -#: ../src/gnome2/preferences_dialog.c:2052 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Schriften" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Farben" -#: ../src/gnome2/preferences_dialog.c:2062 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Größen und Ansichten" -#: ../src/gnome2/preferences_dialog.c:2076 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Speziell" -#: ../src/gnome2/preferences_dialog.c:2785 ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Liste leeren?" -#: ../src/gnome2/preferences_dialog.c:2786 ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Möchten Sie die Modulliste wirklich leeren?" -#: ../src/gnome2/preferences_dialog.c:2837 ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Modul entfernen?" -#: ../src/gnome2/preferences_dialog.c:2838 ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Wollen Sie das ausgewählte Modul entfernen?" @@ -1237,20 +1353,20 @@ msgid "found in " msgstr "gefunden in " -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Neue Liste %s" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Die letzte Modulliste wird eventuell nicht gelöscht" -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Liste löschen?" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Möchten Sie Folgendes löschen:" @@ -1270,7 +1386,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1343,7 +1459,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1374,15 +1490,15 @@ "Morphologische Symbole werden buchstabengetreu eingegebe, z.B. \"N-ASF\" " "steht für \"Nomen, Accusativ Singular Feminin\" -- siehe Robinsonmodul." -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Modul ist weder eine Bibel noch ein Kommentar" -#: ../src/gnome2/search_dialog.c:1247 ../src/gnome2/sidebar.c:996 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync ist nicht aktiv zum übertragen." -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1390,105 +1506,95 @@ "Die ist eine inklusive (\"UND\") Suche:\n" "Findet Treffer, die alle Worte enthalten." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Öffne erweiterte Suche" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Öffne den separaten Dialog für erweiterte Suchanfragen." -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Suchmodul" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "Bibel" - -#: ../src/gnome2/search_sidebar.c:259 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Kommentare" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Suchtyp" -#: ../src/gnome2/search_sidebar.c:287 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Mehrere Worte" -#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: ../src/gnome2/search_sidebar.c:306 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Genaue Phrase" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Suchoptionen" -#: ../src/gnome2/search_sidebar.c:333 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Groß-/Kleinschreibung" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Suchbereich" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Kein Bereich" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Grenzen verwenden" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Letzte Suche" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Grenzen" -#: ../src/gnome2/search_sidebar.c:410 ../src/gnome2/search_sidebar.c:439 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Untere" -#: ../src/gnome2/search_sidebar.c:420 ../src/gnome2/search_sidebar.c:446 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Obere" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Modul im Editor öffnen?" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Wenn nicht, wird es nur angezeigt." -#: ../src/gnome2/sidebar.c:950 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Versreferenz einfügen" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Liste:" -#: ../src/gnome2/sidebar.c:1512 ../src/gnome2/sidebar.c:1547 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Suchen" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Seitenleiste" @@ -1496,73 +1602,73 @@ msgid "Powered by the SWORD Project" msgstr "Benutzt das SWORD-Projekt" -#: ../src/gnome2/tabbed_browser.c:359 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Konnte Verzeichnis für Reiter nicht anlegen." -#: ../src/gnome2/treekey-editor.c:139 ../src/gnome2/treekey-editor.c:202 -#: ../src/gnome2/treekey-editor.c:298 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Gebetslisten-/Tagebucheintrag" -#: ../src/gnome2/treekey-editor.c:140 ../src/gnome2/treekey-editor.c:203 -#: ../src/gnome2/treekey-editor.c:299 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Neuer Name" -#: ../src/gnome2/treekey-editor.c:260 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Ausgewählten Eintrag entfernen" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januar" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februar" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "März" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mai" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juni" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juli" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Oktober" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Dezember" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1570,7 +1676,7 @@ "Eine Bildgröße konnte nicht bestimmt werden.\n" "Xiphos kann Bilder nicht an die Fenstergröße anpassen." -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" @@ -1578,7 +1684,7 @@ "Nichtzutreffendes Paket\n" "\n" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" @@ -1586,7 +1692,7 @@ "Anwesenheitsmitteilung:\n" "\n" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" @@ -1594,11 +1700,11 @@ "Navigationspaket:\n" "\n" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "unbekanntes Modul" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." @@ -1606,43 +1712,43 @@ ".\n" "Indirekt über die Versliste navigiert." -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " msgstr "FEHLER: unbekannter BibleSync-Indikator" -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" msgstr "Andere Anzeichen sind:" -#: ../src/main/biblesync_glue.cc:577 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "Kontrollkästchen aktivieren, um diesem Sprecher zu folgen" -#: ../src/main/biblesync_glue.cc:590 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "Verfügbare Sprecher" -#: ../src/main/biblesync_glue.cc:599 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "" -#: ../src/main/biblesync_glue.cc:609 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" msgstr "Letzte Navigation war Direkt oder Indirekt" -#: ../src/main/biblesync_glue.cc:618 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "Letzte Navigation" -#: ../src/main/biblesync_glue.cc:637 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" msgstr "UUID" -#: ../src/main/biblesync_glue.cc:659 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "IP Adresse:" -#: ../src/main/biblesync_glue.cc:660 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " @@ -1650,7 +1756,7 @@ "\n" "Anwendung: " -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " @@ -1658,7 +1764,7 @@ "\n" "Gerät: " -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " @@ -1666,14 +1772,14 @@ "\n" "UUID: " -#: ../src/main/display.cc:88 +#: ../src/main/display.cc:89 msgid "" "

This module has no content at this point.
" msgstr "" "

Dieses Modul hat an dieser Stelle keinen Inhalt." -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1682,247 +1788,271 @@ "Unzulässig kodierte persönliche Kommentarbeschriftung:\n" "'%s'" -#: ../src/main/display.cc:1110 ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapitel" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos versteht nicht mehr als ein Argument." -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Initialisiere HTML" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Erstelle Schnittstelle" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Starte Sword" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Lade Einstellungen" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Zeige Xiphos" -#: ../src/main/module_dialogs.cc:188 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Vorschau" -#: ../src/main/module_dialogs.cc:243 ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Fußnote" -#: ../src/main/module_dialogs.cc:249 ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Referenz" -#: ../src/main/module_dialogs.cc:255 ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:261 ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 ../src/main/module_dialogs.cc:386 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morphologische Markierungen" -#: ../src/main/module_dialogs.cc:1012 ../src/main/url.cc:529 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Zurück zu " -#: ../src/main/parallel_view.cc:387 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +#, fuzzy +msgid "Unknown parallel module: " +msgstr "unbekanntes Modul" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongs Nummern" -#: ../src/main/parallel_view.cc:397 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Fußnoten" -#: ../src/main/parallel_view.cc:407 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morphologische Markierungen" -#: ../src/main/parallel_view.cc:417 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebräische Vokalpunkte" -#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebräische Kantillation" -#: ../src/main/parallel_view.cc:437 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Griechische Akzente" -#: ../src/main/parallel_view.cc:447 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Querverweise" -#: ../src/main/parallel_view.cc:457 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmata" -#: ../src/main/parallel_view.cc:467 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Überschriften" -#: ../src/main/parallel_view.cc:477 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morphem-Zerlegung" -#: ../src/main/parallel_view.cc:491 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Christi Worte in Rot" -#: ../src/main/parallel_view.cc:501 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteration" -#: ../src/main/parallel_view.cc:511 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Textvarianten" -#: ../src/main/parallel_view.cc:519 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Primärtexte" -#: ../src/main/parallel_view.cc:528 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Sekundärtexte" -#: ../src/main/parallel_view.cc:537 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Alle Texte" -#: ../src/main/parallel_view.cc:704 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteration" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Glossare" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "Kontext anzeigen" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Wachstum" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Für Wachstum
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Erlösung" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Für Rettung
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Gesundheit" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Für Gesundheit
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Verschiedenes" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Diverses
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punkt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punkt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punkt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Unterpunkt 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Unterpunkt 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Unterpunkt 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Unterpunkt 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Unterpunkt 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Unterpunkt 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Unterpunkt 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Unterpunkt 4
" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Name für neue Gebetsliste oder Tagebuch" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos hat diese Gebetsliste bereits gefunden." -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1931,19 +2061,19 @@ "Xiphos konnte den Modulpfad nicht erzeugen:\n" "%s" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Eine einfache Gebetsliste. \\par\\par Modul erzeugt durch Xiphos." -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "HauptGebetsliste" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MeineGebetsliste" -#: ../src/main/prayerlists.cc:335 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1951,106 +2081,106 @@ "Personen:
Robert
Samuel
Susanne

Gemeinde:
Kirchenbänke
Mitgliedschaft
Bibeln für Missionare


" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Eine Gegenstands-basierte Gebetsliste.. \\par\\par Modul erzeugt durch " "Xiphos." -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "ThemenGebetsliste" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Robert
Samuel
Susanne
Johannes
" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Geistliches Wachstum" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Michael
Stefan
" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Susanne
Johannes
" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Eine Monats-Gebetsliste. \\par\\par Modul erzeugt durch Xiphos." -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonantsGebetsliste" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Ein Tagebuch. \\par\\par Modul erzeugt durch Xiphos." -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Tagebuch" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Eine untergliedertes Thema (z. B. einer Predigt). \\par\\par Modul erzeugt " "durch Xiphos." -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "UntergliedertesThema" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Hauptpunkt A" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Hauptpunkt A
" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Hauptpunkt B" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Hauptpunkt B
" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Hauptpunkt C" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Hauptpunkt C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Benutzerkommentar" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Suchergebnis %s: %s" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Bereich löschen?" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Wollen Sie diesen Bereich löschen?" -#: ../src/main/search_dialog.cc:645 ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Suchen: " -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2061,16 +2191,16 @@ "Kein solches Module installiert.\n" "%s" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Bitte die Modulliste anpassen." -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Es existiert kein Schnellsuch-Index für %s.%s%s" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2078,7 +2208,7 @@ "\n" "Suche auf diesem Modul jetzt `Mehrere Worte'." -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2086,19 +2216,19 @@ "\n" "Siehe Modulverwaltung, Pflegeseite." -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Suche beendet" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "Treffer" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Es gibt kein Kommentar-Modul." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME ist nicht gesetzt!" @@ -2107,12 +2237,12 @@ msgid "Xiphos can not create directory " msgstr "Xiphos konnte Verzeichnis nicht erzeugen " -#: ../src/main/settings.c:135 ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "kann nicht erzeugen " -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2124,7 +2254,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Leere Einstellungsdatei -- kein Backup?!? Informationen sind verloren!" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2139,11 +2269,11 @@ "Ohne Bibel-Module kann Xiphos\n" "jedoch nicht fortfahren und wird jetzt beendet." -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Installation der Bibel-Module abgeschlossen." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2151,15 +2281,15 @@ "Modulfehler: xref nicht verwendbar.\n" "Bitte melden sie dies zusammen mit Modul & Vers" -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "Vers" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "Kapitel" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2167,7 +2297,7 @@ "Xiphoss Datei für\n" "Sprachabkürzungen nicht gefunden." -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2175,7 +2305,7 @@ "Xiphoss Datei für Sprachabkürzungen\n" "konnte nicht geöffnet werden." -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2183,7 +2313,7 @@ "Xiphos konnte keinen Speicher für\n" "Sprachabkürzungen anlegen." -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2192,7 +2322,7 @@ "Sprachabkürzungen nicht lesen." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2201,11 +2331,11 @@ "Keine passende Lokalisierung gefunden für `%s'.\n" "%s" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Bücher-Namen und Menüs können nicht übersetzt werden" -#: ../src/main/sword.cc:1052 ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2216,7 +2346,7 @@ "%s.\n" "Wollen Sie diese auch öffnen?%s" -#: ../src/main/sword.cc:1056 ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2228,11 +2358,11 @@ "Das Erste wird im Hauptfenster geöffnet\n" "alle weiteren in separate Fenstern." -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Es ist keine Tageslosung installiert, die angezeigt werden kann." -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2256,93 +2386,93 @@ "\n" "Bitte geben Sie den Schlüssel im Dialog ein." -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Verlauf leeren" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "Verlauf ➛ Versliste" -#: ../src/main/url.cc:103 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nicht gefunden:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos konnte %s nicht ausführen" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Betrachter-Fehler:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "%s in Hauptfenster anzeigen" -#: ../src/main/xml.c:86 ../src/main/xml.c:478 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokument nicht erfolgreich erzeugt. \n" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Was muss ich tun, um gerettet zu sein?" -#: ../src/main/xml.c:98 ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apg 16:31" -#: ../src/main/xml.c:103 ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Eph 2:8,9" -#: ../src/main/xml.c:108 ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Römer 1:16" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Was ist die Gute Nachricht?" -#: ../src/main/xml.c:114 ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:270 ../src/main/xml.c:416 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokument nicht erfolgreich eingelesen. \n" -#: ../src/main/xml.c:276 ../src/main/xml.c:422 ../src/main/xml.c:444 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "Leeres Dokument \n" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "falscher Typ, Wurzelknoten != SwordBookmarks\n" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "falscher Typ, Wurzelknoten != Copy_Export\n" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Kapitel %d

" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Kapitel %d

" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2355,7 +2485,7 @@ "Kapitel %d\n" "\n" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2368,12 +2498,12 @@ "Kapitel %d\n" "\n" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Kapitel %d

" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2382,82 +2512,82 @@ "%s: %s Kapitel %d\n" "\n" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:529 ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Altes Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "1 Mos - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Neues Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mt - Offb" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Beispiel-Modulliste" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "falscher Typ, Wurzelknoten != %s\n" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2466,7 +2596,7 @@ "Speichern der Einstellungen fehlgeschlagen! Stat %d, Größe %d\n" "%s" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Versuch, das letzte Speichern rückgängig zu machen." @@ -2480,13 +2610,13 @@ msgstr "Lesezeichendialog" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Neuen Ordner erstellen" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Neuer Ordner" @@ -2495,7 +2625,7 @@ msgstr "Neu ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Lesezeichen löschen" @@ -2508,22 +2638,22 @@ msgstr "Beschriftung Eingabe" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Verseintrag" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Modul Eintrag" @@ -2660,7 +2790,7 @@ msgstr "Neues Dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Textstelle kopieren/exportieren" @@ -2697,7 +2827,7 @@ msgstr "Ganzes Buch exportieren" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Buch" @@ -2805,8 +2935,8 @@ msgid "Open about dialog" msgstr "Öffne Informationsdialog" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Fett" @@ -2855,7 +2985,7 @@ msgstr "Auswahl entfernen" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Eintrag löschen" @@ -3133,124 +3263,84 @@ msgstr "_Bearbeiten" #: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Ansicht" - -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Hilfe" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normal" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Überschrift 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Überschrift 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Überschrift 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Überschrift 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Überschrift 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Überschrift 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adresse" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Vorformatiert" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Spiegelstrichliste" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Nummerierte Liste" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Nummerierte Liste" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Alphabetische Liste" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Durchstreichen" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Schriftfarbe für Auswahl setzen." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Auswahl durch setzen einer Hintergrundfarbe hervorheben." -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Verse Markieren" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Markieren" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Aufheben" @@ -3327,31 +3417,39 @@ msgstr "Lösche den Schnellsuch-Index für diese Module?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Fortfahren" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulverwaltung" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "WARNUNG: Vorsicht, wenn es in ihrem Land Verfolgung gibt." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Quellen hinzufügen oder entfernen" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Aktuelle lokale Quellen" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3360,15 +3458,15 @@ "typischerweise auf einer CD oder einem Stick. So ein Verzeichnis enthält " "Unterverzeichnisse \"mods.d\" und \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Entfernt eines ihrer lokalen Verzeichnisse als Installationsquelle." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Aktuelle ferne Quellen" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3376,43 +3474,43 @@ "Hinzufügen einer maßgeschneiderten entfernten Installationsquelle. Sie " "brauchen dazu den Rechnernamen und das Verzeichnis des Repositories." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Geben sie eine Quelle im Internet an" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Installationsquelle" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokal" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Fern" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Installationsziel" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Persönlicher Bereich, nur für eigenen Gebrauch:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Heimverzeichnis" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Systembereich, für alle Benutzer:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword Systemverzeichnis" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3421,10 +3519,14 @@ "könnten und nicht riskieren wollen, entdeckt zu werden, sollten sie KEINE " "fernen Quellen verwenden! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokales Installationsverzeichnis" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Ausklapp-Verlaufsliste" @@ -3433,11 +3535,11 @@ msgid "Choose book to display" msgstr "Wähle Buch für die Anzeige" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Buchauswahl Knopf" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Offenbarung des Johannes" @@ -3445,11 +3547,11 @@ msgid "Choose chapter to display" msgstr "Wähle Kapitel für die Anzeige" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Kapitel umschalten Knopf" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3608,11 +3710,11 @@ "synchronisieren; als Sprecher, um in einer Vorlesung die Bibelprogramme der " "Zuhörer zu steuern; als Zuhörer, um der Navigation des Sprechers zu folgen." -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "Modus:" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Modus auswählen, in dem BibleSync arbeiten soll." @@ -3681,11 +3783,11 @@ msgid "BSP privacy button" msgstr "BSP Privatsphäre-Knopf" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "Navigieren:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" "Auswahl wie eingehende Navigationssynchronisierungen akzeptiert werden." @@ -3716,11 +3818,11 @@ msgid "BSP nav verse list radio button" msgstr "BSP Navigation Versliste-Schaltknopf" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "Folgen:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos hört auf die Sprecher entsprechend dieser Wahl." @@ -3760,11 +3862,11 @@ msgid "BSP listen none radio button" msgstr "BSP keinem Folgen-Schaltknopf" -#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "Speziell:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3960,177 +4062,181 @@ msgstr "Gebetslisten aktivieren Kontrollkästchen" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Versnummer" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Hervorheben der Versnummer auf verschiedene Arten" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Zeige fettgedruckte Versnummern" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Fette Versnummern Kontrollkästchen" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Klammern" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Zeige Versnummern in [Klammern]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Versnummern in Klammern Kontrollkästchen" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Hochgestellt" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Zeige hochgestellte Versnummern" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Hochgestellte Versnummern Kontrollkästchen" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Vorgabeverzeichnis für das Notizbuch" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Verzeichnis wählen" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Vorgabeverzeichnis für das Notizbuch Kombinationsfeld" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Allgemein" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Hauptfenster Module" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblischer Text" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Ändere Biblischer Text Kombinationsfeld" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Ändere Kommentar Kombinationsfeld" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Wörterbuch" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Ändere Wörterbuch Kombinationsfeld" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Ändere Buch Kombinationsfeld" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Module" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Alle Module aus der Liste löschen" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Alle Module aus der Liste löschen Knopf" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Ausgewähltes Modul aus der Liste entfernen" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Ausgewähltes Modul aus der Liste entfernen Knopf" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Öffnet einen Dialog, um Module auszuwählen" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Module hinzufügen" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Öffne Auswahldialog Knopf" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Module parallel" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Spezialmodule" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Tageslosung" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Tageslosung Kombinationsfeld" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebräischlexikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebräischlexikon Kombinationsfeld" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Griechischlexikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Griechischlexikon Kombinationsfeld" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Vorgabewörterbuch" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Ändere Vorgabewörterbuch Kombinationsfeld" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Persönliche Notizen" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Ändere Persönliche Notizen Kombinationsfeld" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Verschiedene Module" @@ -4162,6 +4268,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "BibleSync als Sprecher aktivieren." + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Erweiterte Suche" @@ -4372,11 +4483,11 @@ msgid "Found" msgstr "Gefunden" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Ergebniszusammenfassung Fenster" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Ergebniszusammenfassung Tabelle" @@ -4665,6 +4776,10 @@ msgid "_Module Manager" msgstr "_Modulverwaltung" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Ansicht" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Vorschau auf _Tageslosung" @@ -4816,27 +4931,27 @@ msgid "Learn about Xiphos" msgstr "Info zu _Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Vers kommentieren" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Modul öffnen" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Notiz" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Im Editor öffnen" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Vers pro Zeile" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Fußnote/Querverweis Markierung" @@ -4844,81 +4959,81 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Zeige nicht-anonyme Markierungen, z. B. \"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianten" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Bildinhalt" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respektiere Schriftarten" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Kommentarkapitelansicht" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "D_oppelter Zeilenabstand" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Auswahl nachschlagen" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Aktuelles Wörterbuch benutzen" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Browse in BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Dieses Modul freigeben" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Zeige Buchtitel" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Zeige Kapitelüberschrift" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Pers.Komm. Umbenennen" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Pers.Komm. ausgeben" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Auswahl laut vorlesen" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Speichere diese Ergebnisse als ein einzelnes Lesezeichen" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Liste als einzelnes Lesezeichen speichern" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" "Speichere diese Ergebnisse als eine Reihe von Lesezeichen in einen eigenen " "Ordner" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Liste als eine Reihe von Lesezeichen speichern" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." @@ -4926,19 +5041,19 @@ "Ein Dialog in dem eine Zeile mit Versreferenzen eingefügt werden kann, um " "die Verliste zu füllen." -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Versliste füllen" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." msgstr "Den ganzen Inhalt der Versliste in die Verlaufsliste aufnehmen." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "Verlauf aus der Versliste laden" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." @@ -4946,100 +5061,100 @@ "Sende diese Versliste über BibleSync an andere, wenn sie im persönlichen " "oder Sprechermodus sind." -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Sende Liste über BibleSync" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Liste exportieren" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Dieses Lesezeichen in einem Dialogfenster öffnen" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "In neuem Reiter öffnen" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Dieses Lesezeichen in einem Dialogfenster öffnen" -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "In Dialogfenster öffnen" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Neuen Ordner zu ausgewähltem Ordner hinzufügen" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Hier neues Lesezeichen einfügen" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Lesezeichen einfügen" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Lesezeichen Eintrag bearbeiten" -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "Eintrag _bearbeiten" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Eintrag löschen" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Alle Lesezeichengruppen ausklappen" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Ausklappen" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Alle Lesezeichengruppen zusammenfalten" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Zusammenfalten" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Einträge dürfen in andere Ordner verschoben werden" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Umsortierung erlauben" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" "Lesezeichen aus einem anderen Programm laden (Voreinstellung BibleTime)" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Lesezeichen importieren" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Ordner entfernen und speichern" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Ordner exportieren" -#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Ausgewähltes Modul in neuem Reiter öffnen" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5047,79 +5162,79 @@ "Öffne ausgewähltes Modul in einem\n" "\tseparaten ['Dialog'] Fenster" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Öffne in separatem Fenster" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Erstelle eine neue einfache Gebetsliste" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Einfach" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Erstelle eine neue Themen-Gebetsliste" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Gegenstand" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Erzeuge neues monatliches Tagebuch" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Monatlich" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Erzeuge neues Tagebuch" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Täglich" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Erzeuge neues untergliedertes Thema" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Skizziert" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Öffne Modul im Editor oder im einfachen Anzeigefenster" -#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "In separatem Fenster öffnen" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Einen Untereintrag hinzufügen" -#: ../ui/xi-menus.glade.h:146 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Untereintrag hinzufügen" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Eintrag hinzufügen" -#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Eintrag hinzufügen" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Diesen Eintrag entfernen" -#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Diesen Eintrag editieren" @@ -5131,6 +5246,61 @@ msgid "Study the Bible" msgstr "Studiere die Bibel" +#~ msgid "network setup errors." +#~ msgstr "Fehler in den Netzwerkeinstellungen." + +#~ msgid " client socket" +#~ msgstr " Klient Socket" + +#~ msgid " server socket" +#~ msgstr " Server Socket" + +#~ msgid "bad protocol version" +#~ msgstr "unpassende Protokollversion" + +#~ msgid "bad msg type" +#~ msgstr "unpassender Nachrichtentyp" + +#~ msgid "bad packet count" +#~ msgstr "unpassender Paketzähler" + +#~ msgid "bad packet index" +#~ msgstr "unpassender Paketindex" + +#~ msgid "bad body format" +#~ msgstr "unpassendes Nachrichtenformat" + +#~ msgid "missing required header " +#~ msgstr "verpflichtende Kopfinformationen fehlen" + +#~ msgid "Spoof stopped: " +#~ msgstr "Manipulation gestoppt: " + +#~ msgid "Ignoring echo." +#~ msgstr "Ignoriere Echo." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domäne ist nicht 'BIBLE-VERSE': " + +#~ msgid "Invalid group: " +#~ msgstr "Ungültige Gruppe:" + +#~ msgid "[no dump ready]" +#~ msgstr "[kein dump bereit]" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Übertragung fehlgeschlagen.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Gruppenruf (Multicast) funktioniert nicht; BibleSync wird jetzt " +#~ "deaktiviert. Wenn ihre Netzwerkverbindung sich verändert hat, während " +#~ "dieses Programm aktiv war, könnte es reichen, dies einfach wieder zu " +#~ "aktivieren." + #~ msgid "Page %d of %d" #~ msgstr "Seite %d von %d" @@ -6462,9 +6632,6 @@ #~ msgid "Open New Dialog" #~ msgstr "Dialogfenster öffnen" -#~ msgid "Close" -#~ msgstr "Schließen" - #~ msgid "Sync with NavBar" #~ msgstr "Mit NavBar synchronisieren" diff -Nru xiphos-4.0.0+dfsg1/po/en_GB.po xiphos-4.0.4+dfsg1/po/en_GB.po --- xiphos-4.0.0+dfsg1/po/en_GB.po 2014-12-21 19:54:38.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/en_GB.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-21 09:46-0500\n" "Last-Translator: Thomas Abthorpe \n" "Language-Team: British English \n" @@ -18,91 +18,7 @@ "X-Poedit-Language: English\n" "X-Poedit-Country: UNITED KINGDOM\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "network setup errors." - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr " client socket" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr " server socket" - -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "bad magic" - -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "bad protocol version" - -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "bad msg type" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "bad packet count" - -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "bad packet index" - -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "bad body format" - -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "missing required header " - -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "UUID spoofed: wrong ipaddr." - -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "Ignoring echo." - -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domain not 'BIBLE-VERSE': " - -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "Invalid group: " - -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr " present at " - -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr " using " - -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "[no dump ready]" - -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" - -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "Transmit failed.\n" - -#: ../src/biblesync/biblesync.cc:792 -msgid "Unable to multicast; BibleSync is now disabled. If your network connection changed while this program was active, it may be sufficient to re-enable." -msgstr "Unable to multicast; BibleSync is now disabled. If your network connection changed while this program was active, it may be sufficient to re-enable." - -#: ../src/backend/sword_main.cc:740 +#: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" "Please report this. sword_main.cc:set_treekey\n" @@ -112,364 +28,400 @@ "Please report this. sword_main.cc:set_treekey\n" "What were you doing when this occurred?" -#: ../src/backend/sword_main.cc:1091 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Configuration not found" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Page %d of %d" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Are you sure you want to delete the note for" -#: ../src/editor/slib-editor.c:393 -#: ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 -#: ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Open" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Save As" - -#: ../src/editor/slib-editor.c:453 -#: ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Untitled document" -#: ../src/editor/slib-editor.c:644 -#: ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Are you sure you want to delete the note for" - -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML Output" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML Source" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Plain Source" - -#: ../src/editor/slib-editor.c:711 -#: ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Print..." - -#: ../src/editor/slib-editor.c:718 -#: ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Print Pre_view" - -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Quit" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Open" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Save" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Save _As..." - -#: ../src/editor/slib-editor.c:752 -#: ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "New" - -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Open new document" - -#: ../src/editor/slib-editor.c:758 -#: ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Delete" - -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Delete current note" - -#: ../src/editor/slib-editor.c:765 -#: ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 -#: ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 -#: ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_File" - -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML _Output" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML Source" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Plain Source" - -#: ../src/editor/slib-editor.c:841 -#: ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_View" - -#: ../src/editor/slib-editor.c:852 -#: ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 -#: ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Save" - -#: ../src/editor/slib-editor.c:863 -#: ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Insert Link" - -#: ../src/editor/slib-editor.c:1254 -#: ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 -#: ../src/editor/webkit_editor.c:1374 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Save the changes to document" -#: ../src/editor/slib-editor.c:1255 -#: ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 -#: ../src/editor/webkit_editor.c:1375 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "before closing?" -#: ../src/editor/slib-editor.c:1262 -#: ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 -#: ../src/editor/webkit_editor.c:1382 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "If you don't save, changes will be permanently lost." -#: ../src/editor/slib-editor.c:1291 -#: ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "File" -#: ../src/editor/slib-editor.c:1348 -#: ../src/editor/webkit_editor.c:1423 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "StudyPad" -#: ../src/editor/slib-editor.c:1363 -#: ../src/editor/webkit_editor.c:1438 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Note Editor" -#: ../src/editor/slib-editor.c:1379 -#: ../src/editor/webkit_editor.c:1453 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Prayer List/Journal Editor" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Unlock " +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "About Sword Module" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Preparing to print" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Printing is not supported on this printer" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Module Manager" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Printer %s does not support PostScript printing." +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Options" -#: ../src/gecko/gecko-print.c:342 -#: ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Printing" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Waiting to print" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Scope" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "An error occurred while printing" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Daily Devotional" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "It was not possible to print your document: %s" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Maps" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "About Sword Module" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Images" -#: ../src/gnome2/about_modules.c:347 -#: ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "The module has no About information." +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Glossaries" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bible" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Commentary" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Dictionary" + +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "General Books" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Rename Commentary" + +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DailyJournal" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Unknown" + +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Module Lists" + +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Ranges" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" + +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Install Source" + +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Main Window Modules" + +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Format" + +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Headings" + +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Footnotes" + +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Cross-references" + +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strong's Numbers" + +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morphological Tags" + +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemmas" + +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Words of Christ in Red" + +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Greek Accents" + +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Hebrew Vowel Points" + +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebrew Cantillation" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" + +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteration" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" + +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morpheme Segmentation" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" + +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Attribute" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Options" + +#: ../src/gnome2/about_sword.c:79 msgid "" -"The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework.\n" +"The SWORD Project is an effort to create an ever-expanding software package " +"for research and study of God and His Word. The SWORD Project framework " +"allows easy use and study of Bible texts, commentaries, lexicons, " +"dictionaries, and other books. Many frontends are built using this " +"framework. An installed set of books may be shared among all frontends using " +"the framework.\n" "\n" " Books can be downloaded from the SWORD Project." msgstr "" -"The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many front-ends are built using this framework. An installed set of books may be shared among all front-ends using the framework.\n" +"The SWORD Project is an effort to create an ever-expanding software package " +"for research and study of God and His Word. The SWORD Project framework " +"allows easy use and study of Bible texts, commentaries, lexicons, " +"dictionaries, and other books. Many front-ends are built using this " +"framework. An installed set of books may be shared among all front-ends " +"using the framework.\n" "\n" " Books can be downloaded from the SWORD Project." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "The SWORD Project" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" -"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts." +"We are always looking for contributions of new translations of Xiphos into " +"other languages. If you are able to translate for us, please see the link " +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its " +"display using your native language? You could translate Xiphos! \n" "\n" -"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts." +"We are always looking for contributions of new translations of Xiphos into " +"other languages. If you are able to translate for us, please see the link " +"below, contact us, and get involved with our efforts." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "About Xiphos Translation" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "See TRANSLATION-HOWTO in Xiphos source" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos development" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Xiphos Development Team" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" -"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project." +"We would like to thank Troy Griffitts and all the other folks who have given " +"us The SWORD Project." msgstr "" "\n" "Powered by The SWORD Project.\n" -"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project." +"We would like to thank Troy Griffitts and all the other folks who have given " +"us The SWORD Project." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 -#: ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 -#: ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 -#: ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 -#: ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Bookmark" -#: ../src/gnome2/bookmark_dialog.c:177 -#: ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Enter Folder Name" -#: ../src/gnome2/bookmark_dialog.c:179 -#: ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Folder Name" -#: ../src/gnome2/bookmark_dialog.c:180 -#: ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Folder: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Specify bookmarks file" -#: ../src/gnome2/bookmarks_menu.c:355 -#: ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Edit" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Folder name: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Bookmark name: " -#: ../src/gnome2/bookmarks_menu.c:378 -#: ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Verse: " -#: ../src/gnome2/bookmarks_menu.c:379 -#: ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Module: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Remove the selected folder" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(and all its contents)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Remove the selected bookmark" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Add" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Label: " -#: ../src/gnome2/bookmarks_treeview.c:104 -#: ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Search result: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -477,166 +429,154 @@ "Opening a multi-reference bookmark in\n" "separate tabs is not supported." -#: ../src/gnome2/bookmarks_treeview.c:849 -#: ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Bookmarks" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Cipher key for module %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "for:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Enter Key: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Close without Saving" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Close _without Saving" -#: ../src/gnome2/export_bookmarks.c:197 -#: ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 -#: ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Verse List" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "VerseList" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "SearchResults" -#: ../src/gnome2/export_dialog.c:319 -#: ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Please check copyright before exporting!" -#: ../src/gnome2/find_dialog.c:186 -#: ../src/gnome2/find_dialog.c:344 -#: ../ui/gtk2_webedit.ui.h:18 -#: ../ui/gtk_webedit.ui.h:18 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 +#: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Find" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Enter Word or Phrase" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Search backwards" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Find Next" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Set Module Font" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Change font for" -#: ../src/gnome2/font_dialog.c:336 -#: ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Module" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Current font: " -#: ../src/gnome2/font_dialog.c:372 -#: ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Use the default font for this module" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos is about to crash due to a \"STRDUP\" error." -#: ../src/gnome2/gui.c:187 -#: ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Please report this error to the Xiphos team with:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos is about to crash due to a \"STRING\" error." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Module has no support for %s." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: No windows." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Current navigation sent." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Not speaking." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Bible Study Software" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Open a new tab" -#: ../src/gnome2/main_window.c:1020 -#: ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 -#: ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 -#: ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standard View" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Commentary View" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Book View" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Welcome to Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -656,37 +596,33 @@ "Therefore, personal commentary renaming is\n" "not available in the Windows environment." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Rename Commentary" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Choose Commentary Name" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "New Name" -#: ../src/gnome2/menu_popup.c:1232 -#: ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 -#: ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Name: " -#: ../src/gnome2/menu_popup.c:1242 -#: ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Module names must contain [A-Za-z0-9_] only." -#: ../src/gnome2/menu_popup.c:1249 -#: ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos already knows a module by that name." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -695,7 +631,7 @@ "Failed to create new configuration:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -703,7 +639,7 @@ "Configuration build error:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "No module in this pane." @@ -717,68 +653,98 @@ "This is Xiphos' mechanism to get new and updated content.\n" "If you have never been here before, please take a moment to look it over.\n" "\n" -"Modules come from different repositories. Module Sources: Add/Remove will show you what repositories are currently known.\n" +"Modules come from different repositories. Module Sources: Add/" +"Remove will show you what repositories are currently known.\n" "\n" -"Module Sources: Choose is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set Install Source and Install Destination, then click Refresh.\n" +"Module Sources: Choose is for deciding from where modules should " +"come, that is, from which repository Xiphos should obtain them, as well as " +"where they should be placed on your system. Set Install Source and " +"Install Destination, then click Refresh.\n" "\n" -"Modules: Install/Update is for selecting and obtaining modules after choosing source and destination.\n" +"Modules: Install/Update is for selecting and obtaining modules after " +"choosing source and destination.\n" "\n" "Modules: Maintenance is for archive and index creation.\n" "\n" -"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n" +"See section 5 of our manual for Module Manager detail, or ask for help via " +"Live Chat, or (if no one is responsive in chat) send mail to our users' " +"mailing list.\n" msgstr "" "Overview of the Module Manager.\n" "\n" "This is Xiphos' mechanism to get new and updated content.\n" "If you have never been here before, please take a moment to look it over.\n" "\n" -"Modules come from different repositories. Module Sources: Add/Remove will show you what repositories are currently known.\n" +"Modules come from different repositories. Module Sources: Add/" +"Remove will show you what repositories are currently known.\n" "\n" -"Module Sources: Choose is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set Install Source and Install Destination, then click Refresh.\n" +"Module Sources: Choose is for deciding from where modules should " +"come, that is, from which repository Xiphos should obtain them, as well as " +"where they should be placed on your system. Set Install Source and " +"Install Destination, then click Refresh.\n" "\n" -"Modules: Install/Update is for selecting and obtaining modules after choosing source and destination.\n" +"Modules: Install/Update is for selecting and obtaining modules after " +"choosing source and destination.\n" "\n" "Modules: Maintenance is for archive and index creation.\n" "\n" -"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n" +"See section 5 of our manual for Module Manager detail, or ask for help via " +"Live Chat, or (if no one is responsive in chat) send mail to our users' " +"mailing list.\n" #: ../src/gnome2/mod_mgr.c:67 msgid "" "Welcome to Xiphos.\n" "\n" -"There are no Bibles installed. In order to initialize, Xiphos needs at least one Bible module. To facilitate this, the Module Manager has been opened so that you may install one or more Bibles, either from a local module set (cdrom, flash drive) or over the network from CrossWire Bible Society. Please refer to these step-by-step instructions, and to the general module manager overview that has also been opened.\n" +"There are no Bibles installed. In order to initialize, Xiphos needs at least " +"one Bible module. To facilitate this, the Module Manager has been opened so " +"that you may install one or more Bibles, either from a local module set " +"(cdrom, flash drive) or over the network from CrossWire Bible Society. " +"Please refer to these step-by-step instructions, and to the general module " +"manager overview that has also been opened.\n" "\n" "For local install:\n" -"- In Module Sources: Add/Remove, add a new local folder name where modules can be found.\n" +"- In Module Sources: Add/Remove, add a new local folder name where " +"modules can be found.\n" " (This is where folders exist named mods.d and modules.)\n" -"- In Module Sources: Choose, click the \"Local\" button, and select your folder from the pulldown.\n" +"- In Module Sources: Choose, click the \"Local\" button, and select " +"your folder from the pulldown.\n" "\n" "For network install from CrossWire:\n" -"- In Module Sources: Choose, click the \"Remote\" button and select CrossWire from the pulldown.\n" +"- In Module Sources: Choose, click the \"Remote\" button and select " +"CrossWire from the pulldown.\n" "- Click the \"Refresh\" button at the bottom.\n" "\n" "In either case:\n" -"- In Modules: Install/Update, select Bibles and other modules of your preference.\n" +"- In Modules: Install/Update, select Bibles and other modules of your " +"preference.\n" "- Click \"Install\".\n" "- Close the Module Manager when you are done.\n" "\n" "Warning: If you live in a persecuted country, use with care.\n" "\n" -"Both this step-by-step instruction dialog and the general introduction dialog may be closed at any time." +"Both this step-by-step instruction dialog and the general introduction " +"dialog may be closed at any time." msgstr "" "Welcome to Xiphos.\n" "\n" -"There are no Bibles installed. In order to initialise, Xiphos needs at least one Bible module.\n" +"There are no Bibles installed. In order to initialise, Xiphos needs at least " +"one Bible module.\n" "\n" -"With your permission, Xiphos will open the Module Manager so that you may install one or more Bibles from either a local module set (cdrom, flash drive) or over the network from CrossWire Bible Society.\n" +"With your permission, Xiphos will open the Module Manager so that you may " +"install one or more Bibles from either a local module set (cdrom, flash " +"drive) or over the network from CrossWire Bible Society.\n" "\n" "For local install:\n" -"- In Module Sources: Add/Remove, add a new local folder name where modules can be found.\n" +"- In Module Sources: Add/Remove, add a new local folder name where " +"modules can be found.\n" " (This is where folders exist named mods.d and modules.)\n" -"- In Module Sources: Choose, click the \"Local\" button, and select your folder from the pulldown.\n" +"- In Module Sources: Choose, click the \"Local\" button, and select " +"your folder from the pulldown.\n" "\n" "For network install from CrossWire:\n" -"- In Module Sources: Choose, click the \"Remote\" button and select CrossWire from the pulldown.\n" +"- In Module Sources: Choose, click the \"Remote\" button and select " +"CrossWire from the pulldown.\n" "- Click the \"Refresh\" button at the bottom.\n" "\n" "In either case:\n" @@ -790,21 +756,20 @@ "\n" "May Xiphos open the Module Manager so that you may install a Bible?" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Remove these modules?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Preparing to remove" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Removing" -#: ../src/gnome2/mod_mgr.c:192 -#: ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Remove" @@ -824,23 +789,23 @@ msgid "Install" msgstr "Install" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archive these modules?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Preparing to archive" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archiving" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archive" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -848,87 +813,101 @@ "Build fast-search index for these\n" "modules (may take minutes/module)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Preparing to index" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexing" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Index" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Delete fast-search index for these modules?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Preparing to delete index" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Deleting index" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Deletion" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "The module has no About information." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Module Name" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "A tick-mark means this module is already installed" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Click the box to work on this module" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Click the box to select this module for install/update" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installed" -#: ../src/gnome2/mod_mgr.c:583 -msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)" -msgstr "The index icon means you have built an optimised ('lucene') index for this module for fast searching (see the Maintenance pane for this function)" - -#: ../src/gnome2/mod_mgr.c:601 -msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner" -msgstr "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner" - -#: ../src/gnome2/mod_mgr.c:618 -#: ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:625 +msgid "" +"The index icon means you have built an optimized ('lucene') index for this " +"module for fast searching (see the Maintenance pane for this function)" +msgstr "" +"The index icon means you have built an optimised ('lucene') index for this " +"module for fast searching (see the Maintenance pane for this function)" + +#: ../src/gnome2/mod_mgr.c:649 +msgid "" +"The lock icon means this module is encrypted, and requires that you purchase " +"an unlock key from the content owner" +msgstr "" +"The lock icon means this module is encrypted, and requires that you purchase " +"an unlock key from the content owner" + +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "About" -#: ../src/gnome2/mod_mgr.c:638 -msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module" -msgstr "The refresh icon means the Installed module is older than the newer Available module: You should update the module" +#: ../src/gnome2/mod_mgr.c:688 +msgid "" +"The refresh icon means the Installed module is older than the newer " +"Available module: You should update the module" +msgstr "" +"The refresh icon means the Installed module is older than the newer " +"Available module: You should update the module" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Available" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Size" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Description" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -937,40 +916,33 @@ "`mkdir %s' failed:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " archived in: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Journals and prayer lists cannot be indexed." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s failed" -#: ../src/gnome2/mod_mgr.c:927 -#: ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Finished" -#: ../src/gnome2/mod_mgr.c:1095 -#: ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 -#: ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 -#: ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 -#: ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 -#: ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 -#: ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Unknown" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -979,7 +951,7 @@ "Repository:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -987,72 +959,44 @@ "Categorised by\n" "Module Type" -#: ../src/gnome2/mod_mgr.c:1416 -#: ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 -#: ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Biblical Texts" -#: ../src/gnome2/mod_mgr.c:1420 -#: ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 -#: ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Commentaries" -#: ../src/gnome2/mod_mgr.c:1424 -#: ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 -#: ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Dictionaries" -#: ../src/gnome2/mod_mgr.c:1428 -#: ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 -#: ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glossaries" -#: ../src/gnome2/mod_mgr.c:1432 -#: ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 -#: ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Daily Devotionals" -#: ../src/gnome2/mod_mgr.c:1436 -#: ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 -#: ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "General Books" -#: ../src/gnome2/mod_mgr.c:1440 -#: ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 -#: ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Maps" - -#: ../src/gnome2/mod_mgr.c:1444 -#: ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 -#: ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Images" - -#: ../src/gnome2/mod_mgr.c:1448 -#: ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 -#: ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Cult/Unorthodox" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1060,100 +1004,95 @@ "Categorised by\n" "Availability" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Updates" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Uninstalled" -#: ../src/gnome2/mod_mgr.c:1469 -#: ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 -#: ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 -#: ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Prayer List/Journal" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Refreshing from remote source" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Remote source not found" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configure" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Type" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Caption" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Source" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Directory" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "User" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Password" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Module Sources" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Add/Remove" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Choose" -#: ../src/gnome2/mod_mgr.c:1849 -#: ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 -#: ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modules" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Install/Update" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Maintenance" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Please Refresh" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Your module list is not up to date!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1161,7 +1100,7 @@ "You have uninstalled your last Bible.\n" "Xiphos requires at least one." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1169,122 +1108,123 @@ "There are still no Bibles installed.\n" "Xiphos cannot continue without one." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standard remote sources have been loaded." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Could not load standard sources from CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 -#: ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Remove the selected source" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Enter a remote source" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Caption:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Type:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Directory:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "User (optional):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Password (optional):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "A source by that name already exists." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Delete a remote source" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[no module]" -#: ../src/gnome2/navbar_book.c:363 -#: ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Go outward, to the section containing this one" -#: ../src/gnome2/navbar_book.c:378 -#: ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Go to previous item" -#: ../src/gnome2/navbar_book.c:392 -#: ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Go to next item" -#: ../src/gnome2/navbar_book.c:406 -#: ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Go inward, to the first subsection" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synchronise this window's scrolling with the main window" -#: ../src/gnome2/parallel_dialog.c:356 -#: ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Detach/Attach" -#: ../src/gnome2/parallel_view.c:121 -#: ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Module Options" -#: ../src/gnome2/parallel_view.c:215 -#: ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 -#: ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 -#: ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 -#: ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Parallel View" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "BibleSync session passphrase" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Phrase:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1292,140 +1232,128 @@ "Mode selection failed.\n" "Set \"Debug\" and try again to see why." -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Mode selection failed.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (passphrase \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Disabled" -#: ../src/gnome2/preferences_dialog.c:1018 -#: ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personal" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Speaker" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Audience" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Select --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Locale will take effect after restart." -#: ../src/gnome2/preferences_dialog.c:1958 -#: ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferences" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "General" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Options" -#: ../src/gnome2/preferences_dialog.c:2049 -#: ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Fonts" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Colour" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Sizes and Faces" -#: ../src/gnome2/preferences_dialog.c:2073 -#: ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Special" -#: ../src/gnome2/preferences_dialog.c:2782 -#: ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Clear List?" -#: ../src/gnome2/preferences_dialog.c:2783 -#: ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Are you sure you want to clear the module list?" -#: ../src/gnome2/preferences_dialog.c:2828 -#: ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Remove Module?" -#: ../src/gnome2/preferences_dialog.c:2829 -#: ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Are you sure you want to remove the selected module?" -#: ../src/gnome2/search_dialog.c:62 -#: ../src/main/search_dialog.cc:52 +#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:52 #: ../src/main/search_sidebar.cc:51 msgid "Searching the " msgstr "Searching the " -#: ../src/gnome2/search_dialog.c:63 -#: ../src/main/search_dialog.cc:53 +#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:53 #: ../src/main/search_sidebar.cc:52 msgid " Module" msgstr " Module" -#: ../src/gnome2/search_dialog.c:64 -#: ../src/main/search_dialog.cc:54 +#: ../src/gnome2/search_dialog.c:64 ../src/main/search_dialog.cc:54 #: ../src/main/search_sidebar.cc:53 msgid "found in " msgstr "found in " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "New List %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "The last module list may not be deleted" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Delete list?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Are you sure you want to delete:" @@ -1445,7 +1373,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1515,38 +1443,47 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" -"Searches for content contained in markup outside the main text. Attributes are footnotes, Strong's numbers, and morphological symbols.\n" +"Searches for content contained in markup outside the main text. Attributes " +"are footnotes, Strong's numbers, and morphological symbols.\n" "\n" -"Be aware that most such searches can now be done faster via optimized \"lucene\" searches using keyword qualifiers.\n" +"Be aware that most such searches can now be done faster via optimized " +"\"lucene\" searches using keyword qualifiers.\n" "\n" -"To use attribute searches, you must select the appropriate button on the Attribute Search tab.\n" +"To use attribute searches, you must select the appropriate button on the " +"Attribute Search tab.\n" "* Footnote text is searched just like regular text.\n" -"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" -"* Morphological tags are identified literally, e.g. N-ASF for \"noun, accusative singular feminine\" -- see the Robinson module for details." +"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) " +"and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" +"* Morphological tags are identified literally, e.g. N-ASF for \"noun, " +"accusative singular feminine\" -- see the Robinson module for details." msgstr "" "Attribute-based searches\n" -"Searches for content contained in markup outside the main text. Attributes are footnotes, Strong's numbers, and morphological symbols.\n" +"Searches for content contained in markup outside the main text. Attributes " +"are footnotes, Strong's numbers, and morphological symbols.\n" "\n" -"Be aware that most such searches can now be done faster via optimised \"lucene\" searches using keyword qualifiers.\n" +"Be aware that most such searches can now be done faster via optimised " +"\"lucene\" searches using keyword qualifiers.\n" "\n" -"To use attribute searches, you must select the appropriate button on the Attribute Search tab.\n" +"To use attribute searches, you must select the appropriate button on the " +"Attribute Search tab.\n" "* Footnote text is searched just like regular text.\n" -"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" -"* Morphological tags are identified literally, e.g. N-ASF for \"noun, accusative singular feminine\" -- see the Robinson module for details." +"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) " +"and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" +"* Morphological tags are identified literally, e.g. N-ASF for \"noun, " +"accusative singular feminine\" -- see the Robinson module for details." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Module is neither Bible nor commentary" -#: ../src/gnome2/search_dialog.c:1213 -#: ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync is not active for transmit." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1554,114 +1491,95 @@ "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Open Advanced Search" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Open the separate Advanced Search dialogue." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Search Module" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Bible" - -#: ../src/gnome2/search_sidebar.c:233 -#: ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Commentary" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Search Type" -#: ../src/gnome2/search_sidebar.c:261 -#: ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Multi word" -#: ../src/gnome2/search_sidebar.c:272 -#: ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regular expression" -#: ../src/gnome2/search_sidebar.c:280 -#: ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Exact phrase" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Search Options" -#: ../src/gnome2/search_sidebar.c:307 -#: ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Match case" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Search Scope" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "No scope" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Use bounds" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Last search" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Bounds" -#: ../src/gnome2/search_sidebar.c:384 -#: ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Lower" -#: ../src/gnome2/search_sidebar.c:394 -#: ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Upper" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Open module in editor?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "If no, it will open for display only." -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Paste verse references" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "List:" -#: ../src/gnome2/sidebar.c:1499 -#: ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Search" -#: ../src/gnome2/sidebar_dialog.c:157 -#: ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sidebar" @@ -1669,75 +1587,73 @@ msgid "Powered by the SWORD Project" msgstr "Powered by the SWORD Project" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Can't create tabs dir." -#: ../src/gnome2/treekey-editor.c:141 -#: ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Prayer List/Journal Item" -#: ../src/gnome2/treekey-editor.c:142 -#: ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "New name" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Remove the selected item" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "January" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "February" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "March" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "May" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "June" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "July" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "October" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1747,7 +1663,99 @@ "(Or possibly the image is of type other than bmp/gif/jpg/png.)\n" "Xiphos cannot resize images to fit window." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "[no module]" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Click the box to work on this module" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Available" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Navigate" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "IP address: " +msgstr "Address" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1756,277 +1764,270 @@ "Improperly encoded personal annotation label:\n" "'%s'" -#: ../src/main/display.cc:1032 -#: ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 -#: ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Chapter" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos does not understand more than one argument." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Initiating HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Building Interface" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Starting Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Loading Settings" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Displaying Xiphos" -#: ../src/main/module_dialogs.cc:189 -#: ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Previewer" -#: ../src/main/module_dialogs.cc:244 -#: ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Footnote" -#: ../src/main/module_dialogs.cc:250 -#: ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Cross Reference" -#: ../src/main/module_dialogs.cc:256 -#: ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 -#: ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 -#: ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 -#: ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 -#: ../src/main/module_dialogs.cc:387 -#: ../src/main/previewer.cc:208 -#: ../src/main/previewer.cc:227 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 +#: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morphology" -#: ../src/main/module_dialogs.cc:1013 -#: ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Back to " -#: ../src/main/parallel_view.cc:383 -#: ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strong's Numbers" -#: ../src/main/parallel_view.cc:393 -#: ../ui/search-dialog.glade.h:102 -#: ../ui/search-dialog.gtkbuilder.h:101 -#: ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 +#: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Footnotes" -#: ../src/main/parallel_view.cc:403 -#: ../ui/search-dialog.glade.h:99 -#: ../ui/search-dialog.gtkbuilder.h:98 -#: ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 +#: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morphological Tags" -#: ../src/main/parallel_view.cc:413 -#: ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebrew Vowel Points" -#: ../src/main/parallel_view.cc:423 -#: ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrew Cantillation" -#: ../src/main/parallel_view.cc:433 -#: ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Greek Accents" -#: ../src/main/parallel_view.cc:443 -#: ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Cross-references" -#: ../src/main/parallel_view.cc:453 -#: ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmas" -#: ../src/main/parallel_view.cc:463 -#: ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Headings" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morpheme Segmentation" -#: ../src/main/parallel_view.cc:487 -#: ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Words of Christ in Red" -#: ../src/main/parallel_view.cc:497 -#: ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteration" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Textual Variants" -#: ../src/main/parallel_view.cc:515 -#: ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Primary Reading" -#: ../src/main/parallel_view.cc:524 -#: ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Secondary Reading" -#: ../src/main/parallel_view.cc:533 -#: ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "All Readings" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteration" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Glossaries" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "view context" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Growth" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "For Growth
" -#: ../src/main/prayerlists.cc:114 -#: ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Salvation" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "For Salvation
" -#: ../src/main/prayerlists.cc:116 -#: ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Health" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "For Health
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Misc" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Miscellaneous
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Point x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Point y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Point z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Minor Topic 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subtopic 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Minor Topic 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subtopic 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Minor Topic 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subtopic 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Minor Topic 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subtopic 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Name for new prayer list or journal" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos finds that prayer list already." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -2035,120 +2036,122 @@ "Xiphos cannot create module's path:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "A basic prayer list. \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "BasicPrayerList" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MyPrayerList" -#: ../src/main/prayerlists.cc:330 -msgid "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" -msgstr "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" +#: ../src/main/prayerlists.cc:323 +msgid "" +"People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" +msgstr "" +"People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "A subject-based prayer list. \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubjectPrayerList" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Spiritual Growth" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "A monthly prayer list. \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonthlyPrayerList" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "A daily journal. \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DailyJournal" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OutlinedTopic" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Major Topic A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Major Topic A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Major Topic B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Major Topic B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Major Topic C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Major Topic C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "User Annotation" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Search result %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Delete Range?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Are you sure you want to delete this range?" -#: ../src/main/search_dialog.cc:640 -#: ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 -#: ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Search: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2159,16 +2162,16 @@ "No such module is installed.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Please adjust the module list." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "No fast-search index exists for %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2176,7 +2179,7 @@ "\n" "Search on this module is now `multi word'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2184,42 +2187,35 @@ "\n" "See the Module Manager, Maintenance pane." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Search finished" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "matches" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "There is no commentary module." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME is not set!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +"Xiphos cannot create module's path:\n" +"%s" -#: ../src/main/settings.c:133 -#: ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "can not create " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2227,11 +2223,11 @@ "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Empty settings file -- no backup?!? Information lost!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2247,11 +2243,11 @@ "Xiphos cannot proceed,\n" "and will now exit." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Bible module installation complete." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2263,11 +2259,11 @@ msgid "verse" msgstr "verse" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "chapter" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2275,7 +2271,7 @@ "Xiphos' file for language\n" "abbreviations is missing." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2283,7 +2279,7 @@ "Xiphos' language abbreviation\n" "file cannot be opened." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2291,7 +2287,7 @@ "Xiphos cannot allocate space\n" "for language abbreviations." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2300,7 +2296,7 @@ "language abbreviation file." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2309,12 +2305,11 @@ "No matching locale found for `%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Book names and menus may not be translated." -#: ../src/main/sword.cc:1014 -#: ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2325,8 +2320,7 @@ "%s.\n" "Would you like to open these as well?%s" -#: ../src/main/sword.cc:1018 -#: ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2338,17 +2332,20 @@ "The first will open in the main window\n" "and others in separate windows." -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Daily devotional was requested, but there are none installed." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" "You are opening a module which requires a key.\n" "\n" -"The module is locked, meaning that the content is encrypted by its publisher, and you must enter its key in order for the content to become useful. This key should have been received by you on the web page which confirmed your purchase, or perhaps sent via email after purchase.\n" +"The module is locked, meaning that the content is encrypted by its " +"publisher, and you must enter its key in order for the content to become " +"useful. This key should have been received by you on the web page which " +"confirmed your purchase, or perhaps sent via email after purchase.\n" "\n" "Please enter the key in the dialog." msgstr "" @@ -2356,105 +2353,101 @@ "\n" "You are opening a module which requires a key.\n" "\n" -"The module is locked, meaning that the content is encrypted by its publisher, and you must enter its key in order for the content to become useful. This key should have been received by you on the web page which confirmed your purchase, or perhaps sent via email after purchase.\n" +"The module is locked, meaning that the content is encrypted by its " +"publisher, and you must enter its key in order for the content to become " +"useful. This key should have been received by you on the web page which " +"confirmed your purchase, or perhaps sent via email after purchase.\n" "\n" "Please enter the key in the dialogue." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Clear History" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Verse List" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL not found:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos could not execute %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Viewer error:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Show %s in main window" -#: ../src/main/xml.c:84 -#: ../src/main/xml.c:476 -#: ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Document not created successfully. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "What must I do to be saved?" -#: ../src/main/xml.c:96 -#: ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Acts 16:31" -#: ../src/main/xml.c:101 -#: ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Eph 2:8,9" -#: ../src/main/xml.c:106 -#: ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romans 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "What is the Gospel?" -#: ../src/main/xml.c:112 -#: ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:268 -#: ../src/main/xml.c:414 -#: ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Document not parsed successfully. \n" -#: ../src/main/xml.c:274 -#: ../src/main/xml.c:420 -#: ../src/main/xml.c:442 -#: ../src/main/xml.c:862 -#: ../src/main/xml.c:1176 -#: ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "empty document \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "wrong type, root node != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "wrong type, root node != Copy_Export\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Chapter %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Chapter %d

" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2467,7 +2460,7 @@ "Chapter %d\n" "\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2480,12 +2473,12 @@ "Chapter %d\n" "\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Chapter %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2494,84 +2487,82 @@ "%s: %s Chapter %d\n" "\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:527 -#: ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Old Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "New Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Rev" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Sample Module List" -#: ../src/main/xml.c:868 -#: ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "wrong type, root node != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2580,95 +2571,76 @@ "Save of settings failed! stat %d, size %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Attempting to revert to previous save." -#: ../ui/bookmarks.glade.h:1 -#: ../ui/bookmarks.gtkbuilder.h:1 +#: ../ui/bookmarks.glade.h:1 ../ui/bookmarks.gtkbuilder.h:1 msgid "Add Bookmark" msgstr "Add Bookmark" -#: ../ui/bookmarks.glade.h:2 -#: ../ui/bookmarks.gtkbuilder.h:13 -#: ../ui/markverse.glade.h:2 -#: ../ui/markverse.gtkbuilder.h:11 +#: ../ui/bookmarks.glade.h:2 ../ui/bookmarks.gtkbuilder.h:13 +#: ../ui/markverse.glade.h:2 ../ui/markverse.gtkbuilder.h:11 msgid "Bookmark Dialog" msgstr "Bookmark Dialogue" -#: ../ui/bookmarks.glade.h:3 -#: ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 -#: ../ui/markverse.gtkbuilder.h:6 +#: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Create new folder" -#: ../ui/bookmarks.glade.h:4 -#: ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 -#: ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 -#: ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "New Folder" -#: ../ui/bookmarks.glade.h:5 -#: ../ui/bookmarks.gtkbuilder.h:3 +#: ../ui/bookmarks.glade.h:5 ../ui/bookmarks.gtkbuilder.h:3 msgid "New ..." msgstr "New ..." -#: ../ui/bookmarks.glade.h:6 -#: ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 -#: ../ui/markverse.gtkbuilder.h:10 +#: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Cancel Bookmark" -#: ../ui/bookmarks.glade.h:7 -#: ../ui/bookmarks.gtkbuilder.h:6 +#: ../ui/bookmarks.glade.h:7 ../ui/bookmarks.gtkbuilder.h:6 msgid "Label:" msgstr "Label:" -#: ../ui/bookmarks.glade.h:8 -#: ../ui/bookmarks.gtkbuilder.h:7 +#: ../ui/bookmarks.glade.h:8 ../ui/bookmarks.gtkbuilder.h:7 msgid "Label Entry" msgstr "Label Entry" -#: ../ui/bookmarks.glade.h:9 -#: ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 -#: ../ui/markverse.gtkbuilder.h:2 +#: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Verse:" -#: ../ui/bookmarks.glade.h:10 -#: ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 -#: ../ui/markverse.gtkbuilder.h:3 +#: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Verse Entry" -#: ../ui/bookmarks.glade.h:11 -#: ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 -#: ../ui/markverse.gtkbuilder.h:4 +#: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Module:" -#: ../ui/bookmarks.glade.h:12 -#: ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 -#: ../ui/markverse.gtkbuilder.h:5 +#: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Module Entry" -#: ../ui/bookmarks.glade.h:13 -#: ../ui/bookmarks.gtkbuilder.h:12 +#: ../ui/bookmarks.glade.h:13 ../ui/bookmarks.gtkbuilder.h:12 msgid "Bookmark Folder Treeview" msgstr "Bookmark Folder Treeview" -#: ../ui/editor_link_dialog.xml.h:2 -#: ../ui/export-dialog.glade.h:17 +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Insert Link" + +#: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" msgstr "Verse" @@ -2689,13 +2661,11 @@ msgid "Test Link" msgstr "Test Link" -#: ../ui/editor_note.xml.h:1 -#: ../ui/editor_studypad.xml.h:1 +#: ../ui/editor_note.xml.h:1 ../ui/editor_studypad.xml.h:1 msgid "Exit the program" msgstr "Exit the program" -#: ../ui/editor_note.xml.h:2 -#: ../ui/editor_studypad.xml.h:2 +#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:2 msgid "Exit" msgstr "Exit" @@ -2707,13 +2677,11 @@ msgid "Preview the note to be printed" msgstr "Preview the note to be printed" -#: ../ui/editor_note.xml.h:5 -#: ../ui/editor_studypad.xml.h:5 +#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:5 msgid "HTML Format switch" msgstr "HTML Format switch" -#: ../ui/editor_note.xml.h:6 -#: ../ui/editor_studypad.xml.h:6 +#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:6 msgid "HTML mode" msgstr "HTML mode" @@ -2725,6 +2693,12 @@ msgid "_Delete Personal Comment" msgstr "_Delete Personal Comment" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_File" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Save the current note" @@ -2733,16 +2707,27 @@ msgid "_Save (Personal Comment)" msgstr "_Save (Personal Comment)" -#: ../ui/editor_note.xml.h:14 -#: ../ui/editor_studypad.xml.h:20 +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Print Pre_view" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Print..." + +#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "E_xit" -#: ../ui/editor_note.xml.h:15 -#: ../ui/editor_studypad.xml.h:21 +#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21 msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Save" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Print this document" @@ -2779,146 +2764,121 @@ msgid "New Document" msgstr "New Document" -#: ../ui/export-dialog.glade.h:1 -#: ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 -#: ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copy/Export Passage" -#: ../ui/export-dialog.glade.h:2 -#: ../ui/export-dialog.gtkbuilder.h:2 +#: ../ui/export-dialog.glade.h:2 ../ui/export-dialog.gtkbuilder.h:2 msgid "Export Passage Cancel" msgstr "Export Passage Cancel" -#: ../ui/export-dialog.glade.h:3 -#: ../ui/export-dialog.gtkbuilder.h:3 +#: ../ui/export-dialog.glade.h:3 ../ui/export-dialog.gtkbuilder.h:3 msgid "Export Passage OK" msgstr "Export Passage OK" -#: ../ui/export-dialog.glade.h:5 -#: ../ui/export-dialog.gtkbuilder.h:5 +#: ../ui/export-dialog.glade.h:5 ../ui/export-dialog.gtkbuilder.h:5 msgid "Version" msgstr "Version" -#: ../ui/export-dialog.glade.h:6 -#: ../ui/export-dialog.gtkbuilder.h:6 +#: ../ui/export-dialog.glade.h:6 ../ui/export-dialog.gtkbuilder.h:6 msgid ": " msgstr ": " -#: ../ui/export-dialog.glade.h:7 -#: ../ui/export-dialog.gtkbuilder.h:7 +#: ../ui/export-dialog.glade.h:7 ../ui/export-dialog.gtkbuilder.h:7 msgid "Key" msgstr "Key" -#: ../ui/export-dialog.glade.h:8 -#: ../ui/export-dialog.gtkbuilder.h:8 +#: ../ui/export-dialog.glade.h:8 ../ui/export-dialog.gtkbuilder.h:8 msgid "Copy" msgstr "Copy" -#: ../ui/export-dialog.glade.h:9 -#: ../ui/export-dialog.gtkbuilder.h:9 +#: ../ui/export-dialog.glade.h:9 ../ui/export-dialog.gtkbuilder.h:9 msgid "Export" msgstr "Export" -#: ../ui/export-dialog.glade.h:10 -#: ../ui/export-dialog.gtkbuilder.h:11 +#: ../ui/export-dialog.glade.h:10 ../ui/export-dialog.gtkbuilder.h:11 msgid "Export complete book" msgstr "Export complete book" -#: ../ui/export-dialog.glade.h:11 -#: ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 -#: ../ui/prefs.gtkbuilder.h:136 +#: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Book" -#: ../ui/export-dialog.glade.h:12 -#: ../ui/export-dialog.gtkbuilder.h:12 +#: ../ui/export-dialog.glade.h:12 ../ui/export-dialog.gtkbuilder.h:12 msgid "Book Radio Button" msgstr "Book Radio Button" -#: ../ui/export-dialog.glade.h:13 -#: ../ui/export-dialog.gtkbuilder.h:14 +#: ../ui/export-dialog.glade.h:13 ../ui/export-dialog.gtkbuilder.h:14 msgid "Export complete chapter" msgstr "Export complete chapter" -#: ../ui/export-dialog.glade.h:15 -#: ../ui/export-dialog.gtkbuilder.h:15 +#: ../ui/export-dialog.glade.h:15 ../ui/export-dialog.gtkbuilder.h:15 msgid "Chapter Radio Button" msgstr "Chapter Radio Button" -#: ../ui/export-dialog.glade.h:16 -#: ../ui/export-dialog.gtkbuilder.h:17 +#: ../ui/export-dialog.glade.h:16 ../ui/export-dialog.gtkbuilder.h:17 msgid "Export single verse" msgstr "Export single verse" -#: ../ui/export-dialog.glade.h:18 -#: ../ui/export-dialog.gtkbuilder.h:18 +#: ../ui/export-dialog.glade.h:18 ../ui/export-dialog.gtkbuilder.h:18 msgid "Verse Radio Button" msgstr "Verse Radio Button" -#: ../ui/export-dialog.glade.h:19 -#: ../ui/export-dialog.gtkbuilder.h:19 +#: ../ui/export-dialog.glade.h:19 ../ui/export-dialog.gtkbuilder.h:19 msgid "Verse range" msgstr "Verse range" -#: ../ui/export-dialog.glade.h:20 -#: ../ui/export-dialog.gtkbuilder.h:20 +#: ../ui/export-dialog.glade.h:20 ../ui/export-dialog.gtkbuilder.h:20 msgid "Format" msgstr "Format" -#: ../ui/export-dialog.glade.h:21 -#: ../ui/export-dialog.gtkbuilder.h:21 +#: ../ui/export-dialog.glade.h:21 ../ui/export-dialog.gtkbuilder.h:21 msgid "Plain Text" msgstr "Plain Text" -#: ../ui/export-dialog.glade.h:22 -#: ../ui/export-dialog.gtkbuilder.h:22 +#: ../ui/export-dialog.glade.h:22 ../ui/export-dialog.gtkbuilder.h:22 msgid "Plain Text Radio Button" msgstr "Plain Text Radio Button" -#: ../ui/export-dialog.glade.h:23 -#: ../ui/export-dialog.gtkbuilder.h:23 +#: ../ui/export-dialog.glade.h:23 ../ui/export-dialog.gtkbuilder.h:23 msgid "HTML" msgstr "HTML" -#: ../ui/export-dialog.glade.h:24 -#: ../ui/export-dialog.gtkbuilder.h:24 +#: ../ui/export-dialog.glade.h:24 ../ui/export-dialog.gtkbuilder.h:24 msgid "HTML Radio Button" msgstr "HTML Radio Button" #: ../ui/export-dialog.glade.h:25 -msgid "Indicates whether verse numbers should appear inline in the text for more than 1 verse." -msgstr "Indicates whether verse numbers should appear inline in the text for more than 1 verse." +msgid "" +"Indicates whether verse numbers should appear inline in the text for more " +"than 1 verse." +msgstr "" +"Indicates whether verse numbers should appear inline in the text for more " +"than 1 verse." -#: ../ui/export-dialog.glade.h:26 -#: ../ui/export-dialog.gtkbuilder.h:25 +#: ../ui/export-dialog.glade.h:26 ../ui/export-dialog.gtkbuilder.h:25 msgid "_Verse numbers in text" msgstr "_Verse numbers in text" -#: ../ui/export-dialog.glade.h:27 -#: ../ui/export-dialog.gtkbuilder.h:27 +#: ../ui/export-dialog.glade.h:27 ../ui/export-dialog.gtkbuilder.h:27 msgid "Verse Number button" msgstr "Verse Number button" -#: ../ui/export-dialog.glade.h:28 -#: ../ui/export-dialog.gtkbuilder.h:29 +#: ../ui/export-dialog.glade.h:28 ../ui/export-dialog.gtkbuilder.h:29 msgid "Indicates whether reference is placed first or last." msgstr "Indicates whether reference is placed first or last." -#: ../ui/export-dialog.glade.h:29 -#: ../ui/export-dialog.gtkbuilder.h:28 +#: ../ui/export-dialog.glade.h:29 ../ui/export-dialog.gtkbuilder.h:28 msgid "Reference last" msgstr "Reference last" -#: ../ui/export-dialog.glade.h:30 -#: ../ui/export-dialog.gtkbuilder.h:30 +#: ../ui/export-dialog.glade.h:30 ../ui/export-dialog.gtkbuilder.h:30 msgid "Reference last button" msgstr "Reference last button" -#: ../ui/export-dialog.glade.h:31 -#: ../ui/export-dialog.gtkbuilder.h:32 +#: ../ui/export-dialog.glade.h:31 ../ui/export-dialog.gtkbuilder.h:32 msgid "Indicates whether or not version name is included in reference." msgstr "Indicates whether or not version name is included in reference." @@ -2926,8 +2886,7 @@ msgid "Include Version" msgstr "Include Version" -#: ../ui/export-dialog.glade.h:33 -#: ../ui/export-dialog.gtkbuilder.h:33 +#: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 msgid "Version button" msgstr "Version button" @@ -2943,747 +2902,603 @@ msgid "Include version" msgstr "Include version" -#: ../ui/gtk2_webedit.ui.h:1 -#: ../ui/gtk_webedit.ui.h:1 +#: ../ui/gtk2_webedit.ui.h:1 ../ui/gtk_webedit.ui.h:1 msgid "About Studypad" msgstr "About Studypad" -#: ../ui/gtk2_webedit.ui.h:3 -#: ../ui/gtk_webedit.ui.h:3 +#: ../ui/gtk2_webedit.ui.h:3 ../ui/gtk_webedit.ui.h:3 msgid "Open about dialog" msgstr "Open about dialog" -#: ../ui/gtk2_webedit.ui.h:4 -#: ../ui/gtk_webedit.ui.h:4 -#: ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Bold" -#: ../ui/gtk2_webedit.ui.h:5 -#: ../ui/gtk_webedit.ui.h:5 +#: ../ui/gtk2_webedit.ui.h:5 ../ui/gtk_webedit.ui.h:5 msgid "Make selection bold" msgstr "Make selection bold" -#: ../ui/gtk2_webedit.ui.h:6 -#: ../ui/gtk_webedit.ui.h:6 +#: ../ui/gtk2_webedit.ui.h:6 ../ui/gtk_webedit.ui.h:6 msgid "Copy" msgstr "Copy" -#: ../ui/gtk2_webedit.ui.h:7 -#: ../ui/gtk_webedit.ui.h:7 +#: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 msgid "Copy selection to clipboard" msgstr "Copy selection to clipboard" -#: ../ui/gtk2_webedit.ui.h:8 -#: ../ui/gtk_webedit.ui.h:8 +#: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 msgid "Cut" msgstr "Cut" -#: ../ui/gtk2_webedit.ui.h:9 -#: ../ui/gtk_webedit.ui.h:9 +#: ../ui/gtk2_webedit.ui.h:9 ../ui/gtk_webedit.ui.h:9 msgid "Cut selection" msgstr "Cut selection" -#: ../ui/gtk2_webedit.ui.h:10 -#: ../ui/gtk_webedit.ui.h:10 +#: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 msgid "Decrease indent" msgstr "Decrease indent" -#: ../ui/gtk2_webedit.ui.h:11 -#: ../ui/gtk_webedit.ui.h:11 +#: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 msgid "Decrease" msgstr "Decrease" -#: ../ui/gtk2_webedit.ui.h:12 -#: ../ui/gtk_webedit.ui.h:12 +#: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 msgid "Decrease paragraph indent" msgstr "Decrease paragraph indent" -#: ../ui/gtk2_webedit.ui.h:13 -#: ../ui/gtk_webedit.ui.h:13 +#: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 msgid "Delete selection" msgstr "Delete selection" -#: ../ui/gtk2_webedit.ui.h:15 -#: ../ui/gtk_webedit.ui.h:15 +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Delete" + +#: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Remove selection" -#: ../ui/gtk2_webedit.ui.h:16 -#: ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 -#: ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Delete Item" -#: ../ui/gtk2_webedit.ui.h:17 -#: ../ui/gtk_webedit.ui.h:17 +#: ../ui/gtk2_webedit.ui.h:17 ../ui/gtk_webedit.ui.h:17 msgid "Delete current item" msgstr "Delete current item" -#: ../ui/gtk2_webedit.ui.h:19 -#: ../ui/gtk_webedit.ui.h:19 +#: ../ui/gtk2_webedit.ui.h:19 ../ui/gtk_webedit.ui.h:19 msgid "Search current document" msgstr "Search current document" -#: ../ui/gtk2_webedit.ui.h:20 -#: ../ui/gtk_webedit.ui.h:20 +#: ../ui/gtk2_webedit.ui.h:20 ../ui/gtk_webedit.ui.h:20 msgid "Font" msgstr "Font" -#: ../ui/gtk2_webedit.ui.h:21 -#: ../ui/gtk_webedit.ui.h:21 +#: ../ui/gtk2_webedit.ui.h:21 ../ui/gtk_webedit.ui.h:21 msgid "Change font" msgstr "Change font" -#: ../ui/gtk2_webedit.ui.h:22 -#: ../ui/gtk_webedit.ui.h:22 +#: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 msgid "Increase indent" msgstr "Increase indent" -#: ../ui/gtk2_webedit.ui.h:23 -#: ../ui/gtk_webedit.ui.h:23 +#: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 msgid "Increase" msgstr "Increase" -#: ../ui/gtk2_webedit.ui.h:24 -#: ../ui/gtk_webedit.ui.h:24 +#: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 msgid "Increase paragraph indent" msgstr "Increase paragraph indent" -#: ../ui/gtk2_webedit.ui.h:25 -#: ../ui/gtk_webedit.ui.h:25 +#: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 msgid "Insert emoticon" msgstr "Insert emoticon" -#: ../ui/gtk2_webedit.ui.h:26 -#: ../ui/gtk_webedit.ui.h:26 +#: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 msgid "Emoticon" msgstr "Emoticon" -#: ../ui/gtk2_webedit.ui.h:27 -#: ../ui/gtk_webedit.ui.h:27 +#: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 msgid "Insert an emoticon" msgstr "Insert an emoticon" -#: ../ui/gtk2_webedit.ui.h:28 -#: ../ui/gtk_webedit.ui.h:28 +#: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 msgid "Insert image" msgstr "Insert image" -#: ../ui/gtk2_webedit.ui.h:29 -#: ../ui/gtk_webedit.ui.h:29 +#: ../ui/gtk2_webedit.ui.h:29 ../ui/gtk_webedit.ui.h:29 msgid "Image" msgstr "Image" -#: ../ui/gtk2_webedit.ui.h:30 -#: ../ui/gtk_webedit.ui.h:30 +#: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 msgid "Insert image at cursor" msgstr "Insert image at cursor" -#: ../ui/gtk2_webedit.ui.h:31 -#: ../ui/gtk_webedit.ui.h:31 +#: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 msgid "Insert link" msgstr "Insert link" -#: ../ui/gtk2_webedit.ui.h:32 -#: ../ui/gtk_webedit.ui.h:32 +#: ../ui/gtk2_webedit.ui.h:32 ../ui/gtk_webedit.ui.h:32 msgid "Link" msgstr "Link" -#: ../ui/gtk2_webedit.ui.h:33 -#: ../ui/gtk_webedit.ui.h:33 +#: ../ui/gtk2_webedit.ui.h:33 ../ui/gtk_webedit.ui.h:33 msgid "Insert a link" msgstr "Insert a link" -#: ../ui/gtk2_webedit.ui.h:34 -#: ../ui/gtk_webedit.ui.h:34 +#: ../ui/gtk2_webedit.ui.h:34 ../ui/gtk_webedit.ui.h:34 msgid "Insert Outline" msgstr "Insert Outline" -#: ../ui/gtk2_webedit.ui.h:35 -#: ../ui/gtk_webedit.ui.h:35 +#: ../ui/gtk2_webedit.ui.h:35 ../ui/gtk_webedit.ui.h:35 msgid "Outline" msgstr "Outline" -#: ../ui/gtk2_webedit.ui.h:36 -#: ../ui/gtk_webedit.ui.h:36 +#: ../ui/gtk2_webedit.ui.h:36 ../ui/gtk_webedit.ui.h:36 msgid "Insert outline" msgstr "Insert outline" -#: ../ui/gtk2_webedit.ui.h:37 -#: ../ui/gtk_webedit.ui.h:37 +#: ../ui/gtk2_webedit.ui.h:37 ../ui/gtk_webedit.ui.h:37 msgid "Insert rule" msgstr "Insert rule" -#: ../ui/gtk2_webedit.ui.h:38 -#: ../ui/gtk_webedit.ui.h:38 +#: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 msgid "Rule" msgstr "Rule" -#: ../ui/gtk2_webedit.ui.h:39 -#: ../ui/gtk_webedit.ui.h:39 +#: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 msgid "Insert horizontal rule" msgstr "Insert horizontal rule" -#: ../ui/gtk2_webedit.ui.h:40 -#: ../ui/gtk_webedit.ui.h:40 +#: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 msgid "Xiphos Link" msgstr "Xiphos Link" -#: ../ui/gtk2_webedit.ui.h:41 -#: ../ui/gtk_webedit.ui.h:41 +#: ../ui/gtk2_webedit.ui.h:41 ../ui/gtk_webedit.ui.h:41 msgid "Xiphos" msgstr "Xiphos" -#: ../ui/gtk2_webedit.ui.h:42 -#: ../ui/gtk_webedit.ui.h:42 +#: ../ui/gtk2_webedit.ui.h:42 ../ui/gtk_webedit.ui.h:42 msgid "Insert a link to a sword module" msgstr "Insert a link to a sword module" -#: ../ui/gtk2_webedit.ui.h:43 -#: ../ui/gtk_webedit.ui.h:43 +#: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 msgid "Insert table" msgstr "Insert table" -#: ../ui/gtk2_webedit.ui.h:44 -#: ../ui/gtk_webedit.ui.h:44 +#: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 msgid "Table" msgstr "Table" -#: ../ui/gtk2_webedit.ui.h:45 -#: ../ui/gtk_webedit.ui.h:45 +#: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 msgid "Insert a table" msgstr "Insert a table" -#: ../ui/gtk2_webedit.ui.h:46 -#: ../ui/gtk_webedit.ui.h:46 +#: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 msgid "Italic" msgstr "Italic" -#: ../ui/gtk2_webedit.ui.h:47 -#: ../ui/gtk_webedit.ui.h:47 +#: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 msgid "Change selection to italic font" msgstr "Change selection to italic font" -#: ../ui/gtk2_webedit.ui.h:48 -#: ../ui/gtk_webedit.ui.h:48 +#: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 msgid "Center" msgstr "Center" -#: ../ui/gtk2_webedit.ui.h:49 -#: ../ui/gtk_webedit.ui.h:49 +#: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 msgid "Center justify paragraph" msgstr "Center justify paragraph" -#: ../ui/gtk2_webedit.ui.h:50 -#: ../ui/gtk_webedit.ui.h:50 +#: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 msgid "Full" msgstr "Full" -#: ../ui/gtk2_webedit.ui.h:51 -#: ../ui/gtk_webedit.ui.h:51 +#: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 msgid "full justify" msgstr "full justify" -#: ../ui/gtk2_webedit.ui.h:52 -#: ../ui/gtk_webedit.ui.h:52 +#: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 msgid "Left" msgstr "Left" -#: ../ui/gtk2_webedit.ui.h:53 -#: ../ui/gtk_webedit.ui.h:53 +#: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 msgid "Left justify paragraph" msgstr "Left justify paragraph" -#: ../ui/gtk2_webedit.ui.h:54 -#: ../ui/gtk_webedit.ui.h:54 +#: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 msgid "Right" msgstr "Right" -#: ../ui/gtk2_webedit.ui.h:55 -#: ../ui/gtk_webedit.ui.h:55 +#: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 msgid "Right justify paragraph" msgstr "Right justify paragraph" -#: ../ui/gtk2_webedit.ui.h:57 -#: ../ui/gtk_webedit.ui.h:57 +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "New" + +#: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "Create new file" -#: ../ui/gtk2_webedit.ui.h:59 -#: ../ui/gtk_webedit.ui.h:59 +#: ../ui/gtk2_webedit.ui.h:59 ../ui/gtk_webedit.ui.h:59 msgid "Open file" msgstr "Open file" -#: ../ui/gtk2_webedit.ui.h:60 -#: ../ui/gtk_webedit.ui.h:60 +#: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 msgid "Paste" msgstr "Paste" -#: ../ui/gtk2_webedit.ui.h:61 -#: ../ui/gtk_webedit.ui.h:61 +#: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 msgid "Paste clipboard at cursor." msgstr "Paste clipboard at cursor." -#: ../ui/gtk2_webedit.ui.h:62 -#: ../ui/gtk_webedit.ui.h:62 +#: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 msgid "Print Document" msgstr "Print Document" -#: ../ui/gtk2_webedit.ui.h:63 -#: ../ui/gtk_webedit.ui.h:63 +#: ../ui/gtk2_webedit.ui.h:63 ../ui/gtk_webedit.ui.h:63 msgid "Print" msgstr "Print" -#: ../ui/gtk2_webedit.ui.h:64 -#: ../ui/gtk_webedit.ui.h:64 +#: ../ui/gtk2_webedit.ui.h:64 ../ui/gtk_webedit.ui.h:64 msgid "Print the current document" msgstr "Print the current document" -#: ../ui/gtk2_webedit.ui.h:65 -#: ../ui/gtk_webedit.ui.h:65 +#: ../ui/gtk2_webedit.ui.h:65 ../ui/gtk_webedit.ui.h:65 msgid "Print Preview" msgstr "Print Preview" -#: ../ui/gtk2_webedit.ui.h:66 -#: ../ui/gtk_webedit.ui.h:66 +#: ../ui/gtk2_webedit.ui.h:66 ../ui/gtk_webedit.ui.h:66 msgid "Preview" msgstr "Preview" -#: ../ui/gtk2_webedit.ui.h:67 -#: ../ui/gtk_webedit.ui.h:67 +#: ../ui/gtk2_webedit.ui.h:67 ../ui/gtk_webedit.ui.h:67 msgid "Print preview of current document" msgstr "Print preview of current document" -#: ../ui/gtk2_webedit.ui.h:68 -#: ../ui/gtk_webedit.ui.h:68 +#: ../ui/gtk2_webedit.ui.h:68 ../ui/gtk_webedit.ui.h:68 msgid "Quit" msgstr "Quit" -#: ../ui/gtk2_webedit.ui.h:69 -#: ../ui/gtk_webedit.ui.h:69 +#: ../ui/gtk2_webedit.ui.h:69 ../ui/gtk_webedit.ui.h:69 msgid "Shut down editor" msgstr "Shut down editor" -#: ../ui/gtk2_webedit.ui.h:70 -#: ../ui/gtk_webedit.ui.h:70 +#: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 msgid "Redo" msgstr "Redo" -#: ../ui/gtk2_webedit.ui.h:71 -#: ../ui/gtk_webedit.ui.h:71 +#: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 msgid "Redo last undo" msgstr "Redo last undo" -#: ../ui/gtk2_webedit.ui.h:72 -#: ../ui/gtk_webedit.ui.h:72 +#: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 msgid "Find and replace" msgstr "Find and replace" -#: ../ui/gtk2_webedit.ui.h:73 -#: ../ui/gtk_webedit.ui.h:73 +#: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 msgid "Replace" msgstr "Replace" -#: ../ui/gtk2_webedit.ui.h:74 -#: ../ui/gtk_webedit.ui.h:74 +#: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 msgid "Search and replace" msgstr "Search and replace" -#: ../ui/gtk2_webedit.ui.h:76 -#: ../ui/gtk_webedit.ui.h:76 +#: ../ui/gtk2_webedit.ui.h:76 ../ui/gtk_webedit.ui.h:76 msgid "Save changes to file" msgstr "Save changes to file" -#: ../ui/gtk2_webedit.ui.h:77 -#: ../ui/gtk_webedit.ui.h:77 +#: ../ui/gtk2_webedit.ui.h:77 ../ui/gtk_webedit.ui.h:77 msgid "Save as" msgstr "Save as" -#: ../ui/gtk2_webedit.ui.h:78 -#: ../ui/gtk_webedit.ui.h:78 +#: ../ui/gtk2_webedit.ui.h:78 ../ui/gtk_webedit.ui.h:78 msgid "Save file as ..." msgstr "Save file as ..." -#: ../ui/gtk2_webedit.ui.h:79 -#: ../ui/gtk_webedit.ui.h:79 +#: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 msgid "Strikethrough" msgstr "Strikethrough" -#: ../ui/gtk2_webedit.ui.h:80 -#: ../ui/gtk_webedit.ui.h:80 +#: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 msgid "Strikethrough selection" msgstr "Strikethrough selection" -#: ../ui/gtk2_webedit.ui.h:81 -#: ../ui/gtk_webedit.ui.h:81 +#: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 msgid "Underline" msgstr "Underline" -#: ../ui/gtk2_webedit.ui.h:82 -#: ../ui/gtk_webedit.ui.h:82 +#: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 msgid "Underline selection" msgstr "Underline selection" -#: ../ui/gtk2_webedit.ui.h:83 -#: ../ui/gtk_webedit.ui.h:83 +#: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 msgid "Undo" msgstr "Undo" -#: ../ui/gtk2_webedit.ui.h:84 -#: ../ui/gtk_webedit.ui.h:84 +#: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 msgid "Undo last change" msgstr "Undo last change" -#: ../ui/gtk2_webedit.ui.h:85 -#: ../ui/gtk_webedit.ui.h:85 +#: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 msgid "Editor" msgstr "Editor" -#: ../ui/gtk2_webedit.ui.h:87 -#: ../ui/gtk_webedit.ui.h:87 +#: ../ui/gtk2_webedit.ui.h:87 ../ui/gtk_webedit.ui.h:87 msgid "Recent files" msgstr "Recent files" -#: ../ui/gtk2_webedit.ui.h:88 -#: ../ui/gtk_webedit.ui.h:88 -#: ../ui/xi-menus.glade.h:9 -#: ../ui/xi-menus.gtkbuilder.h:6 +#: ../ui/gtk2_webedit.ui.h:88 ../ui/gtk_webedit.ui.h:88 +#: ../ui/xi-menus.glade.h:9 ../ui/xi-menus.gtkbuilder.h:6 msgid "_Edit" msgstr "_Edit" -#: ../ui/gtk2_webedit.ui.h:90 -#: ../ui/gtk_webedit.ui.h:90 -#: ../ui/xi-menus.glade.h:40 -#: ../ui/xi-menus.gtkbuilder.h:25 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 +#: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Help" -#: ../ui/gtk2_webedit.ui.h:91 -#: ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 -#: ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 -#: ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 -#: ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 -#: ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 -#: ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 -#: ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 -#: ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normal" -#: ../ui/gtk2_webedit.ui.h:99 -#: ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Header 1" -#: ../ui/gtk2_webedit.ui.h:100 -#: ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Header 2" -#: ../ui/gtk2_webedit.ui.h:101 -#: ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Header 3" -#: ../ui/gtk2_webedit.ui.h:102 -#: ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Header 4" -#: ../ui/gtk2_webedit.ui.h:103 -#: ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Header 5" -#: ../ui/gtk2_webedit.ui.h:104 -#: ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Header 6" -#: ../ui/gtk2_webedit.ui.h:105 -#: ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Address" -#: ../ui/gtk2_webedit.ui.h:106 -#: ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Preformatted" -#: ../ui/gtk2_webedit.ui.h:107 -#: ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Bulleted List" -#: ../ui/gtk2_webedit.ui.h:108 -#: ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Roman Numeral List" -#: ../ui/gtk2_webedit.ui.h:109 -#: ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Numbered List" -#: ../ui/gtk2_webedit.ui.h:110 -#: ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Alphabetical List" -#: ../ui/gtk2_webedit.ui.h:111 -#: ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 -#: ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Strikethrough" -#: ../ui/gtk2_webedit.ui.h:113 -#: ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Set font color of selected text." -#: ../ui/gtk2_webedit.ui.h:114 -#: ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Highlight selected text by setting background color." -#: ../ui/gtk2_webedit.ui.h:115 -#: ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - -#: ../ui/markverse.glade.h:1 -#: ../ui/markverse.gtkbuilder.h:1 +#: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Mark/Unmark Verse" -#: ../ui/markverse.glade.h:9 -#: ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Mark" -#: ../ui/markverse.glade.h:10 -#: ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Unmark" -#: ../ui/module-manager.glade.h:1 -#: ../ui/module-manager.gtkbuilder.h:1 +#: ../ui/module-manager.glade.h:1 ../ui/module-manager.gtkbuilder.h:1 msgid "Module Manager" msgstr "Module Manager" -#: ../ui/module-manager.glade.h:2 -#: ../ui/module-manager.gtkbuilder.h:2 +#: ../ui/module-manager.glade.h:2 ../ui/module-manager.gtkbuilder.h:2 msgid "_View Intro" msgstr "_View Intro" -#: ../ui/module-manager.glade.h:3 -#: ../ui/module-manager.gtkbuilder.h:3 +#: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3 msgid "Open a brief introductory explanation of how the Module Manager works." msgstr "Open a brief introductory explanation of how the Module Manager works." -#: ../ui/module-manager.glade.h:4 -#: ../ui/module-manager.gtkbuilder.h:4 +#: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4 msgid "_Load Standard" msgstr "_Load Standard" -#: ../ui/module-manager.glade.h:5 -#: ../ui/module-manager.gtkbuilder.h:5 -msgid "Load and synchronize the standard set of known repositories, as maintained at crosswire.org, with your current remote sources." -msgstr "Load and synchronise the standard set of known repositories, as maintained at crosswire.org, with your current remote sources." - -#: ../ui/module-manager.glade.h:6 -#: ../ui/module-manager.gtkbuilder.h:6 -msgid "Refresh Xiphos' knowledge of what modules are available at the selected remote repository" -msgstr "Refresh Xiphos' knowledge of what modules are available at the selected remote repository" +#: ../ui/module-manager.glade.h:5 ../ui/module-manager.gtkbuilder.h:5 +msgid "" +"Load and synchronize the standard set of known repositories, as maintained " +"at crosswire.org, with your current remote sources." +msgstr "" +"Load and synchronise the standard set of known repositories, as maintained " +"at crosswire.org, with your current remote sources." + +#: ../ui/module-manager.glade.h:6 ../ui/module-manager.gtkbuilder.h:6 +msgid "" +"Refresh Xiphos' knowledge of what modules are available at the selected " +"remote repository" +msgstr "" +"Refresh Xiphos' knowledge of what modules are available at the selected " +"remote repository" -#: ../ui/module-manager.glade.h:7 -#: ../ui/module-manager.gtkbuilder.h:8 +#: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8 msgid "_Install" msgstr "_Install" -#: ../ui/module-manager.glade.h:8 -#: ../ui/module-manager.gtkbuilder.h:7 +#: ../ui/module-manager.glade.h:8 ../ui/module-manager.gtkbuilder.h:7 msgid "Install or update the selected modules" msgstr "Install or update the selected modules" -#: ../ui/module-manager.glade.h:9 -#: ../ui/module-manager.gtkbuilder.h:9 +#: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9 msgid "Remove the selected modules from your system" msgstr "Remove the selected modules from your system" -#: ../ui/module-manager.glade.h:10 -#: ../ui/module-manager.gtkbuilder.h:10 +#: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10 msgid "_Archive" msgstr "_Archive" -#: ../ui/module-manager.glade.h:11 -#: ../ui/module-manager.gtkbuilder.h:11 +#: ../ui/module-manager.glade.h:11 ../ui/module-manager.gtkbuilder.h:11 msgid "Create a zip archive of the selected modules." msgstr "Create a zip archive of the selected modules." -#: ../ui/module-manager.glade.h:12 -#: ../ui/module-manager.gtkbuilder.h:12 +#: ../ui/module-manager.glade.h:12 ../ui/module-manager.gtkbuilder.h:12 msgid "_Index" msgstr "_Index" -#: ../ui/module-manager.glade.h:13 -#: ../ui/module-manager.gtkbuilder.h:13 -msgid "Build an index of the selected modules, for optimized (\"lucene\") searching." -msgstr "Build an index of the selected modules, for optimised (\"lucene\") searching." +#: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13 +msgid "" +"Build an index of the selected modules, for optimized (\"lucene\") searching." +msgstr "" +"Build an index of the selected modules, for optimised (\"lucene\") searching." -#: ../ui/module-manager.glade.h:14 -#: ../ui/module-manager.gtkbuilder.h:14 +#: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14 msgid "_Delete Index" msgstr "_Delete Index" -#: ../ui/module-manager.glade.h:15 -#: ../ui/module-manager.gtkbuilder.h:15 +#: ../ui/module-manager.glade.h:15 ../ui/module-manager.gtkbuilder.h:15 msgid "Delete the fast-search index of the selected modules." msgstr "Delete the fast-search index of the selected modules." -#: ../ui/module-manager.glade.h:16 -#: ../ui/module-manager.gtkbuilder.h:16 +#: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Continue" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 -#: ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 -#: ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Module Manager" -#: ../ui/module-manager.glade.h:20 -#: ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "WARNING: If you live in a persecuted country use with care." -#: ../ui/module-manager.glade.h:21 -#: ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Add and Remove Sources" -#: ../ui/module-manager.glade.h:22 -#: ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Current local sources" -#: ../ui/module-manager.glade.h:23 -#: ../ui/module-manager.gtkbuilder.h:23 -msgid "Add a local folder as an install source, typically on a cdrom or flash drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." -msgstr "Add a local folder as an install source, typically on a cdrom or flash drive. Such a folder contains sub-folders \"mods.d\" and \"modules\"." +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 +msgid "" +"Add a local folder as an install source, typically on a cdrom or flash " +"drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." +msgstr "" +"Add a local folder as an install source, typically on a cdrom or flash " +"drive. Such a folder contains sub-folders \"mods.d\" and \"modules\"." -#: ../ui/module-manager.glade.h:24 -#: ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Remove one of your local folders as an install source." -#: ../ui/module-manager.glade.h:25 -#: ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Current Remote Sources" -#: ../ui/module-manager.glade.h:26 -#: ../ui/module-manager.gtkbuilder.h:26 -msgid "Add a custom remote install source. You must know its hostname and the folder where its repository lives." -msgstr "Add a custom remote install source. You must know its hostname and the folder where its repository lives." +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 +msgid "" +"Add a custom remote install source. You must know its hostname and the " +"folder where its repository lives." +msgstr "" +"Add a custom remote install source. You must know its hostname and the " +"folder where its repository lives." -#: ../ui/module-manager.glade.h:27 -#: ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Remove a remote install source." -#: ../ui/module-manager.glade.h:28 -#: ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Install Source" -#: ../ui/module-manager.glade.h:29 -#: ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Local" -#: ../ui/module-manager.glade.h:30 -#: ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Remote" -#: ../ui/module-manager.glade.h:31 -#: ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Install Destination" -#: ../ui/module-manager.glade.h:32 -#: ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Personal area, for your use only:" -#: ../ui/module-manager.glade.h:33 -#: ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Home dir" -#: ../ui/module-manager.glade.h:34 -#: ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "System area, for all users:" -#: ../ui/module-manager.glade.h:35 -#: ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword sys dir" -#: ../ui/module-manager.glade.h:36 -#: ../ui/module-manager.gtkbuilder.h:36 -msgid "Warning: If you live in a persecuted country and do not wish to risk detection you should NOT use the remote installation feature! " -msgstr "Warning: If you live in a persecuted country and do not wish to risk detection you should NOT use the remote installation feature! " +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 +msgid "" +"Warning: If you live in a persecuted country and do not wish to risk " +"detection you should NOT use the remote installation feature! " +msgstr "" +"Warning: If you live in a persecuted country and do not wish to risk " +"detection you should NOT use the remote installation feature! " -#: ../ui/module-manager.glade.h:37 -#: ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Local Install Folder" -#: ../ui/navbar_versekey.glade.h:1 -#: ../ui/navbar_versekey.gtkbuilder.h:1 +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + +#: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Drop down history list" @@ -3691,13 +3506,11 @@ msgid "Choose book to display" msgstr "Choose book to display" -#: ../ui/navbar_versekey.glade.h:3 -#: ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Book Selector Button" -#: ../ui/navbar_versekey.glade.h:4 -#: ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Revelation of John" @@ -3705,13 +3518,11 @@ msgid "Choose chapter to display" msgstr "Choose chapter to display" -#: ../ui/navbar_versekey.glade.h:6 -#: ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Toggle Chapter Button" -#: ../ui/navbar_versekey.glade.h:7 -#: ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3719,103 +3530,83 @@ msgid "Choose Verse to display" msgstr "Choose Verse to display" -#: ../ui/navbar_versekey.glade.h:9 -#: ../ui/navbar_versekey.gtkbuilder.h:6 +#: ../ui/navbar_versekey.glade.h:9 ../ui/navbar_versekey.gtkbuilder.h:6 msgid "Toggle Verse Button" msgstr "Toggle Verse Button" -#: ../ui/navbar_versekey.glade.h:10 -#: ../ui/navbar_versekey.gtkbuilder.h:7 +#: ../ui/navbar_versekey.glade.h:10 ../ui/navbar_versekey.gtkbuilder.h:7 msgid "Enter a Verse reference in Book 1:1 format and press Return" msgstr "Enter a Verse reference in Book 1:1 format and press Return" -#: ../ui/navbar_versekey.glade.h:11 -#: ../ui/navbar_versekey.gtkbuilder.h:8 +#: ../ui/navbar_versekey.glade.h:11 ../ui/navbar_versekey.gtkbuilder.h:8 msgid "Reference Entry" msgstr "Reference Entry" -#: ../ui/prefs.glade.h:2 -#: ../ui/prefs.gtkbuilder.h:10 +#: ../ui/prefs.glade.h:2 ../ui/prefs.gtkbuilder.h:10 msgid "Cover" msgstr "Cover" -#: ../ui/prefs.glade.h:3 -#: ../ui/prefs.gtkbuilder.h:11 +#: ../ui/prefs.glade.h:3 ../ui/prefs.gtkbuilder.h:11 msgid "Font Colors" msgstr "Font Colours" -#: ../ui/prefs.glade.h:4 -#: ../ui/prefs.gtkbuilder.h:12 +#: ../ui/prefs.glade.h:4 ../ui/prefs.gtkbuilder.h:12 msgid "Background" msgstr "Background" -#: ../ui/prefs.glade.h:5 -#: ../ui/prefs.gtkbuilder.h:13 +#: ../ui/prefs.glade.h:5 ../ui/prefs.gtkbuilder.h:13 msgid " " msgstr " " -#: ../ui/prefs.glade.h:6 -#: ../ui/prefs.gtkbuilder.h:14 +#: ../ui/prefs.glade.h:6 ../ui/prefs.gtkbuilder.h:14 msgid "Foreground" msgstr "Foreground" -#: ../ui/prefs.glade.h:7 -#: ../ui/prefs.gtkbuilder.h:15 +#: ../ui/prefs.glade.h:7 ../ui/prefs.gtkbuilder.h:15 msgid "Current Verse" msgstr "Current Verse" -#: ../ui/prefs.glade.h:8 -#: ../ui/prefs.gtkbuilder.h:16 +#: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16 msgid "Verse Number" msgstr "Verse Number" -#: ../ui/prefs.glade.h:9 -#: ../ui/prefs.gtkbuilder.h:17 +#: ../ui/prefs.glade.h:9 ../ui/prefs.gtkbuilder.h:17 msgid "Links" msgstr "Links" -#: ../ui/prefs.glade.h:10 -#: ../ui/prefs.gtkbuilder.h:18 +#: ../ui/prefs.glade.h:10 ../ui/prefs.gtkbuilder.h:18 msgid "Highlight Foreground" msgstr "Highlight Foreground" -#: ../ui/prefs.glade.h:11 -#: ../ui/prefs.gtkbuilder.h:19 +#: ../ui/prefs.glade.h:11 ../ui/prefs.gtkbuilder.h:19 msgid "Highlight Background" msgstr "Highlight Background" -#: ../ui/prefs.glade.h:12 -#: ../ui/prefs.gtkbuilder.h:20 +#: ../ui/prefs.glade.h:12 ../ui/prefs.gtkbuilder.h:20 msgid "Invert color pairs" msgstr "Invert color pairs" -#: ../ui/prefs.glade.h:13 -#: ../ui/prefs.gtkbuilder.h:21 +#: ../ui/prefs.glade.h:13 ../ui/prefs.gtkbuilder.h:21 msgid "Normal Text" msgstr "Normal Text" -#: ../ui/prefs.glade.h:14 -#: ../ui/prefs.gtkbuilder.h:22 +#: ../ui/prefs.glade.h:14 ../ui/prefs.gtkbuilder.h:22 msgid "Highlight" msgstr "Highlight" -#: ../ui/prefs.glade.h:15 -#: ../ui/prefs.gtkbuilder.h:23 +#: ../ui/prefs.glade.h:15 ../ui/prefs.gtkbuilder.h:23 msgid "Font Colors" msgstr "Font Colours" -#: ../ui/prefs.glade.h:16 -#: ../ui/prefs.gtkbuilder.h:24 +#: ../ui/prefs.glade.h:16 ../ui/prefs.gtkbuilder.h:24 msgid "Font Sizes" msgstr "Font Sizes" -#: ../ui/prefs.glade.h:17 -#: ../ui/prefs.gtkbuilder.h:25 +#: ../ui/prefs.glade.h:17 ../ui/prefs.gtkbuilder.h:25 msgid "All displayed font sizes are relative to this choice" msgstr "All displayed font sizes are relative to this choice" -#: ../ui/prefs.glade.h:18 -#: ../ui/prefs.gtkbuilder.h:26 +#: ../ui/prefs.glade.h:18 ../ui/prefs.gtkbuilder.h:26 msgid "Base font size" msgstr "Base font size" @@ -3839,662 +3630,581 @@ "+4\n" "+5" -#: ../ui/prefs.glade.h:27 -#: ../ui/prefs.gtkbuilder.h:27 +#: ../ui/prefs.glade.h:27 ../ui/prefs.gtkbuilder.h:27 msgid "Commonly -1, to make verse numbers less obtrusive" msgstr "Commonly -1, to make verse numbers less obtrusive" -#: ../ui/prefs.glade.h:28 -#: ../ui/prefs.gtkbuilder.h:28 +#: ../ui/prefs.glade.h:28 ../ui/prefs.gtkbuilder.h:28 msgid "Verse number size" msgstr "Verse number size" -#: ../ui/prefs.glade.h:29 -#: ../ui/prefs.gtkbuilder.h:29 -msgid "Name and size choice for any module in a given language; still overridden by a specific choice on a particular module" -msgstr "Name and size choice for any module in a given language; still overridden by a specific choice on a particular module" +#: ../ui/prefs.glade.h:29 ../ui/prefs.gtkbuilder.h:29 +msgid "" +"Name and size choice for any module in a given language; still overridden by " +"a specific choice on a particular module" +msgstr "" +"Name and size choice for any module in a given language; still overridden by " +"a specific choice on a particular module" -#: ../ui/prefs.glade.h:30 -#: ../ui/prefs.gtkbuilder.h:30 +#: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30 msgid "Font preferences, per language" msgstr "Font preferences, per language" -#: ../ui/prefs.glade.h:31 -#: ../ui/prefs.gtkbuilder.h:31 +#: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 msgid "Language Font Combo" msgstr "Language Font Combo" -#: ../ui/prefs.glade.h:32 -#: ../ui/prefs.gtkbuilder.h:32 +#: ../ui/prefs.glade.h:32 ../ui/prefs.gtkbuilder.h:32 msgid "Font Misc" msgstr "Font Misc" -#: ../ui/prefs.glade.h:33 -#: ../ui/prefs.gtkbuilder.h:33 +#: ../ui/prefs.glade.h:33 ../ui/prefs.gtkbuilder.h:33 msgid "BibleSync" msgstr "BibleSync" -#: ../ui/prefs.glade.h:34 -#: ../ui/prefs.gtkbuilder.h:34 -msgid "Xiphos is the first Bible study program to provide an implementation of BibleSync, a synchronization protocol for Bible programs. If you work with multiple Bible programs, or if you work in a team, or if you have classroom activities using shared study, BibleSync can be a useful tool for you. BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible applications of your own, or in a working team; Speaker, to drive a lecture audience's Bible programs to follow along; Audience, to receive the speaker's navigation." -msgstr "Xiphos is the first Bible study program to provide an implementation of BibleSync, a synchronisation protocol for Bible programs. If you work with multiple Bible programs, or if you work in a team, or if you have classroom activities using shared study, BibleSync can be a useful tool for you. BibleSync operates in 1 of 3 modes: Personal, to synchronise multiple Bible applications of your own, or in a working team; Speaker, to drive a lecture audience's Bible programs to follow along; Audience, to receive the speaker's navigation." - -#: ../ui/prefs.glade.h:35 -#: ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "Mode" +#: ../ui/prefs.glade.h:34 ../ui/prefs.gtkbuilder.h:34 +msgid "" +"Xiphos is the first Bible study program to provide an implementation of " +"BibleSync, a synchronization protocol for Bible programs. If you work with " +"multiple Bible programs, or if you work in a team, or if you have classroom " +"activities using shared study, BibleSync can be a useful tool for you. " +"BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible " +"applications of your own, or in a working team; Speaker, to drive a lecture " +"audience's Bible programs to follow along; Audience, to receive the " +"speaker's navigation." +msgstr "" +"Xiphos is the first Bible study program to provide an implementation of " +"BibleSync, a synchronisation protocol for Bible programs. If you work with " +"multiple Bible programs, or if you work in a team, or if you have classroom " +"activities using shared study, BibleSync can be a useful tool for you. " +"BibleSync operates in 1 of 3 modes: Personal, to synchronise multiple Bible " +"applications of your own, or in a working team; Speaker, to drive a lecture " +"audience's Bible programs to follow along; Audience, to receive the " +"speaker's navigation." + +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Modules" -#: ../ui/prefs.glade.h:36 -#: ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Select the mode in which BibleSync should operate." -#: ../ui/prefs.glade.h:37 -#: ../ui/prefs.gtkbuilder.h:37 +#: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 msgid "_Off" msgstr "_Off" -#: ../ui/prefs.glade.h:38 -#: ../ui/prefs.gtkbuilder.h:38 +#: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." msgstr "Disable BibleSync." -#: ../ui/prefs.glade.h:39 -#: ../ui/prefs.gtkbuilder.h:39 +#: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 msgid "BSP off radio button" msgstr "BSP off radio button" -#: ../ui/prefs.glade.h:40 -#: ../ui/prefs.gtkbuilder.h:40 +#: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 msgid "_Speaker" msgstr "_Speaker" -#: ../ui/prefs.glade.h:41 -#: ../ui/prefs.gtkbuilder.h:41 +#: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 msgid "Enable BibleSync as the speaker." msgstr "Enable BibleSync as the speaker." -#: ../ui/prefs.glade.h:42 -#: ../ui/prefs.gtkbuilder.h:42 +#: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 msgid "BSP speaker radio button" msgstr "BSP speaker radio button" -#: ../ui/prefs.glade.h:43 -#: ../ui/prefs.gtkbuilder.h:43 +#: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 msgid "_Audience" msgstr "_Audience" -#: ../ui/prefs.glade.h:44 -#: ../ui/prefs.gtkbuilder.h:44 +#: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 msgid "Enable BibleSync as a member of the audience." msgstr "Enable BibleSync as a member of the audience." -#: ../ui/prefs.glade.h:45 -#: ../ui/prefs.gtkbuilder.h:45 +#: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 msgid "BSP audience radio button" msgstr "BSP audience radio button" -#: ../ui/prefs.glade.h:46 -#: ../ui/prefs.gtkbuilder.h:46 +#: ../ui/prefs.glade.h:46 ../ui/prefs.gtkbuilder.h:46 msgid "_Personal" msgstr "_Personal" -#: ../ui/prefs.glade.h:47 -#: ../ui/prefs.gtkbuilder.h:47 +#: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 msgid "Enable BibleSync for personal or team use." msgstr "Enable BibleSync for personal or team use." -#: ../ui/prefs.glade.h:48 -#: ../ui/prefs.gtkbuilder.h:48 +#: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 msgid "BSP personal radio button" msgstr "BSP personal radio button" -#: ../ui/prefs.glade.h:49 -#: ../ui/prefs.gtkbuilder.h:49 +#: ../ui/prefs.glade.h:49 ../ui/prefs.gtkbuilder.h:49 msgid "Private" msgstr "Private" -#: ../ui/prefs.glade.h:50 -#: ../ui/prefs.gtkbuilder.h:50 -msgid "When in Personal mode, only programs running on this machine will hear your navigation." -msgstr "When in Personal mode, only programs running on this machine will hear your navigation." +#: ../ui/prefs.glade.h:50 ../ui/prefs.gtkbuilder.h:50 +msgid "" +"When in Personal mode, only programs running on this machine will hear your " +"navigation." +msgstr "" +"When in Personal mode, only programs running on this machine will hear your " +"navigation." -#: ../ui/prefs.glade.h:51 -#: ../ui/prefs.gtkbuilder.h:51 +#: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 msgid "BSP privacy button" msgstr "BSP privacy button" -#: ../ui/prefs.glade.h:52 -#: ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +#, fuzzy +msgid "Navigate:" msgstr "Navigate" -#: ../ui/prefs.glade.h:53 -#: ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Choose how to accept incoming navigation synchronisation." -#: ../ui/prefs.glade.h:54 -#: ../ui/prefs.gtkbuilder.h:54 +#: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 msgid "_Direct" msgstr "_Direct" -#: ../ui/prefs.glade.h:55 -#: ../ui/prefs.gtkbuilder.h:55 +#: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 msgid "BibleSync navigation will send Xiphos directly to the verse indicated." msgstr "BibleSync navigation will send Xiphos directly to the verse indicated." -#: ../ui/prefs.glade.h:56 -#: ../ui/prefs.gtkbuilder.h:56 +#: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 msgid "BSP nav direct radio button" msgstr "BSP nav direct radio button" -#: ../ui/prefs.glade.h:57 -#: ../ui/prefs.gtkbuilder.h:57 +#: ../ui/prefs.glade.h:57 ../ui/prefs.gtkbuilder.h:57 msgid "_Verse list" msgstr "_Verse list" -#: ../ui/prefs.glade.h:58 -#: ../ui/prefs.gtkbuilder.h:58 +#: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 msgid "BibleSync navigation will use Xiphos' sidebar verse list." msgstr "BibleSync navigation will use Xiphos' sidebar verse list." -#: ../ui/prefs.glade.h:59 -#: ../ui/prefs.gtkbuilder.h:59 +#: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 msgid "BSP nav verse list radio button" msgstr "BSP nav verse list radio button" -#: ../ui/prefs.glade.h:60 -#: ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "List Name" -#: ../ui/prefs.glade.h:61 -#: ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos will listen to Speakers according to choice here." -#: ../ui/prefs.glade.h:62 -#: ../ui/prefs.gtkbuilder.h:62 +#: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" msgstr "Selective" -#: ../ui/prefs.glade.h:63 -#: ../ui/prefs.gtkbuilder.h:63 +#: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." msgstr "Choose the Speakers to be followed." -#: ../ui/prefs.glade.h:64 -#: ../ui/prefs.gtkbuilder.h:64 +#: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 msgid "BSP listen some radio button" msgstr "BSP listen some radio button" -#: ../ui/prefs.glade.h:65 -#: ../ui/prefs.gtkbuilder.h:65 +#: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 msgid "All" msgstr "All" -#: ../ui/prefs.glade.h:66 -#: ../ui/prefs.gtkbuilder.h:66 +#: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 msgid "All Speakers will be followed." msgstr "All Speakers will be followed." -#: ../ui/prefs.glade.h:67 -#: ../ui/prefs.gtkbuilder.h:67 +#: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 msgid "BSP listen all radio button" msgstr "BSP listen all radio button" -#: ../ui/prefs.glade.h:68 -#: ../ui/prefs.gtkbuilder.h:68 +#: ../ui/prefs.glade.h:68 ../ui/prefs.gtkbuilder.h:68 msgid "None" msgstr "None" -#: ../ui/prefs.glade.h:69 -#: ../ui/prefs.gtkbuilder.h:69 +#: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." msgstr "No Speakers will be followed." -#: ../ui/prefs.glade.h:70 -#: ../ui/prefs.gtkbuilder.h:70 +#: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 msgid "BSP listen none radio button" msgstr "BSP listen none radio button" -#: ../ui/prefs.glade.h:72 -#: ../ui/prefs.gtkbuilder.h:72 -msgid "Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number." -msgstr "Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number." +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Special" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 +msgid "" +"Additional traces can be presented during BibleSync operation by enabling " +"presence, mismatch, and debug. Beware enabling these, they can be very " +"chatty. Also, decide whether to allow group parameter as Xiphos' tab number." +msgstr "" +"Additional traces can be presented during BibleSync operation by enabling " +"presence, mismatch, and debug. Beware enabling these, they can be very " +"chatty. Also, decide whether to allow group parameter as Xiphos' tab number." -#: ../ui/prefs.glade.h:73 -#: ../ui/prefs.gtkbuilder.h:73 +#: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 msgid "Presence" msgstr "Presence" -#: ../ui/prefs.glade.h:74 -#: ../ui/prefs.gtkbuilder.h:74 +#: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 msgid "Presence announcements will be shown in dialogs." msgstr "Presence announcements will be shown in dialogs." -#: ../ui/prefs.glade.h:75 -#: ../ui/prefs.gtkbuilder.h:75 +#: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 msgid "BSP presence button" msgstr "BSP presence button" -#: ../ui/prefs.glade.h:76 -#: ../ui/prefs.gtkbuilder.h:76 +#: ../ui/prefs.glade.h:76 ../ui/prefs.gtkbuilder.h:76 msgid "Mismatch" msgstr "Mismatch" -#: ../ui/prefs.glade.h:77 -#: ../ui/prefs.gtkbuilder.h:77 +#: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 msgid "Mismatches from your session will be shown in dialogs." msgstr "Mismatches from your session will be shown in dialogs." -#: ../ui/prefs.glade.h:78 -#: ../ui/prefs.gtkbuilder.h:78 +#: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 msgid "BSP mismatch button" msgstr "BSP mismatch button" -#: ../ui/prefs.glade.h:79 -#: ../ui/prefs.gtkbuilder.h:79 +#: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 msgid "Debug" msgstr "Debug" -#: ../ui/prefs.glade.h:80 -#: ../ui/prefs.gtkbuilder.h:80 +#: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." msgstr "Packet tracing." -#: ../ui/prefs.glade.h:81 -#: ../ui/prefs.gtkbuilder.h:81 +#: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 msgid "BSP event debug button" msgstr "BSP event debug button" -#: ../ui/prefs.glade.h:82 -#: ../ui/prefs.gtkbuilder.h:82 +#: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 msgid "_Group as tab" msgstr "_Group as tab" -#: ../ui/prefs.glade.h:83 -#: ../ui/prefs.gtkbuilder.h:83 -msgid "Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number." -msgstr "Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number." +#: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 +msgid "" +"Interpret the protocol's group number parameter as Xiphos' tab number. " +"Disabling this may be necessary if some Speakers' use of group number is not " +"appropriate as a tab number." +msgstr "" +"Interpret the protocol's group number parameter as Xiphos' tab number. " +"Disabling this may be necessary if some Speakers' use of group number is not " +"appropriate as a tab number." -#: ../ui/prefs.glade.h:84 -#: ../ui/prefs.gtkbuilder.h:84 +#: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 msgid "BSP event group-as-tab button" msgstr "BSP event group-as-tab button" -#: ../ui/prefs.glade.h:86 -#: ../ui/prefs.gtkbuilder.h:86 +#: ../ui/prefs.glade.h:86 ../ui/prefs.gtkbuilder.h:86 msgid "General" msgstr "General" -#: ../ui/prefs.glade.h:87 -#: ../ui/prefs.gtkbuilder.h:87 -msgid "Select a particular language for interface display, other than your usual setting" -msgstr "Select a particular language for interface display, other than your usual setting" +#: ../ui/prefs.glade.h:87 ../ui/prefs.gtkbuilder.h:87 +msgid "" +"Select a particular language for interface display, other than your usual " +"setting" +msgstr "" +"Select a particular language for interface display, other than your usual " +"setting" -#: ../ui/prefs.glade.h:88 -#: ../ui/prefs.gtkbuilder.h:88 +#: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88 msgid "Special Locale (requires restart)" msgstr "Special Locale (requires restart)" -#: ../ui/prefs.glade.h:89 -#: ../ui/prefs.gtkbuilder.h:89 +#: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 msgid "Special Locale Combo" msgstr "Special Locale Combo" -#: ../ui/prefs.glade.h:90 -#: ../ui/prefs.gtkbuilder.h:90 +#: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 msgid "Show splash screen at start up" msgstr "Show splash screen at start up" -#: ../ui/prefs.glade.h:91 -#: ../ui/prefs.gtkbuilder.h:91 +#: ../ui/prefs.glade.h:91 ../ui/prefs.gtkbuilder.h:91 msgid "Show Daily Devotion at start up" msgstr "Show Daily Devotion at start up" -#: ../ui/prefs.glade.h:92 -#: ../ui/prefs.gtkbuilder.h:92 -msgid "If you have set a preferred daily devotion module, its entry for today will be shown at startup." -msgstr "If you have set a preferred daily devotion module, its entry for today will be shown at startup." +#: ../ui/prefs.glade.h:92 ../ui/prefs.gtkbuilder.h:92 +msgid "" +"If you have set a preferred daily devotion module, its entry for today will " +"be shown at startup." +msgstr "" +"If you have set a preferred daily devotion module, its entry for today will " +"be shown at startup." -#: ../ui/prefs.glade.h:93 -#: ../ui/prefs.gtkbuilder.h:93 +#: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93 msgid "Use default Dictionary" msgstr "Use default Dictionary" -#: ../ui/prefs.glade.h:94 -#: ../ui/prefs.gtkbuilder.h:94 -msgid "Make double-click of a word always use default dictionary instead of dictionary currently displayed" -msgstr "Make double-click of a word always use default dictionary instead of dictionary currently displayed" +#: ../ui/prefs.glade.h:94 ../ui/prefs.gtkbuilder.h:94 +msgid "" +"Make double-click of a word always use default dictionary instead of " +"dictionary currently displayed" +msgstr "" +"Make double-click of a word always use default dictionary instead of " +"dictionary currently displayed" -#: ../ui/prefs.glade.h:95 -#: ../ui/prefs.gtkbuilder.h:95 +#: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 msgid "Use default Dictionary Checkbox" msgstr "Use default Dictionary Tickbox" -#: ../ui/prefs.glade.h:96 -#: ../ui/prefs.gtkbuilder.h:96 +#: ../ui/prefs.glade.h:96 ../ui/prefs.gtkbuilder.h:96 msgid "Scroll to Previous/Next Chapter" msgstr "Scroll to Previous/Next Chapter" -#: ../ui/prefs.glade.h:97 -#: ../ui/prefs.gtkbuilder.h:97 +#: ../ui/prefs.glade.h:97 ../ui/prefs.gtkbuilder.h:97 msgid "Use Bible Text scroll bar to scroll to previous or next chapter" msgstr "Use Bible Text scroll bar to scroll to previous or next chapter" -#: ../ui/prefs.glade.h:98 -#: ../ui/prefs.gtkbuilder.h:98 +#: ../ui/prefs.glade.h:98 ../ui/prefs.gtkbuilder.h:98 msgid "Scroll to Previous/Next Chapter Checkbox" msgstr "Scroll to Previous/Next Chapter Tickbox" -#: ../ui/prefs.glade.h:99 -#: ../ui/prefs.gtkbuilder.h:99 +#: ../ui/prefs.glade.h:99 ../ui/prefs.gtkbuilder.h:99 msgid "Resize images" msgstr "Resize images" -#: ../ui/prefs.glade.h:100 -#: ../ui/prefs.gtkbuilder.h:100 +#: ../ui/prefs.glade.h:100 ../ui/prefs.gtkbuilder.h:100 msgid "Automatically resize image content to fit the pane" msgstr "Automatically re-size image content to fit the pane" -#: ../ui/prefs.glade.h:101 -#: ../ui/prefs.gtkbuilder.h:101 +#: ../ui/prefs.glade.h:101 ../ui/prefs.gtkbuilder.h:101 msgid "Resize images checkbox" msgstr "Resize images tickbox" -#: ../ui/prefs.glade.h:102 -#: ../ui/prefs.gtkbuilder.h:102 +#: ../ui/prefs.glade.h:102 ../ui/prefs.gtkbuilder.h:102 msgid "Highlight current verse" msgstr "Highlight current verse" -#: ../ui/prefs.glade.h:103 -#: ../ui/prefs.gtkbuilder.h:103 +#: ../ui/prefs.glade.h:103 ../ui/prefs.gtkbuilder.h:103 msgid "Apply high-contrast highlight to current verse - see color pickers" msgstr "Apply high-contrast highlight to current verse - see color pickers" -#: ../ui/prefs.glade.h:104 -#: ../ui/prefs.gtkbuilder.h:104 +#: ../ui/prefs.glade.h:104 ../ui/prefs.gtkbuilder.h:104 msgid "Highlight current verse check box" msgstr "Highlight current verse tick box" -#: ../ui/prefs.glade.h:105 -#: ../ui/prefs.gtkbuilder.h:105 +#: ../ui/prefs.glade.h:105 ../ui/prefs.gtkbuilder.h:105 msgid "Highlight user annotations" msgstr "Highlight user annotations" -#: ../ui/prefs.glade.h:106 -#: ../ui/prefs.gtkbuilder.h:106 +#: ../ui/prefs.glade.h:106 ../ui/prefs.gtkbuilder.h:106 msgid "Use inverted highlight on user-annotated verses" msgstr "Use inverted highlight on user-annotated verses" -#: ../ui/prefs.glade.h:107 -#: ../ui/prefs.gtkbuilder.h:107 +#: ../ui/prefs.glade.h:107 ../ui/prefs.gtkbuilder.h:107 msgid "Highlight user annotations check box" msgstr "Highlight user annotations tick box" -#: ../ui/prefs.glade.h:108 -#: ../ui/prefs.gtkbuilder.h:108 +#: ../ui/prefs.glade.h:108 ../ui/prefs.gtkbuilder.h:108 msgid "Cross-references in verse list" msgstr "Cross-references in verse list" -#: ../ui/prefs.glade.h:109 -#: ../ui/prefs.gtkbuilder.h:109 +#: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109 msgid "Use the verse list for Bible cross-references instead of the previewer" msgstr "Use the verse list for Bible cross-references instead of the previewer" -#: ../ui/prefs.glade.h:110 -#: ../ui/prefs.gtkbuilder.h:110 +#: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 msgid "Xrefs in verse list check box" msgstr "Resize images tickbox" -#: ../ui/prefs.glade.h:111 -#: ../ui/prefs.gtkbuilder.h:111 +#: ../ui/prefs.glade.h:111 ../ui/prefs.gtkbuilder.h:111 msgid "Enable Prayer Lists" msgstr "Enable Prayer Lists" -#: ../ui/prefs.glade.h:112 -#: ../ui/prefs.gtkbuilder.h:112 +#: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112 msgid "Make journals/prayer lists available" msgstr "Make journals/prayer lists available" -#: ../ui/prefs.glade.h:113 -#: ../ui/prefs.gtkbuilder.h:113 +#: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113 msgid "Enable Prayer Lists Checkbox" msgstr "Enable Prayer Lists Tickkbox" -#: ../ui/prefs.glade.h:114 -#: ../ui/prefs.gtkbuilder.h:114 +#: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Verse number" -#: ../ui/prefs.glade.h:115 -#: ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Offset the verse number in several ways" -#: ../ui/prefs.glade.h:117 -#: ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Show verse number in bold text" -#: ../ui/prefs.glade.h:118 -#: ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Verse number bold checkbox" -#: ../ui/prefs.glade.h:119 -#: ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Brackets" -#: ../ui/prefs.glade.h:120 -#: ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Show verse number with [surrounding brackets]" -#: ../ui/prefs.glade.h:121 -#: ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Verse number bracket checkbox" -#: ../ui/prefs.glade.h:122 -#: ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Superscript" -#: ../ui/prefs.glade.h:123 -#: ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Show verse number as a superscript" -#: ../ui/prefs.glade.h:124 -#: ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Verse number superscript checkbox" -#: ../ui/prefs.glade.h:125 -#: ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "StudyPad default directory" -#: ../ui/prefs.glade.h:126 -#: ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Select A Directory" -#: ../ui/prefs.glade.h:127 -#: ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudyPad default directory combo" -#: ../ui/prefs.glade.h:128 -#: ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "General Misc" -#: ../ui/prefs.glade.h:129 -#: ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Main Window Modules" -#: ../ui/prefs.glade.h:130 -#: ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblical Text" -#: ../ui/prefs.glade.h:131 -#: ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Change Biblical Text Combo" -#: ../ui/prefs.glade.h:133 -#: ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Change Commentary Combo" -#: ../ui/prefs.glade.h:134 -#: ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Dictionary" - -#: ../ui/prefs.glade.h:135 -#: ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Change Dictionary Combo" -#: ../ui/prefs.glade.h:137 -#: ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Change Book Combo" -#: ../ui/prefs.glade.h:138 -#: ../ui/prefs.gtkbuilder.h:138 -#: ../ui/search-dialog.glade.h:22 -#: ../ui/search-dialog.gtkbuilder.h:23 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modules" -#: ../ui/prefs.glade.h:139 -#: ../ui/prefs.gtkbuilder.h:139 -#: ../ui/search-dialog.glade.h:86 -#: ../ui/search-dialog.gtkbuilder.h:86 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Clear all modules from the list" -#: ../ui/prefs.glade.h:140 -#: ../ui/prefs.gtkbuilder.h:140 -#: ../ui/search-dialog.glade.h:87 -#: ../ui/search-dialog.gtkbuilder.h:87 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Clear Modules from List Button" -#: ../ui/prefs.glade.h:141 -#: ../ui/prefs.gtkbuilder.h:141 -#: ../ui/search-dialog.glade.h:88 -#: ../ui/search-dialog.gtkbuilder.h:88 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Remove the selected module from the list" -#: ../ui/prefs.glade.h:142 -#: ../ui/prefs.gtkbuilder.h:142 -#: ../ui/search-dialog.glade.h:89 -#: ../ui/search-dialog.gtkbuilder.h:89 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Delete Selected Module From List Button" -#: ../ui/prefs.glade.h:143 -#: ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Open a dialogue to select modules" -#: ../ui/prefs.glade.h:144 -#: ../ui/prefs.gtkbuilder.h:144 -#: ../ui/search-dialog.glade.h:91 -#: ../ui/search-dialog.gtkbuilder.h:91 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Add Modules" -#: ../ui/prefs.glade.h:145 -#: ../ui/prefs.gtkbuilder.h:145 -#: ../ui/search-dialog.glade.h:92 -#: ../ui/search-dialog.gtkbuilder.h:92 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Open Selection Dialogue Button" -#: ../ui/prefs.glade.h:146 -#: ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modules Parallel" -#: ../ui/prefs.glade.h:147 -#: ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Special Purpose Modules" -#: ../ui/prefs.glade.h:148 -#: ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Daily Devotional" -#: ../ui/prefs.glade.h:149 -#: ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Daily Devotional Combo" -#: ../ui/prefs.glade.h:150 -#: ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebrew Lexicon" -#: ../ui/prefs.glade.h:151 -#: ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebrew Lexicon Combo" -#: ../ui/prefs.glade.h:152 -#: ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Greek Lexicon" -#: ../ui/prefs.glade.h:153 -#: ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Greek Lexicon Combo" -#: ../ui/prefs.glade.h:154 -#: ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Default Dictionary" -#: ../ui/prefs.glade.h:155 -#: ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Change Default Dictionary Combo" -#: ../ui/prefs.glade.h:156 -#: ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Personal Notes" -#: ../ui/prefs.glade.h:157 -#: ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Change Personal Notes Combo" -#: ../ui/prefs.glade.h:158 -#: ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modules Misc" -#: ../ui/prefs.glade.h:159 -#: ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 -#: ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Module Selection" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4523,153 +4233,131 @@ msgid "+5" msgstr "+5" -#: ../ui/search-dialog.glade.h:1 -#: ../ui/search-dialog.gtkbuilder.h:1 +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Enable BibleSync as the speaker." + +#: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Advanced Search" -#: ../ui/search-dialog.glade.h:2 -#: ../ui/search-dialog.gtkbuilder.h:2 +#: ../ui/search-dialog.glade.h:2 ../ui/search-dialog.gtkbuilder.h:2 msgid "_Lucene Search Syntax" msgstr "_Lucene Search Syntax" -#: ../ui/search-dialog.glade.h:3 -#: ../ui/search-dialog.gtkbuilder.h:3 -msgid "Open a brief explanation of the syntax used for optimized \"lucene\" searches." -msgstr "Build an index of the selected modules, for optimised (\"lucene\") searching." +#: ../ui/search-dialog.glade.h:3 ../ui/search-dialog.gtkbuilder.h:3 +msgid "" +"Open a brief explanation of the syntax used for optimized \"lucene\" " +"searches." +msgstr "" +"Build an index of the selected modules, for optimised (\"lucene\") searching." -#: ../ui/search-dialog.glade.h:4 -#: ../ui/search-dialog.gtkbuilder.h:4 +#: ../ui/search-dialog.glade.h:4 ../ui/search-dialog.gtkbuilder.h:4 msgid "_Attribute Search" msgstr "Attribute Search" -#: ../ui/search-dialog.glade.h:5 -#: ../ui/search-dialog.gtkbuilder.h:5 +#: ../ui/search-dialog.glade.h:5 ../ui/search-dialog.gtkbuilder.h:5 msgid "Open a brief explanation of attribute-based searches." msgstr "Open a brief explanation of attribute-based searches." -#: ../ui/search-dialog.glade.h:6 -#: ../ui/search-dialog.gtkbuilder.h:7 +#: ../ui/search-dialog.glade.h:6 ../ui/search-dialog.gtkbuilder.h:7 msgid "for " msgstr "for " -#: ../ui/search-dialog.glade.h:7 -#: ../ui/search-dialog.gtkbuilder.h:8 +#: ../ui/search-dialog.glade.h:7 ../ui/search-dialog.gtkbuilder.h:8 msgid "Main Search Entry" msgstr "Main Search Entry" -#: ../ui/search-dialog.glade.h:8 -#: ../ui/search-dialog.gtkbuilder.h:9 +#: ../ui/search-dialog.glade.h:8 ../ui/search-dialog.gtkbuilder.h:9 msgid "Start/stop searching" msgstr "Start/stop searching" -#: ../ui/search-dialog.glade.h:9 -#: ../ui/search-dialog.gtkbuilder.h:10 +#: ../ui/search-dialog.glade.h:9 ../ui/search-dialog.gtkbuilder.h:10 msgid "Find Button" msgstr "Find Button" -#: ../ui/search-dialog.glade.h:10 -#: ../ui/search-dialog.gtkbuilder.h:11 +#: ../ui/search-dialog.glade.h:10 ../ui/search-dialog.gtkbuilder.h:11 msgid "Search Criteria Treeview" msgstr "Search Criteria Treeview" -#: ../ui/search-dialog.glade.h:11 -#: ../ui/search-dialog.gtkbuilder.h:12 +#: ../ui/search-dialog.glade.h:11 ../ui/search-dialog.gtkbuilder.h:12 msgid "Scope" msgstr "Scope" -#: ../ui/search-dialog.glade.h:12 -#: ../ui/search-dialog.gtkbuilder.h:14 +#: ../ui/search-dialog.glade.h:12 ../ui/search-dialog.gtkbuilder.h:14 msgid "Search entire module" msgstr "Search entire module" -#: ../ui/search-dialog.glade.h:13 -#: ../ui/search-dialog.gtkbuilder.h:13 +#: ../ui/search-dialog.glade.h:13 ../ui/search-dialog.gtkbuilder.h:13 msgid "Entire module" msgstr "Entire module" -#: ../ui/search-dialog.glade.h:14 -#: ../ui/search-dialog.gtkbuilder.h:15 +#: ../ui/search-dialog.glade.h:14 ../ui/search-dialog.gtkbuilder.h:15 msgid "Entire module radiobutton" msgstr "Entire module radiobutton" -#: ../ui/search-dialog.glade.h:15 -#: ../ui/search-dialog.gtkbuilder.h:17 +#: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17 msgid "Use the results of the last search as the scope of the search" msgstr "Use the results of the last search as the scope of the search" -#: ../ui/search-dialog.glade.h:16 -#: ../ui/search-dialog.gtkbuilder.h:16 +#: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16 msgid "Current results" msgstr "Current results" -#: ../ui/search-dialog.glade.h:17 -#: ../ui/search-dialog.gtkbuilder.h:18 +#: ../ui/search-dialog.glade.h:17 ../ui/search-dialog.gtkbuilder.h:18 msgid "Current results radiobutton" msgstr "Current results radiobutton" -#: ../ui/search-dialog.glade.h:18 -#: ../ui/search-dialog.gtkbuilder.h:20 +#: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20 msgid "Use a custom range for the scope of the search" msgstr "Use a custom range for the scope of the search" -#: ../ui/search-dialog.glade.h:19 -#: ../ui/search-dialog.gtkbuilder.h:19 +#: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19 msgid "Custom verse range" msgstr "Custom verse range" -#: ../ui/search-dialog.glade.h:20 -#: ../ui/search-dialog.gtkbuilder.h:21 +#: ../ui/search-dialog.glade.h:20 ../ui/search-dialog.gtkbuilder.h:21 msgid "Custom verse range radiobutton" msgstr "Custom verse range radiobutton" -#: ../ui/search-dialog.glade.h:21 -#: ../ui/search-dialog.gtkbuilder.h:22 +#: ../ui/search-dialog.glade.h:21 ../ui/search-dialog.gtkbuilder.h:22 msgid "Custom Range Selector Combo" msgstr "Custom Range Selector Combo" -#: ../ui/search-dialog.glade.h:23 -#: ../ui/search-dialog.gtkbuilder.h:25 +#: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25 msgid "Use a single module for the search" msgstr "Use a single module for the search" -#: ../ui/search-dialog.glade.h:24 -#: ../ui/search-dialog.gtkbuilder.h:24 +#: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24 msgid "Single module" msgstr "Single module" -#: ../ui/search-dialog.glade.h:25 -#: ../ui/search-dialog.gtkbuilder.h:26 +#: ../ui/search-dialog.glade.h:25 ../ui/search-dialog.gtkbuilder.h:26 msgid "Single module radiobutton" msgstr "Single module radiobutton" -#: ../ui/search-dialog.glade.h:26 -#: ../ui/search-dialog.gtkbuilder.h:28 +#: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28 msgid "Use the current module list for the search" msgstr "Use the current module list for the search" -#: ../ui/search-dialog.glade.h:27 -#: ../ui/search-dialog.gtkbuilder.h:27 +#: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27 msgid "Module list" msgstr "Module list" -#: ../ui/search-dialog.glade.h:28 -#: ../ui/search-dialog.gtkbuilder.h:29 +#: ../ui/search-dialog.glade.h:28 ../ui/search-dialog.gtkbuilder.h:29 msgid "Module list radiobutton" msgstr "Module list radiobutton" -#: ../ui/search-dialog.glade.h:29 -#: ../ui/search-dialog.gtkbuilder.h:31 +#: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31 msgid "Use a custom module list for the search" msgstr "Use a custom module list for the search" -#: ../ui/search-dialog.glade.h:30 -#: ../ui/search-dialog.gtkbuilder.h:30 +#: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30 msgid "Custom module list" msgstr "Custom module list" -#: ../ui/search-dialog.glade.h:31 -#: ../ui/search-dialog.gtkbuilder.h:32 +#: ../ui/search-dialog.glade.h:31 ../ui/search-dialog.gtkbuilder.h:32 msgid "Custom module list radiobutton" msgstr "Custom module list radiobutton" @@ -4677,13 +4365,11 @@ msgid "Custom Module List Combo" msgstr "Custom Module List Combo" -#: ../ui/search-dialog.glade.h:33 -#: ../ui/search-dialog.gtkbuilder.h:33 +#: ../ui/search-dialog.glade.h:33 ../ui/search-dialog.gtkbuilder.h:33 msgid "Search Type" msgstr "Search Type" -#: ../ui/search-dialog.glade.h:34 -#: ../ui/search-dialog.gtkbuilder.h:35 +#: ../ui/search-dialog.glade.h:34 ../ui/search-dialog.gtkbuilder.h:35 msgid "" "Fast, featureful, index-based search\n" "Indexes must have been built beforehand:\n" @@ -4693,336 +4379,275 @@ "Indexes must have been built beforehand:\n" "See Module Manager's maintenance functions" -#: ../ui/search-dialog.glade.h:37 -#: ../ui/search-dialog.gtkbuilder.h:34 +#: ../ui/search-dialog.glade.h:37 ../ui/search-dialog.gtkbuilder.h:34 msgid "Optimized (\"Lucene\")" msgstr "Optimised (\"Lucene\")" -#: ../ui/search-dialog.glade.h:38 -#: ../ui/search-dialog.gtkbuilder.h:38 +#: ../ui/search-dialog.glade.h:38 ../ui/search-dialog.gtkbuilder.h:38 msgid "Optimized (\"Lucene\") radiobutton" msgstr "Optimised (\"Lucene\") radiobutton" -#: ../ui/search-dialog.glade.h:40 -#: ../ui/search-dialog.gtkbuilder.h:40 +#: ../ui/search-dialog.glade.h:40 ../ui/search-dialog.gtkbuilder.h:40 msgid "Multi word radiobutton" msgstr "Multi word radiobutton" -#: ../ui/search-dialog.glade.h:42 -#: ../ui/search-dialog.gtkbuilder.h:42 +#: ../ui/search-dialog.glade.h:42 ../ui/search-dialog.gtkbuilder.h:42 msgid "Regular expression radiobutton" msgstr "Regular expression radiobutton" -#: ../ui/search-dialog.glade.h:44 -#: ../ui/search-dialog.gtkbuilder.h:44 +#: ../ui/search-dialog.glade.h:44 ../ui/search-dialog.gtkbuilder.h:44 msgid "Exact phrase radiobutton" msgstr "Exact phrase radiobutton" -#: ../ui/search-dialog.glade.h:45 -#: ../ui/search-dialog.gtkbuilder.h:46 +#: ../ui/search-dialog.glade.h:45 ../ui/search-dialog.gtkbuilder.h:46 msgid "Make selections on the Attribute Search tab" msgstr "Make selections on the Attribute Search tab" -#: ../ui/search-dialog.glade.h:46 -#: ../ui/search-dialog.gtkbuilder.h:45 +#: ../ui/search-dialog.glade.h:46 ../ui/search-dialog.gtkbuilder.h:45 msgid "Attributes" msgstr "Attributes" -#: ../ui/search-dialog.glade.h:47 -#: ../ui/search-dialog.gtkbuilder.h:47 +#: ../ui/search-dialog.glade.h:47 ../ui/search-dialog.gtkbuilder.h:47 msgid "Attributes radiobutton" msgstr "Attributes radiobutton" -#: ../ui/search-dialog.glade.h:48 -#: ../ui/search-dialog.gtkbuilder.h:48 +#: ../ui/search-dialog.glade.h:48 ../ui/search-dialog.gtkbuilder.h:48 msgid "Options" msgstr "Options" -#: ../ui/search-dialog.glade.h:50 -#: ../ui/search-dialog.gtkbuilder.h:50 +#: ../ui/search-dialog.glade.h:50 ../ui/search-dialog.gtkbuilder.h:50 msgid "Match case checkbox" msgstr "Match case tickbox" -#: ../ui/search-dialog.glade.h:51 -#: ../ui/search-dialog.gtkbuilder.h:51 +#: ../ui/search-dialog.glade.h:51 ../ui/search-dialog.gtkbuilder.h:51 msgid "Search Criteria" msgstr "Search Criteria" -#: ../ui/search-dialog.glade.h:52 -#: ../ui/search-dialog.gtkbuilder.h:52 +#: ../ui/search-dialog.glade.h:52 ../ui/search-dialog.gtkbuilder.h:52 msgid "Show in main window" msgstr "Show in main window" -#: ../ui/search-dialog.glade.h:53 -#: ../ui/search-dialog.gtkbuilder.h:53 +#: ../ui/search-dialog.glade.h:53 ../ui/search-dialog.gtkbuilder.h:53 msgid "Save search results as bookmarks" msgstr "Save search results as bookmarks" -#: ../ui/search-dialog.glade.h:54 -#: ../ui/search-dialog.gtkbuilder.h:54 +#: ../ui/search-dialog.glade.h:54 ../ui/search-dialog.gtkbuilder.h:54 msgid "Export current search results" msgstr "Export current search results" -#: ../ui/search-dialog.glade.h:55 -#: ../ui/search-dialog.gtkbuilder.h:55 +#: ../ui/search-dialog.glade.h:55 ../ui/search-dialog.gtkbuilder.h:55 msgid "Export" msgstr "Export" -#: ../ui/search-dialog.glade.h:56 -#: ../ui/search-dialog.gtkbuilder.h:56 +#: ../ui/search-dialog.glade.h:56 ../ui/search-dialog.gtkbuilder.h:56 msgid "Clear lists for new search" msgstr "Clear lists for new search" -#: ../ui/search-dialog.glade.h:57 -#: ../ui/search-dialog.gtkbuilder.h:57 +#: ../ui/search-dialog.glade.h:57 ../ui/search-dialog.gtkbuilder.h:57 msgid "Found" msgstr "Found" -#: ../ui/search-dialog.glade.h:58 -#: ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Result Summary Window" -#: ../ui/search-dialog.glade.h:59 -#: ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Result Summary Table" -#: ../ui/search-dialog.glade.h:60 -#: ../ui/search-dialog.gtkbuilder.h:60 +#: ../ui/search-dialog.glade.h:60 ../ui/search-dialog.gtkbuilder.h:60 msgid "Search Results" msgstr "Search Results" -#: ../ui/search-dialog.glade.h:61 -#: ../ui/search-dialog.gtkbuilder.h:61 +#: ../ui/search-dialog.glade.h:61 ../ui/search-dialog.gtkbuilder.h:61 msgid "Preview" msgstr "Preview" -#: ../ui/search-dialog.glade.h:62 -#: ../ui/search-dialog.gtkbuilder.h:62 +#: ../ui/search-dialog.glade.h:62 ../ui/search-dialog.gtkbuilder.h:62 msgid "Results" msgstr "Results" -#: ../ui/search-dialog.glade.h:63 -#: ../ui/search-dialog.gtkbuilder.h:63 +#: ../ui/search-dialog.glade.h:63 ../ui/search-dialog.gtkbuilder.h:63 msgid "Create new custom range" msgstr "Create new custom range" -#: ../ui/search-dialog.glade.h:64 -#: ../ui/search-dialog.gtkbuilder.h:64 +#: ../ui/search-dialog.glade.h:64 ../ui/search-dialog.gtkbuilder.h:64 msgid "New Range Button" msgstr "New Range Button" -#: ../ui/search-dialog.glade.h:65 -#: ../ui/search-dialog.gtkbuilder.h:65 +#: ../ui/search-dialog.glade.h:65 ../ui/search-dialog.gtkbuilder.h:65 msgid "Save custom range" msgstr "Save custom range" -#: ../ui/search-dialog.glade.h:66 -#: ../ui/search-dialog.gtkbuilder.h:66 +#: ../ui/search-dialog.glade.h:66 ../ui/search-dialog.gtkbuilder.h:66 msgid "Save Range Button" msgstr "Save Range Button" -#: ../ui/search-dialog.glade.h:67 -#: ../ui/search-dialog.gtkbuilder.h:67 +#: ../ui/search-dialog.glade.h:67 ../ui/search-dialog.gtkbuilder.h:67 msgid "Delete selected range" msgstr "Delete selected range" -#: ../ui/search-dialog.glade.h:68 -#: ../ui/search-dialog.gtkbuilder.h:68 +#: ../ui/search-dialog.glade.h:68 ../ui/search-dialog.gtkbuilder.h:68 msgid "Delete Range Button" msgstr "Delete Range Button" -#: ../ui/search-dialog.glade.h:69 -#: ../ui/search-dialog.gtkbuilder.h:69 +#: ../ui/search-dialog.glade.h:69 ../ui/search-dialog.gtkbuilder.h:69 msgid "Ranges" msgstr "Ranges" -#: ../ui/search-dialog.glade.h:70 -#: ../ui/search-dialog.gtkbuilder.h:70 +#: ../ui/search-dialog.glade.h:70 ../ui/search-dialog.gtkbuilder.h:70 msgid "Range Name" msgstr "Range Name" -#: ../ui/search-dialog.glade.h:71 -#: ../ui/search-dialog.gtkbuilder.h:71 +#: ../ui/search-dialog.glade.h:71 ../ui/search-dialog.gtkbuilder.h:71 msgid "Range Name Entry" msgstr "Range Name Entry" -#: ../ui/search-dialog.glade.h:72 -#: ../ui/search-dialog.gtkbuilder.h:72 +#: ../ui/search-dialog.glade.h:72 ../ui/search-dialog.gtkbuilder.h:72 msgid "Range Definition" msgstr "Range Definition" -#: ../ui/search-dialog.glade.h:73 -#: ../ui/search-dialog.gtkbuilder.h:73 +#: ../ui/search-dialog.glade.h:73 ../ui/search-dialog.gtkbuilder.h:73 msgid "Range Definition Entry" msgstr "Range Definition Entry" -#: ../ui/search-dialog.glade.h:74 -#: ../ui/search-dialog.gtkbuilder.h:74 +#: ../ui/search-dialog.glade.h:74 ../ui/search-dialog.gtkbuilder.h:74 msgid "e.g. Matt-John;Rev4" msgstr "e.g. Matt-John;Rev4" -#: ../ui/search-dialog.glade.h:75 -#: ../ui/search-dialog.gtkbuilder.h:75 +#: ../ui/search-dialog.glade.h:75 ../ui/search-dialog.gtkbuilder.h:75 msgid "Custom Range Preview" msgstr "Custom Range Preview" -#: ../ui/search-dialog.glade.h:76 -#: ../ui/search-dialog.gtkbuilder.h:76 +#: ../ui/search-dialog.glade.h:76 ../ui/search-dialog.gtkbuilder.h:76 msgid "Custom Verse Ranges" msgstr "Custom Verse Ranges" -#: ../ui/search-dialog.glade.h:77 -#: ../ui/search-dialog.gtkbuilder.h:77 +#: ../ui/search-dialog.glade.h:77 ../ui/search-dialog.gtkbuilder.h:77 msgid "Create a new module list" msgstr "Create a new module list" -#: ../ui/search-dialog.glade.h:78 -#: ../ui/search-dialog.gtkbuilder.h:78 +#: ../ui/search-dialog.glade.h:78 ../ui/search-dialog.gtkbuilder.h:78 msgid "New Custom Module List Button" msgstr "New Custom Module List Button" -#: ../ui/search-dialog.glade.h:79 -#: ../ui/search-dialog.gtkbuilder.h:79 +#: ../ui/search-dialog.glade.h:79 ../ui/search-dialog.gtkbuilder.h:79 msgid "Save the module list" msgstr "Save the module list" -#: ../ui/search-dialog.glade.h:80 -#: ../ui/search-dialog.gtkbuilder.h:80 +#: ../ui/search-dialog.glade.h:80 ../ui/search-dialog.gtkbuilder.h:80 msgid "Save Custom Module List Button" msgstr "Save Custom Module List Button" -#: ../ui/search-dialog.glade.h:81 -#: ../ui/search-dialog.gtkbuilder.h:81 +#: ../ui/search-dialog.glade.h:81 ../ui/search-dialog.gtkbuilder.h:81 msgid "Delete the selected list" msgstr "Delete the selected list" -#: ../ui/search-dialog.glade.h:82 -#: ../ui/search-dialog.gtkbuilder.h:82 +#: ../ui/search-dialog.glade.h:82 ../ui/search-dialog.gtkbuilder.h:82 msgid "Clear Custom Module List Button" msgstr "Clear Custom Module List Button" -#: ../ui/search-dialog.glade.h:83 -#: ../ui/search-dialog.gtkbuilder.h:83 +#: ../ui/search-dialog.glade.h:83 ../ui/search-dialog.gtkbuilder.h:83 msgid "Module Lists" msgstr "Module Lists" -#: ../ui/search-dialog.glade.h:84 -#: ../ui/search-dialog.gtkbuilder.h:84 +#: ../ui/search-dialog.glade.h:84 ../ui/search-dialog.gtkbuilder.h:84 msgid "List Name" msgstr "List Name" -#: ../ui/search-dialog.glade.h:85 -#: ../ui/search-dialog.gtkbuilder.h:85 +#: ../ui/search-dialog.glade.h:85 ../ui/search-dialog.gtkbuilder.h:85 msgid "Custom Module List Name Entry" msgstr "Custom Module List Name Entry" -#: ../ui/search-dialog.glade.h:90 -#: ../ui/search-dialog.gtkbuilder.h:90 +#: ../ui/search-dialog.glade.h:90 ../ui/search-dialog.gtkbuilder.h:90 msgid "Open a dialog to select modules to add to the list" msgstr "Open a dialogue to select modules to add to the list" -#: ../ui/search-dialog.glade.h:93 -#: ../ui/search-dialog.gtkbuilder.h:93 +#: ../ui/search-dialog.glade.h:93 ../ui/search-dialog.gtkbuilder.h:93 msgid "Custom Module Lists" msgstr "Custom Module Lists" -#: ../ui/search-dialog.glade.h:94 -#: ../ui/search-dialog.gtkbuilder.h:94 +#: ../ui/search-dialog.glade.h:94 ../ui/search-dialog.gtkbuilder.h:94 msgid "Attribute" msgstr "Attribute" -#: ../ui/search-dialog.glade.h:95 -#: ../ui/search-dialog.gtkbuilder.h:96 +#: ../ui/search-dialog.glade.h:95 ../ui/search-dialog.gtkbuilder.h:96 msgid "Search for Strongs Numbers like G4442 or H1121" msgstr "Search for Strong's Numbers like G4442 or H1121" -#: ../ui/search-dialog.glade.h:96 -#: ../ui/search-dialog.gtkbuilder.h:95 +#: ../ui/search-dialog.glade.h:96 ../ui/search-dialog.gtkbuilder.h:95 msgid "Strongs Numbers" msgstr "Strong's Numbers" -#: ../ui/search-dialog.glade.h:97 -#: ../ui/search-dialog.gtkbuilder.h:97 +#: ../ui/search-dialog.glade.h:97 ../ui/search-dialog.gtkbuilder.h:97 msgid "Strongs Numbers radiobutton" msgstr "Strong's Numbers radiobutton" -#: ../ui/search-dialog.glade.h:98 -#: ../ui/search-dialog.gtkbuilder.h:99 +#: ../ui/search-dialog.glade.h:98 ../ui/search-dialog.gtkbuilder.h:99 msgid "Search for Morphological tags" msgstr "Search for Morphological tags" -#: ../ui/search-dialog.glade.h:100 -#: ../ui/search-dialog.gtkbuilder.h:100 +#: ../ui/search-dialog.glade.h:100 ../ui/search-dialog.gtkbuilder.h:100 msgid "Morphological Tags radiobutton" msgstr "Morphological Tags radiobutton" -#: ../ui/search-dialog.glade.h:101 -#: ../ui/search-dialog.gtkbuilder.h:102 +#: ../ui/search-dialog.glade.h:101 ../ui/search-dialog.gtkbuilder.h:102 msgid "Search in footnotes" msgstr "Search in footnotes" -#: ../ui/search-dialog.glade.h:103 -#: ../ui/search-dialog.gtkbuilder.h:103 +#: ../ui/search-dialog.glade.h:103 ../ui/search-dialog.gtkbuilder.h:103 msgid "Footnotes radiobutton" msgstr "Footnotes radiobutton" -#: ../ui/search-dialog.glade.h:104 -#: ../ui/search-dialog.gtkbuilder.h:104 +#: ../ui/search-dialog.glade.h:104 ../ui/search-dialog.gtkbuilder.h:104 msgid "Results Display Options" msgstr "Results Display Options" -#: ../ui/search-dialog.glade.h:105 -#: ../ui/search-dialog.gtkbuilder.h:106 +#: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106 msgid "In modules that have Strong's Numbers" msgstr "In modules that have Strong's Numbers" -#: ../ui/search-dialog.glade.h:106 -#: ../ui/search-dialog.gtkbuilder.h:105 +#: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105 msgid "Show Strong's Numbers" msgstr "Show Strong's Numbers" -#: ../ui/search-dialog.glade.h:107 -#: ../ui/search-dialog.gtkbuilder.h:107 +#: ../ui/search-dialog.glade.h:107 ../ui/search-dialog.gtkbuilder.h:107 msgid "Show Strong's Numbers checkbox" msgstr "Show Strong's Numbers tickbox" -#: ../ui/search-dialog.glade.h:108 -#: ../ui/search-dialog.gtkbuilder.h:109 +#: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109 msgid "In modules that have Morphological Tags" msgstr "In modules that have Morphological Tags" -#: ../ui/search-dialog.glade.h:109 -#: ../ui/search-dialog.gtkbuilder.h:108 +#: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108 msgid "Show Morphological Tags" msgstr "Show Morphological Tags" -#: ../ui/search-dialog.glade.h:110 -#: ../ui/search-dialog.gtkbuilder.h:110 +#: ../ui/search-dialog.glade.h:110 ../ui/search-dialog.gtkbuilder.h:110 msgid "Show Morphological Tags checkbox" msgstr "Show Morphological Tags tickbox" -#: ../ui/search-dialog.glade.h:111 -#: ../ui/search-dialog.gtkbuilder.h:112 +#: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112 msgid "In modules that have Footnotes" msgstr "In modules that have Footnotes" -#: ../ui/search-dialog.glade.h:112 -#: ../ui/search-dialog.gtkbuilder.h:111 +#: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111 msgid "Show Footnotes" msgstr "Show Footnotes" -#: ../ui/search-dialog.glade.h:113 -#: ../ui/search-dialog.gtkbuilder.h:113 +#: ../ui/search-dialog.glade.h:113 ../ui/search-dialog.gtkbuilder.h:113 msgid "Show Footnotes checkbox" msgstr "Show Footnotes tickbox" -#: ../ui/search-dialog.glade.h:114 -#: ../ui/search-dialog.gtkbuilder.h:114 +#: ../ui/search-dialog.glade.h:114 ../ui/search-dialog.gtkbuilder.h:114 msgid "Attribute Search" msgstr "Attribute Search" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Module Selection" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "search module" @@ -5059,13 +4684,11 @@ msgid "gtk-ok" msgstr "gtk-ok" -#: ../ui/xi-menus.glade.h:2 -#: ../ui/xi-menus.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:2 ../ui/xi-menus.gtkbuilder.h:2 msgid "Open Study_pad" msgstr "Open Study_pad" -#: ../ui/xi-menus.glade.h:3 -#: ../ui/xi-menus.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:3 ../ui/xi-menus.gtkbuilder.h:3 msgid "_Open Session" msgstr "_Open Session" @@ -5073,8 +4696,7 @@ msgid "Open a saved tab settings collection" msgstr "Open a saved tab settings collection" -#: ../ui/xi-menus.glade.h:5 -#: ../ui/xi-menus.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:5 ../ui/xi-menus.gtkbuilder.h:4 msgid "_Save Session" msgstr "_Save Session" @@ -5082,8 +4704,7 @@ msgid "Save this collection of tab settings" msgstr "Save this collection of tab settings" -#: ../ui/xi-menus.glade.h:7 -#: ../ui/xi-menus.gtkbuilder.h:5 +#: ../ui/xi-menus.glade.h:7 ../ui/xi-menus.gtkbuilder.h:5 msgid "_New Prayerlist/Journal" msgstr "_New Prayerlist/Journal" @@ -5091,8 +4712,7 @@ msgid "Create a new journal or prayerlist from a template" msgstr "Create a new journal or prayer list from a template" -#: ../ui/xi-menus.glade.h:10 -#: ../ui/xi-menus.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:10 ../ui/xi-menus.gtkbuilder.h:7 msgid "_Search" msgstr "_Search" @@ -5100,8 +4720,7 @@ msgid "Bring the simple sidebar search forward" msgstr "Bring the simple sidebar search forward" -#: ../ui/xi-menus.glade.h:12 -#: ../ui/xi-menus.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:12 ../ui/xi-menus.gtkbuilder.h:8 msgid "_Advanced Search" msgstr "_Advanced Search" @@ -5109,8 +4728,7 @@ msgid "Open the advanced search dialog, to run complex queries" msgstr "Open the advanced search dialog, to run complex queries" -#: ../ui/xi-menus.glade.h:14 -#: ../ui/xi-menus.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:14 ../ui/xi-menus.gtkbuilder.h:9 msgid "_Preferences" msgstr "_Preferences" @@ -5118,42 +4736,40 @@ msgid "Use module manager to install and remove Sword modules" msgstr "Use module manager to install and remove Sword modules" -#: ../ui/xi-menus.glade.h:16 -#: ../ui/xi-menus.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:16 ../ui/xi-menus.gtkbuilder.h:10 msgid "_Module Manager" msgstr "_Module Manager" -#: ../ui/xi-menus.glade.h:18 -#: ../ui/xi-menus.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_View" + +#: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Preview _Daily Devotion" #: ../ui/xi-menus.glade.h:19 msgid "Show today's entry from your selected daily devotional in the previewer" -msgstr "Show today's entry from your selected daily devotional in the previewer" +msgstr "" +"Show today's entry from your selected daily devotional in the previewer" -#: ../ui/xi-menus.glade.h:20 -#: ../ui/xi-menus.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:20 ../ui/xi-menus.gtkbuilder.h:13 msgid "_Bible" msgstr "_Bible" -#: ../ui/xi-menus.glade.h:21 -#: ../ui/xi-menus.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:21 ../ui/xi-menus.gtkbuilder.h:14 msgid "_Preview" msgstr "_Preview" -#: ../ui/xi-menus.glade.h:22 -#: ../ui/xi-menus.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:22 ../ui/xi-menus.gtkbuilder.h:15 msgid "_Commentary/Book" msgstr "_Commentary/Book" -#: ../ui/xi-menus.glade.h:23 -#: ../ui/xi-menus.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:23 ../ui/xi-menus.gtkbuilder.h:16 msgid "Dictionar_y" msgstr "Dictionar_y" -#: ../ui/xi-menus.glade.h:24 -#: ../ui/xi-menus.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:24 ../ui/xi-menus.gtkbuilder.h:17 msgid "L_ink Tabs" msgstr "L_ink Tabs" @@ -5161,8 +4777,7 @@ msgid "Make all tabs' Bibles navigate together" msgstr "Make all tabs' Bibles navigate together" -#: ../ui/xi-menus.glade.h:26 -#: ../ui/xi-menus.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:26 ../ui/xi-menus.gtkbuilder.h:18 msgid "_Read Aloud" msgstr "_Read Aloud" @@ -5170,8 +4785,7 @@ msgid "Turn on text-to-speech reading of Bible verses as they are selected" msgstr "Turn on text-to-speech reading of Bible verses as they are selected" -#: ../ui/xi-menus.glade.h:28 -#: ../ui/xi-menus.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19 msgid "Show Verse _Numbers" msgstr "Show Verse _Numbers" @@ -5179,8 +4793,7 @@ msgid "Display verse numbers in the text" msgstr "Display verse numbers in the text" -#: ../ui/xi-menus.glade.h:30 -#: ../ui/xi-menus.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:30 ../ui/xi-menus.gtkbuilder.h:20 msgid "_Highlight Current Verse" msgstr "_Highlight Current Verse" @@ -5188,8 +4801,7 @@ msgid "Apply a high-contrast highlight to the current verse" msgstr "Apply a high-contrast highlight to the current verse" -#: ../ui/xi-menus.glade.h:32 -#: ../ui/xi-menus.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:32 ../ui/xi-menus.gtkbuilder.h:21 msgid "_Attach/Detach Sidebar" msgstr "_Attach/Detach Sidebar" @@ -5197,8 +4809,7 @@ msgid "Operate the sidebar as a separate window" msgstr "Operate the sidebar as a separate window" -#: ../ui/xi-menus.glade.h:34 -#: ../ui/xi-menus.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:34 ../ui/xi-menus.gtkbuilder.h:22 msgid "_Show/Hide Attached Sidebar" msgstr "_Show/Hide Attached Sidebar" @@ -5206,8 +4817,7 @@ msgid "Remove the sidebar entirely from view" msgstr "Remove the sidebar entirely from view" -#: ../ui/xi-menus.glade.h:36 -#: ../ui/xi-menus.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:36 ../ui/xi-menus.gtkbuilder.h:23 msgid "Show Parallel View in a _Tab" msgstr "Show Parallel View in a _Tab" @@ -5215,8 +4825,7 @@ msgid "Provide the full-chapter parallel Bible window as another tab" msgstr "Provide the full-chapter parallel Bible window as another tab" -#: ../ui/xi-menus.glade.h:38 -#: ../ui/xi-menus.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:38 ../ui/xi-menus.gtkbuilder.h:24 msgid "Show Previe_wer in the Sidebar" msgstr "Show Previe_wer in the Sidebar" @@ -5224,8 +4833,7 @@ msgid "Select Previewer position between sidebar or beneath Bible" msgstr "Select Previewer position between sidebar or beneath Bible" -#: ../ui/xi-menus.glade.h:41 -#: ../ui/xi-menus.gtkbuilder.h:26 +#: ../ui/xi-menus.glade.h:41 ../ui/xi-menus.gtkbuilder.h:26 msgid "_Contents" msgstr "_Contents" @@ -5233,8 +4841,7 @@ msgid "Open the help viewer on the Xiphos manual" msgstr "Open the help viewer on the Xiphos manual" -#: ../ui/xi-menus.glade.h:43 -#: ../ui/xi-menus.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:43 ../ui/xi-menus.gtkbuilder.h:27 msgid "_Mailing List" msgstr "_Mailing List" @@ -5242,8 +4849,7 @@ msgid "Open a browser on the users' mailing list webpage" msgstr "Open a browser on the users' mailing list webpage" -#: ../ui/xi-menus.glade.h:45 -#: ../ui/xi-menus.gtkbuilder.h:28 +#: ../ui/xi-menus.glade.h:45 ../ui/xi-menus.gtkbuilder.h:28 msgid "_Live Chat" msgstr "_Live Chat" @@ -5251,8 +4857,7 @@ msgid "Open a browser on an interface to live IRC chat" msgstr "Open a browser on an interface to live IRC chat" -#: ../ui/xi-menus.glade.h:47 -#: ../ui/xi-menus.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:47 ../ui/xi-menus.gtkbuilder.h:29 msgid "_Report Bug" msgstr "_Report Bug" @@ -5260,8 +4865,7 @@ msgid "Open a browser on our bug tracker" msgstr "Open a browser on our bug tracker" -#: ../ui/xi-menus.glade.h:49 -#: ../ui/xi-menus.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:49 ../ui/xi-menus.gtkbuilder.h:30 msgid "About _Translation" msgstr "About _Translation" @@ -5269,8 +4873,7 @@ msgid "Learn about translating the Xiphos interface to other languages" msgstr "Learn about translating the Xiphos interface to other languages" -#: ../ui/xi-menus.glade.h:51 -#: ../ui/xi-menus.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:51 ../ui/xi-menus.gtkbuilder.h:31 msgid "_About The SWORD Project" msgstr "_About The SWORD Project" @@ -5278,8 +4881,7 @@ msgid "Learn about The Sword Project, of which Xiphos is one application" msgstr "Learn about The Sword Project, of which Xiphos is one application" -#: ../ui/xi-menus.glade.h:53 -#: ../ui/xi-menus.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:53 ../ui/xi-menus.gtkbuilder.h:32 msgid "About _Xiphos" msgstr "About _Xiphos" @@ -5287,33 +4889,27 @@ msgid "Learn about Xiphos" msgstr "Learn about Xiphos" -#: ../ui/xi-menus.glade.h:57 -#: ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Annotate Verse" -#: ../ui/xi-menus.glade.h:60 -#: ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Open Module" -#: ../ui/xi-menus.glade.h:62 -#: ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Note" -#: ../ui/xi-menus.glade.h:63 -#: ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Open in editor" -#: ../ui/xi-menus.glade.h:65 -#: ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Verse Per Line" -#: ../ui/xi-menus.glade.h:73 -#: ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Footnote/Cross-ref Markers" @@ -5321,227 +4917,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Show non-anonymous markers e.g. \"*n23\"" -#: ../ui/xi-menus.glade.h:79 -#: ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variants" -#: ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Image Content" -#: ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respect Font Faces" -#: ../ui/xi-menus.glade.h:85 -#: ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Commentary by Chapter" -#: ../ui/xi-menus.glade.h:86 -#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Double-space" -#: ../ui/xi-menus.glade.h:87 -#: ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Lookup Selection" -#: ../ui/xi-menus.glade.h:88 -#: ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Use Current Dictionary" -#: ../ui/xi-menus.glade.h:89 -#: ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Browse in BibleMap.org" -#: ../ui/xi-menus.glade.h:90 -#: ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Unlock This Module" -#: ../ui/xi-menus.glade.h:91 -#: ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Display Book Heading" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Display Chapter Heading" -#: ../ui/xi-menus.glade.h:93 -#: ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Rename Pers.Comm." -#: ../ui/xi-menus.glade.h:94 -#: ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Dump Pers.Comm." -#: ../ui/xi-menus.glade.h:95 -#: ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Read Selection Aloud" -#: ../ui/xi-menus.glade.h:96 -#: ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Save these results as a single bookmark" -#: ../ui/xi-menus.glade.h:97 -#: ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Save list as a single bookmark" -#: ../ui/xi-menus.glade.h:98 -#: ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Save these results as a series of bookmarks in their own folder" -#: ../ui/xi-menus.glade.h:99 -#: ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Save list as a series of bookmarks" -#: ../ui/xi-menus.glade.h:100 -#: ../ui/xi-menus-popup.gtkbuilder.h:89 -msgid "Provide a dialog in which to paste a line of verse references, to fill the verse list." -msgstr "Provide a dialog in which to paste a line of verse references, to fill the verse list." +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 +msgid "" +"Provide a dialog in which to paste a line of verse references, to fill the " +"verse list." +msgstr "" +"Provide a dialog in which to paste a line of verse references, to fill the " +"verse list." -#: ../ui/xi-menus.glade.h:101 -#: ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Populate verse list" -#: ../ui/xi-menus.glade.h:102 -#: ../ui/xi-menus-popup.gtkbuilder.h:91 -msgid "Send this verse list via BibleSync to others, if you are in Personal or Speaker mode." -msgstr "Send this verse list via BibleSync to others, if you are in Personal or Speaker mode." +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Drop down history list" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 +msgid "" +"Send this verse list via BibleSync to others, if you are in Personal or " +"Speaker mode." +msgstr "" +"Send this verse list via BibleSync to others, if you are in Personal or " +"Speaker mode." -#: ../ui/xi-menus.glade.h:103 -#: ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Send list via BibleSync" -#: ../ui/xi-menus.glade.h:104 -#: ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Export List" -#: ../ui/xi-menus.glade.h:105 -#: ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Open this bookmark in a new tab" -#: ../ui/xi-menus.glade.h:106 -#: ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Open in new tab" -#: ../ui/xi-menus.glade.h:107 -#: ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Open this bookmark in a dialogue" -#: ../ui/xi-menus.glade.h:108 -#: ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Open in a dialogue" -#: ../ui/xi-menus.glade.h:109 -#: ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Add new folder to selected folder" -#: ../ui/xi-menus.glade.h:111 -#: ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Insert new bookmark here" -#: ../ui/xi-menus.glade.h:112 -#: ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Insert Bookmark" -#: ../ui/xi-menus.glade.h:113 -#: ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Edit bookmark item" -#: ../ui/xi-menus.glade.h:114 -#: ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Edit Item" -#: ../ui/xi-menus.glade.h:115 -#: ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Delete item" -#: ../ui/xi-menus.glade.h:117 -#: ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Expand all Bookmarks groups" -#: ../ui/xi-menus.glade.h:118 -#: ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Expand All" -#: ../ui/xi-menus.glade.h:119 -#: ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Collapse all Bookmarks groups" -#: ../ui/xi-menus.glade.h:120 -#: ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Collapse All" -#: ../ui/xi-menus.glade.h:121 -#: ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Allow items to be moved from one folder to another" -#: ../ui/xi-menus.glade.h:122 -#: ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Allow Reordering" -#: ../ui/xi-menus.glade.h:123 -#: ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Load other bookmarks file (default: from BibleTime)" -#: ../ui/xi-menus.glade.h:124 -#: ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Import Bookmarks" -#: ../ui/xi-menus.glade.h:125 -#: ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Remove folder and save it" -#: ../ui/xi-menus.glade.h:126 -#: ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Export Folder" -#: ../ui/xi-menus.glade.h:127 -#: ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Open selected module in a new tab" -#: ../ui/xi-menus.glade.h:128 -#: ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5549,97 +5118,79 @@ "Open selected module in a\n" "\tseparate ['dialogue'] window" -#: ../ui/xi-menus.glade.h:130 -#: ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Open in a separate window" -#: ../ui/xi-menus.glade.h:131 -#: ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Create a new simple prayer list" -#: ../ui/xi-menus.glade.h:132 -#: ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Simple" -#: ../ui/xi-menus.glade.h:133 -#: ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Create a new subject prayer list" -#: ../ui/xi-menus.glade.h:134 -#: ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Subject" -#: ../ui/xi-menus.glade.h:135 -#: ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Create a new monthly journal" -#: ../ui/xi-menus.glade.h:136 -#: ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Monthly" -#: ../ui/xi-menus.glade.h:137 -#: ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Create a new daily journal" -#: ../ui/xi-menus.glade.h:138 -#: ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Daily" -#: ../ui/xi-menus.glade.h:139 -#: ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Create a new outlined topic" -#: ../ui/xi-menus.glade.h:140 -#: ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Outlined" -#: ../ui/xi-menus.glade.h:141 -#: ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Open module in editor or plain display window" -#: ../ui/xi-menus.glade.h:142 -#: ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Open in separate window" -#: ../ui/xi-menus.glade.h:143 -#: ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Add a sub-item" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Add Sub-Item" -#: ../ui/xi-menus.glade.h:145 -#: ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Add an item" -#: ../ui/xi-menus.glade.h:146 -#: ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Add Item" -#: ../ui/xi-menus.glade.h:147 -#: ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Remove this item" -#: ../ui/xi-menus.glade.h:149 -#: ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Edit this item" @@ -5651,6 +5202,188 @@ msgid "Study the Bible" msgstr "Study the Bible" +#~ msgid "network setup errors." +#~ msgstr "network setup errors." + +#~ msgid " client socket" +#~ msgstr " client socket" + +#~ msgid " server socket" +#~ msgstr " server socket" + +#~ msgid "bad magic" +#~ msgstr "bad magic" + +#~ msgid "bad protocol version" +#~ msgstr "bad protocol version" + +#~ msgid "bad msg type" +#~ msgstr "bad msg type" + +#~ msgid "bad packet count" +#~ msgstr "bad packet count" + +#~ msgid "bad packet index" +#~ msgstr "bad packet index" + +#~ msgid "bad body format" +#~ msgstr "bad body format" + +#~ msgid "missing required header " +#~ msgstr "missing required header " + +#~ msgid "UUID spoofed: wrong ipaddr." +#~ msgstr "UUID spoofed: wrong ipaddr." + +#~ msgid "Ignoring echo." +#~ msgstr "Ignoring echo." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domain not 'BIBLE-VERSE': " + +#~ msgid "Invalid group: " +#~ msgstr "Invalid group: " + +#~ msgid " present at " +#~ msgstr " present at " + +#~ msgid " using " +#~ msgstr " using " + +#~ msgid "[no dump ready]" +#~ msgstr "[no dump ready]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Transmit failed.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." + +#~ msgid "Page %d of %d" +#~ msgstr "Page %d of %d" + +#~ msgid "Save As" +#~ msgstr "Save As" + +#~ msgid "HTML Output" +#~ msgstr "HTML Output" + +#~ msgid "HTML Source" +#~ msgstr "HTML Source" + +#~ msgid "Plain Source" +#~ msgstr "Plain Source" + +#~ msgid "_Quit" +#~ msgstr "_Quit" + +#~ msgid "_Open" +#~ msgstr "_Open" + +#~ msgid "_Save" +#~ msgstr "_Save" + +#~ msgid "Save _As..." +#~ msgstr "Save _As..." + +#~ msgid "Open new document" +#~ msgstr "Open new document" + +#~ msgid "Delete current note" +#~ msgstr "Delete current note" + +#~ msgid "HTML _Output" +#~ msgstr "HTML _Output" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML Source" + +#~ msgid "_Plain Source" +#~ msgstr "_Plain Source" + +#~ msgid "Unlock " +#~ msgstr "Unlock " + +#~ msgid "Preparing to print" +#~ msgstr "Preparing to print" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Printing is not supported on this printer" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Printer %s does not support PostScript printing." + +#~ msgid "Printing" +#~ msgstr "Printing" + +#~ msgid "Waiting to print" +#~ msgstr "Waiting to print" + +#~ msgid "An error occurred while printing" +#~ msgstr "An error occurred while printing" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "It was not possible to print your document: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + +#~ msgid "Mode" +#~ msgstr "Mode" + +#~ msgid "Listen" +#~ msgstr "Listen" + #~ msgid "Tabs" #~ msgstr "Tabs" diff -Nru xiphos-4.0.0+dfsg1/po/es.po xiphos-4.0.4+dfsg1/po/es.po --- xiphos-4.0.0+dfsg1/po/es.po 2014-12-21 19:54:38.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/es.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-20 07:53-0600\n" "Last-Translator: Eduardo Rivas \n" "Language-Team: Español; Castellano <>\n" @@ -19,300 +19,267 @@ "X-Generator: Gtranslator 2.91.6\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "errores en la configuración de red." - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "socket del cliente" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "socket del servidor" - -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "magia incorrecta" - -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "versión incorrecta del protocolo" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" +msgstr "" +"Error de Xiphos: \"no puede suceder\", display_mod: null\n" +"Por favor reporte este error. sword_main.cc:set_treekey\n" +"¿Qué estaba haciendo cuando ocurrió este error?" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "tipo incorrecto de mensaje" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Configuración no encontrada" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "conteo incorrecto de paquetes" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "¿Desea eliminar la nota para" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "índice incorrecto de paquetes" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Abrir" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "formato incorrecto del cuerpo" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Documento sin título" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "cabecera requerida no encontrada" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "¿Guardar los cambios al documento" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "UUID falsificado: dirección ip incorrecta." +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "antes de cerrar?" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "Ignorando eco." +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Si no guarda el archivo, los cambios se perderán permanentemente." -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Dominio no 'BIBLE-VERSE':" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Archivo" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "Grupo no válido:" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr " presente en " +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Editor de notas" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr " usando " +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Editor de Lista de oración/Diario" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "[vaciado incompleto]" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Acerca del módulo Sword" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "select < 0" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Gestor de Módulos" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "Transmisión fallida.\n" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Opciones" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -"Imposible iniciar multicast; BibleSync está desactivado. Si su conexión de " -"red cambió durante la ejecución de este programa, podría ser suficiente para " -"rehabilitarlo." -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Error de Xiphos: \"no puede suceder\", display_mod: null\n" -"Por favor reporte este error. sword_main.cc:set_treekey\n" -"¿Qué estaba haciendo cuando ocurrió este error?" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Alcance" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Configuración no encontrada" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Devocional diario" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Página %d de %d" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapas" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Abrir" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Imágenes" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Guardar como" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Glosarios" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Documento sin título" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "¿Desea eliminar la nota para" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblia" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Salida en HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Fuente en HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Fuente en texto plano" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Comentario" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "Im_primir..." +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Diccionario" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Vista Pre_via de Impresión" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Libros generales" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Salir" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Renombrar comentario" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Abrir" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Guardar" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Guardar _como..." +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Diario" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nuevo" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Desconocido" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Abrir un documento nuevo" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Lista de Módulos" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Eliminar" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Rangos" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Eliminar la nota actual" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Archivo" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Fuente de instalación" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Salida en HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_Fuente en HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "Fuente en texto P_lano" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Ver" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Módulos de la ventana principal" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Guardar" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formato" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Insertar enlace" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Encabezados" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "¿Guardar los cambios al documento" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Notas al pie" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "antes de cerrar?" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Referencias cruzadas" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Si no guarda el archivo, los cambios se perderán permanentemente." +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Números de Strong" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Archivo" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Etiquetas morfológicas" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemas" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Editor de notas" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Palabras de Cristo en rojo" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Editor de Lista de oración/Diario" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Acentos griegos" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Desbloquear " +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Puntos de vocales hebreas" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Preparando para imprimir" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Cantilena hebrea" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Esta impresora no soporta impresión" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "La impresora %s no soporta impresión PostScript." +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteración" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Imprimiendo" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Esperando para imprimir" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Ocurrió un error mientras se imprimía" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Segmentación del morfema" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "No se pudo imprimir su documento: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Acerca del módulo Sword" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Atributo" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Este módulo no tiene información Acerca De." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Opciones" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -333,18 +300,20 @@ "\n" " Se pueden descargar libros del proyecto SWORD." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "El Proyecto SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "¿Le gusta utilizar Xiphos para estudiar la Biblia? ¿Quisiera poder hacerlo " "en su propio idioma? ¡Usted puede traducir Xiphos!\n" @@ -353,23 +322,23 @@ "idiomas. Si usted es capaz de traducirlo, siga el enlace a continuación, " "póngase en contacto y forme parte de nuestro esfuerzo." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Acerca de la traducción de Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Vea el TRANSLATION-HOWTO en el código fuente de Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Desarrollo de Xiphos" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2014 El Equipo de Desarrollo de Xiphos" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright 2000-2015 El Equipo de Desarrollo de Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -382,79 +351,79 @@ "SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Marcador" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Introduzca el nombre de la carpeta" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nombre de la carpeta" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Carpeta: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Especificar archivo de marcadores" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Editar" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nombre de la carpeta: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nombre del marcador: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Versículo: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Módulo: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "¿Eliminar la carpeta seleccionada" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(y todos sus contenidos)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Eliminar el marcador seleccionado" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Añadir" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etiqueta: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Resultados de la búsqueda: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -462,154 +431,154 @@ "No se pueden abrir marcadores multi-referencia\n" "en pestañas separadas." -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Marcadores" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Clave de cifrado para el módulo %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "para:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Introduzca la clave de cifrado: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Cerrar sin guardar" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Cerrar _sin guardar" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Lista de versículos" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "ListaDeVersículos" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "ResultasDeBúsqueda" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "¡Verifique los derechos de autor antes de exportar!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Buscar" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Introduzca una palabra o frase" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Buscar hacia atrás" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Encontrar siguiente" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Definir tipografía para el módulo" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Cambiar tipografía para" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Módulo" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Tipografía actual: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Utilizar la tipografía por defecto para este módulo" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "¡ERROR! Xiphos se colgará debido a un error \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Por favor, reporte este error al equipo Xiphos con:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "¡ERROR! Xiphos se colgará debido a un error \"STRING\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "El módulo no soporta %s." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Sin ventanas." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Se envió la navegación actual." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Sin hablar." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Software de Estudio Bíblico" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Abrir nueva pestaña" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Vista estándar" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Vista de comentario" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Vista de libro" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Bienvenido a Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -629,33 +598,33 @@ "Por eso, el renombrado de los comentarios\n" "personales no está disponible en Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Renombrar comentario" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Elija el nombre para el comentario" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nuevo nombre" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nombre: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Los nombres de los módulos sólo pueden contener [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos ya detectó un módulo con ese nombre." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -664,7 +633,7 @@ "Error al crear la nueva configuración:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -672,7 +641,7 @@ "Error de construcción de configuración:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "No hay módulos en este panel." @@ -793,20 +762,20 @@ "Puede cerrar en cualquier momento éstas instrucciones y el diálogo de " "introducción general." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "¿Eliminar éstos módulos?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Preparando para eliminar" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Removiendo" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Eliminar" @@ -826,23 +795,23 @@ msgid "Install" msgstr "Instalar" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "¿Archivar estos módulos?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Preparando para archivar" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archivando" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archivar" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -850,57 +819,61 @@ "¿Construir índice de búsqueda rápida para estos\n" "módulos? (Puede demorar varios minutos)" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Preparando para indexar" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexando" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indexar" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "¿Eliminar índice de búsqueda rápida para estos módulos?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Preparando para eliminar índice" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Eliminando índice" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Eliminación" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Este módulo no tiene información Acerca De." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nombre del módulo" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "La marca significa que el módulo ya está instalado" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Haga clic en la caja para trabajar en este módulo" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Haga clic en la caja para seleccionar este módulo para instalación/" "actualización" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Instalado" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -909,7 +882,7 @@ "este módulo para búsqueda rápida (vea el panel de Mantenimiento para esta " "función)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -917,13 +890,13 @@ "El icono de cerrojo significa que el módulo está encriptado y requiere la " "compra de una clave de apertura del propietario del contenido." -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Acerca de" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -931,19 +904,19 @@ "El icono de actualización significa que el módulo instalado es de una " "versión anterior a la disponible. Debe actualizar el módulo." -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Disponible" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Tamaño" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Descripción" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -952,33 +925,33 @@ "Falló `mkdir %s`:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " archivado en: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Los diarios y las listas de oración no pueden ser indexados." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "Fallaron %s" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Terminado" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Desconocido" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -987,7 +960,7 @@ "Repositorio:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -995,54 +968,44 @@ "Categorizado por \n" "Tipo de módulo" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Textos Bíblicos" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Comentarios" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Diccionarios" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glosarios" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Devocionales diarios" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Libros generales" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Mapas" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Imágenes" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Cultos/No ortodoxos" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1050,95 +1013,95 @@ "Categorizado por \n" "Disponibilidad" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Actualizaciones" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Desinstalados" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Lista de oración/Diario" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Actualizando desde fuente remota" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Fuente remota no encontrada" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configurar" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tipo" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Leyenda" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Fuente" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Directorio" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Usuario" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Contraseña" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Fuentes de módulos" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Añadir/Quitar" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Elegir" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Módulos" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Instalar/Actualizar" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Mantenimiento" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Por favor actualize" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "¡La lista de módulos no está actualizada!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1146,7 +1109,7 @@ "Ha desinstalado la última Biblia.\n" "Xiphos requiere de por lo menos una." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1154,111 +1117,123 @@ "Aun no hay Biblias instaladas.\n" "Xiphos no puede continuar sin una." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Las fuentes remotas estándar fueron cargadas." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "No se pudieron cargar las fuentes estándar de Crosswire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Eliminar la fuente seleccionada" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Introducir una fuente remota" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Leyenda:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tipo:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Anfitrión:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Directorio:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Usuario (opcional):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Contraseña (opcional):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Ya existe una fuente con ese nombre." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Eliminar una fuente remota" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[ningún módulo]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Ir afuera, a la sección que contiene a ésta" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Ir al elemento anterior" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Ir al elemento siguiente" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Ir adentro, a la primera subsección" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Sincronizar el desplazamiento de esta ventana con la ventana principal" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralelo" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Separar/Unir" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Opciones de módulo" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Vista paralela" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "Contraseña de la sesión BibleSync" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Contraseña:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1266,97 +1241,96 @@ "Falló la selección de modo.\n" "Establezca \"Debug\" en inténtelo de nuevo para descubrir por qué." -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Falló la selección de modo.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (contraseña: \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Deshabilitado" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personal" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Orador" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Audiencia" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Seleccionar --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Los cambios de idioma tendrán efecto al reiniciar." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferencias" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "General" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opciones" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Tipografías" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Color" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Tipos y tamaños" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Especial" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "¿Limpiar lista?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "¿Desea limpiar la lista de módulos?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "¿Eliminar módulo?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "¿Desea eliminar el módulo seleccionado?" @@ -1375,20 +1349,20 @@ msgid "found in " msgstr "encontrado en " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nueva lista %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "La última lista de módulos no puede ser eliminada" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "¿Borrar lista?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "¿Está seguro de querer borrar:" @@ -1408,7 +1382,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1481,7 +1455,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1517,15 +1491,15 @@ "N-ASF para \"nombre, acusativo singular femenino\" -- vea el módulo Robinson " "para más detalles." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "El módulo no es Biblia ni comentario" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync no está activo para transmisiones." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1533,105 +1507,95 @@ "Esta es una búsqueda inclusiva (\"AND\"):\n" "Encuentre coincidencias mostrando todas las palabras." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Abrir búsqueda avanzada" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Abrir el diálogo de Búsqueda avanzada." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Buscar en el módulo" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblia" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Comentario" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Tipo de búsqueda" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Multi-palabra" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Expresión regular" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Frase exacta" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Opciones de búsqueda" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Coincidir mayúsculas" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Alcance de búsqueda" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Sin rango" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Utilizar límites" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Última búsqueda" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Límites" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Inferior" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Superior" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "¿Abrir módulo en el editor?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Si no, se abrirá sólo para visualizar." -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Pegar referencias de versículos" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Lista:" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Búsqueda" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Barra lateral" @@ -1639,73 +1603,73 @@ msgid "Powered by the SWORD Project" msgstr "Gracias al Proyecto SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "No se puede crear directorio de pestañas." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Elemento de la Lista de oración/Diario" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nuevo nombre" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Eliminar el elemento seleccionado" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Enero" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Febrero" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marzo" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Abril" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mayo" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Junio" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Julio" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Agosto" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Septiembre" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Octubre" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Noviembre" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Diciembre" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1713,7 +1677,99 @@ "No se puede determinar el tamaño de la imagen.\n" "Xiphos no puede ajustar la imagen a la ventana." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "[ningún módulo]" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Haga clic en la caja para trabajar en este módulo" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Disponible" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Navegación" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "IP address: " +msgstr "Dirección" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1722,247 +1778,270 @@ "Etiqueta de anotación personal codificada de manera incorrecta:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Capítulo" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos no puede entender más de un argumento." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Inicializando HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Construyendo interfaz" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Inicializando SWORD" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Cargando preferencias" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Mostrando Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Vista previa" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Nota al pie" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Referencia cruzada" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfología" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Regresar a " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Números de Strong" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Notas al pie" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Etiquetas morfológicas" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Puntos de vocales hebreas" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Cantilena hebrea" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Acentos griegos" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Referencias cruzadas" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemas" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Encabezados" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentación del morfema" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Palabras de Cristo en rojo" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteración" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Variantes textuales" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Lectura primaria" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Lectura secundaria" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Todas las lecturas" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteración" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Glosarios" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "ver contexto" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Crecimiento" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Para crecimiento
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Salvación" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Para salvación
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Salud" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Para salud
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Misc" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Misceláneo
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punto x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punto y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punto z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Tópico Menor 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subtópico 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Tópico Menor 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subtópico 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Tópico Menor 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subtópico 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Tópico Menor 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subtópico 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Nombre de la nueva lista de oración o diario" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos ya encontró esa lista de oración." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1971,19 +2050,19 @@ "Xiphos no puede crear la ruta del módulo:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Una lista de oración básica. \\par\\par Módulo creado por Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ListaDeOraciónBásica" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MiListaDeOración" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1991,104 +2070,104 @@ "Gente:
Luis
Juan
Sara

Iglesia:
sillas
comunión
Biblias para los misioneros


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Una lista de oración basada en los sujetos. \\par\\par Módulo creado por " "Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "ListaDeOraciónPorTemas" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Luis
Juan
Sara
Daniel
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Crecimiento espiritual" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Miguel
Roberto
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sara
Juan
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Un lista de oración mensual \\par\\par Módulo creado por Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "ListaDeOraciónMensual" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Un diario. \\par\\par Módulo creado por Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Diario" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Esbozo (ej. un sermón). \\par\\par Módulo creado por Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "Esbozo" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Tópico Mayor A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Tópico Mayor A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Tópico Mayor B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Tópico Mayor B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Tópico Mayor C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Tópico Mayor C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Anotación del usuario" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Resultado de la búsqueda %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "¿Eliminar rango?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "¿Desea eliminar este rango?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Buscar: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2099,16 +2178,16 @@ "Este módulo no está instalado.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Ajuste la lista de módulos." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "No existe un índice de búsqueda rápida para %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2116,7 +2195,7 @@ "\n" "La búsqueda en este módulo es ahora 'multi-palabra'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2124,41 +2203,35 @@ "\n" "Vea el panel de Mantenimiento en el Gestor de Módulos." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Búsqueda finalizada" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "coincidencias" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "No hay módulo de comentario." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "¡$HOME no está definido!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos no pudo crear .xiphos:\n" -"%s\n" -"\n" -"Xiphos no puede continuar." +"Xiphos no puede crear la ruta del módulo:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "no se puede crear " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2167,13 +2240,13 @@ "respaldo.\n" "Alguna información puede haberse perdido." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "Archivo de preferencias vacío, no se ha encontrado una copia de respaldo y " "se ha perdido información." -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2189,11 +2262,11 @@ "Xiphos no puede continuar\n" "y se cerrará ahora." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Instalación del módulo Biblia terminada." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2205,11 +2278,11 @@ msgid "verse" msgstr "versículo" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "capítulo" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2217,7 +2290,7 @@ "El archivo para abreviaturas de lenguaje\n" "de Xiphos no se encuentra." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2225,7 +2298,7 @@ "El archivo para abreviaturas de lenguaje\n" "de Xiphos no se puede abrir." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2233,7 +2306,7 @@ "Xiphos no puede hacer espacio\n" "para abreviaturas de lenguaje." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2242,7 +2315,7 @@ "archivo de abreviaturas de lenguaje." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2251,11 +2324,11 @@ "No hay idiomas que coincidan con `%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Nombres de libros y menús pueden no ser traducidos" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2266,7 +2339,7 @@ "%s.\n" "¿Desea abrir estos módulos?%s" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2278,11 +2351,11 @@ "El primero se abrirá en la ventana principal\n" "y los otros en ventanas separadas." -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Se solicitó un devocional diario, pero no hay ninguno instalado." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2306,89 +2379,94 @@ "\n" "Introduzca la clave en el diálogo." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Limpiar historial" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Lista de versículos" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "No se encuentra la URL:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos no pudo ejecutar %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Error del visualizador:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Mostrar %s en la ventana principal" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "No se pudo crear el documento exitosamente. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "¿Qué debo hacer para ser salvo?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Hechos 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Efesios 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romanos 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "¿Qué es el Evangelio?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "No se pudo analizar el documento correctamente. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "documento vacío \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "tipo equivocado, nodo raíz != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "tipo equivocado, nodo raíz != Copy_Export\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Capítulo %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Capítulo %d

" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2401,7 +2479,7 @@ "Capítulo %d\n" "\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2414,12 +2492,12 @@ "Capítulo %d\n" "\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Capítulo %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2428,82 +2506,82 @@ "%s: %s Capítulo %d\n" "\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Antiguo Testamento" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gén - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nuevo Testamento" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Apo" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Lista de módulos de ejemplo" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "tipo equivocado, nodo raíz != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2512,7 +2590,7 @@ "Ha fallado el guardado del archivo de preferencias. estado %d, tamaño %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Intentando revertir a la copia anterior." @@ -2526,13 +2604,13 @@ msgstr "Diálogo de marcadores" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Crear nueva carpeta" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nueva carpeta" @@ -2541,7 +2619,7 @@ msgstr "Nuevo ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Cancelar marcador" @@ -2554,22 +2632,22 @@ msgstr "Entrada de etiqueta" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Versículo:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Entrada de versículo" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Módulo:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Entrada de módulo" @@ -2577,6 +2655,10 @@ msgid "Bookmark Folder Treeview" msgstr "Vista en árbol de la carpeta marcadores" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Insertar enlace" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2630,6 +2712,12 @@ msgid "_Delete Personal Comment" msgstr "_Eliminar Comentario Personal" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Archivo" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Guardar esta nota" @@ -2638,6 +2726,14 @@ msgid "_Save (Personal Comment)" msgstr "_Guardar (Comentario Personal)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Vista Pre_via de Impresión" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "Im_primir..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Salir" @@ -2646,6 +2742,11 @@ msgid "For_mat" msgstr "For_mato" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Guardar" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Imprimir este documento" @@ -2683,7 +2784,7 @@ msgstr "Documento nuevo" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copiar/Exportar pasaje" @@ -2720,7 +2821,7 @@ msgstr "Exportar todo el libro" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Libro" @@ -2829,8 +2930,8 @@ msgid "Open about dialog" msgstr "Abrir diálogo \"Acerca de\"" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Negrita" @@ -2870,12 +2971,16 @@ msgid "Delete selection" msgstr "Eliminar selección" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Eliminar" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Eliminar selección" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Eliminar elemento" @@ -3031,6 +3136,10 @@ msgid "Right justify paragraph" msgstr "Alinear el párrafo a la derecha" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nuevo" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "Crear nuevo archivo" @@ -3148,120 +3257,85 @@ msgid "_Edit" msgstr "_Editar" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "Ay_uda" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normal" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Título 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Título 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Título 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Título 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Título 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Título 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Dirección" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Preformateado" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Lista no numerada" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Lista de números romanos" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Lista numerada" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Lista alfabética" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Tachado" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Establecer el color de tipografía del texto seleccionado" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Resaltar el texto seleccionado con el color elegido" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Marcar/Desmarcar versículo" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Marcar" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Desmarcar" @@ -3338,33 +3412,41 @@ msgstr "Borrar índice de búsqueda rápida para los módulos seleccionados" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Continuar" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Gestor de Módulos" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "ADVERTENCIA Use con cuidado si vive en un país donde es perseguido " "por su fe." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Añadir y quitar fuentes" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Fuentes locales actuales" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3373,15 +3455,15 @@ "los módulos. Esta carpeta debe contener las subcarpetas \"mods.d\" y " "\"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Eliminar una de las carpetas locales de las fuentes de instalación" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Fuentes remotas actuales" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3389,43 +3471,43 @@ "Añadir una fuente de instalación remota personalizada. El hostname y la " "carpeta de este repositorio deben ser conocidos." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Eliminar fuente remota" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Fuente de instalación" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Local" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Remota" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Destino de instalación" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Área personal, sólo para su uso:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Carpeta personal (home)" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Área del sistema, para todos los usuarios:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Directorio de Sword en el sistema" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3433,10 +3515,14 @@ "Advertencia: Si vive en un país donde es perseguido por su fe y no " "desea arriesgarse a ser detectado NO use la instalación remota. " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Carpeta de instalación local" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Historial en lista desplegable" @@ -3445,11 +3531,11 @@ msgid "Choose book to display" msgstr "Elija el libro a mostrar" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Botón selector de libros" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Apocalipsis de Juan" @@ -3457,11 +3543,11 @@ msgid "Choose chapter to display" msgstr "Elija el capítulo a mostrar" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Botón de cambio de capítulo" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3622,11 +3708,12 @@ "guiar lo que la audiencia ve en sus programas bíblicos; Audiencia, para " "seguir la navegación de un orador." -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "Modo" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Módulos" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Selecciona el modo en que opera BibleSync" @@ -3694,11 +3781,12 @@ msgid "BSP privacy button" msgstr "Botón de opción BSP privacidad" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +#, fuzzy +msgid "Navigate:" msgstr "Navegación" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Seleccionar como aceptar la sincronización de navegación entrante" @@ -3726,11 +3814,12 @@ msgid "BSP nav verse list radio button" msgstr "Botón de opción de BSP navegación de versículos" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "Escuchar" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Lista de nombres" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Determinar como Xiphos escuchará a los oradores" @@ -3770,7 +3859,12 @@ msgid "BSP listen none radio button" msgstr "Botón de opción BSP seguir ninguno" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Especial" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3966,185 +4060,184 @@ msgstr "Marca para habilitar listas de oración" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Número de versículo" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Desplazar el número de versículo de varias maneras" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Mostrar números de versículos en negrita" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Tamaño de número de versículo en negrita" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Corchetes" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Mostrar números de versículos [rodeados por corchetes]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Marca para números de versículos con corchetes" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Superíndice" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Mostrar números de versículos como superíndices" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Marca de número de versículos como superíndice" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Carpeta por defecto para StudyPad" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Seleccionar carpeta" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Combo para el directorio predeterminado de StudyPad" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Miscelánea General" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Módulos de la ventana principal" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Texto bíblico" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Combo para texto bíblico" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Combo para comentario" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Diccionario" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Combo para diccionario" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Combo para libro" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Módulos" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Quitar todos los módulos de la lista" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Botón de limpieza de la lista de módulos" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Eliminar el módulo seleccionado de la lista" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Botón para borrar el módulo seleccionado de la lista" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Abrir diálogo para seleccionar módulos" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Añadir módulos" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Botón de Abrir diálogo de selección" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Paralelo de Módulos" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Módulos especiales" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Devocional diario" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Combo para el devocional diario" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Léxico hebreo" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Combo para el léxico hebreo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Léxico griego" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Combo para el léxico griego" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Diccionario predeterminado" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Combo para diccionario predeterminado" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Notas personales" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Combo para notas personales" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Miscelánea de módulos" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Selección de módulo" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4173,6 +4266,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Activar BybleSync para oradores" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Búsqueda avanzada" @@ -4382,11 +4480,11 @@ msgid "Found" msgstr "Encontrado" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Ventana de resumen de resultados" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabla de resumen de resultados" @@ -4578,6 +4676,11 @@ msgid "Attribute Search" msgstr "Búsqueda por atributos" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Selección de módulo" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "Módulo de búsqueda" @@ -4670,6 +4773,10 @@ msgid "_Module Manager" msgstr "_Gestor de Módulos" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Ver" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Vista previa _Devoción diariamente" @@ -4818,27 +4925,27 @@ msgid "Learn about Xiphos" msgstr "Acerca de Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Anotar versículo" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Abrir Módulo" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Nota" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Abrir en editor" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Versículo por línea" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Marcadores de notas al pie / referencias cruzadas" @@ -4846,80 +4953,80 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Mostrar marcadores no anónimos (p. ej.: \"*n23\")" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variantes" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Contenido de imagen" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respetar tipografías" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Comentario por capítulo" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Doble espacio" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Selección de búsqueda" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Utilizar el diccionario actual" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Navegar en BilbleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Desbloquear este módulo" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Mostrar el encabezado del libro" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Mostrar el encabezado del capítulo" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Renombrar Comentarios personales" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Desechar comentario personal" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Leer la selección en voz alta" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Guardar estos resultados en un solo marcador" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Guardar lista como un solo marcador" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" "Guardar estos resultados como una serie de marcadores en su propia carpeta" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Guardar lista como una serie de marcadores" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." @@ -4927,11 +5034,20 @@ "Abrir un diálogo para pegar una línea de citas para llenar las lista de " "versículos." -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Llenar lista de versículos" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Historial en lista desplegable" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." @@ -4939,99 +5055,99 @@ "Enviar esta lista de versículos a través de BibleSync (modo Personal y " "Orador)" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Enviar lista vía BibleSync" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exportar lista" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Abrir este marcador en una nueva pestaña" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Abrir en una nueva pestaña" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Abrir este marcador en un diálogo" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Abrir en diálogo" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Añadir una nueva carpeta a la carpeta seleccionada" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Insertar un nuevo marcador aquí" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Insertar marcador" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Editar el elemento marcador" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Editar elemento" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Borrar elemento" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Expandir todos los grupos de marcadores" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Expandir todos" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Colapsar todos los grupos de marcadores" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Colapsar todos" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Permitir que los elementos se muevan de una carpeta a otra" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Permitir reordenación" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Cargar otro archivo de marcadores (predeterminado: BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importar marcadores" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Eliminar carpeta y guardarla" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Exportar carpeta" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Abrir el módulo seleccionado en una nueva pestaña" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5039,79 +5155,79 @@ "Abrir el módulo seleccionado en una\n" "\t ventana ['diálogo'] separada" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Abrir en una nueva ventana" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Crear una lista de oración simple" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Simple" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Crear una nueva lista de oración por temas" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Temas" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Crear un nuevo diario mensual" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Mensual" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Crear un nuevo diario" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Diariamente" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Crear un nuevo esbozo" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Esbozo" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Abrir módulo en ventana de editor o vista sencilla" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Abrir en una ventana separada" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Añadir un sub-elemento" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Añadir sub-elemento" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Añadir un elemento" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Añadir elemento" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Eliminar éste elemento" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Editar éste elemento" @@ -5123,6 +5239,188 @@ msgid "Study the Bible" msgstr "Estudie la Biblia" +#~ msgid "network setup errors." +#~ msgstr "errores en la configuración de red." + +#~ msgid " client socket" +#~ msgstr "socket del cliente" + +#~ msgid " server socket" +#~ msgstr "socket del servidor" + +#~ msgid "bad magic" +#~ msgstr "magia incorrecta" + +#~ msgid "bad protocol version" +#~ msgstr "versión incorrecta del protocolo" + +#~ msgid "bad msg type" +#~ msgstr "tipo incorrecto de mensaje" + +#~ msgid "bad packet count" +#~ msgstr "conteo incorrecto de paquetes" + +#~ msgid "bad packet index" +#~ msgstr "índice incorrecto de paquetes" + +#~ msgid "bad body format" +#~ msgstr "formato incorrecto del cuerpo" + +#~ msgid "missing required header " +#~ msgstr "cabecera requerida no encontrada" + +#~ msgid "UUID spoofed: wrong ipaddr." +#~ msgstr "UUID falsificado: dirección ip incorrecta." + +#~ msgid "Ignoring echo." +#~ msgstr "Ignorando eco." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Dominio no 'BIBLE-VERSE':" + +#~ msgid "Invalid group: " +#~ msgstr "Grupo no válido:" + +#~ msgid " present at " +#~ msgstr " presente en " + +#~ msgid " using " +#~ msgstr " usando " + +#~ msgid "[no dump ready]" +#~ msgstr "[vaciado incompleto]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Transmisión fallida.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Imposible iniciar multicast; BibleSync está desactivado. Si su conexión " +#~ "de red cambió durante la ejecución de este programa, podría ser " +#~ "suficiente para rehabilitarlo." + +#~ msgid "Page %d of %d" +#~ msgstr "Página %d de %d" + +#~ msgid "Save As" +#~ msgstr "Guardar como" + +#~ msgid "HTML Output" +#~ msgstr "Salida en HTML" + +#~ msgid "HTML Source" +#~ msgstr "Fuente en HTML" + +#~ msgid "Plain Source" +#~ msgstr "Fuente en texto plano" + +#~ msgid "_Quit" +#~ msgstr "_Salir" + +#~ msgid "_Open" +#~ msgstr "_Abrir" + +#~ msgid "_Save" +#~ msgstr "_Guardar" + +#~ msgid "Save _As..." +#~ msgstr "Guardar _como..." + +#~ msgid "Open new document" +#~ msgstr "Abrir un documento nuevo" + +#~ msgid "Delete current note" +#~ msgstr "Eliminar la nota actual" + +#~ msgid "HTML _Output" +#~ msgstr "_Salida en HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_Fuente en HTML" + +#~ msgid "_Plain Source" +#~ msgstr "Fuente en texto P_lano" + +#~ msgid "Unlock " +#~ msgstr "Desbloquear " + +#~ msgid "Preparing to print" +#~ msgstr "Preparando para imprimir" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Esta impresora no soporta impresión" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "La impresora %s no soporta impresión PostScript." + +#~ msgid "Printing" +#~ msgstr "Imprimiendo" + +#~ msgid "Waiting to print" +#~ msgstr "Esperando para imprimir" + +#~ msgid "An error occurred while printing" +#~ msgstr "Ocurrió un error mientras se imprimía" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "No se pudo imprimir su documento: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos no pudo crear .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos no puede continuar." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + +#~ msgid "Mode" +#~ msgstr "Modo" + +#~ msgid "Listen" +#~ msgstr "Escuchar" + #~ msgid "Tabs" #~ msgstr "Pestañas" diff -Nru xiphos-4.0.0+dfsg1/po/fa.po xiphos-4.0.4+dfsg1/po/fa.po --- xiphos-4.0.0+dfsg1/po/fa.po 2014-12-21 19:54:38.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/fa.po 2015-06-16 17:44:26.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: 3.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-20 22:37-0000\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: English/GB \n" @@ -21,297 +21,267 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Poedit 1.6.10\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"شکست Xiphos : \"نمی تواند اتفاق می افتد\" ، display_mod : تهی لطفا گزارش " +"این. sword_main.cc : set_treekey چه انجام داده باشید در زمانی که این اتفاق " +"افتاد؟" -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr " client socket" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr " server socket" - -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "bad magic" - -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "bad protocol version" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "ترکیب پیدا نشد" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "bad msg type" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "آیا به یقین می‌خواهید این یادداشت حذف شود؟" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "bad packet count" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "باز کن" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "bad packet index" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "متن بی‌نام" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "bad body format" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "تغییرات را ضبط کن" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "missing required header " +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "قبل از بستن؟" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "UUID spoofed: wrong ipaddr." +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "اگر ضبط نکنید، تغییرات به کلی حذف خواهد شد." -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "Ignoring echo." +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "پرونده" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domain not 'BIBLE-VERSE': " +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "یادداشتهای مطالعات شخصی" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "Invalid group: " +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "ویرایشگر یادداشتهای شخصی" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr " present at " +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "لیست دعا/یادداشتهای هر روزه" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr " using " +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "درباره برنامۀ سورد" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" - -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "مدیر مدول" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "گزینه‏ها" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -"شکست Xiphos : \"نمی تواند اتفاق می افتد\" ، display_mod : تهی لطفا گزارش " -"این. sword_main.cc : set_treekey چه انجام داده باشید در زمانی که این اتفاق " -"افتاد؟" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "ترکیب پیدا نشد" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "محدوده" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "صفحۀ %d از %d" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "دعا و تفکر روزانه" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "باز کن" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "نقشه‌ها" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "ضبط کن به اسم" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "تصاویر" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "متن بی‌نام" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "کتب‌های لقت" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "آیا به یقین می‌خواهید این یادداشت حذف شود؟" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "نتیجه به صورت اچ.تی.ام.ال" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "منبع به فرمت اچ.تی.ام.ال" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "منبع فرمت نشده" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "کتاب‏مقدس" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_چاپ..." +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "تفسیر" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "چاپ پیشنگری" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "فرهنگ واژگان" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_خروج" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "کتب عمومی" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_باز کردن" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_ضبط" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "نامگذاری جدید تفسیر" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "ضبط کن به _اسم" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "روزانه" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "جدید ..." +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "ناشناس" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "ایجاد متن جدید" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "لیست‏های مدول" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "حذف" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "محدوده‌ها" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "یادداشت فعلی را حذف کن" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_پرونده" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "منبع نصب " -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "نتیجه به فرمت – اج.تی.ام.ال" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_منبع به فرمت اچ.تی.ام.ال" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "منبع فرمت نشده" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_مرور" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "مدولهای پنجره اصلی" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "ضبط" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "فرمت" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "ایجاد علامت" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "تیترها" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "تغییرات را ضبط کن" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "پانویس" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "قبل از بستن؟" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "ارجاعات" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "اگر ضبط نکنید، تغییرات به کلی حذف خواهد شد." +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "شماره‌های استرانگ" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "پرونده" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "علائم واژه‏شناسی" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "یادداشتهای مطالعات شخصی" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "کلمه ریشه‌ای" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "ویرایشگر یادداشتهای شخصی" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "سخنان مسیح به رنگ قرمز" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "لیست دعا/یادداشتهای هر روزه" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "اِعراب‏های زبان یونانی" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "قفل را باز کن " +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "نقاط حروف صدادار عبری" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "آمادگی جهت چاپ" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "نتهای عبری جهت قرائت" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "با چاپگر فعلی چاپ ممکن نیست" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "چاپگر %s .این نوع متن را چاپ نمی‌کند" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "نویسه گردانی" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "چاپ" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "در حال چاپ" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "در خلال چاپ مشکلی پیش آمد" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "تقسیم بندی یک واژه" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "چاپ متن %s امکان پذیر نمی‏باشد" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "درباره برنامۀ سورد" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "مشخصه" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "در بارۀ این مدول اطلاعاتی موجود نیست." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "گزینه‏ها" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -329,18 +299,20 @@ "نصب شده ممکن است مشترک در میان همه frontends با استفاده از چارچوب. کتاب را " "می توان پروژه های دریافت شده از شمشیر." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "پروژه سورد" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "آیا از برنامۀ زیفوس برای مطالعۀ کتاب‏مقدس خوشتان آمده است؟ آیا مشتاق هستید که " "که زیفوس به زبانهای دیگر نیز ترجمه شود؟ شما می‏توانید در کار ترجمۀ زیفوس با " @@ -350,23 +322,23 @@ "توان ترجمه برخوردارید، خواهش می‌کنیم با لینک زیر با ما تماس بگیرید و در این " "امر با ما همگام شوید." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "درباره ترجمۀ زیفوس" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "لطفا به بخش ترجمه در قسمت منابع زیفوس مراجعه کنید" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "بسط و گسترش زیفوس" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "حق چاپ برای تیم گسترش زیفوس محفوظ می‏باشد 2000-2014" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "حق چاپ برای تیم گسترش زیفوس محفوظ می‏باشد 2000-2015" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -380,232 +352,232 @@ "پروژه سورد را در اختیار ما گذاشتند، تشکر می‌کنیم." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "علامت" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "نام پرونده را وارد کنید" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "نام پرونده" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "پرونده: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "ویرایش" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "نام پرونده: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "نام علامت: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "آیه: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "مدول: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "پرونده انتخاب شده را حذف کن" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(به همراه تمامی محتویاتش)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "علامت انتخاب شده را حذف کن" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "اضافه کن" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "علامت گذاری: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "نتایج جستجو: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "علائم" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "کلید برای مدول %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "برای:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "کلید قفل را وارد کن: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "بستن بدون ضبط" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "زیفوس:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "بستن بدون ضبط" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "لیست آیات" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "لیست ایات" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "\"نتیجه‌های چستچو" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "لطفا قبل از ارسال فایل، به حقوق قانونی کپی و نشر دقت کنید!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "پیدا کن" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "کلمه یا عبارت را وارد کنید" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "جستجو به شکل برگشت" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "بعدی را پیدا کن" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "تنظیم نوع قلم هر مدول" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "تعویض قلم برای" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "مدول" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "قلم فعلی: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+٠" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "قلم پیش گزیده را برای این مدول استفاده کن" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "اشکال! Xiphos در مورد به علت تصادف به \"STRDUP\" خطا." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "لطفا گزارش این موضوع را به تیم Xiphos با :" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "اشکال! Xiphos در مورد به علت تصادف به \"رشته\" خطا." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "زیفوس- نرم افزار مطالعۀ کتاب‏مقدس" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "بخش جدیدی را باز کن" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "نگرش استاندارد" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "نگرش تفسیری" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "نگرش کتاب" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "به برنامۀ زیفوص خوش آمدید" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -625,35 +597,35 @@ "بنابراین، تغییر نام یک کتاب تفسیر بصورت دلخواه nدر محیط برنامۀ ویندوز امکان " "پذیر نمی‏باشد." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "نامگذاری جدید تفسیر" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "انتخاب نام تفسیر" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "نام جدید" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "نام: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" "برای نامگذاری عناوین تنها می‏توانید از حروف القبا و اعداد صفر تا نه استفاده " "کنید." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "یک مدول با همین اسم موجود است." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -662,7 +634,7 @@ "ایجاد شکل‏بندی جدید ممکن نیست:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -670,7 +642,7 @@ "اشتباه در ساختن شکل‌بندی:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -773,20 +745,20 @@ "استفاده با دقت هم هر دو این دستور العمل گام به گام ، با گفتگو و معرفی کلی " "گفت و گو ممکن است هیچ در بسته می شود." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "آیا مایلید که این عناوین حذف گردند؟" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "آمادگی جهت حذف" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "حذف" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "حذف کن" @@ -806,23 +778,23 @@ msgid "Install" msgstr "نصب کن" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "آیا میخواهید که این عناوین بایگانی شوند؟" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "آمادگی جهت بایگانی کردن" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "بایگانی" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "بایگانی کن" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -830,55 +802,59 @@ "آیا می‏خواهید برای این عناوین\n" "ایندکس جستجوی سریع بسازید؟ (ممکن است اجرای این فرمان تا چند دقیقه طول بکشد)" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "آمادگی جهت ایندکس‏سازی" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "ایندکس‏سازی" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "_ایندکس" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "آیا می‏خواهید که ایندکس جستجوی سریع برای این عناوین حذف گردد؟" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "آمادگی جهت حذف ایندکس" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "حذف ایندکس" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "حذف" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "در بارۀ این مدول اطلاعاتی موجود نیست." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "نام مدول" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "علامت تیک به این معناست که این مدول قبلاً نصب شده است." -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "روی جعبه کلیک کنید تا بتوانید روی این مدول کار کنید." -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "روی این علامت کلیک کنید تا بتوانید مدول را نصب/به روز کنید" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "نصب شد" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -886,7 +862,7 @@ "نشانۀ \"ایندکس\" به اين معني است که شما برای اين مدول قبلا ایندکسي درست " "کرده‌ايد که کار جستجوي سريع را انجام دهد." -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -894,13 +870,13 @@ "نشانه قفل يعني اینکه این مدول قفل است و جهت استفاده از آن، بايد کليد اين قفل " "خريداري شود" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "درباره" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -908,19 +884,19 @@ "نشانه تجديد به اين معني است که مدول نصب شده از عناوین موجود قديمي‌تر است؛ " "لازم است که عناوین تازه‌تر را نصب فرماييد." -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "در دسترس" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "اندازه" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "توصیف" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -929,33 +905,33 @@ "`mkdir %s' ممکن نیست\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " بایگان شد در: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "ژورنال و لیست دعا قابل ایندکس شدن نیستند" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s ممکن نشد" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "تمام شد" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "ناشناس" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -964,7 +940,7 @@ "انبار:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -972,54 +948,44 @@ "دسته بندی شده بر اساس\n" "مدول" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "متون کتابمقدس" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "کتب تفسیر" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "کتب فرهنگ لغات" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "کتب‌های لقت" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "دعا و تفکر روزانه" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "کتب عمومی" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "نقشه‌ها" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "تصاویر" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "قیر از مسیحیات" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1027,307 +993,318 @@ "دسته‏بندی شده بر اساس\n" "دسترسی" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "روز رسانی‏ها" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "عناوینی که نصب نشده‏اند" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "لیست دعا/نوشتار روزانه" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "به روزرسانی از راه دور" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "منبع راه دور پیدا نشد" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "شکل‌بندی" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "نوع" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "سرلوحه" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "منبع" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "لغت‌نامه" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "کاربر" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "اسم رمز" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "کاربر" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "منبع‌های مدول" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "اضافه/حذف کن" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "انتخاب کن" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "عناوین" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "نصب/روز رسانی" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "تعمیر" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "لطفا دوباره راه اندازی کنید" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "لیست مدول شما روز رسانی نشده است!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "زیفوس یک مدول کتاب مقدس لازم درد" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "زیفوس یک عنون کتاب مقدس لازم درد. خواهش میکنم یکی نصب کن!" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "منابع دوردست استاندارد قبلاً نصب شده‏اند" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "امکان بارگذاری منابع استاندارد از سایت کراس‏وایر موجود نیست." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "منبع انتخاب شده را حذف کنید." -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "منبع راه دور را وارد کنید" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "سرلوحه:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "نوع:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "میزبان:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "فهرست:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "کاربر (اختیاری)" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "اسم رمز (اختیاری)" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "منبعی با همان اسم وجود دارد." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "منبع راه‏ دور را حذف کنید" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "برو به قسمتی که این را دارد" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "به مورد قبلی بازگرد" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "به مورد بعدی برو" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "به سمت اولین بخش فرعی به پیش برو" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "پیمایش همزمان سازی این پنجره را با پنجره اصلی" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "موازی" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "جدا کن/ الصاق کن" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "گزینه‏های مختلف مدول" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "نگرش موازی" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "شخصی" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "--انتخاب--" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "زبان جدید بعد از شروع جدید این برنامه" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "ویژگی‏ها" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "عمومی" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "گزینه‏ها" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "قلم‏ها" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "رنگ" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "بخش‏ها و پنجره‌ها" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "مخصوص" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "آیا می‏خواهید لیست پاک شود؟" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "آیا به یقین می‌خواهید که لیست مدول را پاک کنید؟" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "مدول حذف شود؟" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "آیا به یقین می‌خواهید مدول انتخاب شده را حذف کنید؟" @@ -1346,20 +1323,20 @@ msgid "found in " msgstr "یافت شده در " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "لیست %s تازه" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "لیست مدول پیشین ممکن است ذخیره نشده باشد" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "لیست حذف شود؟" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "آیا به یقین می‌خواهید که لیست را حذف کنید؟" @@ -1379,7 +1356,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1434,7 +1411,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1462,15 +1439,15 @@ "می شوند به معنای واقعی کلمه ، به عنوان مثال ازت - ASF برای \"اسم ، حالت " "مفعولی مفرد زنانه\" -- به ماژول رابینسون برای جزئیات بیشتر." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1478,108 +1455,98 @@ "این نوع جستجو فراگیر (\"و\") است: \n" "تمامی کلمات مربوط به آن را پیدا می‏کند" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_جستجوی پیشرفته" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 #, fuzzy msgid "Open the separate Advanced Search dialog." msgstr "باز کردن پنجره جستجوی پیشرفته ، برای اجرای نمایش داده شد پیچیده" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "جستجو در مدول" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "کتاب‏مقدس" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "تفسیر" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "نوع جستجو" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "کلمات متعدد" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "بیان معمول" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "عبارت به شکل دقیق" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "ترجیحات در جستجو" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "مقایسه و تطبیق موارد" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "محدودۀ جستجو" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "بدون محدوده" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "بکارگیری حدود" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "آخرین جستجو" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "حدود" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "پایین‏تر" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "بالاتر" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "در ویرایشگر باز کن" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "ویژگی‏ها" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "جستجو" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "ستون جانبی" @@ -1587,73 +1554,73 @@ msgid "Powered by the SWORD Project" msgstr "حمایت شده توسط پروژۀ سورد" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "آیا می توانم ایجاد زبانه دیر نیست." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "لیست دعا/یادداشتهای روزانه" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "نام جدید" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "مدول انتخاب شده را حذف کن" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "ژانویه" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "فوریه" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "مارس" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "آوریل" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "می" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "ژوئن" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "ژوئیه" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "اوت" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "سپتامبر" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "اکتبر" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "نوامبر" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "دسامبر" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1664,7 +1631,99 @@ "(شاید نوع فایل تصویر در فرمتی بجز bmp/gif/jpg/pngاست.)\n" "زیفوس نمی‏تواند اندازۀ تصویر را مناسب با پنجرۀ باز تنظیم کند." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "ناشناس" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "روی جعبه کلیک کنید تا بتوانید روی این مدول کار کنید." + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "در دسترس" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "نجات" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "درباره این برنامه" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1673,249 +1732,272 @@ "برچسب حاشیه‏نویسی شخصی به صورت درستی کدبندی نشده است:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "فصل" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "زیفوس در آن واحد بیش از یک بحث را درک نمی‌کند" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "راه‌اندازی گکو" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "بنای ارائه" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "شروع سورد" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "بار گذاری تنظیمات" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "نمایش زیفوس" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "مرورگر" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "پانویس" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "ارجاعات" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "شماره‌های استرانگ" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "واژه شناسی" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "برگشت به " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "شماره‌های استرانگ" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "پانویس" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "علائم واژه‏شناسی" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "نقاط حروف صدادار عبری" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "نتهای عبری جهت قرائت" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "اِعراب‏های زبان یونانی" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "ارجاعات" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "کلمه ریشه‌ای" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "تیترها" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "تقسیم بندی یک واژه" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "سخنان مسیح به رنگ قرمز" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "نویسه گردانی" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "تفاوت‏های متنی" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "قرائت اولیه" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "قرائت دومین" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "تمامی قرائت‏ها" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "نویسه گردانی" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "کتب‌های لقت" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "مشاهدۀ زمینه" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "رشد" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "برای رشد
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "نجات" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "برای نجات" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "سلامتی" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "برای سلامتی
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "متفرقه" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "متفرقه
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "نقطۀ x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "نقطۀ y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "نقطۀ z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "مدول فرعی ۱" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "\"زیر مدول ۱\"
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "مدول فرعی ۲" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "زیر مدول ۲
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "مدول فرعی ۳" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "زیر مدول ۳
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "مدول فرعی ۴" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "زیر مدول ۴
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "نام به جهت لیست دعای جدید" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "در حال حاضر زیفوس به دنبال آن لیست دعا می‌گردد." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1924,19 +2006,19 @@ "زیفوس طریق مدول را نمی‌تواند به وجود آورد\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "یک لیست دعای ساده. \\par\\parاین مدول توسط زیفوس ایجاد شده است." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ابتدایی" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "دعای من" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1944,102 +2026,102 @@ "افراد:
حمید:
شهرام:
سپیده:

کلیسا:
نیمکت‏ها
مشارکت
کتاب‏مقدس برای مبشرین


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "لیست دعای موضوعی \\par\\par این مدول توسط زیفوس ایجاد شده است." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "موضوعی" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "حمید
شهرام
سپیده
پروانه
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "رشد روحانی" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "پویا
پگاه
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "نوشین
زهره
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "لیست دعای ماهانه. \\par\\par این مدول توسط زیفوس ایجاد شده است." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "ماهانه" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "ژورنال روزانه \\par\\parاین مدول توسط زیفوس ایجاد شده است." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "روزانه" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "رئوس مطالب (مثلاً موعظه) \\par\\par این مدول توسط زیفوس ایجاد شده است." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "رئوس" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "مدول اصلی الف" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "مدول اصلی الف
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "مدول اصلی ب" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "مدول اصلی ب
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "مدول اصلی ج" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "مدول اصلی ج
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "یادداشت کاربر" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "نتیجۀ جستجو %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "این قسمت حذف شود؟" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "آیا به یقین می‌خواهید این قسمت را حذف کنید؟" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "جستجو: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2050,16 +2132,16 @@ "چنین مدولی نصب شده است.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "لطفا لیست مدولها را هماهنگ کنید." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "برای این موارد راهنمای جستجوی سریع وجود ندارد. %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2067,7 +2149,7 @@ "\n" "جستجو در این مدول اکنون بصورت «چندکلمه‏ای» می‏باشد." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2075,41 +2157,35 @@ "\n" "به چارچوب تعمیران، در بخش مدیر مدول مراجعه کنید." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "جستجو تمام شد" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "مطابقت دارد" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$منطقۀ شما هنوز تعیین نشده است!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"برنامۀ زیفوس قادر به ایجاد زیفوس نیست:\n" -"%s\n" -"\n" -"زیفوس قادر به ادامه نیست." +"زیفوس طریق مدول را نمی‌تواند به وجود آورد\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "طریق قابل ایجاد نیست. " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2117,11 +2193,11 @@ "خالی فایل تنظیمات -- بازیابی پشتیبان اقدام از دست داد. بعضی از اطلاعات ممکن " "است." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "تنظیمات فایل خالی -- بدون پشتیبان؟!؟ اطلاعات از دست رفته!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2137,11 +2213,11 @@ "زیفوس قادر به ادامه نیست\n" "و برنامه را خواهد بست." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "نصب مدول کتابمقدس پایان یافت." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2151,11 +2227,11 @@ msgid "verse" msgstr "آیه" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "فصل" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2163,7 +2239,7 @@ "فایل زیفوس برای زبان\n" "پیدا نشد." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2171,7 +2247,7 @@ "زیفوس نتوانست فایل مخفف سازی زبان \n" "را باز کند." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2179,7 +2255,7 @@ "زیفوس قادر نیست که فضای\n" "را برای مخفف سازی زبان در اختیار بگیرد." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2188,7 +2264,7 @@ "پروندۀ مخفف‏سازی زبان نیست." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2197,11 +2273,11 @@ "این زبان %s' وجود نیست در این کمپوتر \n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "نام کتاب و منوها را نمی توان ترجمه شده است." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2209,7 +2285,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2217,11 +2293,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "دعا و تفکر روزانه درخواست شد، لیکن چیزی برای نصب وجود ندارد." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2241,89 +2317,94 @@ "در صفحه وب خود را تایید کرد که خرید ، و یا شاید پس از ارسال از طریق ایمیل " "خرید لطفا وارد کلیدی در." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "سابقه پاک شود" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "لیست آیات" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "یو آر ال پیدا نشد:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "زیفوس قادر به اجرا نبود %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "مرورگر اشتباه\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "در پنجرۀ اصلی %s را نمایش بده" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "متن با موفقیت ایجاد نشد. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "چه کنم تا نجات یابم؟" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "اعمال 16: 31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "افسسیان 2: 8" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "رومیان 1: 16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "انجیل چیست؟" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "اول قرنتیان 15: 1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Document not parsed successfully. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "متن خالی \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "نوع پرونده غلط است, ایراد ساختاری != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "نوع پرونده غلط است !=%s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2336,7 +2417,7 @@ "فصل%d\n" "\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2349,94 +2430,94 @@ "فصل%d\n" "\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "عهد عتیق" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "پیدا-ملا" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "عهد جدید" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "متی-مکا" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "لیست مدولهای نمونه" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "نوع پرونده غلط است !=%s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2445,7 +2526,7 @@ "ذخیره تنظیمات شکست خورد! آمار %d, %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "تلاش برای برگرداندن به نجات قبلی." @@ -2459,13 +2540,13 @@ msgstr "علامت گذاری دیالوگ" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "ایچاد پروندۀ جدید" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "پروندۀ جدید" @@ -2474,7 +2555,7 @@ msgstr "جدید ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "علامت را ابطال کن" @@ -2487,22 +2568,22 @@ msgstr "نامگذاری کن" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "آیه:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "ثبت آیه" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "مدول:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "ثبت مدول" @@ -2510,6 +2591,10 @@ msgid "Bookmark Folder Treeview" msgstr "پرونده را به حالت اول بازگردان" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "ایجاد علامت" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2565,6 +2650,12 @@ msgid "_Delete Personal Comment" msgstr "_نظرات شخصی را حذف کن" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_پرونده" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "یادداشت فعلی را ذخیره کن" @@ -2573,6 +2664,14 @@ msgid "_Save (Personal Comment)" msgstr "_ضبط (نظریات شخصی)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "چاپ پیشنگری" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_چاپ..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "خروج" @@ -2581,6 +2680,11 @@ msgid "For_mat" msgstr "فرمت" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "ضبط" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "این متن را چاپ کن" @@ -2618,7 +2722,7 @@ msgstr "متن جدید" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "کپی/ارسال متن" @@ -2655,7 +2759,7 @@ msgstr "ارسال تمامی کتاب" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "کتاب" @@ -2769,8 +2873,8 @@ msgid "Open about dialog" msgstr "یک دیالوگ باز کن" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2813,13 +2917,17 @@ msgid "Delete selection" msgstr "محدوده منتخب را حذف کن" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "حذف" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "مدول انتخاب شده را حذف کن" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "حذف مورد" @@ -2993,6 +3101,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "جدید ..." + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3123,122 +3235,86 @@ msgid "_Edit" msgstr "_ویرایش" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_کمک" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "متن معمولی" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "لیست حذف شود؟" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "لیست آیات" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "علامت‏گذاری/حذف علامت یک آیه" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "علامت‏گذاری‏کن" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "حذف علامت" @@ -3314,32 +3390,40 @@ msgstr "آیا می‏خواهید که ایندکس جستجوی سریع برای این عناوین حذف گردد؟" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "ادامه" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "سورد" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "مدیر مدول" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "هشدار:اگر در کشور زیر جفا زندگی می‌کنید، باید با احتیاط استفاده کنید." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "منابع را اضافه/کم کن" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "منابع محلی فعلی" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3347,15 +3431,15 @@ "اضافه کردن پوشه های محلی به عنوان منبع نصب ، به طور معمول بر روی یک سی دی " "رام و یا فلش درایو. چنین پوشه حاوی پوشه \"mods.d\" و \"ماژول\" # :." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "گزارش یکی از پوشه های محلی خود را به عنوان منبع نصب." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "منابع راه دور فعلی" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3363,43 +3447,43 @@ "افزودنیهای سفارشی منبع نصب از راه دور. شما باید نام هاست خود و پوشه که در آن " "زندگی می کند مخزن آن می دانم." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "منبع راه‏ دور را حذف کنید" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "منبع نصب " -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "محلی" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "دوردست" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "مقصد نصب" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "محدودۀ شخصی، منحصراً برای استفادۀ شخصی شما" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "فهرست پرونده‏های محلی" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "محدودۀ سیستم، برای تمام کاربران:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "فهرست سیستم سورد" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3407,10 +3491,14 @@ "هشدار:/b>اگر در کشور تحت جفا زندگی می‌کنید، به منظور جلوگیری از خطرات " "احتمالی لطفا بخش مربوط به نصب از راه دور را انجام ندهید! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "قفسه نصب محلی" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "لیست تاریخچه" @@ -3419,11 +3507,11 @@ msgid "Choose book to display" msgstr "انتخاب کتاب جهت نمایش" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "کلید انتخاب کتاب" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "مکاشفه یوحنا" @@ -3432,11 +3520,11 @@ msgid "Choose chapter to display" msgstr "انتخاب کتاب جهت نمایش" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "دکمۀ انتخاب باب" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "۱" @@ -3594,11 +3682,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "مدول‏ها" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3670,12 +3759,12 @@ msgid "BSP privacy button" msgstr "یک آیه را علامت گذاری کنید" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "نجات" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3707,11 +3796,12 @@ msgid "BSP nav verse list radio button" msgstr "انتخاب لیست مدول" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "نام لینک" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3754,7 +3844,12 @@ msgid "BSP listen none radio button" msgstr "یک متن فرمت نشده را علامت گذاری کنید" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "مخصوص" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3947,191 +4042,190 @@ msgstr "قسمت فعال کردن لیستهای دعا را انتخاب کن" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "شماره‌ آیه" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "تعداد نمایش آیه در متن" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "اندازۀ قلم شماره آیه" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "انتخاب شیوۀ یک آیه در هر خط استفاده کن" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "توصیف" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "شماره‌های آیات را نشان بده" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "اندازۀ قلم شماره آیه" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "شاخه ترکیبی پیش‌گزیده یادداشت مطالعه" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "انتخاب شاخه" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "شاخه ترکیبی پیش‌گزیده یادداشت مطالعه" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "عمومی ... متفرقه" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "مدولهای پنجره اصلی" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "متن از کتاب‏مقدس" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "تغییر ترکیبی متن کتاب‏مقدس" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "تغییر ترکیبی تفسیر" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "فرهنگ واژگان" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "تغییر ترکیبی فرهنگ واژه‏ها" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "تغییر ترکیب کتاب" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "مدول‏ها" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "همۀ مدول‏ها را از لیست پاک کن" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "مدول‏ها را از لیست پاک کن" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "مدول انتخاب شده را از لیست حذف کن" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "مدول انتخاب شده را از لیست حذف کن" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "بازکردن یک دیالوگ برای انتخاب مدول به جهت اضافه کردن به لیست" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "اضافه کردن مدول‏ها" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "دکمۀ دیالوگ بخش باز" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "مدولهای موازی" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "مدولهای ویژه" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "دعا و تفکر روزانه" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "دعا و تفکر روزانه بصورت ترکیبی" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "قاموس عبری" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "قاموس عبری ترکیبی" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "قاموس به زبان یونانی" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "قاموس یونانی ترکیبی" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "فرهنگ قراردادی واژگان" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "تغییر ترکیب فرهنگ واژه‏های قراردادی" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "یادداشت‏های شخصی" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "تغییر ترکیبی یادداشت‏های شخصی" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "گوناگونی مدولها" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "انتخاب مدول" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-۲" @@ -4160,6 +4254,10 @@ msgid "+5" msgstr "+۵" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "جستجوی پیشرفته" @@ -4369,11 +4467,11 @@ msgid "Found" msgstr "پیدا شد" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "پنجرۀ خلاصۀ نتیجه" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "لیست نتیجه‏ها" @@ -4565,6 +4663,11 @@ msgid "Attribute Search" msgstr "جستجو در مشخصات" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "انتخاب مدول" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "نوع جستجو" @@ -4657,6 +4760,10 @@ msgid "_Module Manager" msgstr "_مدیر مدول‏ها" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_مرور" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "صمیمیت پیشنمایش _Daily" @@ -4803,27 +4910,27 @@ msgid "Learn about Xiphos" msgstr "دربارۀ زیفوس" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "تفسیر یک آیه" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "بازکردن مدول" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "یادداشت" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "در ویرایشگر باز کن" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "_یک آیه در هر خط" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4831,266 +4938,275 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "مغایرت‏ها" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "محتویات تصویر" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "پذیرش فونت به گونه‏ای که هست" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "تفسیر فصل به فصل" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "متن را دوبرابر فاصله بده" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "به گزیده نگاه کن" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "فرهنگ لغت فعلی را استفاده کن" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "جستجو ی نقشه‏های کتاب‏مقدس در بایبل‏مپ" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "قفل این مدول را باز کن" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "نمایش تیتر کتاب" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "نمایش تیتر فصل" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "نامگذاری جدید تفاسیر شخصی" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "دور ریزی تفاسیر شخصی" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "گزیده را با صدای بلند بخوان" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "این نتایج را بمدول یک علامت در پروندۀ من ذخیره کن" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "لیست را بمدول یک علامت ذخیره کن" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "این نتایج را بمدول لیستی از علائم در پروندۀ من ذخیره کن" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "لیست را بمدول لیستی از علائم ذخیره کن" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "لیست آیات" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "سابقه پاک شود" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "صادرت لیست" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "این علامت را در بخشی تازه باز کن" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "در بخشی جدید باز کن" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "این علامت را در دیالوگ باز کن" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "یک دیالوگ باز کن" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "قفسۀ جدیدی را در این قفسه اضافه کن" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "علامت جدید را در اینجا وارد کن" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "ایجاد علامت" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "ویرایش مورد علامت" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_ویرایش مورد" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "حذف مورد" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "بسط همۀ گروههای علائم" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "بسط همه" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "فروریزی تمام گروههای علائم" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "فروریزی تمام" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "انتقال یک مورد را از قفسه‌ای به قفسه‌ای دیگر اجازه بده" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "ترتیب دوباره را اجازه بده" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "علائم را از نرم افزار بایبل‏تایم بارگذاری کن" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "ایجاد علامت" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "پرونده را حذف کن و آن را ضبط نما" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "صادرت پرونده" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "مدول انتخاب شده را در بخشی جدید باز کن" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "عنون باز کن در پنجاره جدید" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "در پنجرۀ تازه‏ای این را باز کن" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "ایجاد لیست سادۀ دعا" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "ساده" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "یجاد لیست دعا درباره مرود" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "موضوع" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "یجاد لیست دعا ماهیانه" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "ماهانه" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "یجاد لیست دعا روزانه" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "روزانه" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "یجاد لیست دعا موضوع زمینه" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "زمینه‌ی" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "در پنجرۀ تازه‏ای این را باز کن" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "زیر مورد اضافه کن" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "زیر مورد اضافه کن" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "اضافه کردن مورد" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "مورد اضافه کن" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "این مورد را حذف کن" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "این مورد را ویرایش کن" @@ -5102,6 +5218,134 @@ msgid "Study the Bible" msgstr "کتاب‏مقدس چه می‌گوید؟" +#~ msgid " client socket" +#~ msgstr " client socket" + +#~ msgid " server socket" +#~ msgstr " server socket" + +#~ msgid "bad magic" +#~ msgstr "bad magic" + +#~ msgid "bad protocol version" +#~ msgstr "bad protocol version" + +#~ msgid "bad msg type" +#~ msgstr "bad msg type" + +#~ msgid "bad packet count" +#~ msgstr "bad packet count" + +#~ msgid "bad packet index" +#~ msgstr "bad packet index" + +#~ msgid "bad body format" +#~ msgstr "bad body format" + +#~ msgid "missing required header " +#~ msgstr "missing required header " + +#~ msgid "UUID spoofed: wrong ipaddr." +#~ msgstr "UUID spoofed: wrong ipaddr." + +#~ msgid "Ignoring echo." +#~ msgstr "Ignoring echo." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domain not 'BIBLE-VERSE': " + +#~ msgid "Invalid group: " +#~ msgstr "Invalid group: " + +#~ msgid " present at " +#~ msgstr " present at " + +#~ msgid " using " +#~ msgstr " using " + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Page %d of %d" +#~ msgstr "صفحۀ %d از %d" + +#~ msgid "Save As" +#~ msgstr "ضبط کن به اسم" + +#~ msgid "HTML Output" +#~ msgstr "نتیجه به صورت اچ.تی.ام.ال" + +#~ msgid "HTML Source" +#~ msgstr "منبع به فرمت اچ.تی.ام.ال" + +#~ msgid "Plain Source" +#~ msgstr "منبع فرمت نشده" + +#~ msgid "_Quit" +#~ msgstr "_خروج" + +#~ msgid "_Open" +#~ msgstr "_باز کردن" + +#~ msgid "_Save" +#~ msgstr "_ضبط" + +#~ msgid "Save _As..." +#~ msgstr "ضبط کن به _اسم" + +#~ msgid "Open new document" +#~ msgstr "ایجاد متن جدید" + +#~ msgid "Delete current note" +#~ msgstr "یادداشت فعلی را حذف کن" + +#~ msgid "HTML _Output" +#~ msgstr "نتیجه به فرمت – اج.تی.ام.ال" + +#~ msgid "_HTML Source" +#~ msgstr "_منبع به فرمت اچ.تی.ام.ال" + +#~ msgid "_Plain Source" +#~ msgstr "منبع فرمت نشده" + +#~ msgid "Unlock " +#~ msgstr "قفل را باز کن " + +#~ msgid "Preparing to print" +#~ msgstr "آمادگی جهت چاپ" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "با چاپگر فعلی چاپ ممکن نیست" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "چاپگر %s .این نوع متن را چاپ نمی‌کند" + +#~ msgid "Printing" +#~ msgstr "چاپ" + +#~ msgid "Waiting to print" +#~ msgstr "در حال چاپ" + +#~ msgid "An error occurred while printing" +#~ msgstr "در خلال چاپ مشکلی پیش آمد" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "چاپ متن %s امکان پذیر نمی‏باشد" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "برنامۀ زیفوس قادر به ایجاد زیفوس نیست:\n" +#~ "%s\n" +#~ "\n" +#~ "زیفوس قادر به ادامه نیست." + #~ msgid "Tabs" #~ msgstr "بخش‏ها" @@ -5493,9 +5737,6 @@ #~ msgid "C_lear" #~ msgstr "پاک" -#~ msgid "Clear history list" -#~ msgstr "سابقه پاک شود" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "دعا و تفکر روزانه امروز را نشان بده" @@ -5513,6 +5754,3 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "اطلاعات بیشتر در مورد پروژه سورد؟" - -#~ msgid "About this application" -#~ msgstr "درباره این برنامه" diff -Nru xiphos-4.0.0+dfsg1/po/fi.po xiphos-4.0.4+dfsg1/po/fi.po --- xiphos-4.0.0+dfsg1/po/fi.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/fi.po 2015-06-16 17:44:26.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-29 21:12+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: American English \n" @@ -24,296 +24,263 @@ "X-Launchpad-Export-Date: 2010-03-21 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Asetuksia ei löydetty" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Haluatko poistaa merkinnän" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Avaa" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Nimeämätön dokumentti" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Tallenna muutokset tiedostoon" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "ennen sulkemista?" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Jos et tallenna, muutokset katoavat pysyvästi." -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Tiedosto" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Opiskelumuistio" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Muistiinpanojen muokkain" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Rukouslistan/päiväkirjan editori" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Tietoa Swordin moduulista" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Moduulien hallinta" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:415 #, fuzzy -msgid "[no dump ready]" -msgstr "Koko moduuli" +msgid "Version: " +msgstr "Valinnat" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Laajuus" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:423 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s epäonnistui" +msgid "Daily Devotion" +msgstr "Päivittäinen hartaus" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Kartat" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Kuvat" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Asetuksia ei löydetty" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Sivu %d / %d" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Avaa" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Raamattu" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Tallenna nimellä" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Kommentaari" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Nimeämätön dokumentti" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Sanakirja" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Haluatko poistaa merkinnän" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Yleiset kirjat" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML-tuloste" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML-lähdeteksti" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Muotoilematon lähdeteksti" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Uudelleennimeä kommentaari" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Tulosta..." +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "PäiväKirja" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Tulostuksen esi_katselu" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Tuntematon" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Lopeta" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Moduulilistat" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Avaa" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Tallenna" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Alueet" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Tallenna nimellä..." +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Uusi" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Asennuslähde" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Avaa uusi dokumentti" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Pääikkunan moduulit" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Poista" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Muotoilu" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Poista nykyinen teksti" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Otsikot" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Tiedosto" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Alaviitteet" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_HTML-muotoilu" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "HTML-lähdekoodi" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Muotoilematon lähdekoodi" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Näkymä" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Ristiviittaukset" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Tallenna" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strongin numerot" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Lisää linkki" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologiset tunnisteet" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Tallenna muutokset tiedostoon" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Sanojen perusmuodot" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "ennen sulkemista?" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Jeesuksen sanat punaisella" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Jos et tallenna, muutokset katoavat pysyvästi." +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Kreikkalaiset korkomerkit" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Tiedosto" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Heprean vokaalipisteet" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Opiskelumuistio" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Heprean kantillaatio" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Muistiinpanojen muokkain" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Rukouslistan/päiväkirjan editori" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Translitteraatio" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Poista lukitus " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Valmistellaan tulostusta" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Tulostus tälle tulostimelle ei ole tuettu" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Tulostin %s ei tue PostScript-tulostusta." +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Tulostaa" - -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Odotetaan tulostusta" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Tulostuksessa tapahtui virhe" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morfeemien segmentointi" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Dokumentin %s tulostus ei onnistunut" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Tietoa Swordin moduulista" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Attribuutti" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Moduulilla ei ole tietoja" +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Valinnat" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -325,18 +292,20 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD-projekti" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Pidätkö Xiphos-ohjelmasta? Haluatko nähdä sen käyttävän omaa kieltäsi? Voit " "kääntää Xiphoksen!\n" @@ -345,24 +314,24 @@ "kääntämisessä, käytä allaolevaa linkkiä, ota meihin yhteytttä ja tule mukaan " "työhömme." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Tietoa Xiphoksen käännöksestä" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Katso TRANSLATION HOWTO Xiphoksen lähdekoodista" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphoksen kehittäminen" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2009 Xiphoksen kehitystiimi" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright 2000-2015 Xiphoksen kehitystiimi" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -375,235 +344,235 @@ "meille SWORD-projektin." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Kirjanmerkki" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Kirjoita kansion nimi" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Kansion nimi" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Kansio: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Muokkaa kirjanmerkkijaksoa" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Muokkaa" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Kansion nimi: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Kirjanmerkin nimi: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Jae: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Moduuli: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Poista valittu kansio" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(ja kaikki sen sisältö)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Poista valitut kirjanmerkit" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Lisää" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etiketti: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Haun tulos: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, fuzzy, c-format msgid "Cipher key for module %s" msgstr "Etsitään SWORD-moduuleja" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "moduulille:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Anna salausavain: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Sulje tallentamatta" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Sulje _tallentamatta" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Jaelista" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Ole hyvä ja tarkista tekijänoikeudet ennen vientiä!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Etsi" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Kirjoita sana tai fraasi" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Hae taaksepäin" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Etsi seuraava" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Aseta moduulin fontti" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Vaihda fontti" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Moduuli" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Nykyinen fontti: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Käytä oletusfonttia tälle moduulille" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUGI! Xiphos kaatuu virheen \"STRDUP\" takia." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Voit raportoida tämän virheen Xiphos-tiimille:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUGI! Xiphos kaatuu virheen \"STRING\" takia." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "Moduuleissa, joissa on Strongin numeroita" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Raamatunopiskeluohjelma" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Avaa uusi välilehti" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standardinäkymä" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Kommentaarinäkymä" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Kirjanäkymä" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Tervetuloa Xiphokseen" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -621,33 +590,33 @@ "kommentaarin uudelleennimeäminen ei ole käytössä\n" "Windows-ympäristössä." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Uudelleennimeä kommentaari" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Valitse kommentaarin nimi" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Uusi nimi" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nimi: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Moduulin nimi saa sisältää vain merkkejä [A-Za-z0-9]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos käyttää jo nimeä jollekin moduulille." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -656,7 +625,7 @@ "Uusien asetusten luominen epäonnistui:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -664,7 +633,7 @@ "Asetusten muodostusvirhe:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -754,20 +723,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Poista nämä moduulit?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Valmistellaan poistoa" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Poistetaan" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Poista" @@ -787,23 +756,23 @@ msgid "Install" msgstr "Asenna" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arkistoi nämä moduulit?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Valmistellaan arkistointia" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arkistoidaan" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arkistoi" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -811,55 +780,59 @@ "Luo indeksi nopeaa hakua varten näille moduuleille\n" "(voi kestää minuutteja/moduuli)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Valmistellaan indeksointia" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indeksoidaan" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeksoi" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Poista nopean haun indeksit näiltä moduuleilta?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Valmistellaan indeksin poistoa" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Poistaan indeksiä" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Poista" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Moduulilla ei ole tietoja" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Moduulin nimi" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Valintamerkki tarkoittaa, että moduuli on jo asennettu" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Paina valintaruutua valitaksesi moduuli toimintoja varten" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Paina valintaruutua valitaksesi moduuli asennusta/päivitystä varten" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Asennettu" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -867,7 +840,7 @@ "Indeksikuvake tarkoittaa, että moduulille on luotu optimoitu ('lucene') " "indeksi nopeaa hakua varten (ks. Ylläpito-paneeli)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -875,13 +848,13 @@ "Lukkokuvake tarkoittaa, ettää moduuli on salattu ja vaatii " "salauksenpurkuavaimen ostoa sisällön omistajalta" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Tietoa" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -889,19 +862,19 @@ "Uudelleenlatauskuvake tarkoittaa, että asennettu moduuli on vanhempi kuin " "saatavilla oleva: moduuli kannattaisi päivittää" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Saatavilla" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Koko" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Kuvaus" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -910,33 +883,33 @@ "`mkdir %s' epäonnistui:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arkistoitu kohteeseen: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Rukouslistoja ja -päiväkirjoja ei voi indeksoida." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s epäonnistui" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Valmis" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Tuntematon" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -945,7 +918,7 @@ "Varasto:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -953,54 +926,44 @@ "Lajiteltu moduulin\n" "tyypin mukaan" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Raamatulliset tekstit" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Kommentaarit" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Sanakirjat" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Päivittäiset hartaudet" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Yleiset kirjat" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Kartat" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Kuvat" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1008,101 +971,101 @@ "Lajiteltu saatavuuden\n" "mukaan" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Päivitykset" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Asentamaton" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Rukouslista/päiväkirja" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Virkistetään etälähteestä" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Etälähdettä ei löytynyt" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Asetukset" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tyyppi" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Seloste" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Lähde" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Kansio" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Käyttäjä" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Salasana" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Moduulien lähteet" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Lisää/Poista" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Valitse" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduulit" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Asenna/Päivitä" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Ylläpito" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Lataa uudestaan" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Moduulilistasi ei ole ajan tasalla!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "Olet poistanut viimeisen Raamatun. Xiphos tarvitsee ainakin yhden." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1110,211 +1073,222 @@ "Yhtään Raamattua ei ole vielä asennettu. Xiphos ei voi jatkaa ilman " "raamattumoduulia." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Vakioetälähteet on ladattu." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Lähteiden lataaminen CrossWirelta ei onnistunut." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Poista valittu lähde" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Lisää etälähde" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Seloste:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tyyppi:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Palvelin:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Kansio:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Käyttäjä (ei pakollinen):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Salasana (valinnainen):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Tämänniminen lähde on jo olemassa." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Tuhoa etälähde" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Koko moduuli" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Siirry ulospäin jaksoon joka sisältää tämän" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Mene edelliseen jaksoon" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Mene seuraavaan jaksoon" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Siirry sisäänpäin, ensimmäiseen alijaksoon" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Rinnakkaisnäkymä" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Liitä/Irrota" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Moduulin asetukset" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Rinnakkaisnäkymä" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Lue valinta ääneen" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Henkilökohtaista" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Valitse --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Paikallisuusasetus astuu voimaan uudellenkäynnistyksen jälkeen." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Asetukset" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Yleinen" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Vaihtoehdot" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Raamattu" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Kirjasinlajit" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Väri" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Välilehdet ja paneelit" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Erityiset" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Tyhjennä lista?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Haluatko varmasti tyhjentää moduulilistan?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Poista moduuli?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Oletko varma, että haluat poistaa valitun moduulin?" @@ -1333,20 +1307,20 @@ msgid "found in " msgstr "löydetty " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, fuzzy, c-format msgid "New List %s" msgstr "Tallenna lista" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Viimeistä moduulilistaa ei voi poistaa" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Poista lista?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Haluatko varmasti poistaa:" @@ -1366,7 +1340,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1411,7 +1385,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1429,15 +1403,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1445,108 +1419,98 @@ "Tämä on JA-haku:\n" "Näyttää tulokset jotka sisältävät kaikki sanat." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "_Edistynyt haku" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Hae moduulista" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Raamattu" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Kommentaari" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Hakutapa" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Monta sanaa" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Säännöllinen lauseke" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Tarkka fraasi" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Hakuasetukset" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Huomioi kirjainkoko" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Haun laajuus" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Ei laajuutta" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Käytä rajoja" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Viimeisin haku" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Rajat" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Alempi" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Ylempi" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Avaa editorissa" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Aseta käyttäjän asetukset" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Haku" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sivupalkki" @@ -1554,73 +1518,73 @@ msgid "Powered by the SWORD Project" msgstr "SWORD-projektin mahdollistama" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Rukouslistan/päiväkirjan kohta" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Uusi nimi" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Poista valittu kohta" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Tammikuu" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Helmikuu" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Maaliskuu" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Huhtikuu" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Toukokuu" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Kesäkuu" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Heinäkuu" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Elokuu" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Syyskuu" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Lokakuu" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Marraskuu" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Joulukuu" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1631,7 +1595,99 @@ "(Tai mahdollisesti kuva on muuta tyyppiä kuin bmp/gif/jpg/png.)\n" "Xiphos ei voi muuttaa kuvien kokoa ikkunaan sopivaksi." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Koko moduuli" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Paina valintaruutua valitaksesi moduuli toimintoja varten" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Saatavilla" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Pelastus" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "Tietoa tästä ohjelmasta" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1640,252 +1696,274 @@ "Väärin enkoodattu oman muistiinpanon otsikko:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kappale" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos ei ymmärrä enempää kuin yhden argumentin." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Alustetaan Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Kasataan näkymää" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Käynnistetään Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Ladataan asetuksia" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Näytetään Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Esikatselija" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Alaviite" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Ristiviittaus" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongin numerot" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Sanojen taivutus" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Takaisin " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongin numerot" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Alaviitteet" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologiset tunnisteet" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Heprean vokaalipisteet" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Heprean kantillaatio" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Kreikkalaiset korkomerkit" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Ristiviittaukset" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Sanojen perusmuodot" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Otsikot" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfeemien segmentointi" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Jeesuksen sanat punaisella" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Translitteraatio" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Tekstivariantit" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Ensisijainen lukutapa" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Toissijainen lukutapa" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Kaikki lukutavat" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Translitteraatio" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "näytä asiayhteys" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Kasvu" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "Kasvua varten
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Pelastus" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "Pelastusta varten
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Terveys" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "Terveyttä varten" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Sekalaiset" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "Sekalaiset" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Kohta x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Kohta y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Kohta z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Alaotsikko 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Alaotsikko 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Alaotsikko 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Alaotsikko 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Alaotsikko 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Alaotsikko 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Alaotsikko 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Alaotsikko 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Uuden rukouslistan tai -päiväkirjan nimi" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Tämänniminen rukouslista on jo olemassa." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1894,19 +1972,19 @@ "Xiphos ei voi luoda moduulin polkua:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Yksinkertainen rukouslista. \\par\\par Xiphoksen luoma moduuli." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "PerusRukousLista" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "OmaRukouslista" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1914,102 +1992,102 @@ "Ihmiset:
Pekka
Sami
Susanna

Seurakunta:
tilaisuudet
yhteys
Raamattuja lähetystyöntekijöille


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Aiheisiin perustuva rukouslista. \\par\\par Xiphoksen luoma moduuli." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "RukousListaAiheet" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Pekka
Sami
Susanna
Jussi
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Hengellinen kasvu" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mikko
Teppo
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Susanna
Jussi
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Kuukausittainen rukouslista. \\par\\par Xiphoksen luoma moduuli." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "KuukausiRukousLista" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Päiväkirja. \\par\\par Xiphoksen luoma moduuli." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "PäiväKirja" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Aiheen runko (esim. saarna). \\par\\par Xiphoksen luoma moduuli." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "AiheenRunko" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Yläotsikko A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Yläotsikko A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Yläotsikko B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Yläotsikko B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Yläotsikko C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Yläotsikko C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Käyttäjän muistiinpanot" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Hakutulos %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Poista alue?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Oletko varma, että haluat poistaa tämän alueen?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Haku: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2020,16 +2098,16 @@ "Kyseistä moduulia ei ole asennettu.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Ole hyvä ja muokkaa moduulilistaa." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Pikahakuindeksiä ei ole moduulille %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2037,7 +2115,7 @@ "\n" "Tälle moduulille on asetettu hakutapa 'monta sanaa'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2045,52 +2123,46 @@ "\n" "Katso Moduulien hallinta, Ylläpito." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Haku päättynyt" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "osumat" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 #, fuzzy msgid "There is no commentary module." msgstr "Kommentaarimoduulien lukumäärä" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME ei ole asetettu!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos ei voi luoda .kansiota .xiphos:\n" -"%s\n" -"\n" -"Xiphos ei voi jatkaa." +"Xiphos ei voi luoda moduulin polkua:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "ei voi luoda " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2106,11 +2178,11 @@ "Xiphos ei voi jatkaa ilman näytettävää\n" "Raamattumoduulia. Ohjelma suljetaan." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Raamattumoduulin asennus valmis." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2120,11 +2192,11 @@ msgid "verse" msgstr "jae" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "luku" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2132,7 +2204,7 @@ "Xiphoksen kielilyhenteiden\n" "tiedostoa ei löydy." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2140,7 +2212,7 @@ "Xiphoksen kielilyhenteiden\n" "tiedostoa ei voi avata." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2148,7 +2220,7 @@ "Xiphos ei pysty varaamaan\n" "tilaa kielilyhenteille." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2157,19 +2229,19 @@ "kielilyhenteiden tiedostoa." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "Paikallisuusasetusta ei löydy:" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Kirjojen nimiä ja valikkoja ei ehkä pystytä kääntämään" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2177,7 +2249,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2185,11 +2257,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Päivittäistä hartausta etsittiin, mutta sellaista ei ole asennettu." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2203,89 +2275,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Tyhjennä historialista" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Jaelista" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URLia ei löydetty:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos ei voinut suorittaa: %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Katselunäkymän virhe:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Näytä %s pääikkunassa" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokumenttia ei onnistuttu luomaan. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Mitä minun täytyy tehdä pelastuakseni?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apt 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Room 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Mitä on evankeliumi?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokumenttia ei onnistuttu käsittelemään. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "tyhjä dokumentti \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "väärä tyyppi, juurisolmu != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "väärä tyyppi, juurisolmu != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2294,7 +2371,7 @@ "\n" msgstr "Kappale" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2303,101 +2380,101 @@ "\n" msgstr "Kappale" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Vanha Testamentti" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "1Moos - Malakia" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Uusi Testamentti" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Matt- Ilm" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Moduulilistan malli" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "väärä tyyppi, juurisolmu != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2411,13 +2488,13 @@ msgstr "Kirjanmerkkidialogi" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Luo hakemisto" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Uusi kansio" @@ -2426,7 +2503,7 @@ msgstr "Uusi ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Peruuta kirjanmerkki" @@ -2439,22 +2516,22 @@ msgstr "Etiketti" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Jae:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Jae" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Moduuli:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Moduuli" @@ -2462,6 +2539,10 @@ msgid "Bookmark Folder Treeview" msgstr "Kirjanmerkkikansion puunäkymä" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Lisää linkki" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2517,6 +2598,12 @@ msgid "_Delete Personal Comment" msgstr "_Poista henkilökohtainen kommentti" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Tiedosto" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Tallenna nykyinen muistiinpano" @@ -2525,6 +2612,14 @@ msgid "_Save (Personal Comment)" msgstr "_Tallenna (henkilökohtainen kommentti)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Tulostuksen esi_katselu" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Tulosta..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "P_oistu" @@ -2533,6 +2628,11 @@ msgid "For_mat" msgstr "Muo_toilu" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Tallenna" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Tulosta tämä tiedosto" @@ -2570,7 +2670,7 @@ msgstr "Uusi tiedosto" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopioi/vie jakso" @@ -2607,7 +2707,7 @@ msgstr "Vie koko kirja" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Kirja" @@ -2722,8 +2822,8 @@ msgid "Open about dialog" msgstr "Avaa dialogissa" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2766,13 +2866,17 @@ msgid "Delete selection" msgstr "Poista valittu alue" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Poista" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Poista valittu kohta" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Poista Jakso" @@ -2947,6 +3051,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Uusi" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3079,122 +3187,86 @@ msgid "_Edit" msgstr "_Muokkaa" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Ohje" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Poista lista?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Jaelista" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Merkkaa jae/poista merkkaus" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Merkkaa" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Poista merkkaus" @@ -3274,88 +3346,96 @@ msgstr "Poista nopean haun indeksit näiltä moduuleilta?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Jatka" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Moduulien hallinta" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "VAROITUS: Jos maassasi vainotaan uskovia, käytä varoen." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr " Lisää ja Poista lähteitä" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Nykyiset paikalliset lähteet" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Nykyiset etälähteet" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Tuhoa etälähde" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Asennuslähde" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Paikallinen" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Etä" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Asennushakemisto" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Henkilökohtainen alue, omaan käyttöösi:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Kotihakemisto" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Järjestelmän alue, kaikille käyttäjille:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Swordin järjestelmähakemisto" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3363,10 +3443,14 @@ "Varoitus: Jos maassasi vainotaan uskovia etkä halua paljastumisen " "riskiä, älä käytä etäasennusominaisuutta! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Paikallinen asennushakemisto" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Historialista" @@ -3375,11 +3459,11 @@ msgid "Choose book to display" msgstr "Valitse näytettävä kirja" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Johanneksen ilmestys" @@ -3388,11 +3472,11 @@ msgid "Choose chapter to display" msgstr "Valitse näytettävä kirja" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3539,11 +3623,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Moduulit" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3612,12 +3697,12 @@ msgid "BSP privacy button" msgstr "Jakeen numero" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Pelastus" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3647,11 +3732,12 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Listan nimi" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3694,7 +3780,12 @@ msgid "BSP listen none radio button" msgstr "Jakeen numero" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Erityiset" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3881,194 +3972,193 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Jakeen numero" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "Näytä jae_numerot" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Jaenumeron fontin koko" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Jaenumeron fontin koko" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Kuvaus" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Näytä jae_numerot" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Jaenumeron fontin koko" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Opiskelumuistion oletushakemisto" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Valitse hakemisto" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Sekalaista" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Pääikkunan moduulit" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Raamatullinen teksti" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Sanakirja" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduulit" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Poista kaikki moduulit listasta" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Poista valittu moduuli listasta" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "Avaa dialogi valitaksesi moduulit, jotka lisätään listaan" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Lisää moduuleja" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Rinnakkaismoduulit" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Moduulit erityistarkoituksiin" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Päivittäinen hartaus" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Heprean sanakirja" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Kreikan sanakirja" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Oletussanakirja" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Henkilökohtaiset muistiinpanot" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Sekalaiset moduulit" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Moduulivalinta" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4099,6 +4189,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Edistynyt haku" @@ -4308,11 +4402,11 @@ msgid "Found" msgstr "Löydettiin" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4504,6 +4598,11 @@ msgid "Attribute Search" msgstr "Attribuuttihaku" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Moduulivalinta" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4600,6 +4699,10 @@ msgid "_Module Manager" msgstr "_Moduulien hallinta" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Näkymä" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4751,28 +4854,28 @@ msgid "Learn about Xiphos" msgstr "Tietoa _Xiphoksesta" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Avaa moduuli" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Muistiinpano" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Avaa editorissa" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "Yksi jae rivillä" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4780,191 +4883,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variantit" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Kuva_sisältö" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Noudata fonttimäärittelyjä" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Kommentaari luvuittain" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" msgstr "Kaksinkertainen riviväli" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Etsi valinta" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Käytä nykyistä sanakirjaa" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Poista moduulin lukitus" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Näytä kirjan otsikko" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Näytä luvun otsikko" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Nimeä henk.koht. komm." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Hävitä henk.koht. komm." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Lue valinta ääneen" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Tallenna tulokset yhdeksi kirjanmerkiksi" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Tallenna lista yhdeksi kirjanmerkiksi" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Tallenna tulokset yhteen kansioon peräkkäisiksi kirjanmerkeiksi" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Tallenna lista peräkkäisiksi kirjanmerkeiksi" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Jaelista" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Tyhjennä historialista" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Vie lista" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Avaa tämä kirjanmerkki uudessa välilehdessä" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Avaa uudessa välilehdessä" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Avaa tämä kirjanmerkki dialogissa" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Avaa dialogissa" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Lisää uusi kansio valittuun kansioon" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Lisää uusi kirjanmerkki tähän" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Lisää kirjanmerkki" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Muokkaa kirjanmerkkijaksoa" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Muokkaa jaksoa" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Poista jakso" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Laajenna kaikki kirjanmerkkiryhmät" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Laajenna kaikki" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Kutista kaikki kirjanmerkkiryhmät" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Kutista kaikki" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Salli jaksojen siirtäminen kansiosta toiseen" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Salli uudelleenjärjestys" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Lataa kirjanmerkit Bibletimesta" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Lisää kirjanmerkki" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Poista kansio ja tallenna se" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Vie kansio" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Avaa valittu moduuli uudessa välilehdessä" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -4972,80 +5084,80 @@ "Avaa valittu moduuli\n" "\terillisessä ['dialogi'] ikkunassa" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Avaa erillisessä ikkunassa" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Luo uusi yksinkertainen rukouslista" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Yksinkertainen" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Luo uusi aiheenmukainen rukouslista" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Aihe" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Luo uusi kuukausittainen päiväkirja" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Kuukausittainen" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Luo uusi päivittäinen päiväkirja" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Päivittäinen" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Luo uusi aiheen runko" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Avaa erillisessä ikkunassa" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Lisää kohta" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Poista tämä kohta" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Muokkaa tätä kohtaa" @@ -5057,6 +5169,91 @@ msgid "Study the Bible" msgstr "Opiskele Raamattua" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Koko moduuli" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s epäonnistui" + +#~ msgid "Page %d of %d" +#~ msgstr "Sivu %d / %d" + +#~ msgid "Save As" +#~ msgstr "Tallenna nimellä" + +#~ msgid "HTML Output" +#~ msgstr "HTML-tuloste" + +#~ msgid "HTML Source" +#~ msgstr "HTML-lähdeteksti" + +#~ msgid "Plain Source" +#~ msgstr "Muotoilematon lähdeteksti" + +#~ msgid "_Quit" +#~ msgstr "_Lopeta" + +#~ msgid "_Open" +#~ msgstr "_Avaa" + +#~ msgid "_Save" +#~ msgstr "_Tallenna" + +#~ msgid "Save _As..." +#~ msgstr "Tallenna nimellä..." + +#~ msgid "Open new document" +#~ msgstr "Avaa uusi dokumentti" + +#~ msgid "Delete current note" +#~ msgstr "Poista nykyinen teksti" + +#~ msgid "HTML _Output" +#~ msgstr "_HTML-muotoilu" + +#~ msgid "_HTML Source" +#~ msgstr "HTML-lähdekoodi" + +#~ msgid "_Plain Source" +#~ msgstr "_Muotoilematon lähdekoodi" + +#~ msgid "Unlock " +#~ msgstr "Poista lukitus " + +#~ msgid "Preparing to print" +#~ msgstr "Valmistellaan tulostusta" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Tulostus tälle tulostimelle ei ole tuettu" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Tulostin %s ei tue PostScript-tulostusta." + +#~ msgid "Printing" +#~ msgstr "Tulostaa" + +#~ msgid "Waiting to print" +#~ msgstr "Odotetaan tulostusta" + +#~ msgid "An error occurred while printing" +#~ msgstr "Tulostuksessa tapahtui virhe" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Dokumentin %s tulostus ei onnistunut" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos ei voi luoda .kansiota .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos ei voi jatkaa." + #~ msgid "Tabs" #~ msgstr "Välilehdet" @@ -5435,9 +5632,6 @@ #~ msgid "C_lear" #~ msgstr "T_yhjennä" -#~ msgid "Clear history list" -#~ msgstr "Tyhjennä historialista" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "Näytä päivittäinen hartaus täksi päiväksi" @@ -5462,9 +5656,6 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "Enemmän tietoa SWORD-projektista" -#~ msgid "About this application" -#~ msgstr "Tietoa tästä ohjelmasta" - #~ msgid "Hi_story" #~ msgstr "Hi_storia" diff -Nru xiphos-4.0.0+dfsg1/po/fr.po xiphos-4.0.4+dfsg1/po/fr.po --- xiphos-4.0.0+dfsg1/po/fr.po 2014-12-20 00:29:48.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/fr.po 2015-08-28 02:13:25.000000000 +0000 @@ -1,5 +1,5 @@ # French translation for Xiphos -# Copyright (C) 2002, 2014 Free Software Foundation, Inc. +# Copyright (C) 2002, 2015 Free Software Foundation, Inc. # Contributions are welcome. # # Translation Notes (Any comment welcome) @@ -13,18 +13,19 @@ # Viewer -> Aperçu # Biblical Text -> Textes bibliques # Lemma -> Lemme +# Glosse -> Annotation # Daily Devotion -> Calendrier biblique -# Speaker -> Orateur +# Speaker -> Intervenant # Audience -> Audience # -# Dominique Corbex , 2002, 2014. +# Dominique Corbex , 2002, 2015. # msgid "" msgstr "" -"Project-Id-Version: Xiphos 3.4.0\n" +"Project-Id-Version: Xiphos 4.0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" -"PO-Revision-Date: 2014-12-19 21:51+0100\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" +"PO-Revision-Date: 2015-08-25 10:39+0200\n" "Last-Translator: Dominique Corbex \n" "Language-Team: emacs + po-mode \n" "Language: \n" @@ -33,93 +34,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "erreurs de configuration du réseau." - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "socket client" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "socket serveur" - -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "mauvaise clé" - -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "mauvaise version du protocole" - -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "mauvais type de message" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "mauvais nombre de paquets" - -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "mauvais indice de paquets" - -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "mauvais format du corps" - -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "entête requis manquant" - -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "UUID usurpé: mauvaise addresse IP." - -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "Écho ignoré." - -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Le domaine n'est pas 'BIBLE-VERSE' : " - -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "Groupe invalide : " - -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr " présent à " - -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr " utilisant " - -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "[Pas de vidage prêt]" - -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" - -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "Échec de la transmission.\n" - -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "Multidiffusion impossible. BibleSync est à présent déactivé. Si votre connection réseau a changé pendant que ce programme était actif, il peut être suffisant de la réactiver." - -#: ../src/backend/sword_main.cc:740 +#: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" "Please report this. sword_main.cc:set_treekey\n" @@ -129,202 +44,230 @@ "Merci de le signaler. sword_main.cc:set_treekey\n" "Que faisiez-vous lorsque c'est arrivé?" -#: ../src/backend/sword_main.cc:1091 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Configuration non trouvée" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Page %d de %d" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Êtes-vous certain de vouloir supprimer le commentaire de" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Ouvrir" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Enregistrer sous" - -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Sans titre" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Êtes-vous certain de vouloir supprimer le commentaire de" - -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Sortie HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Source HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Source texte" - -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Imprimer..." - -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "A_perçu avant impression" - -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Quitter" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Ouvrir" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Enregistrer" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Enregistrer _sous..." - -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nouveau" - -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Ouvre un nouveau document" - -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Supprime" - -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Supprime la note en cours" - -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fichier" - -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Sortie HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "Source _HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "Source _texte" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Affichage" - -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Enregistrer" - -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Insérer un lien" - -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Voulez-vous enregistrer les modifications apportées au document" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "avant de fermer?" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "" "Si vous n'enregistrez pas, les modifications seront définitivement perdues." -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "Fichier" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "Bloc-notes" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Éditeur de note" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Éditeur de liste de prières ou de journal" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Entrez la clé de déverrouillage " +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "À propos de ce module SWORD" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Préparation de l'impression" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "Fermer" + +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " +msgstr "Module :" + +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " +msgstr "Version :" + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "Pas d'indication trouvée" + +#: ../src/gnome2/about_modules.c:421 +msgid "Type: " +msgstr "Type :" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "L'impression n'est pas supportée par ce périphérique." +#: ../src/gnome2/about_modules.c:423 +msgid "Daily Devotion" +msgstr "Calendrier biblique" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "L'imprimante %s n'accepte pas les impressions de type PostScript." +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Cartes" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Impression" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Images" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "En attente de l'impression" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "Glossaire" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "Culte" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Une erreur s'est produite pendant l'impression" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bible" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Le document %s n'a pas pu être imprimé" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Commentaire" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "À propos de ce module SWORD" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Dictionnaire" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Ce module ne contient pas d'information À propos" +#: ../src/gnome2/about_modules.c:446 +msgid "General Book" +msgstr "Livre" + +#: ../src/gnome2/about_modules.c:451 +msgid "Personal Commentary" +msgstr "Commentaire personnel" + +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" +msgstr "Journal" + +#: ../src/gnome2/about_modules.c:457 +msgid "Unknown type" +msgstr "Type inconnu" + +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "Abréviation :" + +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "Langue :" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "Non spécifiée" + +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "Taille :" + +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "Modules compagnons :
" + +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "Options :" + +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "* En-têtes" + +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "* Notes de bas de page" + +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "* Références croisées" + +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "* Nombres de Strong" + +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "* Étiquettes morphologiques" + +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "* Lemmes" + +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "* Paroles de Christ en rouge" + +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "* Accents grecs" + +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "* Ponctuation des voyelles en hébreu" + +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "* Vocalisations en hébreu" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "* Variantes" + +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "* Translittération" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "* Énumérations" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "* Annotations" + +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "* Segmentation de morphème" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "* Aucune option" + +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "Licence de distribution :" + +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "Promotion :" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -335,57 +278,49 @@ "\n" " Books can be downloaded from the SWORD Project." msgstr "" -"Le Projet SWORD a pour objectif la création d'un ensemble de logiciels " -"destinés à l'étude de Dieu et de Sa Parole.\n" +"Le Projet SWORD a pour objectif la création d'un ensemble de logiciels destinés à l'étude de Dieu et de Sa Parole.\n" "\n" -"La bibliothèque logicielle du Projet SWORD donne les moyens d'utiliser et " -"étudier aisément textes bibliques, commentaires, dictionnaires ou autres " -"documents.\n" +"La plateforme logicielle du Projet SWORD apporte les moyens de construire des outils permettant d'utiliser et d'étudier aisément les textes bibliques, commentaires, dictionnaires ou autres ouvrages.\n" "\n" -"De nombreux logiciels utilisateurs sont développés sur cette bibliothèque. " -"L'installation d'une seule collection de textes est ainsi exploitable par " -"tous ces logiciels.\n" +"De nombreux logiciels utilisateurs sont développés à partir de cette plateforme. Une collection de documents installée est ainsi exploitable par tous ces logiciels.\n" "\n" -"Les textes peuvent être téléchargés depuis le Projet SWORD." +"Les documents peuvent être téléchargés depuis le Projet SWORD." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "The SWORD Project" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -"Si vous appréciez Xiphos, vous aimeriez peut-être le voir s'afficher dans " -"votre langue maternelle ? Sachez que vous pouvez participer à sa " -"traduction !\n" +"Si vous appréciez Xiphos, vous aimeriez peut-être le voir s'afficher dans votre langue maternelle ? Sachez que vous pouvez participer à sa traduction !\n" "\n" -"Toute nouvelle contribution à la traduction de Xiphos est la bienvenue. Si " -"vous souhaitez apporter votre aide, suivez le lien ci-dessous. N'hésitez pas " -"à nous contacter et nous rejoindre." +"Toute nouvelle contribution à la traduction de Xiphos est la bienvenue. Si vous souhaitez apporter votre aide, suivez le lien ci-dessous. N'hésitez pas à nous contacter et nous rejoindre. Votre aide sera très appréciée." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "À propos de de la traduction de Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Voir le TRANSLATION-HOWTO dans le source de Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "SIte de développement de Xiphos" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright © 2000-2014 Équipe de développement Xiphos" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Équipe de développement Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -398,233 +333,233 @@ "les autres personnes qui font vivre le Projet SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Signet" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Saisir le nom du dossier" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nom du dossier" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Dossier : " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Spécifie le fichier des signets" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Édition" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nom du dossier : " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nom du signet : " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Verset : " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Module : " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Supprimer le dossier sélectionné" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(et tout son contenu)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Supprimer le signet" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Ajouter" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Étiquette : " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Résultat de la requête : %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "vrir" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Signets" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Clé de chiffrement pour le module %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "pour :" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Entrer la clé : " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Fermer sans sauvegarder" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos :" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Ferme sans enregistrer" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "_Versets" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Liste de versets" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Résultat de la requête" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Prière de vérifier le copyright avant l'export!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Rechercher..." -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Entrez un mot ou une phrase" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Rechercher en arrière" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Rechercher suivant" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Changer de police" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Change la police de" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Module" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Police utilisée : " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Police par défaut dans ce module" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos va s'arrêter sur une erreur « STRDUP »" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" "Merci de signaler cette erreur à l'équipe de développement Xiphos avec :" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos va s'arrêter sur une erreur « STRING »." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Le module n'a pas de support pour %s" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos : Pas de fenêtres." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync : La navigation courante a été envoyée." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync : Ne transmet pas." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Logiciel d'étude biblique" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" -msgstr "Ouvrir un nouvel onglet" +msgstr "Ouvre un nouvel onglet" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Vue simple" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Commentaire" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Livre" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Bienvenue dans Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -642,34 +577,34 @@ "Windows ne permet pas de renommer des fichiers en cours d'utilisation\n" "ce qui est le cas des commentaires personnels." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Renommer le commentaire" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Nom du commentaire" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nouveau nom :" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nom : " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" "Les noms de modules ne peuvent contenir que des lettres et des chiffres." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Il existe déjà un module de ce nom." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -678,7 +613,7 @@ "Impossible de créer une nouvelle configuration\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -686,7 +621,7 @@ "Erreur de configuration\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Pas de module dans ce volet" @@ -717,30 +652,21 @@ "Live Chat, or (if no one is responsive in chat) send mail to our users' " "mailing list.\n" msgstr "" -"Bienvenue dans le Gestionnaire de modules\n" +"Bienvenue dans le Gestionnaire de modules!\n" "\n" -"C'est le mécanisme de Xiphos pour obtenir du contenu et le mettre à jour. Si " -"vous ne l'avez pas encore utilisé, prenez quelques instants pour le " -"connaître.\n" +"C'est le moyen utilisé dans Xiphos pour installer et mettre à jour les modules de bibles, commentaires ou autres. Si vous ne l'avez pas encore utilisé, prenez quelques instants pour le découvrir.\n" " \n" -"Les modules proviennent de différents dépots. \n" +"Les modules proviennent de diverses sources appelées dépots. \n" "\n" -"Dépots : Ajouter/Supprimer indique quels dépots sont actuellement " -"répertoriés.\n" +"Dépots → Ajouter/Supprimer liste les dépots actuellement répertoriés.\n" "\n" -"Dépots : Sélection permet de définir d'où les modules doivent " -"provenir, c'est-à-dire de quel dépôt Xiphos doit les rapatrier, ainsi que " -"l'endroit où ils doivent être placés sur le système. Sélectionnez Source " -"des dépots et Dossier d'installation, puis ensuite Actualiser.\n" +"Dépots → Sélection permet de définir d'où les modules doivent provenir, c'est-à-dire de quel dépôt Xiphos doit les rapatrier, ainsi que l'endroit où ils doivent être placés sur le système. Sélectionnez Source des dépots et Dossier d'installation, puis ensuite Actualiser.\n" "\n" -"Modules : Installer permet de sélectionner et d'obtenir des modules " -"après avoir choisi la source et le dossier d'installation.\n" +"Modules → Installer/Maj permet de sélectionner et d'installer des modules après avoir choisi la source et le dossier d'installation.\n" "\n" -"Modules : Maintenance sert à l'archivage et la création d'index.\n" +"Modules → Maintenance sert à l'archivage et la création d'index.\n" "\n" -"Pour plus d'informations à propos du gestionnaire de modules, voir la " -"section 5 du manuel d'aide. \n" +"Pour plus d'informations à propos du gestionnaire de modules, voir la section 5 du manuel d'aide. \n" #: ../src/gnome2/mod_mgr.c:67 msgid "" @@ -778,51 +704,41 @@ msgstr "" "Bienvenue dans Xiphos.\n" "\n" -"Aucune Bible n'est installée. Pour achever son initialisation, Xiphos a " -"besoin d'au moins un module de texte biblique. \n" -"Le gestionnaire de modules a donc été ouvert pour pouvoir installer une ou " -"plusieurs Bibles depuis soit un dépot local (cdrom, disque flash) soit par " -"internet depuis le serveur de Crosswire Bible Society.\n" -"Merci de se référer aux instructions suivantes, ainsi qu'à celles présentes " -"dans la vue d'ensemble du gestionnaire de modules également ouverte.\n" +"Aucune Bible n'a été trouvée. Pour achever son initialisation, Xiphos a besoin d'au moins un module de texte biblique. \n" +"Le Gestionnaire de modules a donc été ouvert pour vous permettre d'installer une ou plusieurs Bibles soit à partir d'un dépot local (cdrom, disque flash) soit par téléchargement depuis le serveur de la Crosswire Bible Society.\n" +"Merci de se référer aux instructions suivantes, ainsi qu'à celles présentes dans l'écran de bienvenue du Gestionnaire de modules ouvert en arrière-plan.\n" "\n" "Installation locale :\n" -"- Dans Dépôts : Ajouter/Supprimer, ajouter le nom du nouveau " -"répertoire local où se trouvent les modules. (Répertoire contenant les " -"dossiers nommés mods.d et modules)\n" -"- Dans Dépôts : Sélection, sélectionner « Dépot local » puis le nom " -"du répertoire dans le menu déroulant.\n" -"\n" -"Installation par Internet :\n" -"- Dans Dépôts : Sélection, sélectionner « Dépot distant » puis « " -"Crosswire » dans le menu déroulant.\n" -"- Cliquer « Actualiser » au bas de la fenêtre. \n" +"- Dans Dépôts → Ajouter/Supprimer, ajouter le nom du nouveau répertoire local où se trouvent les modules. (Répertoire contenant les dossiers nommés mods.d et modules)\n" +"- Dans Dépôts → Sélection, sélectionner « Dépot local » puis le nom du répertoire dans le menu déroulant.\n" +"\n" +"Installation par téléchargement :\n" +"- Dans Dépôts → Sélection, sélectionner « Dépot distant » puis « Crosswire » dans le menu déroulant.\n" +"- Cliquer sur Actualiser au bas de la fenêtre. \n" "\n" "Dans les 2 cas :\n" -"- Dans Modules : Installer, sélectionner la Bible et les autres " -"modules de votre choix.\n" -"- Cliquer « Installer ».\n" -"- Fermer le Gestionnaire de modules quand vous avez terminé.\n" +"- Dans Modules → Installer/Maj, sélectionner la Bible et les autres modules de votre choix.\n" +"- Cliquer sur Installer.\n" +"- Fermer le Gestionnaire de modules quand vous avez terminé.\n" "\n" -"Attention : Prudence dans les pays de persécution.\n" +"Attention : La plus extrême prudence est requise dans les pays de persécution.\n" "\n" -"Cette fenêtre d'aide ainsi que la vue d'ensemble du gestionnaire de modules " -"peuvent être fermées à tout moment." +" " -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Supprimer ces modules ?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Préparation à la suppression" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Suppression de" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Supprimer" @@ -842,23 +758,23 @@ msgid "Install" msgstr "Installer" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archiver ces modules ?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Préparation à l'archivage" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archivage de" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archiver" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -866,56 +782,60 @@ "Construire un index de recherche optimisée pour les modules suivants (dure " "un certain temps) ?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Préparation à l'indexation" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexation de" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indexer" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Supprimer l'index de recherche optimisée pour les modules suivants ?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Préparation à la suppression d'index" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Suppression de l'index à" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Suppression" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Ce module ne contient pas d'information À propos" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nom du module" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Une coche indique un module déjà installé" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Cocher la case pour travailler avec ce module" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Cocher la case pour sélectionner ce module à installer ou à mettre à jour" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installé" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -923,7 +843,7 @@ "L'icône index indique qu'un index optimisé pour des requêtes rapides " "(lucène) a été construit à l'aide du bouton indexer." -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -931,13 +851,13 @@ "L'icône protection indique un module encrypté et nécessite l'achat d'une clé " "de déverrouillage auprès de l'éditeur du document" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "À propos" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -945,19 +865,19 @@ "L'icône Rafraichir indique un module installé plus vieux que le nouveau " "disponible. Le module est à mettre à jour." -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Dispo" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Taille" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Description" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -966,33 +886,33 @@ "Impossible de créer le répertoire %s\n" "%s" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "Archivé dans \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Les listes de prières et journaux ne peuvent pas être indexés." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s a échoué" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Terminé" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Inconnu" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -1001,7 +921,7 @@ "Dépôt :\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -1009,54 +929,44 @@ "Modules classés\n" "par type" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Textes bibliques" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Commentaires" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Dictionnaires" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glossaires" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Calendriers bibliques" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Livres" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Cartes" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Images" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Hétérodoxie" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1064,96 +974,96 @@ "Modules classés\n" "par disponibilité" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Mise à jour disponible" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Non installé" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Liste de prières / Journal" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Rafraîchissement en cours" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Serveur non trouvé" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configurer" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Type" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Libellé" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Source" # src/gs_preferences_dlg.c -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Répertoire" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Identifiant" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Mot de passe" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Dépots" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Ajouter/Supprimer" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Sélection" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modules" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Installer/Maj" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Maintenance" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Rafraîchir" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "La liste des modules n'est pas à jour!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1161,7 +1071,7 @@ "Vous avez désinstallé votre dernière Bible.\n" "Xiphos requiert au minimum une." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1169,114 +1079,129 @@ "Toujours aucune Bible installée.\n" "Xiphos ne peut pas continuer sans." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" +"%s remplace %s.\n" +"Effacer %s?\n" +"Attention: pas de retour en arrière possible" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "Aucun module périmé trouvé." + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" "Les dépôts distants standards\n" "ont été chargés." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Impossible de charger les dépôts standards depuis CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Supprime le dépôt sélectionné" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Ajouter un dépôt distant" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Libellé :" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Type :" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Serveur :" # src/gs_preferences_dlg.c -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Répertoire :" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Identifiant (optionnel) :" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Password (optional):(optionnel) :" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Un dépôt du même nom existe déjà" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Supprimer un dépôt distant" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "Pas de module" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Revenir à la section contenant cet élément" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Élément précédent" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Élément suivant" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Aller à la première sous-section" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synchronise le défilement de cette fenêtre avec la fenêtre principale" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Vue parallèle" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Détacher/Attacher" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Options du module" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Vue parallèle" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "BibleSync mot de passe de session" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Phrase :" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1284,97 +1209,96 @@ "La sélection de mode a échoué.\n" "Activer le débogage et réessayer pour voir pourquoi." -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "La sélection du mode a échoué.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync : %s (mot de passe \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Désactivé" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Notes personnelles" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" -msgstr "Orateur" +msgstr "Intervenant" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Audience" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "[ Aucun ]" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "La langue prendra effet après redémarrage." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Préférences" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Général" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Options" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Polices" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Couleurs" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Tailles et apparence" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Spécial" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Effacer la liste?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Êtes-vous certain d'effacer la liste des modules?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Enlever les modules?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Êtes-vous certain de vouloir supprimer le module sélectionné?" @@ -1393,20 +1317,20 @@ msgid "found in " msgstr "dans " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nouvelle liste %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Le dernier module de la liste ne peut être supprimé" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Supprimer la liste?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Êtes-vous certain de vouloir supprimer :" @@ -1426,7 +1350,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1455,7 +1379,7 @@ "For complete details, search the web for \"lucene search syntax\"." msgstr "" "Aperçu de la syntaxe des requêtes optimisées « lucene »\n" -"Rechercher des versets qui contiennent ...\n" +"Correspondance des recherches de versets :\n" "\n" "est amour\n" "\t« est » ou « amour »\n" @@ -1481,8 +1405,7 @@ "\tSélectionner aussi l'affichage « Avec nombres \n" "\tde Strong » dans l'onglet « Attributs »\n" "\n" -"Pour plus d'amples détails, rechercher sur Internet : « Syntaxe requête " -"Lucene »." +"Pour plus d'amples détails, rechercher sur Internet : « Syntaxe requête Lucene »." #. ***************************************************************************** #. * Name @@ -1500,7 +1423,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1538,15 +1461,15 @@ "« nom, accusatif singulier féminin » - voir le module Robinson pour plus de " "détails." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Le module n'est ni une Bible ni un commentaire" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync n'est pas actif pour émission." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1554,105 +1477,95 @@ "Ceci est une requête de type inclusive (« ET »)\n" "Les résultats correspondants comprennent tous les mots." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "Recherche avancée" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Ouvre la fenêtre de recherche avancée" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Module" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Texte biblique" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Commentaire" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Type de requête" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Mots multiples" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Expression rationnelle" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Phrase exacte" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Options de la requête" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Respecter la casse" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Plage de versets" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Sans limites" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Avec des limites" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Dernière requête" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Limites de la plage" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Basse" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Haute" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Ouvrir le module dans l'éditeur?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Si la réponse est négative, il sera ouvert en lecture seulement." -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" -msgstr "Copier les références de verset" +msgstr "Coller les références de verset" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Liste :" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Rechercher" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Barre latérale" @@ -1660,73 +1573,73 @@ msgid "Powered by the SWORD Project" msgstr "Xiphos utilise les logiciels du Projet SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Impossible de créer le répertoire tabs." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Élément de liste de prières/Journal" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nouveau nom" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Supprimer l'élément sélectionné" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Janvier" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Février" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Mars" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Avril" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mai" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juin" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juillet" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Août" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Septembre" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Octobre" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Novembre" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Décembre" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1734,7 +1647,96 @@ "La taille d'une image n'a pu être déterminée.\n" "&app; ne peut redimensionner les images pour s'adapter à la fenêtre." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "Paquet incohérent :\n\n" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "Annonce de présence :\n\n" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "Paquet de navigation :\n\n" + +#: ../src/main/biblesync_glue.cc:179 +msgid "Unknown module " +msgstr "Module inconnu" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" +".\n" +"Navigation indirecte en utilisant la liste de versets." + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "ERREUR : indicateur BibleSync inconnu : " + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "Les autres indications sont :" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "Cocher la case pour suivre cet intervenant" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "Intervenants disponibles" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "D/I" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "La dernière navigation était directe ou indirecte" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "Dernière navigation" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "UUID" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "Adresse IP :" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "\nApplication : " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "\nPériphérique :" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "\nUUID : " + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "

Ce module n'a aucun contenu à cette référence.
" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1743,247 +1745,268 @@ "Ce nom d'annotation personnelle est improprement formé :\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Chapitre" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos n'accepte pas plus d'un argument." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Initialisation HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Construction de l'interface" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Démarrage de Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Chargement des préférences" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Affichage de Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Aperçu" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Note de bas de page" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Référence croisée" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Étiquette morphologique" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Revenir à " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "Module parallèle inconnu : " + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Nombres de Strong" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Notes de bas de page" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Étiquettes morphologiques" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Ponctuation des voyelles en hébreu" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Vocalisations en hébreu" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Accents grecs" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Références croisées" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmes" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "En-têtes" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentation de morphème" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Paroles de Christ en rouge" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Translittération" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Variantes du texte" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Lectures principales" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Lectures secondaires" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Toutes les lectures" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "Formes translittérées" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "Énumérations" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "Annotations" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "Voir le contexte" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Croissance" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Pour la croissance
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Salut" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Pour le salut
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Guérison" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Pour la guérison
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Divers" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Divers
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Point x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Point y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Point z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Section 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Section 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Section 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Section 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Section 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Section 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Section 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Section 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Nom de la nouvelle liste de prières ou du journal" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Cette liste de prières ou note existe déjà." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1992,19 +2015,19 @@ "Impossible de créer le chemin d'accès au module:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Une simple liste de prières. \\par\\par Module crée par Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "MaSimpleListeDePrieres" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MaListeDePrieres" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -2013,103 +2036,103 @@ ">Assemblée:
Participants
Fonctionnement
Missions


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Liste de prières organisée par sujets. \\par\\par Module crée par Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "MaListeDePrieresParSujets" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Personne 1
Personne 2
Personne 3
Personne 4
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Croissance spirituelle" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Personne 1
Personne 2
Personne 3
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Personne 1
Personne 2
Personne 3
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Liste de prières mensuelle. \\par\\par Module crée par Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MaListeDePrieresMensuelle" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Un journal quotidien. \\par\\par Module crée par Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "JournalQuotidien" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Thême structuré (ex message). \\par\\par Module crée par Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "ThemeStructure" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Sujet majeur A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Sujet majeur A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Sujet majeur B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Sujet majeur B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Sujet majeur C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Sujet majeur C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Annotation personnelle de" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Résultat de la requête %s : %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Supprimer la plage?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Êtes-vous certain de supprimer cette plage?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Dans : " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2120,16 +2143,16 @@ "Module non installé.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "La liste de modules est à régénérer" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Aucun index de recherche optimisée n'existe pour %s %s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2137,7 +2160,7 @@ "\n" "Les requêtes sur ce module sont maintenant 'multi-mots'" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2145,41 +2168,33 @@ "\n" "Voir le Gestionnaire de modules, onglet Maintenance" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Recherche terminée" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "réponses" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Il n'y a pas de module commentaire." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME n'est pas défini!" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "" -"Xiphos n'a pas pu créer ~/.xiphos:\n" -"%s\n" -"\n" -"Xiphos ne peut s'exécuter normalement." +msgid "Xiphos can not create directory " +msgstr "Impossible de créer le dossier" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "impossible de créer " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2187,12 +2202,12 @@ "Fichier de configuration vide -- Essai de restauration.\n" "Des informations ont pu être perdues." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "Fichier de configuration vide -- pas de sauvegarde?!? Informations perdues!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2201,20 +2216,16 @@ "Xiphos cannot proceed,\n" "and will now exit." msgstr "" -"Aucun module de texte biblique\n" -"n'a été installé, suite à un\n" -"ajournement opérateur.\n" -"\n" -"Sans aucun module de Bible à\n" -"visualiser, Xiphos ne peut\n" -"fonctionner, et va maintenant\n" -"se terminer." +"Aucune Bible trouvée!\n" +"\n" +"Xiphos ne peut fonctionner sans Bible,\n" +"et va maintenant se terminer." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." -msgstr "Installation de module terminée." +msgstr "L'installation des modules est terminée." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2226,11 +2237,11 @@ msgid "verse" msgstr "verset" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "chapitre" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2238,7 +2249,7 @@ "Le fichier des définitions\n" "de langages est absent." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2246,7 +2257,7 @@ "Ouverture impossible du fichier\n" "des définitions de langages." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2254,7 +2265,7 @@ "Impossible d'allouer l'espace suffisant\n" "aux abbréviations de langage." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2263,7 +2274,7 @@ "définitions de langages." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2272,11 +2283,11 @@ "Pas de locale correspondante pour `%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Les noms de livres et les menus ne seront peut-être pas traduits" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2287,7 +2298,7 @@ "%s.\n" "Voulez-vous les ouvrir également?%s" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2299,11 +2310,13 @@ "Le premier va s'ouvrir dans la fenêtre principale\n" "et les autres dans des fenêtres séparées." -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." -msgstr "Un calendrier biblique a été demandé, mais aucun module de ce type n'est installé." +msgstr "" +"Un calendrier biblique a été demandé, mais aucun module de ce type n'est " +"installé." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2327,89 +2340,93 @@ "\n" "Prière de saisir la clé dans la boite de dialogue." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Effacer l'historique" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "Historique ➛ Liste de versets" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL non trouvée :" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos n'a pas pu exécuter %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Erreur d'aperçu:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Affiche %s dans la fenêtre principale" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Erreur de création du document. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Comment être sauvé?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Act 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Éph 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romains 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Qu'est-ce que l'Évangile?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Erreur de lecture du document. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "Document vide \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "Erreur de type, root node != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "Erreur de type, root node !=Copy_Export\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Chapitre %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Chapitre %d

" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2422,7 +2439,7 @@ "Chapitre %d\n" "\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2435,12 +2452,12 @@ "Chapitre %d\n" "\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Chapitre %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2449,82 +2466,82 @@ "%s: %s Chapitre %d\n" "\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Ancien Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Ge - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nouveau Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mt - Ap" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Exemple de liste de modules" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "Erreur de type, root node != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2533,7 +2550,7 @@ "La sauvegarde de la configuration a échouée! stat %d, taille %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Tentative de retour à la sauvegarde précédente." @@ -2547,13 +2564,13 @@ msgstr "Signet" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Crée un nouveau dossier" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nouveau dossier" @@ -2562,7 +2579,7 @@ msgstr "Nouveau..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Annuler un signet" @@ -2575,22 +2592,22 @@ msgstr "Entrée Étiquette" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Verset :" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Entrée Verset" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Module :" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Entrée Module" @@ -2598,6 +2615,10 @@ msgid "Bookmark Folder Treeview" msgstr "Arborescence Dossier des signets" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Insérer un lien" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2651,6 +2672,12 @@ msgid "_Delete Personal Comment" msgstr "Supprimer le commentaire" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fichier" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Enregistre la note en cours" @@ -2659,6 +2686,14 @@ msgid "_Save (Personal Comment)" msgstr "Enregistrer le commentaire" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "A_perçu avant impression" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Imprimer..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Quitter" @@ -2667,6 +2702,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Enregistrer" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Imprime ce document" @@ -2704,7 +2744,7 @@ msgstr "Nouveau document" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copier/exporter le passage" @@ -2741,7 +2781,7 @@ msgstr "Exporter un livre entier" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Livre" @@ -2823,7 +2863,7 @@ #: ../ui/export-dialog.glade.h:32 msgid "Include Version" -msgstr "Nom de la version de la Bible" +msgstr "Nom de la version de Bible" #: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 msgid "Version button" @@ -2849,8 +2889,8 @@ msgid "Open about dialog" msgstr "Ouvre la boite à propos" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Gras" @@ -2890,12 +2930,16 @@ msgid "Delete selection" msgstr "Supprimer la sélection" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Supprime" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Enlève la sélection" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Supprimer l'élément" @@ -3051,6 +3095,10 @@ msgid "Right justify paragraph" msgstr "Aligne le paragraphe à droite" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nouveau" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "Crée un nouveau fichier" @@ -3168,120 +3216,84 @@ msgid "_Edit" msgstr "_Édition" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Aide" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Texte principal" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Titre 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Titre 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Titre 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Titre 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Titre 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Titre 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adresse" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Préformatté" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Liste à puces" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Liste à chiffres romains" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Liste numérotée" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Liste alphabétique" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" +msgstr "Barré" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Modifie la couleur de police du texte sélectionné" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Met en surbrillance le texte sélectionné" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Annoter ce verset" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Annoter" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Supprimer" @@ -3295,9 +3307,7 @@ #: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3 msgid "Open a brief introductory explanation of how the Module Manager works." -msgstr "" -"Ouvre une brève explication introduisant la façon dont le gestionnaire de " -"modules fonctionne." +msgstr "Ouvre l'aide d'introduction du gestionnaire de modules." #: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4 msgid "_Load Standard" @@ -3315,9 +3325,7 @@ msgid "" "Refresh Xiphos' knowledge of what modules are available at the selected " "remote repository" -msgstr "" -"Actualise l'information dans « Xiphos » au sujet des modules disponibles " -"dans les dépôts." +msgstr "Actualise la liste des modules disponibles dans les dépôts." #: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8 msgid "_Install" @@ -3329,7 +3337,7 @@ #: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9 msgid "Remove the selected modules from your system" -msgstr "Supprime les modules sélectionnés de votre système" +msgstr "Enlève les modules sélectionnés." #: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10 msgid "_Archive" @@ -3346,9 +3354,7 @@ #: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13 msgid "" "Build an index of the selected modules, for optimized (\"lucene\") searching." -msgstr "" -"Construit un index des modules sélectionnés, pour une recherche optimisée " -"(« lucène »)." +msgstr "Construit un index des modules sélectionnés, pour optimiser les recherches." #: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14 msgid "_Delete Index" @@ -3359,31 +3365,39 @@ msgstr "Supprime l'index de recherche optimisée des modules sélectionnés." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "Vérifier" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "Vérifie les modules et propose d'enlever les modules périmés." + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Continuer" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Gestionnaire de modules" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." -msgstr "Attention : Prudence dans les pays de persécution" +msgstr "Attention : Prudence requise dans les pays de persécution." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Gestion des dépôts de modules " -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Dépôts locaux" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3392,15 +3406,15 @@ "sur un CD-ROM ou en flash. Un tel répertoire contient les sous-dossiers " "« mods.d » et « modules »." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Supprime un répertoire local en tant que dépot." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Dépôts distants" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3408,54 +3422,56 @@ "Ajoute un dépot d'installation à distance personnalisé. Il est nécessaire de " "connaître au préalable le nom de domaine et le répertoire de stockage." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Supprimer un dépôt distant" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Source des dépôts" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Dépôt local" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Dépôt distant" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Dossier d'installation" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Espace personnel, pour votre usage uniquement" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Dossier personnel" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Espace système, pour tous les utilisateurs" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Rép Sword-sys" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " -msgstr "" -"Attention : Ne pas utiliser les dépôts distants depuis les pays où il " -"est dangereux d'être repéré! " +msgstr "Attention : Ne pas utiliser les dépôts distants dans les pays de persécution!" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Répertoire local d'installation" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "_Annuler" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Historique des versets consultés" @@ -3464,11 +3480,11 @@ msgid "Choose book to display" msgstr "Sélection du livre à afficher" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Bouton Sélection de livre" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Apocalypse" @@ -3476,11 +3492,11 @@ msgid "Choose chapter to display" msgstr "Sélection du chapitre à afficher" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Bouton Bascule chapitre" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3528,7 +3544,7 @@ #: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16 msgid "Verse Number" -msgstr "Numéros de verset" +msgstr "Numéro de verset" #: ../ui/prefs.glade.h:9 ../ui/prefs.gtkbuilder.h:17 msgid "Links" @@ -3602,13 +3618,11 @@ msgid "" "Name and size choice for any module in a given language; still overridden by " "a specific choice on a particular module" -msgstr "" -"Choix de police et taille pour n'importe quel module dans une langue donnée; " -"toujours remplacées par un choix spécifique sur une module particulier" +msgstr "Sélectionne les choix de police pour tout module dans une langue donnée; toujours remplaçable par un choix spécifique sur un module particulier" #: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30 msgid "Font preferences, per language" -msgstr "Préférences de police, par langue" +msgstr "Police préférée par langue" #: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 msgid "Language Font Combo" @@ -3633,22 +3647,22 @@ "audience's Bible programs to follow along; Audience, to receive the " "speaker's navigation." msgstr "" -"Xiphos est le premier programme d'étude biblique à fournir une implémentation de \n" -"BibleSync, un protocole de synchronisation pour programmes Bibliques. Si vous\n" -"utilisez plusieurs programmes Bibliques, ou travaillez en équipe, ou si vous avez\n" -"en classe des études mutualisées, BibleSync peut être un outil utile pour vous.\n" -"BibleSync opère dans un de ces trois modes : Personnel, pour synchroniser plusieurs\n" -"programmes Bibliques, les vôtres ou au sein d'une équipe de travail ; Orateur,\n" -"pour piloter les programmes bibliques du public d'une conférence ; Audience, pour\n" -"recevoir la navigation de l'orateur." - -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "Mode" +"BibleSync est un protocole de synchronisation entre programmes bibliques. Si vous\n" +"utilisez plusieurs logiciels bibliques, travaillez en équipe, ou participez à des\n" +"études en commun, BibleSync est un outil intéressant.\n" +"BibleSync opère dans trois modes distincts : Personnel, pour synchroniser plusieurs\n" +"logiciels bibliques entre eux ou au sein d'une équipe de travail ; Intervenant,\n" +"pour piloter à distance les logiciels bibliques d'un auditoire ; Audience, pour\n" +"recevoir la navigation de l'intervenant.\n" +"Xiphos est le premier programme d'étude biblique à disposer de BibleSync." + +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" +msgstr "Mode :" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." -msgstr "Sélectionne le mode dans lequel BibleSync doit opérer." +msgstr "Sélectionne le mode de fonctionnement de BibleSync" #: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 msgid "_Off" @@ -3656,7 +3670,7 @@ #: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." -msgstr "Désactive BibleSync" +msgstr "BibleSync est désactivé" #: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 msgid "BSP off radio button" @@ -3664,15 +3678,15 @@ #: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 msgid "_Speaker" -msgstr "_Orateur" +msgstr "_Intervenant" #: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 msgid "Enable BibleSync as the speaker." -msgstr "Active BibleSync en tant que Orateur." +msgstr "Biblesync est activé en mode intervenant" #: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 msgid "BSP speaker radio button" -msgstr "Bouton radio Orateur BSP" +msgstr "Bouton radio Intervenant BSP" #: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 msgid "_Audience" @@ -3680,7 +3694,7 @@ #: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 msgid "Enable BibleSync as a member of the audience." -msgstr "Active BibleSync comme membre de l'audience." +msgstr "BibleSync est activé en mode membre de l'audience" #: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 msgid "BSP audience radio button" @@ -3692,7 +3706,7 @@ #: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 msgid "Enable BibleSync for personal or team use." -msgstr "Active BibleSync pour une utilisation personnelle ou en équipe." +msgstr "BibleSync est activé en mode utilisation personnelle ou d'équipe" #: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 msgid "BSP personal radio button" @@ -3706,19 +3720,21 @@ msgid "" "When in Personal mode, only programs running on this machine will hear your " "navigation." -msgstr "En mode Personnel, seuls les programmes tournant sur cette machine recevront votre navigation." +msgstr "" +"En mode Personnel, seuls les programmes tournant sur cette machine recevront " +"votre navigation." #: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 msgid "BSP privacy button" msgstr "Bouton BSP privé" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" -msgstr "Naviguer" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" +msgstr "Navigation :" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." -msgstr "Choisir comment accepter la synchronisation de navigation entrante." +msgstr "Sélectionne le type de navigation entrante" # src/gs_preferences_dlg.c #: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 @@ -3727,7 +3743,7 @@ #: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 msgid "BibleSync navigation will send Xiphos directly to the verse indicated." -msgstr "La navigation BibleSync enverra Xiphos directement au verset indiqué." +msgstr "Le verset indiqué s'affiche directement dans Xiphos" #: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 msgid "BSP nav direct radio button" @@ -3739,19 +3755,19 @@ #: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 msgid "BibleSync navigation will use Xiphos' sidebar verse list." -msgstr "La navigation BibleSync utilisera la liste de versets de la barre latérale de Xiphos. " +msgstr "Le verset indiqué s'affiche dans la liste de versets" #: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 msgid "BSP nav verse list radio button" msgstr "Bouton radio BSP navigation liste de versets" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "Écouter" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" +msgstr "Suivi :" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." -msgstr "Xiphos va écouter les Orateurs en fonction du choix présent." +msgstr "Sélectionne le suivi des intervenants" #: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" @@ -3759,11 +3775,11 @@ #: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." -msgstr "Choisir les Orateurs à suivre." +msgstr "Choix sélectif de la liste des intervenants à suivre" #: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 msgid "BSP listen some radio button" -msgstr "Bouton radio BSP écouter certains orateurs" +msgstr "Bouton radio BSP écouter certains intervenants" #: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 msgid "All" @@ -3771,7 +3787,7 @@ #: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 msgid "All Speakers will be followed." -msgstr "Tous les orateurs seront reçus." +msgstr "Tous les intervenants sont suivis" #: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 msgid "BSP listen all radio button" @@ -3783,22 +3799,22 @@ #: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." -msgstr "Aucun orateur ne sera reçu." +msgstr "Aucun intervenant n'est suivi" #: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 msgid "BSP listen none radio button" msgstr "Bouton radio BSP ecouter aucun" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "Spécial :" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " "chatty. Also, decide whether to allow group parameter as Xiphos' tab number." -msgstr "" -"Des traces supplémentaires peuvent être afichées pendant le fonctionnement de \n" -"BibleSync en autorisant présence, incohérences, et débogage. Attention ceux-ci\n" -"peuvent être très bavards. Voir aussi s'il faut autoriser le paramètre de groupe \n" -"comme numéro d'onglet de Xiphos." +msgstr "Des informations supplémentaires peuvent être affichées pendant le fonctionnement de BibleSync en activant ces options. Attention ces informations peuvent être très denses." #: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 msgid "Presence" @@ -3806,7 +3822,7 @@ #: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 msgid "Presence announcements will be shown in dialogs." -msgstr "Les indications de présence seront affichées." +msgstr "Les fenêtres d'indication de présence seront affichées." #: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 msgid "BSP presence button" @@ -3818,7 +3834,7 @@ #: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 msgid "Mismatches from your session will be shown in dialogs." -msgstr "Les incohérences survenant pendant une session seront affichées." +msgstr "Les fenêtres d'incohérences survenant pendant une session seront affichées" #: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 msgid "BSP mismatch button" @@ -3830,7 +3846,7 @@ #: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." -msgstr "Traçage de paquets." +msgstr "Traçage des paquets sur le réseau" #: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 msgid "BSP event debug button" @@ -3838,18 +3854,14 @@ #: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 msgid "_Group as tab" -msgstr "_Grouper en onglets" +msgstr "_Groupe en onglet" #: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 msgid "" "Interpret the protocol's group number parameter as Xiphos' tab number. " "Disabling this may be necessary if some Speakers' use of group number is not " "appropriate as a tab number." -msgstr "" -"Interpréte le paramètre du numéro du groupe du protocole comme le numéro d'onglet de \n" -"Xiphos.\"\n" -"Il sera peut être nécessaire de désactiver cette option si le numéro de groupe utilisé par \n" -"certains orateurs n'est pas approprié comme numéro d'onglet.\"" +msgstr "Traduit le numéro de groupe de BibleSync en numéro d'onglet de Xiphos. Cette option sera peut-être à désactiver si le numéro de groupe utilisé par certains intervenants n'est pas approprié" #: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 msgid "BSP event group-as-tab button" @@ -3863,13 +3875,11 @@ msgid "" "Select a particular language for interface display, other than your usual " "setting" -msgstr "" -"Sélection d'une langue spécifique pour affichage de l'interface, autre que " -"celle de la configuration habituelle" +msgstr "Sélectionne une langue différente de la configuration habituelle pour l'affichage de l'interface." #: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88 msgid "Special Locale (requires restart)" -msgstr "Langue spécifique (Nécessite un redémarrage)" +msgstr "Langue différente (Nécessite un redémarrage)" #: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 msgid "Special Locale Combo" @@ -3877,7 +3887,7 @@ #: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 msgid "Show splash screen at start up" -msgstr "Afficher l'écran de démarrage" +msgstr "Afficher l'écran d'accueil au démarrage" #: ../ui/prefs.glade.h:91 ../ui/prefs.gtkbuilder.h:91 msgid "Show Daily Devotion at start up" @@ -3887,7 +3897,7 @@ msgid "" "If you have set a preferred daily devotion module, its entry for today will " "be shown at startup." -msgstr "Si un module de calendrier biblique a été spécifié, l'entrée d'aujourd'hui sera affichée au démarrage" +msgstr "Le calendrier biblique du jour sera affiché au démarrage" # src/gs_preferences_dlg.c #: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93 @@ -3898,7 +3908,7 @@ msgid "" "Make double-click of a word always use default dictionary instead of " "dictionary currently displayed" -msgstr "Un double-clic sur un mot utilise toujours le dictionnaire par défaut à la place du dictionnaire actuellement affiché" +msgstr "Un double-clic sur un mot activera le dictionnaire par défaut à la place du dictionnaire en cours" # src/gs_preferences_dlg.c #: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 @@ -3965,7 +3975,7 @@ #: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109 msgid "Use the verse list for Bible cross-references instead of the previewer" -msgstr "Utilise la liste de versets pour afficher les références-croisées au lieu du volet Aperçu" +msgstr "Utilise la liste de versets à la place du volet Aperçu pour afficher les références-croisées" #: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 msgid "Xrefs in verse list check box" @@ -3977,197 +3987,196 @@ #: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112 msgid "Make journals/prayer lists available" -msgstr "Autorise les listes de prières et les journaux" +msgstr "Active les listes de prières et les journaux" #: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113 msgid "Enable Prayer Lists Checkbox" msgstr "Case à cocher Activer les listes de prières" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "Afficher la barre de statut" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "Affiche/cache la barre de statut." + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Affichage du numéro de verset" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" -msgstr "Décore le numéro du verset de plusieurs façons" +msgstr "Modifie l'affichage du numéro du verset" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" -msgstr "Affiche les numéros de verset en gras" +msgstr "Affiche le numéro de verset en gras" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Case à cocher numéro de verset en gras" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Parenthèses" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" -msgstr "Affiche les numéros de versets entourés de [parenthèses]" +msgstr "Affiche le numéro de verset entouré de [parenthèses]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Case à cocher Verset entre parenthèses" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Exposant" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" -msgstr "Affiche les numéros de verset en exposant" +msgstr "Affiche le numéro de verset en exposant" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Case à cocher numéro de verset en exposant" # src/gs_preferences_dlg.c -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Répertoire par défaut du bloc-notes" # src/gs_preferences_dlg.c -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Sélectionner un répertoire" # src/gs_preferences_dlg.c -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Boite combinée Répertoire par défaut du bloc-notes" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Divers" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Modules de base" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Texte biblique" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Boite combinée Changement de texte biblique" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Boite combinée Changement de commentaire" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Dictionnaire" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Boite combinée Changement de dictionnaire" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Boite combinée Changement de livre" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modules" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Efface tous les modules de la liste" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Bouton Efface tous les modules de la liste" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Supprime le module sélectionné de la liste" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Bouton Supprime le module sélectionné de la liste" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Ouvre la fenêtre de sélection des modules" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Ajout de modules" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Bouton Ouvrir la boite de sélection" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Vue parallèle" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Modules d'emploi spécifique" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Calendrier biblique" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Boite combinée Changement de calendrier biblique" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Lexique hébreu" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Boite combinée Lexique hébreu" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Lexique grec" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Boite combinée Lexique grec" # src/gs_preferences_dlg.c -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Dictionnaire par défaut" # src/gs_preferences_dlg.c -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Boite combinée Changement de dictionnaire" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Notes personnelles" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Boite combinée Changement de notes personnelles" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Divers" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Sélection de module" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4196,6 +4205,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "Affiche la barre de statut au bas de la fenêtre principale" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Recherche avancée" @@ -4247,7 +4260,7 @@ #: ../ui/search-dialog.glade.h:12 ../ui/search-dialog.gtkbuilder.h:14 msgid "Search entire module" -msgstr "La requête s'exécute sur tous les versets" +msgstr "Recherche dans tous les versets" #: ../ui/search-dialog.glade.h:13 ../ui/search-dialog.gtkbuilder.h:13 msgid "Entire module" @@ -4259,9 +4272,7 @@ #: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17 msgid "Use the results of the last search as the scope of the search" -msgstr "" -"La requête s'exécute uniquement sur les versets retournés lors de la requête " -"précédente" +msgstr "Recherche uniquement dans les versets retournés lors de la requête précédente" #: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16 msgid "Current results" @@ -4273,7 +4284,7 @@ #: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20 msgid "Use a custom range for the scope of the search" -msgstr "La requête s'exécute sur une plage prédéfinie de versets" +msgstr "Recherche dans une plage prédéfinie de versets" #: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19 msgid "Custom verse range" @@ -4289,7 +4300,7 @@ #: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25 msgid "Use a single module for the search" -msgstr "La requête s'exécute sur un seul module" +msgstr "Recherche dans un seul module" #: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24 msgid "Single module" @@ -4301,7 +4312,7 @@ #: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28 msgid "Use the current module list for the search" -msgstr "La requête s'exécute sur plusieurs modules" +msgstr "Recherche dans plusieurs modules" #: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27 msgid "Module list" @@ -4313,7 +4324,7 @@ #: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31 msgid "Use a custom module list for the search" -msgstr "La requête s'exécute dans une liste de modules prédéfinie" +msgstr "Recherche dans une liste de modules prédéfinie" #: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30 msgid "Custom module list" @@ -4338,7 +4349,7 @@ "See Module Manager's maintenance functions" msgstr "" "Recherche optimisée basée sur les index,\n" -"les index doivent être préalablement construits.\n" +"les index doivent avoir été générés auparavant.\n" "Voir l'onglet Gérer du gestionnaire de modules." #: ../ui/search-dialog.glade.h:37 ../ui/search-dialog.gtkbuilder.h:34 @@ -4413,11 +4424,11 @@ msgid "Found" msgstr "Réponses" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Fenêtre Récapitulatif des résultats" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Table Récapitulatif des résultats" @@ -4571,7 +4582,7 @@ #: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106 msgid "In modules that have Strong's Numbers" -msgstr "Pour les modules avec nombres de Strong" +msgstr "Pour les modules comprenant des nombres de Strong" #: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105 msgid "Show Strong's Numbers" @@ -4583,7 +4594,7 @@ #: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109 msgid "In modules that have Morphological Tags" -msgstr "Pour les modules avec étiquettes morphologiques" +msgstr "Pour les modules comprenant des étiquettes morphologiques" #: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108 msgid "Show Morphological Tags" @@ -4595,7 +4606,7 @@ #: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112 msgid "In modules that have Footnotes" -msgstr "Pour les modules avec notes de bas de page" +msgstr "Pour les modules comprenant des notes de bas de page" #: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111 msgid "Show Footnotes" @@ -4609,6 +4620,11 @@ msgid "Attribute Search" msgstr "Attributs" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Sélection de module" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "Module" @@ -4703,6 +4719,10 @@ msgid "_Module Manager" msgstr "Gérer les modules" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Affichage" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Calendrier biblique" @@ -4748,7 +4768,7 @@ #: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19 msgid "Show Verse _Numbers" -msgstr "Affiche les numéros de verset" +msgstr "Afficher les numéros de verset" #: ../ui/xi-menus.glade.h:29 msgid "Display verse numbers in the text" @@ -4852,27 +4872,27 @@ msgid "Learn about Xiphos" msgstr "En savoir plus sur Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Annoter un verset" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Ouvrir le module" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Note" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Modifier le commentaire" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Verset par ligne" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Marques des notes de bas de page et des références croisées" @@ -4880,188 +4900,197 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Afficher les marques non-anonymes comme « *n23 »" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variantes" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Afficher les images" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respect des polices" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Commentaire par chapitre" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Double espace" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Définition du mot sélectionné" # src/gs_preferences_dlg.c -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Utiliser le dictionnaire en cours" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Consulter la carte sur BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Déverrouiller ce module" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Affiche l'entête du livre" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Affiche l'entête du chapitre" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Renommer ce commentaire" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Liste des versets commentés" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Synthèse vocale du texte sélectionné" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Enregistre ces résultats sous un seul signet" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" -msgstr "Enregistre la liste sous un seul signet" +msgstr "Enregistrer la liste sous un seul signet" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" -msgstr "Enregistre ces résultats sous une série de signets dans leur propre dossier" +msgstr "" +"Enregistre ces résultats sous une série de signets dans leur propre dossier" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" -msgstr "Enregistre la liste dans une série de signets" +msgstr "Enregistrer la liste dans une série de signets" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." -msgstr "Ouvre une boîte de dialogue dans laquelle coller une ligne de références de versets, permet de remplir la liste de versets." +msgstr "Remplit la liste de versets au moyen d'une boîte de dialogue dans laquelle sera collée une ligne de références de versets" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Remplir la liste de versets" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "Place le contenu entier de la liste de versets dans l'historique de consultation." + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +msgid "Preload history from verse list" +msgstr "Charger la liste de versets dans l'historique" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." -msgstr "Envoie cette liste de versets via BibleSync à d'autres, si vous êtes en mode Personnel ou Orateur." +msgstr "Envoie cette liste de versets via BibleSync si vous êtes en mode Personnel ou Intervenant." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" -msgstr "Envoyer la liste vi BibleSync" +msgstr "Envoyer la liste via BibleSync" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exporter la liste" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Ouvre ce signet dans un nouvel onglet" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Ouvrir dans un nouvel onglet" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Ouvre le signet dans une nouvelle fenêtre" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Ouvrir dans une fenêtre" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Ajoute un nouveau dossier au dossier sélectionné" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Insère un nouveau signet dans le dossier sélectionné" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Insérer un signet" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Édite ce signet" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "Éditer l'élément" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Supprime l'élément sélectionné" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Développe tous les groupes de signets" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Développer tout" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Réduit tous les groupes de signets" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Réduire tout" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Active/désactive le déplacement des éléments" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Déplacer les signets" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" -msgstr "Importe un autre fichier de signets (par défaut: de Bibletime)" +msgstr "Importe un fichier de signets (par défaut: de BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importer les signets" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Supprimer le dossier et le sauvegarder" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Exporter le dossier" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Ouvrir le module sélectionné dans un nouvel onglet" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5069,79 +5098,79 @@ "Ouvrir le module sélectionné dans une\n" "nouvelle fenêtre" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Ouvrir dans une fenêtre séparée" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Crée une nouvelle simple liste de prières" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Liste simple" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Crée une nouvelle liste de prières organisée par sujets" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Liste ordonnée par sujet" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Crée un nouveau journal mensuel" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Liste de prières mensuelle" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Crée un nouveau journal quotidien" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Journal quotidien" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Crée un nouveau thême structuré" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Thême structuré" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Ouvre le module dans l'éditeur ou en lecture dans une fenêtre séparée" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Ouvrir dans une fenêtre séparée" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Ajoute un sous-élément" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Ajouter un sous-élément" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Ajouter un élément" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Ajouter un élément" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Supprimer cet élément :" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Éditer cet élément" @@ -5153,6 +5182,188 @@ msgid "Study the Bible" msgstr "Étudier la Bible avec Xiphos" +#~ msgid "network setup errors." +#~ msgstr "erreurs de configuration du réseau." + +#~ msgid " client socket" +#~ msgstr "socket client" + +#~ msgid " server socket" +#~ msgstr "socket serveur" + +#~ msgid "bad magic" +#~ msgstr "mauvaise clé" + +#~ msgid "bad protocol version" +#~ msgstr "mauvaise version du protocole" + +#~ msgid "bad msg type" +#~ msgstr "mauvais type de message" + +#~ msgid "bad packet count" +#~ msgstr "mauvais nombre de paquets" + +#~ msgid "bad packet index" +#~ msgstr "mauvais indice de paquets" + +#~ msgid "bad body format" +#~ msgstr "mauvais format du corps" + +#~ msgid "missing required header " +#~ msgstr "entête requis manquant" + +#~ msgid "UUID spoofed: wrong ipaddr." +#~ msgstr "UUID usurpé: mauvaise addresse IP." + +#~ msgid "Ignoring echo." +#~ msgstr "Écho ignoré." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Le domaine n'est pas 'BIBLE-VERSE' : " + +#~ msgid "Invalid group: " +#~ msgstr "Groupe invalide : " + +#~ msgid " present at " +#~ msgstr " présent à " + +#~ msgid " using " +#~ msgstr " utilisant " + +#~ msgid "[no dump ready]" +#~ msgstr "[Pas de vidage prêt]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Échec de la transmission.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Multidiffusion impossible. BibleSync est à présent déactivé. Si votre " +#~ "connection réseau a changé pendant que ce programme était actif, il peut " +#~ "être suffisant de la réactiver." + +#~ msgid "Page %d of %d" +#~ msgstr "Page %d de %d" + +#~ msgid "Save As" +#~ msgstr "Enregistrer sous" + +#~ msgid "HTML Output" +#~ msgstr "Sortie HTML" + +#~ msgid "HTML Source" +#~ msgstr "Source HTML" + +#~ msgid "Plain Source" +#~ msgstr "Source texte" + +#~ msgid "_Quit" +#~ msgstr "_Quitter" + +#~ msgid "_Open" +#~ msgstr "_Ouvrir" + +#~ msgid "_Save" +#~ msgstr "_Enregistrer" + +#~ msgid "Save _As..." +#~ msgstr "Enregistrer _sous..." + +#~ msgid "Open new document" +#~ msgstr "Ouvre un nouveau document" + +#~ msgid "Delete current note" +#~ msgstr "Supprime la note en cours" + +#~ msgid "HTML _Output" +#~ msgstr "_Sortie HTML" + +#~ msgid "_HTML Source" +#~ msgstr "Source _HTML" + +#~ msgid "_Plain Source" +#~ msgstr "Source _texte" + +#~ msgid "Unlock " +#~ msgstr "Entrez la clé de déverrouillage " + +#~ msgid "Preparing to print" +#~ msgstr "Préparation de l'impression" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "L'impression n'est pas supportée par ce périphérique." + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "L'imprimante %s n'accepte pas les impressions de type PostScript." + +#~ msgid "Printing" +#~ msgstr "Impression" + +#~ msgid "Waiting to print" +#~ msgstr "En attente de l'impression" + +#~ msgid "An error occurred while printing" +#~ msgstr "Une erreur s'est produite pendant l'impression" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Le document %s n'a pas pu être imprimé" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos n'a pas pu créer ~/.xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos ne peut s'exécuter normalement." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + +#~ msgid "Mode" +#~ msgstr "Mode" + +#~ msgid "Listen" +#~ msgstr "Écouter" + #~ msgid "Tabs" #~ msgstr "Onglets" @@ -5307,12 +5518,9 @@ #~ msgstr "" #~ "Bienvenue dans Xiphos.\n" #~ "\n" -#~ "Aucun module de texte biblique n'est installé. Xiphos a besoin d'au moins " -#~ "un module de ce type pour fonctionner.\n" +#~ "Aucun module de texte biblique n'est installé. Xiphos a besoin d'au moins un module de ce type pour fonctionner.\n" #~ "\n" -#~ "Avec votre permission, Xiphos va lancer le gestionnaire de modules pour " -#~ "télécharger des modules depuis le site de Crosswire, les opérations à " -#~ "effectuer sont :\n" +#~ "Avec votre permission, Xiphos va lancer le gestionnaire de modules pour télécharger des modules depuis le site de Crosswire, les opérations à effectuer sont :\n" #~ "1. Configuration du dépôt distant\n" #~ "2. Connexion\n" #~ "3. Choix d'un texte biblique dans la langue désirée\n" @@ -5320,8 +5528,7 @@ #~ "\n" #~ "Attention : Prudence dans les pays de persécution.\n" #~ "\n" -#~ "Autorisez-vous Xiphos à lancer le gestionnaire de modules pour " -#~ "télécharger un texte biblique?" +#~ "Autorisez-vous Xiphos à lancer le gestionnaire de modules pour télécharger un texte biblique?" #~ msgid "Parallel View" #~ msgstr "Vue parallèle" @@ -5529,9 +5736,6 @@ #~ msgid "C_lear" #~ msgstr "_Effacer l'historique" -#~ msgid "Clear history list" -#~ msgstr "Efface l'historique des versets consultés" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "Affiche le calendrier biblique d'aujourd'hui" @@ -5556,9 +5760,6 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "Plus d'information à propos du Projet SWORD" -#~ msgid "About this application" -#~ msgstr "Ã propos de cette application" - #~ msgid "Hi_story" #~ msgstr "H_istorique" diff -Nru xiphos-4.0.0+dfsg1/po/Guidelines xiphos-4.0.4+dfsg1/po/Guidelines --- xiphos-4.0.0+dfsg1/po/Guidelines 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/Guidelines 2015-03-23 01:15:22.000000000 +0000 @@ -41,14 +41,22 @@ intltool-update --pot -It will write a file called untitled.pot. Use "diff -u xiphos.pot -untitled.pot" to see if the new version is sane, and if so, then "mv -untitled.pot xiphos.pot". - -3.) To create a new translation simply copy the file xiphos.pot and rename -your working copy to xx.po where xx stands for the -relevant iso code for your target language - e.g. fa.po for Farsi, de.po for -German etc. +It will write a file called untitled.pot. Use this command to see if the +new version is sane: + +diff -u xiphos.pot untitled.pot + +If it's OK, then... + +mv untitled.pot xiphos.pot + +3.) To create a new translation simply copy the file xiphos.pot to your +working copy: + +cp xiphos.pot xx.po + +where xx stands for the relevant ISO code for your target language, +e.g. fa.po for Farsi, de.po for German etc. 4.) If you need to update your file to the newest strings you can use the command msgmerge: diff -Nru xiphos-4.0.0+dfsg1/po/he.po xiphos-4.0.4+dfsg1/po/he.po --- xiphos-4.0.0+dfsg1/po/he.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/he.po 2015-06-16 17:44:26.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Xiphos 2.3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-03-15 12:44+0000\n" "Last-Translator: Yaron \n" "Language-Team: Xiphos Translation Team\n" @@ -22,298 +22,265 @@ "X-Poedit-Country: ISRAEL\n" "X-Poedit-Language: Hebrew\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"כישלון Xiphos: לא יכול לקרות, display_mod: null. אנא דווח על כך. sword_main." +"cc: set_treekey. מה אתה עושה כאשר זה קרה?" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "מידע מרוחק לא נמצא" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "האם ברצונך למחוק את ההערה על" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "פתיחה" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "הדפס מסמך" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "שמור את השינויים במסמך" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "לפני הסגירה?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "ללא שמירה, השינויים יאבדו לעד." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "קובץ" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "שולחן מחקר" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "עורך הערות" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "עורך יומן\\רשימת תפילות" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "אודות מודול SWORD" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "כל המודול" - -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +msgid "Module name: " +msgstr "מנהל מודולים" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:415 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%sכישלון ב" +msgid "Version: " +msgstr "אפשרויות" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"כישלון Xiphos: לא יכול לקרות, display_mod: null. אנא דווח על כך. sword_main." -"cc: set_treekey. מה אתה עושה כאשר זה קרה?" - -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "מידע מרוחק לא נמצא" - -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "עמוד %d מתוך %d" - -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "פתיחה" - -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "שמור רשימה" - -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "הדפס מסמך" - -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "האם ברצונך למחוק את ההערה על" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "היקף" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "פלט HTML" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "דרשה יומית" -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "מקור" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "מפות" -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "מקור" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "התאמות" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "הדפס..." +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "תצוגה לפני הדפסה" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "עריכה" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "כתבי קודש" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "פתח" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "פירוש" -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "שמור" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "מילון" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "שמור קובץ בשם..." +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "ספרים כלליים" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "חדש" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "פירוש" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "פתיחת מסמך חדש" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "יומן-יומי" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "מחיקה" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "לא ידוע" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "מחיקת ההערה הנוכחית" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "רשימת מודולים" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_קובץ" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "טווחים" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_פלט HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_מקור HTML" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "מקור" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "מקור התקנה" -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_תצוגה" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "מודולי חלון ראשי" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "שמירה" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Sword" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "הוספת קישור" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "כותרות" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "שמור את השינויים במסמך" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "הערות שוליים" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "לפני הסגירה?" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "הפניות צולבות" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "ללא שמירה, השינויים יאבדו לעד." +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "מספרי סטרונג" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "קובץ" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "תגיות מורפולוגיות" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "שולחן מחקר" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "כותרות פירושים" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "עורך הערות" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "מילות הצלוב באדום" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "עורך יומן\\רשימת תפילות" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "הטעמות יווניות" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "פתח " +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "ניקוד עברי" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "מתכונן להתקנה" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "טעמי המקרא" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "המדפסת אינה תומכת בהדפסה" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "המדפסת %s אינה תומכת בהדפסה." +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "תעתיק" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "הדפס" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "מתכונן להתקנה" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "חלה שגיאה בעת ההדפסה" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "התחלקות מורפמות" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "הדפסת המסמך נכשלה: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "אודות מודול SWORD" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "תכונות" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "למודול זה אין טקסט 'אודות'." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "אפשרויות" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -330,18 +297,20 @@ "התקנת מערכת של ספרים עשויה להיות משותפת בין כל frontends באמצעות המסגרת. " "ניתן להוריד ספרים מProject Sword." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "פרויקט SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "האם אתם מרוצים מן השימוש ב-Xiphos ככלי עזר לחקר כתבי הקודש? הייתם רוצים " "שהתוכנה תתמוך בשפת אמכם? אתם יכולים לתרגם את Xiphos! \n" @@ -349,24 +318,24 @@ "אנו מעוניינים בתרגום הממשק של Xiphos לשפות נוספות. אם באפשרותכם לתרגם " "עבורנו, אנא צרו קשר דרך הקישור להלן ותנו כתף למלאכה." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "אודות תרגום Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "ראו TRANSLATION-HOWTO בקוד המקור של Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "פיתוח Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "זכויות היוצרים (2000-2009) שמורות לצוות הפיתוח של Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "זכויות היוצרים (2000-2015) שמורות לצוות הפיתוח של Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -378,235 +347,235 @@ "תודה לטרוי גריפיתס ולכל מי שהעניק לנו את פרוייקט SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "סימנייה" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "הזן שם תיקייה" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "שם תיקייה" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "תיקייה: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "ערוך פריט סימנייה" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "ערוך" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "שם תיקייה: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "שם סימנייה: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "פסוק: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "מודול: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "להסיר התיקייה שנבחרה" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "על כל אשר בה?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "הסר את הסימנייה שנבחרה" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "הוסף" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "תווית: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "תוצאות החיפוש: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "פתיחת סימנייה רבת התייחסות בכרטיסיות נפרדות אינו נתמך." -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "סימניות" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, fuzzy, c-format msgid "Cipher key for module %s" msgstr "בודק את מודולי SWORD" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "עבור:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "נא להזין מפתח הצפנה: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "סגור ללא שמירה" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "סגור ללא שמירה" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "רשימת פסוקים" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "רשימתפסוקים" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "תוצאותחיפוש" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "נא לבדוק זכויות יוצרים בטרם ייצוא!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "מצא" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "הזן מילה או ביטוי" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "חפש אחורה" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "מצא את הבא" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "קבע גופן מודול" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "שנה גופן עבור" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "מודול" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "גופן נוכחי: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "השתמש בגופן ברירת המחדל עבור מודול זה" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "תקלה! Xiphos עומדת בפני קריסה עקב שגיאת \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "יש לדווח אודות התקלה לצוות של Xiphos דרך:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "תקלה! Xiphos עומדת בפני קריסה עקב שגיאת \"STRING\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "במודולים בעלי מספרי סטרונג" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - תוכנה לחקר כתבי הקודש" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "פתח לשונית חדשה" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "תצוגה רגילה" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "תצוגת פירוש" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "תצוגת ספר" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "ברוכים הבאים ל-Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -626,33 +595,33 @@ "לפיכך, לא ניתן לשנות שמות של פירושים אישיים\n" "בסביבת חלונות." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "פירוש" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "תצוגת פירוש" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "שם תיקייה" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "תווית: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "שמות מודולים יכולים להכיל אך ורק את התווים [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "מערכת Xiphos כבר מכירה מודול בשם זה." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -661,7 +630,7 @@ "לא ניתן להפיק תצורה חדשה:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -669,7 +638,7 @@ "שגיאה בבניית תצורה:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 #, fuzzy msgid "No module in this pane." msgstr "המודול נעול." @@ -737,20 +706,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "להסיר את המודולים הבאים?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "מתכונן להסרה" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "מסיר:" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "הסרה" @@ -770,23 +739,23 @@ msgid "Install" msgstr "התקנה" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "להעביר את המודולים הבאים לארכיון?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "מתכונן להסרה" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "מעביר לארכיב" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "ארכיב" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -794,55 +763,59 @@ "לבנות אינדקס לחיפוש מהיר עבור\n" "המודולים הבאים (זמן בדקות\\מודול)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "מתכונן להתקנה" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "בונה אינדקס" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "אינדקס" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "למחוק אינדקס לחיפוש מהיר עבור המודולים הבאים?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "מתכונן להסרה" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "מחק פריט" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "מחק פריט" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "למודול זה אין טקסט 'אודות'." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "שם מודול" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "סימן וי מציין שהמודול כבר מותקן" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "נא לסמן תיבה זו על מנת לעבוד עם המודול הזה." -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "סמנו תיבה זו כדי להתקין או לעדכן מודול זה" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "התקנה" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -850,19 +823,19 @@ "סמלון האינדקס מציין שבנית אינדקס מיטבי ('lucene') עבור המודול על מנת לבצע " "חיפוש מהיר (עיינו בפונקציה זו בחלונית התחזוקה)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "סמלון המנעול מציין שהמודול מוצפן, ושעליך לרכוש מפתח מבעלי התוכן" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "אודות" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -870,19 +843,19 @@ "סמלון הרענון מציין שהמודול המותקן מיושן וקיימת גרסה חדשה יותר: עליך לעדכן את " "המודול" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "זמין" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "גודל" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "תיאור" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -891,33 +864,33 @@ "פעולת `mkdir %s' נכשלה:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " נשמר בארכיון תחת: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "לא ניתן לאנדקס כתבי עת ורשימות תפילות." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%sכישלון ב" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "הסתיים" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "לא ידוע" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -926,7 +899,7 @@ "מאגר:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -934,54 +907,44 @@ "ממוין לפי\n" "סוג המודול" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "כתבי קודש" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "פירושים" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "מילונים" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "דרשות יומיות" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "ספרים כלליים" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "מפות" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "התאמות" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -989,95 +952,95 @@ "ממוין לפי\n" "זמינות" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "עדכונים" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "התקנה" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "יומן\\רשימת תפילות" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "מרענן מן המקור המרוחק" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "המקור המרוחק לא נמצא" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "ערוך תצורה" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "סוג" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "כותרת" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "מקור" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "ספריה" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "משתמש" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "סיסמה" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "מקורות המודול" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "הוספה/הסרה" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "בחירה" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "מודולים" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "התקנה" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "תחזוקה" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "נא לרענן" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "רשימת המודולים אינה מעודכנת!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1085,7 +1048,7 @@ "ביצעת הסרה של התנ\"ך האחרון שברשותך.\n" "Xiphos דורש לפחות אחד." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1093,211 +1056,222 @@ "אין עדיין ספרי תנ\"ך מותקנים.\n" "Xiphos לא יכול להמשיך ללא ספרים." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "נטענו מקורות מרוחקים סטנדרטיים." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "טעינת מקורות סטנדרטיים מ-Crosswire נכשלה." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "הסר את המקור שנבחר" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "הזן מקור מרוחק" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "כותרת:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "סוג:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "מארח:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "ספריה:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "משתמש (אופציונלי):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "סיסמה (אופציונלי):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "יש כבר מקור בשם זה." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "מחק מקור מרוחק" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "כל המודול" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "נוע החוצה אל הקטע הכולל את זה הנוכחי" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "לך אל הפריט הקודם" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "לך אל הפריט הבא" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "נוע פנימה אל תת הקטע הראשון" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "מקביל" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "נתק \\ הצמד" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "אפשרויות מודול" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "תצוגה מקבילה" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "קריאה בקול" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "הערות אישיות" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- בחירה --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "השפה תוחלף לאחר אתחול." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "העדפות" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "כללי" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "אפשרויות" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "כתבי קודש" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "גופנים" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "צבע" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "לשוניות וחלוניות" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "מיוחד" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "לנקות את הרשימה?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "לנר" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "להסיר את המודול?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "האם להסיר את המודול הנבחר?" @@ -1316,20 +1290,20 @@ msgid "found in " msgstr "נמצא בתוך " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, fuzzy, c-format msgid "New List %s" msgstr "שמור רשימה" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "לא ניתן למחוק את רשימת המודולים האחרונה" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "למחוק את הרשימה?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "האם למחוק:" @@ -1349,7 +1323,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1394,7 +1368,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1412,15 +1386,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1428,108 +1402,98 @@ "זהו חיפוש מכיל (\"AND\"):\n" "מצא את כל ההתאמות שכוללות את כל המילים." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "חיפוש מתקדם" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "חפש במודול" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "כתבי קודש" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "פירוש" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "סוג חיפוש" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "מרובה מלים" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "ביטוי רגולרי" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "ביטוי מדויק" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "אפשרויות חיפוש" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "התאם אותיות רישיות" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "היקף חיפוש" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "ללא היקף" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "הצב גבולות" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "חיפוש אחרון" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "גבולות" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "תחתון" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "עליון" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "פתח בתיבת דיאלוג" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "קבע הגדרות משתמש" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "חיפוש" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "שורת צד" @@ -1537,73 +1501,73 @@ msgid "Powered by the SWORD Project" msgstr "מושתת על פרויקט SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "פריט יומן\\רשימת תפילות" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "מסמך חדש" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "להסיר התיקייה שנבחרה" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "ינואר" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "פברואר" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "מרץ" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "אפריל" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "מאי" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "יוני" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "יולי" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "אוגוסט" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "ספטמבר" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "אוקטובר" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "נובמבר" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "דצמבר" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1614,7 +1578,99 @@ "(ייתכן גם שהתמונה אינה מסוג bmp/gif/jpg/png.)\n" "לא ניתן להתאים את גודל התמונות לחלון." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "כל המודול" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "נא לסמן תיבה זו על מנת לעבוד עם המודול הזה." + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "זמין" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "ישועה" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "אודות יישום זה" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1623,259 +1679,281 @@ "קידוד שגוי בתיבת הערות אישיות:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "פרק" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos אינה מפענחת יותר מארגומנט אחד" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "מפעיל את Xiphos" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "ממשק בנייה" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "מתחיל את Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "טוען הגדרות" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "מציג את Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "תצוגה מקדימה" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "הערת שוליים" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "הפנייה צולבת" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "סטרונג" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "מורפולוגיה" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "חזרה אל " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "מספרי סטרונג" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "הערות שוליים" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "תגיות מורפולוגיות" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "ניקוד עברי" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "טעמי המקרא" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "הטעמות יווניות" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "הפניות צולבות" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "כותרות פירושים" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "כותרות" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "התחלקות מורפמות" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "מילות הצלוב באדום" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "תעתיק" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "משתנים טקסטואליים" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "קריאה עיקרית" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "קריאה משנית" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "כל הקריאות" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "תעתיק" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "כתבי קודש" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "התחזקות" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "לשם התחזקות
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "ישועה" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "לשם ישועה
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "בריאות" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "לשם בריאות
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "שונות" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "גופן - שונות" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "הדפס" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 #, fuzzy msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "הדפס" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 #, fuzzy msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "הדפס" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 #, fuzzy msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "נושא משני 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 #, fuzzy msgid "Subtopic 1
" msgstr "היקף" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "נושא משני 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 #, fuzzy msgid "Subtopic 2
" msgstr "היקף" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "נושא משני 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 #, fuzzy msgid "Subtopic 3
" msgstr "היקף" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "נושא משני 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 #, fuzzy msgid "Subtopic 4
" msgstr "היקף" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "שם עבור יומן או רשימת תפילות" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "רשימת התפילות הזו כבר נמצאה." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1884,19 +1962,19 @@ "לא ניתן ליצור את הנתיב למודול:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "A basic prayer list. \\par\\par Module created by Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "רשימת-תפילות-בסיסית" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "רשימת התפילות שלי" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 #, fuzzy msgid "" "People:
Bob
Sam
Sue

Church:
pews
אנשים:
בנימין
שמואל
שושנה

כנסייה:
מושבים
אחווה
ספרים למסיונרים


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "רשימת תפילות על פי נושא. מודול אחד-לאחד שנבנה על ידי Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "רשימת-תפילות-נושא" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 #, fuzzy msgid "Bob
Sam
Sue
John
" msgstr "בנימין
שמואל
שושנה
יוחנן
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "התחזקות רוחנית" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 #, fuzzy msgid "Mike
Steve
" msgstr "מיכאל
טוביה
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 #, fuzzy msgid "Sue
John
" msgstr "שושנה
יוחנן
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "רשימת תפילות חודשית. מודול אחד-לאחד שנבנה על ידי Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "רשימת-תפילות-חודשית" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "יומן יומי. מודול אחד-לאחד שנבנה על ידי Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "יומן-יומי" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "נושא מתואר (למשל, דרשה). מודול אחד-לאחד שנבנה על ידי Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "נושא-מתואר" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "נושא עיקרי א'" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 #, fuzzy msgid "Major Topic A
" msgstr "נושא עיקרי א'
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "נושא עיקרי ב'" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 #, fuzzy msgid "Major Topic B
" msgstr "נושא עיקרי ב'
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "נושא עיקרי ג'" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 #, fuzzy msgid "Major Topic C
" msgstr "נושא עיקרי ג'
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "הערות משתמש" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "תוצאות החיפוש %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "טווח למחיקה?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "האם למחוק טווח זה?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "חיפוש " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2017,16 +2095,16 @@ "לא מותקן מודול כזה.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "שמור רשימת מודולים" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "אין אינדקס לחיפוש מהיר עבור %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2034,7 +2112,7 @@ "\n" "החיפוש במודול זה הוא מעתה 'מרובה מלים'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2042,52 +2120,46 @@ "\n" "ראו בחלונית התחזוקה שבמנהל המודולים." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "החיפוש הושלם" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "התאמות" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 #, fuzzy msgid "There is no commentary module." msgstr "מספר מודולי פירוש" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "לא נקבע $HOME!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"לא ניתן ליצור את .xiphos:\n" -"%s\n" -"\n" -"לא ניתן להמשיך." +"לא ניתן ליצור את הנתיב למודול:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "לא ניתן ליצור " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2104,11 +2176,11 @@ "Xiphos אינה יכולה להמשיך,\n" "ולכן תיסגר." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "התקנת מודול כתבי קודש הושלמה." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2118,11 +2190,11 @@ msgid "verse" msgstr "פסוק" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "פרק" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2130,7 +2202,7 @@ "קובץ השפה\\הקיצורים\n" "של Xiphos חסר." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2138,7 +2210,7 @@ "לא ניתן לפתוח את קובץ\n" "השפה\\הקיצורים של Xiphos." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2146,7 +2218,7 @@ "לא ניתן להקצות שטח\n" "לקיצורי השפה של Xiphos." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2155,19 +2227,19 @@ "קיצורי השפה של Xiphos." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "לא נמצאה שפה תואמת" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "אין לתרגם את שמות הספרים ואת התפריטים" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2175,7 +2247,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2183,11 +2255,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "ביקשת דרשה יומית, אך אף מודול דרשות אינו מותקן." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2201,89 +2273,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "נקה את רשימת ההסטוריה" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "רשימת פסוקים" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "%s לא נמצא" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "לא ניתן להריץ את %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "שגיאת תצוגה:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "הצג %s בחלון הראשי" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "יצירת המסמך נכשלה. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "מה עלי לעשות כדי להיוושע?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "מעשי השליחים 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "אל האפסים 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "אל הרומים 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "מהי הבשורה?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "הראשונה אל הקורינתים 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "לא ניתן לנתח את המסמך. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "מסמך חדש \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "סוג שגוי, צומת השורש != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "סוג שגוי, צומת השורש != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2292,7 +2369,7 @@ "\n" msgstr "פרק" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2301,101 +2378,101 @@ "\n" msgstr "פרק" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "הברית הישנה" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "כללי" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "מסמך חדש" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "הבשורה על פי מתי" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "רשימת מודולים" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "סוג שגוי, צומת השורש != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2409,13 +2486,13 @@ msgstr "דיאלוג סימנייה" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "צור תיקייה חדשה" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "תיקייה חדשה" @@ -2424,7 +2501,7 @@ msgstr "חדש..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "בטל סימנייה" @@ -2437,22 +2514,22 @@ msgstr "ערך תווית" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "פסוק:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "ערך פסוק" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "מודול:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "ערך מודול" @@ -2460,6 +2537,10 @@ msgid "Bookmark Folder Treeview" msgstr "מבט עץ על תיקיית הסימניות" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "הוספת קישור" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2515,6 +2596,12 @@ msgid "_Delete Personal Comment" msgstr "מחק הערה אישית" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_קובץ" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "מחק הערה נוכחית" @@ -2523,6 +2610,14 @@ msgid "_Save (Personal Comment)" msgstr "שמור (הערה אישת)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "תצוגה לפני הדפסה" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "הדפס..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "יציאה" @@ -2531,6 +2626,11 @@ msgid "For_mat" msgstr "עיצוב" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "שמירה" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "הדפס מסמך" @@ -2568,7 +2668,7 @@ msgstr "מסמך חדש" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "העתקייצא קטע" @@ -2605,7 +2705,7 @@ msgstr "ייצוא ספר שלם" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "ספר" @@ -2720,8 +2820,8 @@ msgid "Open about dialog" msgstr "פתח בתיבת דיאלוג" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2764,13 +2864,17 @@ msgid "Delete selection" msgstr "מחק את הטווח הנבחר" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "מחיקה" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "ההסרה נכשלה" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "מחק פריט" @@ -2945,6 +3049,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "חדש" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3077,122 +3185,86 @@ msgid "_Edit" msgstr "ע_ריכה" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "ע_זרה" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "למחוק את הרשימה?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "רשימת פסוקים" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "סמן הסר סימון מפסוק" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "מרקוס" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "הסר סימון" @@ -3272,89 +3344,97 @@ msgstr "למחוק אינדקס לחיפוש מהיר עבור המודולים הבאים?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "המשך" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "מנהל מודולים" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "אזהרה: אם אתם חיים במדינה הרודפת את המאמינים, היזהרו בעת השימוש." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "הוסף והסר מקורות" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "מקורות מקומיים נוכחיים" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "מקורות מרוחקים נוכחיים" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "מחק מקור מרוחק" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "מקור התקנה" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "מקומי" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "מרוחק" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "יעד התקנה" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "איזור אישי, לעיניך בלבד:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "ספריית בית" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "איזור מערכת, לכל המשתמשים:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "ספריית sys של Sword" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3362,10 +3442,14 @@ "אזהרה: אם אתם חיים במדינה הרודפת את המאמינים ומבקשים להימנע מזיהוי, " "אל תשתמשו באפשרות ההתקנה מרחוק! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "תיקיית התקנה מקומית" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "נקה את רשימת ההסטוריה" @@ -3374,11 +3458,11 @@ msgid "Choose book to display" msgstr "נא לבחור ספר" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "כפתור בחירת ספר" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "הבשורה על פי יוחנן" @@ -3387,11 +3471,11 @@ msgid "Choose chapter to display" msgstr "נא לבחור ספר" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "כפתור מעבר פרק" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "+1" @@ -3547,11 +3631,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "מודולים" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3623,12 +3708,12 @@ msgid "BSP privacy button" msgstr "כפתור רדיו: פסוק" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "ישועה" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3660,11 +3745,12 @@ msgid "BSP nav verse list radio button" msgstr "כפתור רדיו לרשימת מודולים" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "רשימת שמות" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3707,7 +3793,12 @@ msgid "BSP listen none radio button" msgstr "כפתור רדיו להצגת טקסט פשוט" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "מיוחד" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3895,194 +3986,193 @@ msgstr "תיבת סימון להפעלת רשימות תפילות" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "פסוק מספר" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "הצג מספרי פסוקים" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "גודל מספר הפסוק" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "תיבת סימון לציון הצגת פסוק בשורה אחת" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "תיאור" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "הצג מספרי פסוקים" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "גודל מספר הפסוק" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "תיבה משולבת לתיקיית ברירת המחדל של שולחן המחקר" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "בחר ספרייה" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "תיבה משולבת לתיקיית ברירת המחדל של שולחן המחקר" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "כללי - שונות" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "מודולי חלון ראשי" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "כתבי קודש" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "תיבה משולבת לשינוי טקסט תנ\"כי" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "תיבה משולבת לשינוי פירוש" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "מילון" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "תיבה משולבת לשינוי מילון" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "תיבה משולבת לשינוי ספר" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "מודולים" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "נקה את כל המודולים מהרשימה" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "כפתור לניקוי המודולים מהרשימה" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "הסר את המודולים שנבחרו מהרשימה" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "כפתור להסרת המודולים שנבחרו מהרשימה" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "פתח תיבת דיאלוג לבחירת המודולים שיתווספו לרשימה" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "הוסף מודולים" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "כפתור לדיאלוג פתיחת הפריטים הנבחרים" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "מודולים - מקביל" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "מודולים למטרות מיוחדות" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "דרשה יומית" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "תיבה משולבת לדרשה יומית" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "לקסיקון עברי" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "תיבה משולבת ללקסיקון עברי" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "לקסיקון יווני" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "תיבה משולבת ללקסיקון יווני" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "מילון ברירת המחדל" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "תיבה משולבת לשינוי מילון ברירת המחדל" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "הערות אישיות" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "תיבה משולבת לשינוי הערות אישיות" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "מודולים - שונות" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "בחירת מודולים" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4111,6 +4201,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "חיפוש מתקדם" @@ -4320,11 +4414,11 @@ msgid "Found" msgstr "נמצא" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "חלון תקציר תוצאות" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "טבלת תקציר תוצאות" @@ -4516,6 +4610,11 @@ msgid "Attribute Search" msgstr "חיפוש תכונות" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "בחירת מודולים" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4612,6 +4711,10 @@ msgid "_Module Manager" msgstr "מנהל מודולים" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_תצוגה" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4763,28 +4866,28 @@ msgid "Learn about Xiphos" msgstr "אודות Xiphos_..." -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "הערות לפסוק" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "פתח מודול" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "הערה" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "פתח בתיבת דיאלוג" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "_פסוק לשורה" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4792,270 +4895,279 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "משתנים" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "תוכן" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "התחשב בקבוצות גופנים" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "פירוש לפי פרק" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" msgstr "רווחים כפולים" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "בחירת חיפוש" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "השתמש במילון הנוכחי" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "עיין ב-BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "פתח מודול זה" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "הצג כותרת ספר" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "הצג כותרת פרק" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "שנה שם פירוש אישי" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "השלך פירוש אישי" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "קריאה בקול" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "שמור תוצאות אלה כסימניה בודדת" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "שמור את הרשימה כסימניה בודדת" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "שמור תוצאות אלה כסדרת סימניות בתיקיה חדשה" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "שמור את הרשימה כסדרת סימניות" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "רשימת פסוקים" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "נקה את רשימת ההסטוריה" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "פתח סימנייה זו בטאב חדש." -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "פתח בלשונית חדשה" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "פתח את הסימנייה בתיבת דיאלוג" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "פתח בתיבת דיאלוג" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "הוסף התיקייה החדשה לתיקייה שנבחרה" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "הכנס לכאן את הסימנייה החדשה" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "הכנס סימנייה" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "ערוך פריט סימנייה" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "ערוך פריט" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "מחק פריט" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "הרחב את כל קבוצות הסימניות" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "הרחב הכל" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "צמצם את כל קבוצות הסימניות" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "צמצם הכל" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "אפשר הזזת פריטים בין ספריות" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "אפשר סידור מחדש" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "טען סימניות מ-Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "הכנס סימנייה" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "הסר תיקייה ושמור אותה" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "ייצוא תיקייה" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "פתח את המודול הנבחר בלשונית חדשה" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "פתח בחלון נפרד" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "צור רשימת מודולים חדשה" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "פשוט" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "אובייקט Pixbuf" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "יצירת יומן חודשי חדש" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "חודשי" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "יצירת יומן יומי חדש" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "יומי" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "פתח בחלון נפרד" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "הוספת תת־פריט" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "הוסף כפריט" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "הוספת פריט" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "הסר - שחזר" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "הדפס הערה" @@ -5067,6 +5179,91 @@ msgid "Study the Bible" msgstr "מחקר בכתבי הקודש" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "כל המודול" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%sכישלון ב" + +#~ msgid "Page %d of %d" +#~ msgstr "עמוד %d מתוך %d" + +#~ msgid "Save As" +#~ msgstr "שמור רשימה" + +#~ msgid "HTML Output" +#~ msgstr "פלט HTML" + +#~ msgid "HTML Source" +#~ msgstr "מקור" + +#~ msgid "Plain Source" +#~ msgstr "מקור" + +#~ msgid "_Quit" +#~ msgstr "עריכה" + +#~ msgid "_Open" +#~ msgstr "פתח" + +#~ msgid "_Save" +#~ msgstr "שמור" + +#~ msgid "Save _As..." +#~ msgstr "שמור קובץ בשם..." + +#~ msgid "Open new document" +#~ msgstr "פתיחת מסמך חדש" + +#~ msgid "Delete current note" +#~ msgstr "מחיקת ההערה הנוכחית" + +#~ msgid "HTML _Output" +#~ msgstr "_פלט HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_מקור HTML" + +#~ msgid "_Plain Source" +#~ msgstr "מקור" + +#~ msgid "Unlock " +#~ msgstr "פתח " + +#~ msgid "Preparing to print" +#~ msgstr "מתכונן להתקנה" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "המדפסת אינה תומכת בהדפסה" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "המדפסת %s אינה תומכת בהדפסה." + +#~ msgid "Printing" +#~ msgstr "הדפס" + +#~ msgid "Waiting to print" +#~ msgstr "מתכונן להתקנה" + +#~ msgid "An error occurred while printing" +#~ msgstr "חלה שגיאה בעת ההדפסה" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "הדפסת המסמך נכשלה: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "לא ניתן ליצור את .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "לא ניתן להמשיך." + #~ msgid "Module has no morphology support." #~ msgstr "יש מודול אין תמיכת מורפולוגיה." @@ -5450,9 +5647,6 @@ #~ msgid "C_lear" #~ msgstr "נקה" -#~ msgid "Clear history list" -#~ msgstr "נקה את רשימת ההסטוריה" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "הצג את הדרשה היומית להיום" @@ -5477,9 +5671,6 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "מידע נוסף אודות פרויקט Sword" -#~ msgid "About this application" -#~ msgstr "אודות יישום זה" - #~ msgid "Hi_story" #~ msgstr "הסטוריה" diff -Nru xiphos-4.0.0+dfsg1/po/hu.po xiphos-4.0.4+dfsg1/po/hu.po --- xiphos-4.0.0+dfsg1/po/hu.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/hu.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-15 13:02+0000\n" "Last-Translator: Dmitrijs Ledkovs \n" "Language-Team: Hungarian \n" @@ -20,296 +20,263 @@ "X-Poedit-Country: HUNGARY\n" "X-Poedit-Language: Hungarian\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Konfiguráció nem található" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Biztos benne, hogy törölni akarja a megjegyzést" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Megnyit" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Névtelen dokumentum" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Változások dokumentumba mentése" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "bezárás előtt?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Fájl" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "TanulóTömb" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Jegyzet szerkesztő" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Imalista szerkesztő" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "A Sword modulról" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Egész modul" +msgid "Module name: " +msgstr "Modulkezelő" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Opciók" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s sikertelen" +msgid "Type: " +msgstr "Tartomány" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Napi áhítat" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Térképek" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Konfiguráció nem található" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Képek" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "%d/%d oldal" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Megnyit" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Mentés másként" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblia" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Névtelen dokumentum" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Magyarázat" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Biztos benne, hogy törölni akarja a megjegyzést" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Szótár" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML-kimenet" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML-forrás" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Egyszerű forrás" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Általános könyvek" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "N_yomtat..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Kommentár átnevezése" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Nyomtatási ké_p" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DailyJournal" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Kilép" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Ismeretlen" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Megnyitás" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "Menté_s" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Modul lista" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Men_tés másként…" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Tartományok" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Új" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Új dokumentum megnyitása" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Telepítés forrás" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Törlés" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Modulok főablak" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Aktuális jegyzet törlése" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formátum" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fájl" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Fejlécek" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML-_kimenet" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "HTML-_forrás" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Egyszerű forrás" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "Né_zet" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Lábjegyzetek" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Ment" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Utalások" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Hivatkozás beszúrása" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strong féle számozás" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Változások dokumentumba mentése" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Nyelvtani elemek" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "bezárás előtt?" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Segédletek" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek." +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Jézus szavai pirossal" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Fájl" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Görög ékezetek" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "TanulóTömb" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Héber punktálás" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Jegyzet szerkesztő" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Héber recitáció" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Imalista szerkesztő" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Felold " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Nyomtatás előkészítése" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "A nyomtatás nem támogatott ezen a nyomtatón" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Átirat" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "A %s nyomtató nem támogatja a PostScript nyomtatást." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Nyomtatás" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Várakozás nyomtatásra" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Hiba történt a nyomtatás során" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morféma részekre osztása" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Nem volt lehetséges a dokumentum nyomtatása: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "A Sword modulról" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Attribútumok" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "A modul nem rendelkezik Infó leírással" +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Opciók" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -329,18 +296,20 @@ "az alkalmazások között.\n" " A könyvek letölthetők a SWORD projekt weboldaláról." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "A SWORD(kard) projekt" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Szereti használni a Xiphos alkalmazást a Bibliatanulmányozáshoz? Szeretné " "használni a programot a saját nyelvén? Lehetősége van lefordítani az " @@ -351,24 +320,24 @@ "számunkra fordítani, akkor kérjük klikkeljen az alábbi linkre, lépjen " "kapcsolatba velünk, és kapcsolódjon be a munkánkba." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Xiphos fordításról" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Lásd a TRANSLATION-HOWTO fájlt a Xiphos forrásmappában" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos fejlesztés" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Minden jog fenntartva 2000-2009 A Xiphos Fejlesztői csapat" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Minden jog fenntartva 2000-2015 A Xiphos Fejlesztői csapat" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -381,233 +350,233 @@ "nekünk a SWORD projektet." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Könyvjelző" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Adja meg a mappa nevét" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Mappa neve" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mappa: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Könyvjelző fájl megadása" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Szerkeszt" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Mappa neve: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Könyvjelző neve: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "A kiválasztott mappa eltávolítása" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(és minden tartalmával együtt)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "A kijelölt könyvjelző eltávolítása" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Hozzáad" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Címke: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Keresés eredménye: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "A modul titkosító kulcsa %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "amit keres:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Adja meg a kulcsot: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Bezár mentés nélkül" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Bezár mentés _nélkül" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Vers lista" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "VersLista" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "KeresésiEredmény" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Kérem nézze meg a szerzői jogot, mielőtt exportálná!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Keres" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Adjon meg egy szót vagy mondatot" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Keresés visszafelé" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Következő találat" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Modul betűkészlet beállítása" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Betűkészlet megváltoztatása" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Aktuális betűkészlet: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Az alap betűkészlet használata ehhez a modulhoz" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "HIBA! Xiphos összeomlani készül egy \"STRDUP\" hibának köszönhetően." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Kérem jelentse ezt a hibát a Xiphos csapatnak:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "HIBA! Xiphos is about to crash due to a \"STRING\" error." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "Olyan modulokban, amelyek tartalmaznak Strong féle számozást" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Biblia tanulmányozó alkalmazás" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Új fül megnyitása" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Normál nézet" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Magyarázó nézet" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Könyv nézet" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Üdvözli Önt a Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -626,33 +595,33 @@ "Éppen ezért személyes megjegyzések átnevezése Windows\n" "környezetben nem lehetséges." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Kommentár átnevezése" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Válasszon egy kommentár nevet" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Új név" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Név: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modul nevek csak [A-Za-z0-9_]-t tartalmazhatnak." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos már tud azonos nevű modulról." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -661,7 +630,7 @@ "Nem sikerült új konfigurációt létrehozni:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -670,7 +639,7 @@ "%s\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -795,20 +764,20 @@ "\n" "Megnyissa Xiphos a modulkezelőt, hogy Bibliákat telepíthessen?" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "El kívánja távolítani ezeket a modulokat?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Előkészítés eltávolításhoz" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Eltávolítás" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Eltávolít" @@ -828,23 +797,23 @@ msgid "Install" msgstr "Telepít" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archiválni kívánja ezeket a modulokat?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Archiválás előkészítése" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archiválás" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archivum" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -852,55 +821,59 @@ "Készüljön gyors-keresés index ezekhez\n" "a modulokhoz (modulonként több percet is igénybe vehet)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Indexelés előkészítése" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexelés" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Index" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Biztosan törli ezeknek a moduloknak a gyors-keresés indexeit?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Index törlésének előkészítése" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Index törlése" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Törlés" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "A modul nem rendelkezik Infó leírással" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modul neve" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "A megjelölés azt jelenti, hogy ez a modul már telepítve van" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Pipálja be a négyzetet, ha ezzel a modullal kíván dolgozni." -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Jelölje be a négyzetet, ha telepíteni/frissíteni szeretné ezt a modult" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Telepített" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -909,7 +882,7 @@ "('lucene') indexelés készült az adott modulhoz (több információt erről a " "funkcióról a karbantartó panelen talál)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -917,13 +890,13 @@ "A lakat ikon azt jelenti, hogy az adott modul titkosított. Regisztrációs " "kulcsot a tulajdonostól vásárolhat." -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Névjegy" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -931,19 +904,19 @@ "A frissítés ikon azt jelenti, hogy a telepített modul régebbi, mint az " "elérhető újabb modul. Frissítenie kellene a modult" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Elérhető" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Méret" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Leírás" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -952,33 +925,33 @@ "`mkdir %s' sikertelen:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " archiválva: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Naplót és imalistát nem lehet indexelni." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s sikertelen" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Befejezve" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Ismeretlen" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -987,7 +960,7 @@ "Tárhely:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -995,54 +968,44 @@ "Modulok típusai\n" "szerint kategorizálva" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bibliai szövegek" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Magyarázatok" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Szótárak" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Napi áhitatok" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Általános könyvek" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Térképek" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Képek" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1050,95 +1013,95 @@ "Kategorizálva\n" "elérhetőség alapján" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Frissítések" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Eltávolítva" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Imalista/Napló" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Frissítés távoli forrásból" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Távoli forrás nem található" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurál" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Típus" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Fejezet" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Forrás" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Könyvtár" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Felhasználó" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Jelszó" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Modul források" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Hozzáad/eltávolít" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Kiválaszt" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modulok" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Telepít/Frissít" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Karbantartás" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Kérem frissítsen" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "A modul-lista napra kész!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1146,7 +1109,7 @@ "Eltávolította az utolsó Bibliát.\n" "Xiphosnak minimum egyre szüksége van." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1154,210 +1117,221 @@ "Még nincsenek Bibliák telepítve.\n" "Xiphos nem futhat egy nélkül sem." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Alap távoli forrás betöltve." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Alap források betöltése nem sikerült a CrossWire oldaláról." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "A kiválasztott forrás eltávolítása" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Távoli forrás megadása" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Fejezet:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Típus:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Kiszolgáló:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Könyvtár:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Felhasználó (opcionális):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Jelszó (opcionális):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Forrás ilyen névvel már létezik." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Távoli forrás törlése" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Egész modul" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Ugrás kifelé ahhoz a fejezethez, amely ezt a fejezetet tartalmazza" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Előző elemhez ugrás" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Következő elemre ugrás" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Ugrás belülre az első alfejezethez" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Ennek az ablaknak a görgetését szinkronizálja a fő ablakkal" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Párhuzamos" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Leválaszt/hozzácsatol" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Modul beállítások" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Párhuzamos nézet" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Kiválasztás hangos felolvasása" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Személyes" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Kiválaszt --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "A módosítás az alkalmazás újraindítása után lép érvénybe" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Beállítások" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Általános" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opciók" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Biblia" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Betűkészlet" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Szín" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Méret és típus" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Speciális" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Lista törlése?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Biztos benne, hogy törli a modul-listát?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Modul eltávolítása?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Biztos benne, hogy el akarja távolítani a kiválasztott modult?" @@ -1376,20 +1350,20 @@ msgid "found in " msgstr "megtalálva itt: " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Új lista %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Az utolsó modul-lista nem törölhető" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Lista törlése?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Biztos benne, hogy törölni kívánja:" @@ -1409,7 +1383,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1454,7 +1428,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1472,15 +1446,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1488,108 +1462,98 @@ "Ez egy összetett (\"ÉS\") keresés:\n" "Találatok keresése és az összes szó megjelenítése." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Össz_etett keresés" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Modul keresése" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblia" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Magyarázat" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Keresés típusa" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Több szavas" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Reguláris kifejezés" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Pontos kifejezés" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Keresési opciók" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Nagybetűérzékeny" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Keresési tartomány" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Tartomány nélkül" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Határok használata" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Utolsó keresés" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Határok" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Alsó" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Felső" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Megnyitás szövefszerkesztőben" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Beállítások" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Keresés" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Oldalpanel" @@ -1597,73 +1561,73 @@ msgid "Powered by the SWORD Project" msgstr "Támogatja a SWORD projekt" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "A lap-könyvtárat nem sikerült létrehozni." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Imalista/Napló elem" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Új név" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Kiválasztott elem törlése" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "január" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "február" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "március" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "április" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "május" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "június" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "július" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "augusztus" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "szeptember" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "október" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "november" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "december" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1674,7 +1638,98 @@ "(Vagy lehetséges, hogy a képnek más formátuma van, mint bmp/gif/png.)\n" "Xiphos nem tudta átméretezni a képet, hogy az betöltse az ablakot." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Egész modul" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Pipálja be a négyzetet, ha ezzel a modullal kíván dolgozni." + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Elérhető" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Üdvösség" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1683,259 +1738,281 @@ "Helytelenül kódolt személyes megjegyzés cimke:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Fejezet" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nem tud egy argumentumnál többet értelmezni" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Gecko inicializálása" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Interfész felépítése" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Sword indítása" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Beállítások betöltése" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Xiphos megjelenítése" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Előnézeti ablak" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Lábjegyzet" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Utalás" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strong" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Nyelvtan" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Vissza ide: " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strong féle számozás" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Lábjegyzetek" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Nyelvtani elemek" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Héber punktálás" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Héber recitáció" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Görög ékezetek" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Utalások" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Segédletek" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Fejlécek" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morféma részekre osztása" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Jézus szavai pirossal" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Átirat" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Szövegvariánsok" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Elsődleges olvasat" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Másodlagos olvasat" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Az összes olvasat" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Átirat" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "tartalom megjelenítése" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Növekedés" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "A növekedésért
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Üdvösség" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "Az üdvösségért
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Egészség" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "Az egészségért
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Egyebek" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "Vegyes
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Point x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 #, fuzzy msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Point y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 #, fuzzy msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Point z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 #, fuzzy msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Kis téma 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 #, fuzzy msgid "Subtopic 1
" msgstr "Altéma 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Kis téma 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 #, fuzzy msgid "Subtopic 2
" msgstr "Altéma 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Kis téma 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 #, fuzzy msgid "Subtopic 3
" msgstr "Altéma 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Kis téma 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 #, fuzzy msgid "Subtopic 4
" msgstr "Altéma 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Új imalista vagy napló neve" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos már megtalálta azt az imalistát." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1944,19 +2021,19 @@ "Xiphos nem tudja létrehozni a modul elérési útvonalát:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Alap imalista. \\par\\par Modult létrehozta: Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "AlapImalista" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "Imalistám" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 #, fuzzy msgid "" "People:
Bob
Sam
Sue

Church:
pews
Emberek:
Tamás
Sándor
Zsuzsi

Templom:
padok
társaság
Biblia a misszionáriusoknak


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Téma alapú imalista. \\par\\par Modult létrehozta: Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubjectPrayerList" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 #, fuzzy msgid "Bob
Sam
Sue
John
" msgstr "Tamás
Sándor
Zsuzsi
János
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Lelki növekedés" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 #, fuzzy msgid "Mike
Steve
" msgstr "Miklós
Elemér
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 #, fuzzy msgid "Sue
John
" msgstr "Zsuzsi
János
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Havi imalista. \\par\\par Modult létrehozta: Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonthlyPrayerList" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Napi imalista. \\par\\par Modult létrehozta: Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DailyJournal" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Egy vázlatos téma (pl.: prédikáció) \\par\\par Modult létrehozta: Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OutlinedTopic" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "A. fő téma" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 #, fuzzy msgid "Major Topic A
" msgstr "A. fő téma
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Fő téma 2" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 #, fuzzy msgid "Major Topic B
" msgstr "B. fő téma
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Fő téma 3" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 #, fuzzy msgid "Major Topic C
" msgstr "C. fő téma
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Felhasználói jegyzetek" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "A %s keresés eredménye: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Tartomány törlése?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Biztosan töröli ezt a tartományt?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Keresés: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2078,16 +2155,16 @@ "Nincs ilyen modul telepítve.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Kérem állítsa be a modul-listát." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Ehhez nem létezik gyors kereső-index: %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2095,7 +2172,7 @@ "\n" "Keresés módja ezen a modulon most már 'több szavas'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2103,41 +2180,35 @@ "\n" "Lásd modulkezelő, karbantartó panel." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Keresés befejezve" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "találatok" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME nincs megadva!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos nem tudja létrehozni .xiphos fájlt:\n" -"%s\n" -"\n" -"Xiphos futása leáll." +"Xiphos nem tudja létrehozni a modul elérési útvonalát:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nem tudja létrehozni " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2145,12 +2216,12 @@ "A beállítások fájl üres -- az alkalmazás megkísérli a visszaállítást.\n" "Számos adat elveszhetett." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "A beállítások fájl üres -- nincs biztonsági másolat?!? Ez bizony adatvesztés!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2167,11 +2238,11 @@ "Xiphos nem futtatható,\n" "ezért az alkalmazás leáll." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Bibliai modul telepítése befejeződött." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2181,11 +2252,11 @@ msgid "verse" msgstr "vers" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "fejezet" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2193,7 +2264,7 @@ "Xiphos nyelvi rövidítéseket\n" "tartalmazó fájlja nem található." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2201,7 +2272,7 @@ "Xiphos nem tudja megnyitni\n" "a nyelvi rövidítéseket tartalmazó fájlt." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2209,7 +2280,7 @@ "Xiphos nem tud helyet foglalni\n" "a nyelvi rövidítéseknek." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2218,19 +2289,19 @@ "tartalmazó fájlt." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "A keresett nyelvterület nem található" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Könyvnevek és menük valószínüleg nincsenek lefordítva" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2238,7 +2309,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2246,11 +2317,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Napi áhítat megnyitása sikertelen, mivel egy sincs telepítve." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2275,89 +2346,94 @@ "\n" "Kérem adja meg a kulcsot a dialógusablakban." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Előzmények törlése" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Vers lista" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nem található:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nem tudta futtatni: %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Megjenítő hiba:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "%s megjelenítése a főablakban" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokumentum létrehozása nem volt sikeres. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Mit kell tennem, hogy üdvözüljek?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apostolok Cselekedetei 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Efézus 2:8-9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Róma 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Mi az Evangélium?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Korintus 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokumentum feldolgozása sikertelen! \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "üres dokumentum \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "wrong type, root node != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "wrong type, root node != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2366,7 +2442,7 @@ "\n" msgstr "Fejezet" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2375,94 +2451,94 @@ "\n" msgstr "Fejezet" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Ószövetség" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Újszövetség" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mt - Jel" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Minta modul lista" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "wrong type, root node != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2471,7 +2547,7 @@ "Beállítások mentése nem sikerült! stat %d, size %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Az alkalmazás megkísérli a korábbi mentést visszaállítani." @@ -2485,13 +2561,13 @@ msgstr "Bookmark Dialog" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Új mappa létrehozása" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Új mappa" @@ -2500,7 +2576,7 @@ msgstr "Új ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Könyvjelző mégsem" @@ -2513,22 +2589,22 @@ msgstr "Label Entry" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Verse Entry" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Module Entry" @@ -2536,6 +2612,10 @@ msgid "Bookmark Folder Treeview" msgstr "Bookmark Folder Treeview" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Hivatkozás beszúrása" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2591,6 +2671,12 @@ msgid "_Delete Personal Comment" msgstr "Személyes megjegyzés _törlése" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fájl" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Aktuális megjegyzés mentése" @@ -2599,6 +2685,14 @@ msgid "_Save (Personal Comment)" msgstr "Menté_s (személyes megjegyzés)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Nyomtatási ké_p" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "N_yomtat..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "K_ilépés" @@ -2607,6 +2701,11 @@ msgid "For_mat" msgstr "For_mátum" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Ment" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Dokumentum nyomtatása" @@ -2644,7 +2743,7 @@ msgstr "Új dokumentum" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Szakasz másolása/exportálása" @@ -2681,7 +2780,7 @@ msgstr "A teljes könyv exportálása" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Könyv" @@ -2796,8 +2895,8 @@ msgid "Open about dialog" msgstr "Megnyitás dialógusablakban" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2840,13 +2939,17 @@ msgid "Delete selection" msgstr "Kiválasztott tartomány törlése" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Törlés" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Kiválasztott elem törlése" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Elem törlése" @@ -3021,6 +3124,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Új" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3155,122 +3262,86 @@ msgid "_Edit" msgstr "Szerkesz_t" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Segítség" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Lista törlése?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Vers lista" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Vers megjelölése/megjelölés törlése" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Megjelöl" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Megjelölés törlése" @@ -3346,33 +3417,41 @@ msgstr "A kiválasztott modulok gyors-keresés indexelésének törlése" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Folytat" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword(kard)" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulkezelő" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "FIGYELMEZTETÉS: amennyiben Ön olyan országban él,\n" "ahol kereszt(y)én(y) üldözés van, csak óvatosan használja." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Források hozzáadása és eltávolítása" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Jelenlegi helyi források" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3381,15 +3460,15 @@ "meghajtó. Olyan mappa, amelyik tartalmaz \"mods.d\" és \"modules\" " "almappákat." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Az egyik helyi mappa - mint telepítő forrás - eltávolítása." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Jelenlegi távoli források" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3397,43 +3476,43 @@ "Alap távoli telepítő forrás hozzáadása. Ismernie kell a webcímet és a " "mappát, ahol a tárhely található." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Távoli telepítő forrás eltávolítása." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Telepítés forrás" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Helyi" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Távoli" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Telepítés cél" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Személyes terület, csak saját használatra:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Home mappa" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Rendszer terület, minden felhasználónak:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword sys dir" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3442,10 +3521,14 @@ "kereszt(y)én(y) üldözés van, és nem akarja, hogy felfedezzék, akkor NE " "használja a távoli telepítés opciót. " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Helyí telepítő mappa" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Felugró esemény-lista" @@ -3454,11 +3537,11 @@ msgid "Choose book to display" msgstr "A megjelenítéshez válasszon egy könyvet" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Book Selector Button" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Jelenések könyve" @@ -3467,11 +3550,11 @@ msgid "Choose chapter to display" msgstr "A megjelenítéshez válasszon egy könyvet" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Toggle Chapter Button" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3626,11 +3709,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Modulok" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3702,12 +3786,12 @@ msgid "BSP privacy button" msgstr "Verse Radio Button" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Üdvösség" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3739,11 +3823,12 @@ msgid "BSP nav verse list radio button" msgstr "Module list radiobutton" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Lista neve" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3786,7 +3871,12 @@ msgid "BSP listen none radio button" msgstr "Plain Text Radio Button" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Speciális" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3972,193 +4062,192 @@ msgstr "Enable Prayer Lists Checkbox" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Vers számozás" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "Versszámozás megjelenítése" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Vers számozás mérete" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Resize images checkbox" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Leírás" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Versszámozás megjelenítése" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Vers számozás mérete" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "StudyPad default directory combo" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Könyvtár kiválasztása" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudyPad default directory combo" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Általános egyéb" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Modulok főablak" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Bibliai szöveg" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Change Biblical Text Combo" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Change Commentary Combo" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Szótár" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Change Dictionary Combo" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Change Book Combo" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modulok" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Az összes modul eltávolítása a listáról" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Clear Modules from List Button" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "A kiválasztott modul eltávolítása a listából" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Delete Selected Module From List Button" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Dialógus ablak megjelenítése a modulok kiválasztásához" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Modul hozzáadása" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Open Selection Dialog Button" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modulok párhuzamos" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Különleges célú modulok" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Napi áhítat" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Daily Devotional Combo" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Héber lexikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebrew Lexicon Combo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Görög lexikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Greek Lexicon Combo" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Alap szótár" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Change Default Dictionary Combo" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Személyes jegyzetek" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Change Personal Notes Combo" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modulok egyéb" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Modul kiválasztása" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4189,6 +4278,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Összetett keresés" @@ -4402,11 +4495,11 @@ msgid "Found" msgstr "Találat" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Keresési eredmény ablak" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Keresési eredmény táblázat" @@ -4600,6 +4693,11 @@ msgid "Attribute Search" msgstr "Attribútumos keresés" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Modul kiválasztása" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4695,6 +4793,10 @@ msgid "_Module Manager" msgstr "_Modulkezelő" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "Né_zet" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "_Napi áhítat előnézete" @@ -4843,27 +4945,27 @@ msgid "Learn about Xiphos" msgstr "A Xiphos névjegye" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Jegyzet hozzáfűzése a vershez" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Modul megnyitása" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Megjegyzés" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Megnyitás szövefszerkesztőben" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Versek soronként" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4871,188 +4973,197 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variánsok" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Kép tartalom" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Betűkészlet figyelembe vétele" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Fejezetenkénti kommentár" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Kétszeres sorköz" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Kiválasztás keresése" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Aktuális szótár kasználata" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "BibleMap.org böngészése" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Modul feloldása" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Könyv fejlécének megjelenítése" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Fejezet fejlécének megjelenítése" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Személyes megjegyzés átnevezése" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Személyes megjegyzések kiiratása" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Kiválasztás hangos felolvasása" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Ezen eredmények elmentése könyvjelzőként" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Lista elmentése könyvjelzőként" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Ezen eredmények elmentése könyvjelzőkként a mappájukba" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Lista elmentése könyvjelzőkként" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Vers lista" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Felugró esemény-lista" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Lista exportálása" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Könyvjelző megjelenítése új lapon" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Megjelenítés új lapon" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Könyvjelző megnyitása új dialógus ablakban" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Megnyitás dialógusablakban" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Új mappa hozzáadása a kijelölt mappához" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Új könyvjelző beszúrása ide" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Könyvjelző beillesztése" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Könyvjelzői elem szerkesztése" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Elem szerkesztése" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Elem törlése" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Az összes könyvjelző-csoport kibontása" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Mindent kibont" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Minden könyvjelző-csoport összezárása" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Mindent összezár" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Elemek egyik mappából a másik mappába mozgatásának engedélyezése" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Átrendezés engedélyezése" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Más könyvjelző fájl betöltése (alap beállítás.: BibleTime programból)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Könyvjelzők importálása" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Mappa eltávolítása és mentése" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Mappa exportálása" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Kiválasztott modul megnyitása új lapon" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5060,80 +5171,80 @@ "Kiválasztott modul megjelenítése\n" "\tkülön ['dialog'] ablakban" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Megnyitás külön ablakban" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Egy új egyszerű imalista létrehozása" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Egyszerű" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Egy új téma alapú imalista létrehozása" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Tárgy" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Havi napló létrehozása" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Havi" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Napi napló létrehozása" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "napi" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Egy új vázlatos téma létrehozása" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Vázlatos" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Megnyitás külön ablakban" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Alelem hozzáadása" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Al-elem hozzáadása" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Új elem hozzáadása" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Elem hozzáadása" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Elem eltávolítása" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Elem szerkesztése" @@ -5145,6 +5256,91 @@ msgid "Study the Bible" msgstr "A Biblia tanulmányozása" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Egész modul" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s sikertelen" + +#~ msgid "Page %d of %d" +#~ msgstr "%d/%d oldal" + +#~ msgid "Save As" +#~ msgstr "Mentés másként" + +#~ msgid "HTML Output" +#~ msgstr "HTML-kimenet" + +#~ msgid "HTML Source" +#~ msgstr "HTML-forrás" + +#~ msgid "Plain Source" +#~ msgstr "Egyszerű forrás" + +#~ msgid "_Quit" +#~ msgstr "_Kilép" + +#~ msgid "_Open" +#~ msgstr "_Megnyitás" + +#~ msgid "_Save" +#~ msgstr "Menté_s" + +#~ msgid "Save _As..." +#~ msgstr "Men_tés másként…" + +#~ msgid "Open new document" +#~ msgstr "Új dokumentum megnyitása" + +#~ msgid "Delete current note" +#~ msgstr "Aktuális jegyzet törlése" + +#~ msgid "HTML _Output" +#~ msgstr "HTML-_kimenet" + +#~ msgid "_HTML Source" +#~ msgstr "HTML-_forrás" + +#~ msgid "_Plain Source" +#~ msgstr "_Egyszerű forrás" + +#~ msgid "Unlock " +#~ msgstr "Felold " + +#~ msgid "Preparing to print" +#~ msgstr "Nyomtatás előkészítése" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "A nyomtatás nem támogatott ezen a nyomtatón" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "A %s nyomtató nem támogatja a PostScript nyomtatást." + +#~ msgid "Printing" +#~ msgstr "Nyomtatás" + +#~ msgid "Waiting to print" +#~ msgstr "Várakozás nyomtatásra" + +#~ msgid "An error occurred while printing" +#~ msgstr "Hiba történt a nyomtatás során" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Nem volt lehetséges a dokumentum nyomtatása: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos nem tudja létrehozni .xiphos fájlt:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos futása leáll." + #~ msgid "Tabs" #~ msgstr "Fülek" diff -Nru xiphos-4.0.0+dfsg1/po/ja.po xiphos-4.0.4+dfsg1/po/ja.po --- xiphos-4.0.0+dfsg1/po/ja.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/ja.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-05-17 03:32+0000\n" "Last-Translator: Kunio Nakamaru \n" "Language-Team: Japanese \n" @@ -18,294 +18,240 @@ "X-Launchpad-Export-Date: 2010-09-20 05:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "設定が見つかりませんでした。" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "以下のメモを削除しますがよろしいですか？" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" msgstr "" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "タイトルなしのドキュメント" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "文書の変更を保存" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "閉じる前に？" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "保存しない場合、変更は失われます。" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "ファイル(&F)" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "メモ編集ツール" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "祈り帳/日記編集ツール" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Sword拡張データについて" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "拡張データ名" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "拡張データ名" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "削除" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" msgstr "" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "設定が見つかりませんでした。" - -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "ページ %d / %d" - -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "名前を付けて保存" - -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "タイトルなしのドキュメント" - -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "以下のメモを削除しますがよろしいですか？" - -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML の出力" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML のソース(_S)" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "通常のソース" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "印刷(_P)..." +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "印刷プレビュー(_V)" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "終了する(_Q)" +#: ../src/gnome2/about_modules.c:446 +msgid "General Book" +msgstr "" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "開く(_O)" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "保存(_S)" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "注解書名を変更" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "名前を付けて保存(_A)..." +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "新規作成" +#: ../src/gnome2/about_modules.c:457 +msgid "Unknown type" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "新しい文書を開く" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "削除する" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "現在のメモを削除" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "ファイル(_F)" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML の出力(_O)" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "HTML のソース(_H)" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "通常のソース(_P)" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "表示(_V)" +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "保存する" +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "リンクの挿入" +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "文書の変更を保存" +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "閉じる前に？" +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "保存しない場合、変更は失われます。" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "ファイル(&F)" +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "メモ編集ツール" +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "祈り帳/日記編集ツール" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "開錠 " +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "印刷する準備をしています" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "このプリンタでは印刷をサポートしていません" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "プリンター%sでは、PostScript印刷がサポートされていません。" +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "印刷しています" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "印刷待ち" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "印刷する際にエラーが発生しました" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "ドキュメントを印刷できませんでした: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Sword拡張データについて" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "拡張データ情報がありません。" +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -326,18 +272,20 @@ "\n" "これらの書物データは、Sword Projectからダウンロードする事ができます。" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Xiphosを聖書学習ツールとしてお気に召しましたでしょうか？\n" "翻訳には満足されていますか？あなたも翻訳に貢献する事が可能です。\n" @@ -345,23 +293,23 @@ "私たちは、常に様々な言語に翻訳するボランティアを募集しています。もし、ほかの" "言語に訳してくださる方がいらしたら、どうぞご連絡ください。" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Xiphosの翻訳について" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Xiphosソースコードの翻訳HowToを参照ください" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos開発" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" msgstr "" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -373,232 +321,232 @@ "The SWORD Projectを世に出したTroy Griffittsと関係者に感謝します。" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "ブックマーク" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "フォルダ名入力" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "フォルダ名" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "フォルダ: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "編集" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "フォルダ名 " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "ブックマーク名 " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "節 " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "拡張データ " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "選択されたフォルダを削除" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(中身すべて削除されます)" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "選択されているブックマークを削除" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "追加" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "ラベル: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "ブックマーク" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "保存せずに閉じる" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "保存せずに閉じる(_W)" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "節一覧" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "節一覧" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "検索結果" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "エキスポートする前に著作権を確認下さい！" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "検索" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "単語又文章を入力下さい" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "上方を検索します" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "次を検索" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "拡張データフォント設定" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "フォントの変更" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "拡張データ" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "現在のフォント " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "この拡張データにおいては、既定のフォントを使う" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "拡張データ情報がありません。" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - 聖書学習ソフトウェア" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "新しいタブを開く" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "基本ビュー" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "注解書ビュー" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "ブックビュー" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -610,40 +558,40 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "注解書名を変更" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "注解書名を入力下さい" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "新しい名前" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "名前: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "拡張データ名は、特殊文字を含まない英数字である必要があります。" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "その名前の拡張データは、すでに存在します。" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -651,7 +599,7 @@ "設定構築エラー:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -718,20 +666,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "これらの拡張データを除外しますか？" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "除外準備中" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "除外中" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "削除" @@ -751,513 +699,518 @@ msgid "Install" msgstr "インストール" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "これらの拡張データをアーカイブ化しますか？" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "アーカイブ準備中" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "アーカイブ中" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "アーカイブ" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "これらの拡張データに高速検索用の索引を構築しますか？" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "索引構築準備中" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "索引構築中" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "索引" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "これらの拡張データの高速検索用の索引を削除しますか？" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "索引削除準備中" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "索引削除中" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "削除" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "拡張データ情報がありません。" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "拡張データ名" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "チェックされている拡張データは、インストール済みです" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "インストール済" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "ソフトウェア情報" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "選択されたフォルダを削除" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1276,20 +1229,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1309,7 +1262,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1354,7 +1307,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1372,119 +1325,109 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "正規表現" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "大文字と小文字を区別する" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "" @@ -1492,446 +1435,554 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +msgid "Unknown module " +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1939,68 +1990,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2010,11 +2057,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2024,47 +2071,47 @@ msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2072,7 +2119,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2080,11 +2127,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2098,89 +2145,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "節一覧" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2189,7 +2241,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2198,101 +2250,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2306,13 +2358,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "" @@ -2321,7 +2373,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2334,22 +2386,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2357,6 +2409,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "リンクの挿入" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2411,6 +2467,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "ファイル(_F)" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2419,6 +2481,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "印刷プレビュー(_V)" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "印刷(_P)..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "" @@ -2427,6 +2497,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "保存する" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "" @@ -2464,7 +2539,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2501,7 +2576,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2608,8 +2683,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2651,13 +2726,17 @@ msgid "Delete selection" msgstr "削除" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "削除する" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "選択されたフォルダを削除" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2826,6 +2905,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "新規作成" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "" @@ -2953,122 +3036,86 @@ msgid "_Edit" msgstr "" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "節一覧" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "節一覧" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3138,96 +3185,108 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3236,11 +3295,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3248,11 +3307,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3394,11 +3453,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3464,11 +3523,11 @@ msgid "BSP privacy button" msgstr "" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3497,11 +3556,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3541,7 +3600,11 @@ msgid "BSP listen none radio button" msgstr "" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3718,186 +3781,185 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "節 " -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -3926,6 +3988,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "" @@ -4131,11 +4197,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4327,6 +4393,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4419,6 +4490,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "表示(_V)" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4564,27 +4639,27 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4592,266 +4667,275 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "節一覧" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "節一覧" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4862,3 +4946,69 @@ #: ../xiphos.desktop.in.in.h:2 msgid "Study the Bible" msgstr "" + +#~ msgid "Page %d of %d" +#~ msgstr "ページ %d / %d" + +#~ msgid "Save As" +#~ msgstr "名前を付けて保存" + +#~ msgid "HTML Output" +#~ msgstr "HTML の出力" + +#~ msgid "HTML Source" +#~ msgstr "HTML のソース(_S)" + +#~ msgid "Plain Source" +#~ msgstr "通常のソース" + +#~ msgid "_Quit" +#~ msgstr "終了する(_Q)" + +#~ msgid "_Open" +#~ msgstr "開く(_O)" + +#~ msgid "_Save" +#~ msgstr "保存(_S)" + +#~ msgid "Save _As..." +#~ msgstr "名前を付けて保存(_A)..." + +#~ msgid "Open new document" +#~ msgstr "新しい文書を開く" + +#~ msgid "Delete current note" +#~ msgstr "現在のメモを削除" + +#~ msgid "HTML _Output" +#~ msgstr "HTML の出力(_O)" + +#~ msgid "_HTML Source" +#~ msgstr "HTML のソース(_H)" + +#~ msgid "_Plain Source" +#~ msgstr "通常のソース(_P)" + +#~ msgid "Unlock " +#~ msgstr "開錠 " + +#~ msgid "Preparing to print" +#~ msgstr "印刷する準備をしています" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "このプリンタでは印刷をサポートしていません" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "プリンター%sでは、PostScript印刷がサポートされていません。" + +#~ msgid "Printing" +#~ msgstr "印刷しています" + +#~ msgid "Waiting to print" +#~ msgstr "印刷待ち" + +#~ msgid "An error occurred while printing" +#~ msgstr "印刷する際にエラーが発生しました" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "ドキュメントを印刷できませんでした: %s" diff -Nru xiphos-4.0.0+dfsg1/po/ko_KR.po xiphos-4.0.4+dfsg1/po/ko_KR.po --- xiphos-4.0.0+dfsg1/po/ko_KR.po 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/ko_KR.po 2015-07-15 14:34:29.000000000 +0000 @@ -0,0 +1,5153 @@ +# Korean translarion for the Xiphos. +# Copyright (C) 2015 Xiphos Developer Team and the Korean Translator. +# This file is distributed under the same license as the Xiphos package. +# Seong-ho Cho , 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: Xiphos 4.0.2\n" +"Report-Msgid-Bugs-To: Seong-ho Cho \n" +"POT-Creation-Date: 2015-07-15 17:14+0900\n" +"PO-Revision-Date: 2015-07-15 20:56+0900\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: Seong-ho Cho \n" +"Language: ko_KR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.5\n" + +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" +msgstr "" +"xiphos 치명적 오류: \"동작을 수행할 수 없음\", display_mod: null\n" +"이 문제를 보고하십시오: sword_main.cc:set_treekey\n" +"이 문제가 일어났을때 무얼 하고 있었습니까?" + +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "설정이 없습니다" + +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "정말로 해당 메모를 삭제하시겠습니까?" + +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "열기" + +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "제목 없는 문서" + +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "바뀐 내용 문서로 저장" + +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "닫기 전에 확인하셨습니까?" + +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "저장하지 않으면, 바꾼 내용이 완전히 없어집니다." + +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "파일" + +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "학습장" + +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "메모 편집기" + +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "기도 목록/묵상 일기 편집기" + +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "sword 모듈 정보" + +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "닫기" + +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " +msgstr "모듈 이름:" + +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " +msgstr "버전:" + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "버전 스탬프가 없습니다" + +#: ../src/gnome2/about_modules.c:421 +msgid "Type: " +msgstr "형식:" + +#: ../src/gnome2/about_modules.c:423 +msgid "Daily Devotion" +msgstr "매일 묵상" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "지도" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "그림" + +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "용어집" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "이단" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "성서" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "해설" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "사전" + +#: ../src/gnome2/about_modules.c:446 +msgid "General Book" +msgstr "일반 서적" + +#: ../src/gnome2/about_modules.c:451 +msgid "Personal Commentary" +msgstr "개별 해설" + +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" +msgstr "저널" + +#: ../src/gnome2/about_modules.c:457 +msgid "Unknown type" +msgstr "알 수 없는 형식" + +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "모듈 약자:" + +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "언어:" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "지정 안함" + +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "설치 크기:" + +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "부록 모듈:
" + +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "기능:" + +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "* 제목" + +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "* 각주" + +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "* 상호 참조" + +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "* 불규칙 변화 수" + +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "* 어형론상 태그" + +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "* 부명제" + +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "* 적 그리스도 구절" + +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "* 그리스어 강세 부호" + +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "* 히브리어 모음 부호" + +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "* 히브리어 가사" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "* 이문(異文)" + +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "* 음역 양식" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "* 목록" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "* 해설 목록" + +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "* 형태소 분리" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "* 기능이 없습니다" + +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "배포 라이선스:" + +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "홍보문:" + +#: ../src/gnome2/about_sword.c:79 +msgid "" +"The SWORD Project is an effort to create an ever-expanding software package " +"for research and study of God and His Word. The SWORD Project framework " +"allows easy use and study of Bible texts, commentaries, lexicons, " +"dictionaries, and other books. Many frontends are built using this " +"framework. An installed set of books may be shared among all frontends using " +"the framework.\n" +"\n" +" Books can be downloaded from the SWORD Project." +msgstr "" +"SWORD 프로젝트는 하나님과 그분의 말씀을 연구하고 학습하는 확장성을 지닌 프로" +"그램 모음이자 노력의 산물입니다. SWORD 프로젝트 프레임워크는 성경 말씀, 해" +"설, 어휘 목록, 사전, 기타 서적의 내용을 공부하고 쉽게 활용할 수 있게 합니다. " +"대부분의 프론트엔드는 이 프레임워크를 기반으로 만듭니다. 설치한 서적 목록은 " +"프레임워크를 사용하여 모든 프론트엔드에서 공유할 수 있습니다.\n" +"\n" +"서적은 SWORD 프로젝트에서 다운로드할 수 있습니다." + +#: ../src/gnome2/about_sword.c:98 +msgid "The SWORD Project" +msgstr "SWORD 프로젝트" + +#: ../src/gnome2/about_trans.c:82 +msgid "" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" +"\n" +"We are always looking for contributions of new translations of Xiphos into " +"other languages. If you are able to translate for us, please see the link " +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" +msgstr "" +"성경을 공부할 때 xiphos를 쓰고 싶으세요? 모국어로 된 사용자 인터페이스를 사용" +"하고 싶으세요? xiphos를 번역할 수 있습니다!\n" +"\n" +"xiphos를 다른 언어로 번역해줄 분을 항상 찾고 있습니다. 번역해주실 수 있다면 " +"아래 링크를 방문하여 저희에게 연락주십시오. 그리고 xiphos팀의 열정에 함께해주십시" +"오. 여러분의 도움을 감사하게 생각합니다!" + +#: ../src/gnome2/about_trans.c:96 +msgid "About Xiphos Translation" +msgstr "xiphos 번역 참고" + +#: ../src/gnome2/about_trans.c:135 +msgid "See TRANSLATION-HOWTO in Xiphos source" +msgstr "xiphos 소스 코드의 TRANSLATION-HOWTO를 참고하십시오" + +#: ../src/gnome2/about_trans.c:141 +msgid "Xiphos development" +msgstr "xiphos 개발" + +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Xiphos Development Team" + +#: ../src/gnome2/about_xiphos.c:131 +msgid "" +"\n" +"Powered by The SWORD Project.\n" +"We would like to thank Troy Griffitts and all the other folks who have given " +"us The SWORD Project." +msgstr "" +"\n" +"SWORD 프로젝트 제공.\n" +"Troy Griffitts과 SWORD 프로젝트에 도움을 준 모든 분께 감사드립니다." + +#. info->stock_icon = GTK_STOCK_OPEN; +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 +msgid "Bookmark" +msgstr "책갈피" + +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 +msgid "Enter Folder Name" +msgstr "폴더 이름을 입력하십시오" + +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 +msgid "Folder Name" +msgstr "폴더 이름" + +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 +msgid "Folder: " +msgstr "폴더: " + +#: ../src/gnome2/bookmarks_menu.c:200 +msgid "Specify bookmarks file" +msgstr "책갈피 파일을 지정하십시오" + +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 +msgid "Edit" +msgstr "편집" + +#: ../src/gnome2/bookmarks_menu.c:364 +msgid "Folder name: " +msgstr "폴더 이름: " + +#: ../src/gnome2/bookmarks_menu.c:367 +msgid "Bookmark name: " +msgstr "책갈피 이름: " + +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 +msgid "Verse: " +msgstr "절: " + +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 +msgid "Module: " +msgstr "모듈: " + +#: ../src/gnome2/bookmarks_menu.c:493 +msgid "Remove the selected folder" +msgstr "선택한 폴더를 제거합니까" + +#: ../src/gnome2/bookmarks_menu.c:494 +msgid "(and all its contents)?" +msgstr "(폴더의 모든 내용 포함)?" + +#: ../src/gnome2/bookmarks_menu.c:498 +msgid "Remove the selected bookmark" +msgstr "선택한 책갈피를 제거합니까" + +#: ../src/gnome2/bookmarks_menu.c:654 +msgid "Add" +msgstr "추가" + +#: ../src/gnome2/bookmarks_menu.c:660 +msgid "Label: " +msgstr "레이블: " + +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 +#, c-format +msgid "Search result: %s" +msgstr "검색 결과: %s" + +#: ../src/gnome2/bookmarks_treeview.c:747 +msgid "" +"Opening a multi-reference bookmark in\n" +"separate tabs is not supported." +msgstr "" +"다중 참조 책갈피에서 여는 중이며\n" +"탭 분리를 지원하지않습니다." + +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 +msgid "Bookmarks" +msgstr "책갈피" + +#: ../src/gnome2/cipher_key_dialog.c:63 +#, c-format +msgid "Cipher key for module %s" +msgstr "%s 모듈의 암호 키" + +#: ../src/gnome2/cipher_key_dialog.c:64 +msgid "for:" +msgstr "다음에 대해:" + +#: ../src/gnome2/cipher_key_dialog.c:67 +msgid "Enter Key: " +msgstr "키 입력: " + +#: ../src/gnome2/dialog.c:289 +msgid "Close without Saving" +msgstr "저장 않고 닫기" + +#: ../src/gnome2/dialog.c:724 +msgid "Xiphos:" +msgstr "xiphos:" + +#: ../src/gnome2/dialog.c:854 +msgid "Close _without Saving" +msgstr "저장 않고 닫기(_W)" + +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 +#, c-format +msgid "Verse List" +msgstr "절 목록" + +#: ../src/gnome2/export_bookmarks.c:659 +msgid "VerseList" +msgstr "절 목록" + +#: ../src/gnome2/export_bookmarks.c:663 +msgid "SearchResults" +msgstr "검색 결과" + +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 +#: ../ui/export-dialog.gtkbuilder.h:4 +msgid "Please check copyright before exporting!" +msgstr "내보내기 전에 저작권을 확인하십시오!" + +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 +#: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 +msgid "Find" +msgstr "찾기" + +#: ../src/gnome2/find_dialog.c:202 +msgid "Enter Word or Phrase" +msgstr "단어 또는 어구를 입력하십시오" + +#: ../src/gnome2/find_dialog.c:217 +msgid "Search backwards" +msgstr "후방 검색" + +#: ../src/gnome2/find_dialog.c:280 +msgid "Find Next" +msgstr "다음 겁색" + +#: ../src/gnome2/font_dialog.c:296 +msgid "Set Module Font" +msgstr "모듈 글꼴 설정" + +#: ../src/gnome2/font_dialog.c:330 +msgid "Change font for" +msgstr "다음에 대한 글꼴 바꾸기" + +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 +msgid "Module" +msgstr "모듈" + +#: ../src/gnome2/font_dialog.c:338 +msgid "Current font: " +msgstr "현재 글꼴: " + +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 +#: ../ui/prefs.gtkbuilder.h:3 +msgid "+0" +msgstr "+0" + +#: ../src/gnome2/font_dialog.c:398 +msgid "Use the default font for this module" +msgstr "이 모듈의 기본 글꼴로 사용" + +#: ../src/gnome2/gui.c:173 +msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." +msgstr "버그네요?! \"STRDUP\" 오류 때문에 xiphos가 깨진 것 같습니다." + +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 +msgid "Please report this error to the Xiphos team with:" +msgstr "다음 내용을 첨부하여 xiphos 팀에게 오류를 보고하십시오:" + +#: ../src/gnome2/gui.c:203 +msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." +msgstr "버그네요?! \"STRING\" 오류 때문에 xiphos가 깨진 것 같습니다." + +#: ../src/gnome2/main_window.c:583 +#, c-format +msgid "Module has no support for %s." +msgstr "모듈은 %s을(를) 지원하지 않습니다." + +#: ../src/gnome2/main_window.c:656 +msgid "Xiphos: No windows." +msgstr "xiphos: 창이 없습니다." + +#: ../src/gnome2/main_window.c:708 +msgid "BibleSync: Current navigation sent." +msgstr "BibleSync: 현재 내비게이션을 보냈습니다." + +#: ../src/gnome2/main_window.c:710 +msgid "BibleSync: Not speaking." +msgstr "BibleSync: 스피커로 출력하지 않습니다." + +#: ../src/gnome2/main_window.c:897 +msgid "Xiphos - Bible Study Software" +msgstr "xiphos - 성경 공부 프로그램" + +#: ../src/gnome2/main_window.c:972 +msgid "Open a new tab" +msgstr "새 탭 열기" + +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 +msgid "Standard View" +msgstr "표준 보기" + +#: ../src/gnome2/main_window.c:1109 +msgid "Commentary View" +msgstr "해설 보기" + +#: ../src/gnome2/main_window.c:1123 +msgid "Book View" +msgstr "책 보기" + +#: ../src/gnome2/main_window.c:1152 +msgid "Welcome to Xiphos" +msgstr "xiphos를 사용하시는 여러분 반갑습니다" + +#: ../src/gnome2/menu_popup.c:1296 +msgid "" +"Renaming is not available in Windows.\n" +"\n" +"Xiphos is limited by Windows' filesystem,\n" +"because it disallows the renaming of filename\n" +"components of currently-open files,\n" +"such as the contents of this commentary.\n" +"Therefore, personal commentary renaming is\n" +"not available in the Windows environment." +msgstr "" +"윈도우 운영체제에서는 이름을 바꿀 수 없습니다.\n" +"\n" +"xiphos는 윈도우 파일 시스템에서 기능상 제한이 있는데,\n" +"개별 해설 같은 내용이 있는 이미 열린 파일의 이름을\n" +"바꿀 수 없기 때문입니다.\n" +"따라서 윈도우 운영체제 환경에서는 개별 해설의 이름을\n" +"바꿀 수 없습니다." + +#: ../src/gnome2/menu_popup.c:1315 +msgid "Rename Commentary" +msgstr "해설 이름 바꾸기" + +#: ../src/gnome2/menu_popup.c:1318 +msgid "Choose Commentary Name" +msgstr "해설 이름 선택" + +#: ../src/gnome2/menu_popup.c:1320 +msgid "New Name" +msgstr "새 이름 부여하기" + +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 +msgid "Name: " +msgstr "이름: " + +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 +msgid "Module names must contain [A-Za-z0-9_] only." +msgstr "모듈 이름은 영문 대소문자, 숫자, 밑줄문자만 가능합니다." + +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 +msgid "Xiphos already knows a module by that name." +msgstr "xiphos에 이미 해당 이름을 가진 모듈이 있습니다." + +#: ../src/gnome2/menu_popup.c:1378 +#, c-format +msgid "" +"Failed to create new configuration:\n" +"%s" +msgstr "" +"새 설정에 실패했습니다:\n" +"%s" + +#: ../src/gnome2/menu_popup.c:1387 +msgid "" +"Configuration build error:\n" +"\n" +msgstr "" +"설정 빌드 오류:\n" +"\n" + +#: ../src/gnome2/menu_popup.c:2032 +msgid "No module in this pane." +msgstr "이 창에 모듈이 없습니다." + +#. ***************************************************************************** +#. * defines +#. +#: ../src/gnome2/mod_mgr.c:64 +msgid "" +"Overview of the Module Manager.\n" +"\n" +"This is Xiphos' mechanism to get new and updated content.\n" +"If you have never been here before, please take a moment to look it over.\n" +"\n" +"Modules come from different repositories. Module Sources: Add/" +"Remove will show you what repositories are currently known.\n" +"\n" +"Module Sources: Choose is for deciding from where modules should " +"come, that is, from which repository Xiphos should obtain them, as well as " +"where they should be placed on your system. Set Install Source and " +"Install Destination, then click Refresh.\n" +"\n" +"Modules: Install/Update is for selecting and obtaining modules after " +"choosing source and destination.\n" +"\n" +"Modules: Maintenance is for archive and index creation.\n" +"\n" +"See section 5 of our manual for Module Manager detail, or ask for help via " +"Live Chat, or (if no one is responsive in chat) send mail to our users' " +"mailing list.\n" +msgstr "" +"모듈 관리자 살펴보기입니다.\n" +"\n" +"xiphos에서 새 컨텐트를 가져오는 방식에 대한 내용입니다.\n" +"이 내용을 본 적이 없다면 잠깐 살펴보십시오.\n" +"\n" +"모듈은 개별 저장소에서 가져옵니다. 모듈 공급원: 추가/제거 항목" +"에서는 현재 알려진 저장소를 보여줍니다.\n" +"\n" +"모듈 공급원: 선택 항목은 모듈을 가져올 위치를 선택하는데, 시스템의 어" +"떤 위치에 모듈을 저장할지 설정하는 것처럼 xiphos가 모듈을 가져올 저장소를 언" +"급합니다. 설치 원본 과 설치 대상을 설정하시고, 새로 고침" +"을 누르십시오.\n" +"\n" +"모듈: 설치/업데이트 는 원본과 대상을 선택한 후 모듈을 선택하고 가져올 " +"때 필요한 설정 항목입니다.\n" +"\n" +"모듈: 관리 는 저장 모듈을 관리하며 인덱스를 만듭니다.\n" +"\n" +"모듈 관리자 설명을 더 자세하게 살펴보려면 설명서 5절을 참고하시거나, 실시간 " +"대화방에서 도움을 구하시든지, (대화방에서 아무도 반응하지 않는다면) 사용자 메" +"일링 리스트에 전자메일을 보내십시오.\n" + +#: ../src/gnome2/mod_mgr.c:67 +msgid "" +"Welcome to Xiphos.\n" +"\n" +"There are no Bibles installed. In order to initialize, Xiphos needs at least " +"one Bible module. To facilitate this, the Module Manager has been opened so " +"that you may install one or more Bibles, either from a local module set " +"(cdrom, flash drive) or over the network from CrossWire Bible Society. " +"Please refer to these step-by-step instructions, and to the general module " +"manager overview that has also been opened.\n" +"\n" +"For local install:\n" +"- In Module Sources: Add/Remove, add a new local folder name where " +"modules can be found.\n" +" (This is where folders exist named mods.d and modules.)\n" +"- In Module Sources: Choose, click the \"Local\" button, and select " +"your folder from the pulldown.\n" +"\n" +"For network install from CrossWire:\n" +"- In Module Sources: Choose, click the \"Remote\" button and select " +"CrossWire from the pulldown.\n" +"- Click the \"Refresh\" button at the bottom.\n" +"\n" +"In either case:\n" +"- In Modules: Install/Update, select Bibles and other modules of your " +"preference.\n" +"- Click \"Install\".\n" +"- Close the Module Manager when you are done.\n" +"\n" +"Warning: If you live in a persecuted country, use with care.\n" +"\n" +"Both this step-by-step instruction dialog and the general introduction " +"dialog may be closed at any time." +msgstr "" +"xiphos를 사용하시는 여러분 반갑습니다.\n" +"\n" +"설치한 성경이 없습니다. 초기화하려면, 최소한 한가지 성경 모듈이 필요합니다. " +"성경 모듈을 설치하려 모듈 관리자를 연 후, 지역 모듈 집합(CD-ROM, 또는 USB 메" +"모리) 또는 CrossWire 성서 공회 네트워크로부터 하나 이상의 성경을 설치합니다. " +"아래의 절차와 앞서 열어놓은 일반 모듈 관리자를 참고하십시오.\n" +"\n" +"로컬 설치:\n" +"- 모듈 공급원: 추가/제거를 통해 모듈을 찾을 수 있는 위치의 로컬 폴더 " +"이름을 추가하십시오.\n" +" (이 위치는 기존의 mods.d 그리고 modules 폴더입니다.)\n" +"- 모듈 공급원: 선택을 통해 \"로컬\" 단추를 누른 후 풀 다운 항목에서 폴" +"더를 선택하십시오.\n" +"\n" +"CrossWire 네트워크로 설치:\n" +"- 모듈 공급원: 선택에서 \"원격\" 단추를 누른 후 풀 다운 항목에서 " +"CrossWire를 선택하십시오.\n" +"- 하단의 \"새로 고침\" 단추를 누르십시오.\n" +"\n" +"두 가지 경우에 대해:\n" +"- 모듈: 설치/업데이트에서 성경 또는 원하는 다른 모듈을 선택하십시오.\n" +"- \"설치\"를 누르십시오.\n" +"- 다 마쳤으면 모듈 관리자를 닫으십시오.\n" +"\n" +"경고: 다른 국가에 살고 있다면 저작권에 유의하여 사용하십시오.\n" +"\n" +"절차 대화상자와 일반 소개 대화상자는 언제든 닫을 수 있습니다." + +#: ../src/gnome2/mod_mgr.c:191 +msgid "Remove these modules?" +msgstr "이 모듈을 제거합니까?" + +#: ../src/gnome2/mod_mgr.c:192 +msgid "Preparing to remove" +msgstr "제거 준비 중" + +#: ../src/gnome2/mod_mgr.c:193 +msgid "Removing" +msgstr "제거 중" + +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 +msgid "Remove" +msgstr "제거" + +#: ../src/gnome2/mod_mgr.c:195 +msgid "Install these modules?" +msgstr "이 모듈을 설치합니까?" + +#: ../src/gnome2/mod_mgr.c:196 +msgid "Preparing to install" +msgstr "설치 준비 중" + +#: ../src/gnome2/mod_mgr.c:197 +msgid "Installing" +msgstr "설치 중" + +#: ../src/gnome2/mod_mgr.c:198 +msgid "Install" +msgstr "설치" + +#: ../src/gnome2/mod_mgr.c:199 +msgid "Archive these modules?" +msgstr "이 모듈을 보관처리 합니까?" + +#: ../src/gnome2/mod_mgr.c:200 +msgid "Preparing to archive" +msgstr "보관처리 준비 중" + +#: ../src/gnome2/mod_mgr.c:201 +msgid "Archiving" +msgstr "보관처리 중" + +#: ../src/gnome2/mod_mgr.c:202 +msgid "Archive" +msgstr "보관처리" + +#: ../src/gnome2/mod_mgr.c:203 +msgid "" +"Build fast-search index for these\n" +"modules (may take minutes/module)?" +msgstr "" +"이 모듈에 대한 고속 검색 인덱스를\n" +"만드시겠습니까(모듈에 대해 수 분이 걸림)?" + +#: ../src/gnome2/mod_mgr.c:204 +msgid "Preparing to index" +msgstr "색인 준비 중" + +#: ../src/gnome2/mod_mgr.c:205 +msgid "Indexing" +msgstr "색인 중" + +#: ../src/gnome2/mod_mgr.c:206 +msgid "Index" +msgstr "색인" + +#: ../src/gnome2/mod_mgr.c:207 +msgid "Delete fast-search index for these modules?" +msgstr "이 모듈에 대한 빠른 검색 색인을 삭제하시겠습니까?" + +#: ../src/gnome2/mod_mgr.c:208 +msgid "Preparing to delete index" +msgstr "색인 삭제 준비 중" + +#: ../src/gnome2/mod_mgr.c:209 +msgid "Deleting index" +msgstr "색인을 삭제합니다" + +#: ../src/gnome2/mod_mgr.c:210 +msgid "Deletion" +msgstr "삭제" + +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "모듈 정보가 없습니다." + +#: ../src/gnome2/mod_mgr.c:533 +msgid "Module Name" +msgstr "모듈 이름" + +#: ../src/gnome2/mod_mgr.c:562 +msgid "A checkmark means this module is already installed" +msgstr "표시 기호는 이 모듈을 이미 설치했다는 뜻입니다" + +#: ../src/gnome2/mod_mgr.c:589 +msgid "Click the box to work on this module" +msgstr "이 모듈을 다루려면 박스를 누르십시오" + +#: ../src/gnome2/mod_mgr.c:590 +msgid "Click the box to select this module for install/update" +msgstr "설치/업데이트할 모듈을 선택하려면 박스를 주르십시오" + +#: ../src/gnome2/mod_mgr.c:608 +msgid "Installed" +msgstr "설치함" + +#: ../src/gnome2/mod_mgr.c:625 +msgid "" +"The index icon means you have built an optimized ('lucene') index for this " +"module for fast searching (see the Maintenance pane for this function)" +msgstr "" +"색인 아이콘은 고속 검색 목적으로 이 모듈에 대해 최적화('루씬') 색인을 만들었" +"다는 뜻입니다(이 기능에 대해서는 관리자 창을 살펴보십시오)" + +#: ../src/gnome2/mod_mgr.c:649 +msgid "" +"The lock icon means this module is encrypted, and requires that you purchase " +"an unlock key from the content owner" +msgstr "" +"잠금 아이콘은 모듈을 암호화했다는 뜻이며, 이 아이콘이 나타나면 컨텐드 소유자 " +"로부터 잠금 해제 키를 구매해야합니다." + +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 +#: ../ui/xi-menus-popup.gtkbuilder.h:35 +msgid "About" +msgstr "정보" + +#: ../src/gnome2/mod_mgr.c:688 +msgid "" +"The refresh icon means the Installed module is older than the newer " +"Available module: You should update the module" +msgstr "" +"새로 고침 아이콘은 설치한 모듈이 새 버전의 모듈보다 오래됐다는 뜻입니다: 모듈" +"을 업데이트해야합니다" + +#: ../src/gnome2/mod_mgr.c:700 +msgid "Available" +msgstr "가용성" + +#: ../src/gnome2/mod_mgr.c:709 +msgid "Size" +msgstr "크기" + +#: ../src/gnome2/mod_mgr.c:718 +msgid "Description" +msgstr "설명" + +#: ../src/gnome2/mod_mgr.c:872 +#, c-format +msgid "" +"`mkdir %s' failed:\n" +"%s." +msgstr "" +"`mkdir %s' 실패\n" +"%s." + +#: ../src/gnome2/mod_mgr.c:906 +msgid " archived in: \n" +msgstr " 다음에 보관: \n" + +#: ../src/gnome2/mod_mgr.c:985 +msgid "Journals and prayer lists cannot be indexed." +msgstr "묵상 일기 및 기도 목록을 색인할 수 없습니다." + +#: ../src/gnome2/mod_mgr.c:1016 +#, c-format +msgid "%s failed" +msgstr "%s 실패" + +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 +msgid "Finished" +msgstr "마침" + +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 +msgid "Unknown" +msgstr "알 수 없음" + +#: ../src/gnome2/mod_mgr.c:1515 +#, c-format +msgid "" +"Repository:\n" +"%s" +msgstr "" +"저장소:\n" +"%s" + +#: ../src/gnome2/mod_mgr.c:1528 +msgid "" +"Categorized by\n" +"Module Type" +msgstr "" +"모듈 형식별\n" +"분류" + +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 +msgid "Biblical Texts" +msgstr "성경" + +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 +msgid "Commentaries" +msgstr "해설" + +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 +msgid "Dictionaries" +msgstr "사전" + +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +msgid "Glossaries" +msgstr "용어집" + +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 +msgid "Daily Devotionals" +msgstr "매일 묵상" + +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 +msgid "General Books" +msgstr "일반 서적" + +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 +msgid "Cult/Unorthodox" +msgstr "광신도/이단" + +#: ../src/gnome2/mod_mgr.c:1575 +msgid "" +"Categorized by\n" +"Availability" +msgstr "" +"가용성별\n" +"분류" + +#: ../src/gnome2/mod_mgr.c:1579 +msgid "Updates" +msgstr "업데이트" + +#: ../src/gnome2/mod_mgr.c:1584 +msgid "Uninstalled" +msgstr "설치하지 않음" + +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 +msgid "Prayer List/Journal" +msgstr "기도 목록/묵상 일기" + +#: ../src/gnome2/mod_mgr.c:1767 +msgid "Refreshing from remote source" +msgstr "원격 원본으로 새로 고치는 중" + +#: ../src/gnome2/mod_mgr.c:1779 +msgid "Remote source not found" +msgstr "원격 원본이 없습니다" + +#: ../src/gnome2/mod_mgr.c:1850 +msgid "Configure" +msgstr "설정" + +#: ../src/gnome2/mod_mgr.c:1879 +msgid "Type" +msgstr "형식" + +#: ../src/gnome2/mod_mgr.c:1886 +msgid "Caption" +msgstr "설명 제목" + +#: ../src/gnome2/mod_mgr.c:1893 +msgid "Source" +msgstr "원본" + +#: ../src/gnome2/mod_mgr.c:1900 +msgid "Directory" +msgstr "디렉터리" + +#: ../src/gnome2/mod_mgr.c:1908 +msgid "User" +msgstr "사용자" + +#: ../src/gnome2/mod_mgr.c:1915 +msgid "Password" +msgstr "암호" + +#: ../src/gnome2/mod_mgr.c:1922 +msgid "UID" +msgstr "UID" + +#: ../src/gnome2/mod_mgr.c:1937 +msgid "Module Sources" +msgstr "모듈 원본" + +#: ../src/gnome2/mod_mgr.c:1940 +msgid "Add/Remove" +msgstr "추가/제거" + +#: ../src/gnome2/mod_mgr.c:1943 +msgid "Choose" +msgstr "선택" + +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 +msgid "Modules" +msgstr "모듈" + +#: ../src/gnome2/mod_mgr.c:1948 +msgid "Install/Update" +msgstr "설치/업데이트" + +#: ../src/gnome2/mod_mgr.c:1951 +msgid "Maintenance" +msgstr "관리" + +#: ../src/gnome2/mod_mgr.c:2167 +msgid "Please Refresh" +msgstr "새로 고치십시오" + +#: ../src/gnome2/mod_mgr.c:2168 +msgid "Your module list is not up to date!" +msgstr "모듈 목록이 최신이 아닙니다!" + +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 +msgid "" +"You have uninstalled your last Bible.\n" +"Xiphos requires at least one." +msgstr "" +"마지막 성경을 제거했습니다.\n" +"xiphos에는 최소한 하나의 성경이 필요합니다." + +#: ../src/gnome2/mod_mgr.c:2491 +msgid "" +"There are still no Bibles installed.\n" +"Xiphos cannot continue without one." +msgstr "" +"여전히 설치한 성경이 없습니다.\n" +"xiphos는 성경이 아무것도 없으면 계속 실행할 수 없습니다." + +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" +"%2$s은(는) %1$s의 오래된 버전입니다.\n" +"%3$s을(를) 삭제하시겠습니까?\n" +"참고: 되돌릴 수 없습니다." + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "오래된 모듈이 없습니다." + +#: ../src/gnome2/mod_mgr.c:2704 +msgid "Standard remote sources have been loaded." +msgstr "표준 원격 원본을 불러왔습니다." + +#: ../src/gnome2/mod_mgr.c:2713 +msgid "Could not load standard sources from CrossWire." +msgstr "CrossWire에서 표준 원본을 불러올 수 없습니다." + +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 +msgid "Remove the selected source" +msgstr "선택한 원본 제거" + +#: ../src/gnome2/mod_mgr.c:2930 +msgid "Enter a remote source" +msgstr "원격 원본 정보를 입력하십시오" + +#: ../src/gnome2/mod_mgr.c:2939 +msgid "Caption:" +msgstr "설명 제목:" + +#: ../src/gnome2/mod_mgr.c:2940 +msgid "Type:" +msgstr "형식:" + +#: ../src/gnome2/mod_mgr.c:2941 +msgid "Host:" +msgstr "호스트:" + +#: ../src/gnome2/mod_mgr.c:2942 +msgid "Directory:" +msgstr "디렉터리:" + +#: ../src/gnome2/mod_mgr.c:2943 +msgid "User (optional):" +msgstr "사용자(선택):" + +#: ../src/gnome2/mod_mgr.c:2944 +msgid "Password (optional):" +msgstr "암호(선택):" + +#. this can happen at most once +#: ../src/gnome2/mod_mgr.c:2970 +msgid "A source by that name already exists." +msgstr "해당 이름을 가진 공금원이 이미 있습니다." + +#: ../src/gnome2/mod_mgr.c:3117 +msgid "Delete a remote source" +msgstr "원격 공금원 삭제" + +#: ../src/gnome2/mod_mgr.c:3636 +msgid "[no module]" +msgstr "[모듈 없음]" + +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 +msgid "Go outward, to the section containing this one" +msgstr "이 절이 들어있는 절 바깥 장으로 이동" + +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 +msgid "Go to previous item" +msgstr "이전 항목으로 이동" + +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 +msgid "Go to next item" +msgstr "다음 항목으로 이동" + +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 +msgid "Go inward, to the first subsection" +msgstr "첫번째 하위 절이 있는 안쪽으로 이동" + +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 +msgid "Synchronize this window's scrolling with the main window" +msgstr "이 동기화의 스크롤을 메인 창의 스크롤과 동기화" + +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 +msgid "Parallel" +msgstr "나란히 보기" + +#: ../src/gnome2/parallel_view.c:112 +msgid "Detach/Attach" +msgstr "붙이기/떼어내기" + +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 +msgid "Module Options" +msgstr "모듈 옵션" + +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 +msgid "Parallel View" +msgstr "나란히 보기" + +#: ../src/gnome2/preferences_dialog.c:860 +msgid "BibleSync session passphrase" +msgstr "BiboeSync 세션 암호" + +#: ../src/gnome2/preferences_dialog.c:862 +msgid "Phrase:" +msgstr "어구:" + +#. mode selection failed? probably dead interface +#: ../src/gnome2/preferences_dialog.c:933 +msgid "" +"Mode selection failed.\n" +"Set \"Debug\" and try again to see why." +msgstr "" +"모드 선택에 실패했습니다.\n" +"\"디버깅\"를 설정하고 원인을 살펴보십시오." + +#: ../src/gnome2/preferences_dialog.c:988 +msgid "Mode selection failed.\n" +msgstr "모드 선택에 실패했습니다.\n" + +#: ../src/gnome2/preferences_dialog.c:991 +#, c-format +msgid "BibleSync: %s (passphrase \"%s\")." +msgstr "BibleSync: %s (암호: \"%s\")," + +#: ../src/gnome2/preferences_dialog.c:993 +msgid "Disabled" +msgstr "비활성" + +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 +msgid "Personal" +msgstr "개인" + +#: ../src/gnome2/preferences_dialog.c:997 +msgid "Speaker" +msgstr "독서자" + +#: ../src/gnome2/preferences_dialog.c:998 +msgid "Audience" +msgstr "청자" + +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 +msgid "-- Select --" +msgstr "-- 선택 --" + +#: ../src/gnome2/preferences_dialog.c:1855 +msgid "Locale will take effect after restart." +msgstr "다시 시작하고 나서 로캘을 적용합니다." + +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 +#: ../ui/prefs.gtkbuilder.h:9 +msgid "Preferences" +msgstr "기본 설정" + +#: ../src/gnome2/preferences_dialog.c:2003 +msgid "General" +msgstr "일반" + +#: ../src/gnome2/preferences_dialog.c:2006 +msgid "Options" +msgstr "옵션" + +# 주: 고유명사이므로 번역해선 안됨. xiphos도 음역하지 않았으므로 용어 번역 일관성을 따르기 위해 번역하지 마십시오. +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 +#: ../ui/prefs.gtkbuilder.h:85 +msgid "BibleSync" +msgstr "BibleSync" + +#: ../src/gnome2/preferences_dialog.c:2013 +msgid "Fonts" +msgstr "글꼴" + +#: ../src/gnome2/preferences_dialog.c:2016 +msgid "Color" +msgstr "색상" + +#: ../src/gnome2/preferences_dialog.c:2019 +msgid "Sizes and Faces" +msgstr "크기 및 모양새" + +#: ../src/gnome2/preferences_dialog.c:2033 +msgid "Special" +msgstr "특수" + +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 +msgid "Clear List?" +msgstr "목록을 지웁니까?" + +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 +msgid "Are you sure you want to clear the module list?" +msgstr "정말로 모듈 목록을 지우시겠습니까?" + +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 +msgid "Remove Module?" +msgstr "모듈을 제거합니까?" + +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 +msgid "Are you sure you want to remove the selected module?" +msgstr "정말로 선택한 모듈을 제거하시겠습니까?" + +#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:52 +#: ../src/main/search_sidebar.cc:51 +msgid "Searching the " +msgstr "검색 " + +#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:53 +#: ../src/main/search_sidebar.cc:52 +msgid " Module" +msgstr " 모듈" + +#: ../src/gnome2/search_dialog.c:64 ../src/main/search_dialog.cc:54 +#: ../src/main/search_sidebar.cc:53 +msgid "found in " +msgstr "다음에서 찾음 " + +#: ../src/gnome2/search_dialog.c:483 +#, c-format +msgid "New List %s" +msgstr "새 목록 %s" + +#: ../src/gnome2/search_dialog.c:700 +msgid "The last module list may not be deleted" +msgstr "마지막 모듈 목록은 삭제하지 않을 수도 있습니다" + +#: ../src/gnome2/search_dialog.c:715 +msgid "Delete list?" +msgstr "목록을 삭제합니까?" + +#: ../src/gnome2/search_dialog.c:716 +msgid "Are you sure you want to delete:" +msgstr "정말로 다음을 삭제하시겠습니까:" + +#. ***************************************************************************** +#. * Name +#. * on_lucene_intro_clicked +#. * +#. * Synopsis +#. * #include "gui/search_dialog.h" +#. * +#. * void on_lucene_intro_clicked(GtkToggleButton *button, +#. * gpointer user_data) +#. * +#. * Description +#. * +#. * +#. * Return value +#. * void +#. +#: ../src/gnome2/search_dialog.c:842 +msgid "" +"Syntax overview for optimized \"lucene\" searches\n" +"Search for verses that contain...\n" +"\n" +"loved one\n" +"\t \"loved\" or \"one\"\n" +"\tThis is the same as searching for loved OR one\n" +"\"loved one\"\n" +"\tThe phrase \"loved one\"\n" +"love*\n" +"\tA word starting with \"love\"\n" +"\t(love OR loves OR loved OR etc...)\n" +"loved AND one\n" +"\tThe word \"loved\" and the word \"one\"\n" +"\t&& can be used in place of AND\n" +"+loved one\n" +"\tVerses that must contain \"loved\" and may contain \"one\"\n" +"loved NOT one\n" +"\t\"loved\" but not \"one\"\n" +"(loved one) AND God\n" +"\t\"loved\" or \"one\" and \"God\"\n" +"lemma:G2316\n" +"\tSearch for the Strong's Greek (\"G\") word number 2316.\n" +"\tAlso, select Strong's display on the Attribute Search tab.\n" +"\n" +"For complete details, search the web for \"lucene search syntax\"." +msgstr "" +"잘 정리된 \"루씬\" 검색 문법 정리\n" +"다음 내용이 들어있는 구절을 검색할 경우...\n" +"\n" +"loved one\n" +"\t \"loved\" or \"one\"\n" +"\t이 방식은 loved OR one을 검색하는 방식과 같습니다\n" +"\"loved one\"\n" +"\t\"loved one\" 구절\n" +"love*\n" +"\t\"love\"로 시작하는 단어\n" +"\t(love OR loves OR loved 등등...)\n" +"loved AND one\n" +"\t\"loved\" 단어와 \"one\" 단어\n" +"\t&& 연산자를 AND 위치에 놓을 수 있습니다\n" +"+loved one\n" +"\t \"loved\"가 들어 있어야 하고 \"one\"을 포함 할 수 있습니다\n" +"loved NOT one\n" +"\t\"loved\"는 있지만 \"one\"은 없는 구절\n" +"(loved one) AND God\n" +"\t\"loved\" or \"one\" and \"God\"\n" +"lemma:G2316\n" +"\t스트롱 단어기호 헬라(\"G\") 번호 2316의 검색 결과를 보여줍니다.\n" +"\t또한 속성 검색 탭에서 스트롱 표시 방식으로 보여줍니다.\n" +"\n" +"완벽한 내용을 자세히 살펴보시려면 \"루씬 검색 문법\"을 웹에서 찾아보세요." + +#. ***************************************************************************** +#. * Name +#. * on_attributes_intro_clicked +#. * +#. * Synopsis +#. * #include "gui/search_dialog.h" +#. * +#. * void on_attributes_intro_clicked(GtkToggleButton *button, +#. * gpointer user_data) +#. * +#. * Description +#. * +#. * +#. * Return value +#. * void +#. +#: ../src/gnome2/search_dialog.c:900 +msgid "" +"Attribute-based searches\n" +"Searches for content contained in markup outside the main text. Attributes " +"are footnotes, Strong's numbers, and morphological symbols.\n" +"\n" +"Be aware that most such searches can now be done faster via optimized " +"\"lucene\" searches using keyword qualifiers.\n" +"\n" +"To use attribute searches, you must select the appropriate button on the " +"Attribute Search tab.\n" +"* Footnote text is searched just like regular text.\n" +"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) " +"and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" +"* Morphological tags are identified literally, e.g. N-ASF for \"noun, " +"accusative singular feminine\" -- see the Robinson module for details." +msgstr "" +"속성 기반 검색\n" +"본질적인 내용 밖에 있는 마크업에 일부 내용이 있는데 이 내용을 검색합니다. 속" +"성에는 각주, 스트롱 번호, 어형론상 기호가 있습니다.\n" +"\n" +"대부분의 검색 결과는 키워드 검증자로 최적화된 \"루씬\" 검색이 더 빠를 수 있음" +"을 참고하십시오.\n" +"\n" +"속성 검색을 사용하려면, 속성 검색 탭의 적절한 단추를 선택해야합니다.\n" +"* 각주 내용은 일반 내용처럼 검색합니다.\n" +"* \"θεός\"(\"God\")를 검색하는데 사용하는 스트롱 기호에서 문자(단어)는 H 또" +"는 G 접두문자(희랍, 헬라), 그리고 식별 숫자(예: G2316)를 사용합니다.\n" +"* 어형론상 태그는 문장속 단어처럼 인식합니다. 예를 들면, N-ASF는\"noun, " +"accusative singular feminine\" 입니다. 자세한 사용법은 Robinson 모듈을 살펴보" +"십시오." + +#: ../src/gnome2/search_dialog.c:1195 +msgid "Module is neither Bible nor commentary" +msgstr "모듈이 성경 또는 해설이 아닙니다." + +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 +msgid "BibleSync is not active for transmit." +msgstr "BibleSync에서 전송 준비를 하지 않았습니다." + +#: ../src/gnome2/search_sidebar.c:215 +msgid "" +"This is an inclusive (\"AND\") search:\n" +"Find matches showing all words." +msgstr "" +"포함(\"AND\") 검색 방식입니다:\n" +"모든 단어가 들어있는 결과를 찾습니다." + +#: ../src/gnome2/search_sidebar.c:227 +msgid "_Open Advanced Search" +msgstr "고급 검색 열기(_O)" + +#: ../src/gnome2/search_sidebar.c:232 +msgid "Open the separate Advanced Search dialog." +msgstr "고급 검색 대화상자를 따로 엽니다." + +#: ../src/gnome2/search_sidebar.c:248 +msgid "Search Module" +msgstr "모듈 검색" + +#: ../src/gnome2/search_sidebar.c:285 +msgid "Search Type" +msgstr "검색 형식" + +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 +#: ../ui/search-dialog.gtkbuilder.h:39 +msgid "Multi word" +msgstr "여러 단어 일치" + +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 +#: ../ui/search-dialog.gtkbuilder.h:41 +msgid "Regular expression" +msgstr "정규 표현식" + +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 +#: ../ui/search-dialog.gtkbuilder.h:43 +msgid "Exact phrase" +msgstr "어구 일치" + +#: ../src/gnome2/search_sidebar.c:330 +msgid "Search Options" +msgstr "검색 옵션" + +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 +#: ../ui/search-dialog.gtkbuilder.h:49 +msgid "Match case" +msgstr "대소문자 일치" + +#: ../src/gnome2/search_sidebar.c:359 +msgid "Search Scope" +msgstr "검색 범위" + +#: ../src/gnome2/search_sidebar.c:372 +msgid "No scope" +msgstr "범위 없음" + +#: ../src/gnome2/search_sidebar.c:381 +msgid "Use bounds" +msgstr "범위 사용" + +#: ../src/gnome2/search_sidebar.c:389 +msgid "Last search" +msgstr "마지막 검색" + +#: ../src/gnome2/search_sidebar.c:406 +msgid "Bounds" +msgstr "범위" + +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 +msgid "Lower" +msgstr "아래로" + +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 +msgid "Upper" +msgstr "위로" + +#: ../src/gnome2/sidebar.c:834 +msgid "Open module in editor?" +msgstr "편집기에서 모듈을 여시겠습니까?" + +#: ../src/gnome2/sidebar.c:835 +msgid "If no, it will open for display only." +msgstr "그렇지 않으면, 디스플레이만 엽니다." + +#: ../src/gnome2/sidebar.c:934 +msgid "Paste verse references" +msgstr "절 참조 붙여넣기" + +#: ../src/gnome2/sidebar.c:936 +msgid "List:" +msgstr "목록:" + +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 +msgid "Search" +msgstr "검색" + +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 +msgid "Sidebar" +msgstr "가장자리 표시줄" + +#: ../src/gnome2/splash.c:403 +msgid "Powered by the SWORD Project" +msgstr "SWORD 프로젝트에서 기술 제공함" + +#: ../src/gnome2/tabbed_browser.c:358 +msgid "Can't create tabs dir." +msgstr "탭 디렉터리를 만들 수 없습니다." + +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 +msgid "Prayer List/Journal Item" +msgstr "기도 목록/묵상 일기 항목" + +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 +msgid "New name" +msgstr "새 이름" + +#: ../src/gnome2/treekey-editor.c:252 +msgid "Remove the selected item" +msgstr "선택한 항목 제거" + +#: ../src/gnome2/utilities.c:86 +msgid "January" +msgstr "1월" + +#: ../src/gnome2/utilities.c:87 +msgid "February" +msgstr "2월" + +#: ../src/gnome2/utilities.c:88 +msgid "March" +msgstr "3월" + +#: ../src/gnome2/utilities.c:89 +msgid "April" +msgstr "4월" + +#: ../src/gnome2/utilities.c:90 +msgid "May" +msgstr "5월" + +#: ../src/gnome2/utilities.c:91 +msgid "June" +msgstr "6월" + +#: ../src/gnome2/utilities.c:92 +msgid "July" +msgstr "7월" + +#: ../src/gnome2/utilities.c:93 +msgid "August" +msgstr "8월" + +#: ../src/gnome2/utilities.c:94 +msgid "September" +msgstr "9월" + +#: ../src/gnome2/utilities.c:94 +msgid "October" +msgstr "10월" + +#: ../src/gnome2/utilities.c:94 +msgid "November" +msgstr "11월" + +#: ../src/gnome2/utilities.c:94 +msgid "December" +msgstr "12월" + +#: ../src/gnome2/utilities.c:2038 +msgid "" +"An image file's size could not be determined.\n" +"Xiphos cannot resize images to fit window." +msgstr "" +"그림 파일의 크기를 알 수 없습니다.\n" +"xiphos에서 창 크기에 맞춰 그림을 크기조절 할 수 없습니다." + +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" +"일치하지 않는 패킷\n" +"\n" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" +"존재 알림:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" +"탐색 패킷:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:179 +msgid "Unknown module " +msgstr "알 수 없는 모듈" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" +".\n" +"절 목록으로 간접 탐색했습니다." + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "오류: 알 수 없는 BibleSync 표시자: " + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "다른 표시:" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "이 독서자의 읽기를 들으려면 상자에 표시하십시오" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "존재하는 독서자" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "D/I" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "마지막 탐색은 직간접적인 방식입니다" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "마지막 탐색" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "UUID" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "IP 주소: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" +"\n" +"프로그램: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" +"\n" +"장치: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" +"\n" +"UUID" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "

이 모듈은 현재 내용이 없습니다
" + +#: ../src/main/display.cc:249 +#, c-format +msgid "" +"Improperly encoded personal annotation label:\n" +"'%s'" +msgstr "" +"개인 주석을 올버르지 못한 방법으로 인코딩했습니다:\n" +"'%s'" + +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 +#: ../ui/export-dialog.gtkbuilder.h:13 +msgid "Chapter" +msgstr "장" + +#: ../src/main/main.c:129 +msgid "Xiphos does not understand more than one argument." +msgstr "xiphos에서 하나 이상의 매개변수를 인식할 수 없습니다." + +#: ../src/main/main.c:240 +msgid "Initiating HTML" +msgstr "HTML 초기화 중" + +#: ../src/main/main.c:245 +msgid "Building Interface" +msgstr "인더페이스 빌드 중" + +#: ../src/main/main.c:248 +msgid "Starting Sword" +msgstr "sword 시작 중" + +#: ../src/main/main.c:251 +msgid "Loading Settings" +msgstr "설정 불러오는 중" + +#: ../src/main/main.c:254 +msgid "Displaying Xiphos" +msgstr "xiphos 창 표시 중" + +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 +msgid "Previewer" +msgstr "미리보기" + +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 +msgid "Footnote" +msgstr "각주" + +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 +msgid "Cross Reference" +msgstr "교차 참조" + +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 +msgid "Strongs" +msgstr "불규칙 변화" + +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 +#: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 +msgid "Morphology" +msgstr "어형론" + +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 +msgid "Back to " +msgstr "돌아가기" + +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "알 수 없는 병렬 모듈:" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 +msgid "Strong's Numbers" +msgstr "불규칙 변화 수" + +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 +#: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 +msgid "Footnotes" +msgstr "각주" + +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 +#: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 +msgid "Morphological Tags" +msgstr "어형론상 태그" + +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 +msgid "Hebrew Vowel Points" +msgstr "히브리어 모음 부호" + +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 +msgid "Hebrew Cantillation" +msgstr "히브리어 가사" + +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 +msgid "Greek Accents" +msgstr "그리스어 강세" + +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 +msgid "Cross-references" +msgstr "교차 목록" + +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 +msgid "Lemmas" +msgstr "기본형" + +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 +msgid "Headings" +msgstr "제목" + +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 +msgid "Morpheme Segmentation" +msgstr "형태소 분리" + +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 +msgid "Words of Christ in Red" +msgstr "적 그리스도 구절" + +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 +msgid "Transliteration" +msgstr "음역" + +#: ../src/main/parallel_view.cc:512 +msgid "Textual Variants" +msgstr "원문 변형" + +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 +msgid "Primary Reading" +msgstr "제 1독서" + +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 +msgid "Secondary Reading" +msgstr "제 2독서" + +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 +msgid "All Readings" +msgstr "모든 독서" + +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "음역 양식" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "목록" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "해설 목록" + +#: ../src/main/parallel_view.cc:745 +msgid "view context" +msgstr "뷰 컨텍스트" + +#: ../src/main/prayerlists.cc:107 +msgid "Growth" +msgstr "성숙" + +#: ../src/main/prayerlists.cc:108 +msgid "For Growth
" +msgstr "성숙
" + +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 +msgid "Salvation" +msgstr "구원" + +#: ../src/main/prayerlists.cc:110 +msgid "For Salvation
" +msgstr "구원
" + +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 +msgid "Health" +msgstr "건강" + +#: ../src/main/prayerlists.cc:112 +msgid "For Health
" +msgstr "건강
" + +#: ../src/main/prayerlists.cc:113 +msgid "Misc" +msgstr "기타" + +#: ../src/main/prayerlists.cc:114 +msgid "Miscellaneous
" +msgstr "기타
" + +#: ../src/main/prayerlists.cc:122 +msgid "Point x" +msgstr "x 지점" + +#: ../src/main/prayerlists.cc:123 +msgid "(x)
" +msgstr "(x)
" + +#: ../src/main/prayerlists.cc:124 +msgid "Point y" +msgstr "y 지점" + +#: ../src/main/prayerlists.cc:125 +msgid "(y)
" +msgstr "(y)
" + +#: ../src/main/prayerlists.cc:126 +msgid "Point z" +msgstr "z 지점" + +#: ../src/main/prayerlists.cc:127 +msgid "(z)
" +msgstr "(z)
" + +#: ../src/main/prayerlists.cc:135 +msgid "Minor Topic 1" +msgstr "부 주제 1" + +#: ../src/main/prayerlists.cc:136 +msgid "Subtopic 1
" +msgstr "하위 주제 1
" + +#: ../src/main/prayerlists.cc:138 +msgid "Minor Topic 2" +msgstr "부 주제 2" + +#: ../src/main/prayerlists.cc:139 +msgid "Subtopic 2
" +msgstr "하위 주제 2
" + +#: ../src/main/prayerlists.cc:141 +msgid "Minor Topic 3" +msgstr "부 주제 3" + +#: ../src/main/prayerlists.cc:142 +msgid "Subtopic 3
" +msgstr "하위 주제 3
" + +#: ../src/main/prayerlists.cc:144 +msgid "Minor Topic 4" +msgstr "부 주제 4" + +#: ../src/main/prayerlists.cc:145 +msgid "Subtopic 4
" +msgstr "하위 주제 4
" + +#: ../src/main/prayerlists.cc:229 +msgid "Name for new prayer list or journal" +msgstr "새 기도 목록 또는 묵상 일기의 이름" + +#: ../src/main/prayerlists.cc:257 +msgid "Xiphos finds that prayer list already." +msgstr "xiphos에서 이미 기도 목록을 찾았습니다." + +#. this one matters. +#: ../src/main/prayerlists.cc:269 +#, c-format +msgid "" +"Xiphos cannot create module's path:\n" +"%s" +msgstr "" +"xiphos에서 모듈 경로를 만들 수 없습니다:\n" +"%s" + +#: ../src/main/prayerlists.cc:308 +msgid "A basic prayer list. \\par\\par Module created by Xiphos." +msgstr "기본 기도 목록. \\par\\par xiphos가 만든 모듈임." + +#: ../src/main/prayerlists.cc:309 +msgid "BasicPrayerList" +msgstr "기본 기도 목록" + +#: ../src/main/prayerlists.cc:322 +msgid "MyPrayerList" +msgstr "내 기도 목록" + +#: ../src/main/prayerlists.cc:323 +msgid "" +"People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" +msgstr "" +"성도:
Bob
Sam
Sue

교회:
pews
fellowship
Bibles for missionaries


" + +#: ../src/main/prayerlists.cc:347 +msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." +msgstr "제목 기반 기도 목록. \\par\\par xiphos가 만든 모듈임." + +#: ../src/main/prayerlists.cc:348 +msgid "SubjectPrayerList" +msgstr "기도 제목 목록" + +#: ../src/main/prayerlists.cc:362 +msgid "Bob
Sam
Sue
John
" +msgstr "Bob
Sam
Sue
John
" + +#: ../src/main/prayerlists.cc:363 +msgid "Spiritual Growth" +msgstr "영적 성숙" + +#: ../src/main/prayerlists.cc:364 +msgid "Mike
Steve
" +msgstr "Mike
Steve
" + +#: ../src/main/prayerlists.cc:366 +msgid "Sue
John
" +msgstr "Sue
John
" + +#: ../src/main/prayerlists.cc:390 +msgid "A monthly prayer list. \\par\\par Module created by Xiphos." +msgstr "월별 기도 목록. \\par\\par xiphos가 만든 모듈임." + +#: ../src/main/prayerlists.cc:391 +msgid "MonthlyPrayerList" +msgstr "월간 기도 목록" + +#: ../src/main/prayerlists.cc:439 +msgid "A daily journal. \\par\\par Module created by Xiphos." +msgstr "매일 저널. \\par\\par xiphos가 만든 모듈임." + +#: ../src/main/prayerlists.cc:440 +msgid "DailyJournal" +msgstr "묵상 일기" + +#: ../src/main/prayerlists.cc:501 +msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." +msgstr "주제(예: 설교) 윤곽잡기. \\par\\par xiphos가 만든 모듈임." + +#: ../src/main/prayerlists.cc:502 +msgid "OutlinedTopic" +msgstr "개요주제" + +#: ../src/main/prayerlists.cc:515 +msgid "Major Topic A" +msgstr "주제 가" + +#: ../src/main/prayerlists.cc:516 +msgid "Major Topic A
" +msgstr "주제 가
" + +#: ../src/main/prayerlists.cc:518 +msgid "Major Topic B" +msgstr "주제 나" + +#: ../src/main/prayerlists.cc:519 +msgid "Major Topic B
" +msgstr "주제 나
" + +#: ../src/main/prayerlists.cc:521 +msgid "Major Topic C" +msgstr "주제 다" + +#: ../src/main/prayerlists.cc:522 +msgid "Major Topic C
" +msgstr "주제 다
" + +#: ../src/main/previewer.cc:193 +msgid "User Annotation" +msgstr "사용자 주석" + +#: ../src/main/search_dialog.cc:188 +#, c-format +msgid "Search result %s: %s" +msgstr "%s 검색 결과: %s" + +#: ../src/main/search_dialog.cc:404 +msgid "Delete Range?" +msgstr "범위를 삭제합니까?" + +#: ../src/main/search_dialog.cc:405 +msgid "Are you sure you want to delete this range?" +msgstr "정말로 이 범위를 삭제하시겠습니까?" + +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 +msgid "Search: " +msgstr "검색:" + +#: ../src/main/search_dialog.cc:1376 +#, c-format +msgid "" +"%s:\n" +"No such module is installed.\n" +"%s" +msgstr "" +"%s:\n" +"설치한 모듈이 없습니다.\n" +"%s" + +#: ../src/main/search_dialog.cc:1378 +msgid "Please adjust the module list." +msgstr "모듈 목록을 조정하십시오." + +#: ../src/main/search_dialog.cc:1394 +#, c-format +msgid "No fast-search index exists for %s.%s%s" +msgstr "%s.%s%s의 비 고속 검색 인덱스가 있습니다" + +#: ../src/main/search_dialog.cc:1396 +msgid "" +"\n" +"Search on this module is now `multi word'." +msgstr "" +"\n" +"이 모듈 검색 방식은 이제 `여러 단어'를 사용한 방식입니다." + +#: ../src/main/search_dialog.cc:1397 +msgid "" +"\n" +"See the Module Manager, Maintenance pane." +msgstr "" +"\n" +"관리 창의 모듈 관리자를 참고하십시오." + +#: ../src/main/search_dialog.cc:1458 +msgid "Search finished" +msgstr "검색이 끝났습니다" + +#: ../src/main/search_sidebar.cc:88 +msgid "matches" +msgstr "일치 건수" + +#: ../src/main/search_sidebar.cc:203 +msgid "There is no commentary module." +msgstr "해설 모듈이 없습니다." + +#: ../src/main/settings.c:106 +msgid "$HOME is not set!" +msgstr "$HOME을 설정하지 않았습니다" + +#: ../src/main/settings.c:120 +#, c-format +msgid "Xiphos can not create directory " +msgstr "xiphos에서 디렉터리를 만들 수 없습니다" + +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 +msgid "can not create " +msgstr "만들 수 없습니다" + +#: ../src/main/settings.c:187 +msgid "" +"Empty settings file -- backup recovery attempted.\n" +"Some information may have been lost." +msgstr "" +"설정 파일이 비었습니다 -- 백업 복구를 시도했습니다.\n" +"일부 정보를 잃을 수 있습니다." + +#: ../src/main/settings.c:190 +msgid "Empty settings file -- no backup?!? Information lost!" +msgstr "설정 파일이 비었습니다 -- 백업이 없나요?!? 정보가 없습니다!" + +#: ../src/main/settings.c:217 +msgid "" +"There are no Bibles installed.\n" +"Evidently, you declined to install any.\n" +"\n" +"Without any Bible modules to display,\n" +"Xiphos cannot proceed,\n" +"and will now exit." +msgstr "" +"설치한 성경이 없습니다.\n" +"분명하게도 어떤 성경 모듈이든\n" +"\n" +"표시할 성경의 설치를 거부했기 때문에,\n" +"xiphos는 계속 진행할 수 없으며,\n" +"빠져나가겠습니다." + +#: ../src/main/settings.c:223 +msgid "Bible module installation complete." +msgstr "성경 모듈 설치가 끝났습니다." + +#: ../src/main/sidebar.cc:146 +msgid "" +"Module error: Unusable xref encoding.\n" +"Please report this, with module & verse" +msgstr "" +"모듈 오류: xref 인코딩이 무용지물입니다.\n" +"모듈과 해당 절의 문제를 보고하십시오" + +#: ../src/main/sidebar.cc:411 +msgid "verse" +msgstr "절" + +#: ../src/main/sidebar.cc:471 +msgid "chapter" +msgstr "장" + +#: ../src/main/sword.cc:654 +msgid "" +"Xiphos's file for language\n" +"abbreviations is missing." +msgstr "" +"xiphos 언어 약어 파일이\n" +"빠졌습니다" + +#: ../src/main/sword.cc:660 +msgid "" +"Xiphos's language abbreviation\n" +"file cannot be opened." +msgstr "" +"xiphos 언어 약어 파일을\n" +"열 수 없습니다" + +#: ../src/main/sword.cc:672 +msgid "" +"Xiphos cannot allocate space\n" +"for language abbreviations." +msgstr "" +"xiphos에서 언어 약어를 저장할\n" +"공간을 확보할 수 없습니다" + +#: ../src/main/sword.cc:678 +msgid "" +"Xiphos cannot read the\n" +"language abbreviation file." +msgstr "" +"xiphos에서 언어 약어 파일을\n" +"읽을 수 없습니다." + +#. either we were given a null sys_locale, or it didn't match anything. +#: ../src/main/sword.cc:758 +#, c-format +msgid "" +"No matching locale found for `%s'.\n" +"%s" +msgstr "" +"`%s'에 일치하는 로캘이 없습니다.\n" +"%s" + +#: ../src/main/sword.cc:760 +msgid "Book names and menus may not be translated." +msgstr "책 이름과 메뉴는 번역하면 안됩니다." + +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 +#, c-format +msgid "" +"Module %s has companion modules:\n" +"%s.\n" +"Would you like to open these as well?%s" +msgstr "" +"%s 모듈은 부록 모듈입니다:\n" +"%s.\n" +"이 모듈 역시 마찬가지로 여시겠습니까?%s" + +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 +msgid "" +"\n" +"\n" +"The first will open in the main window\n" +"and others in separate windows." +msgstr "" +"\n" +"\n" +"우선 메인 창을 열고 다른 창은\n" +"다른 창에 열겠습니다." + +#: ../src/main/sword.cc:1411 +msgid "Daily devotional was requested, but there are none installed." +msgstr "매일 묵상을 요청했으나 설치하지 않았습니다." + +#: ../src/main/sword.cc:1665 +msgid "" +"Locked Module.\n" +"\n" +"You are opening a module which requires a key.\n" +"\n" +"The module is locked, meaning that the content is encrypted by its " +"publisher, and you must enter its key in order for the content to become " +"useful. This key should have been received by you on the web page which " +"confirmed your purchase, or perhaps sent via email after purchase.\n" +"\n" +"Please enter the key in the dialog." +msgstr "" +"모듈 잠김.\n" +"\n" +"키가 필요한 모듈을 여는 중입니다.\n" +"\n" +"모듈이 잠겨있으며, 작성자가 내용을 암호화했고, 내용을 보려면 키를 입력해야합" +"니다. 이 키는 키를 구매한 웹 사이트에서 받아오거나 구매후 받은 전자메일로 받" +"아야 합니다.\n" +"\n" +"대화상자에 키를 입력하십시오." + +#: ../src/main/tab_history.c:302 +msgid "Clear History" +msgstr "기록 지우기" + +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "기록 ➛ 절 목록" + +#: ../src/main/url.cc:106 +msgid "URL not found:" +msgstr "URL이 없습니다:" + +#: ../src/main/url.cc:194 +#, c-format +msgid "Xiphos could not execute %s" +msgstr "xiphos에서 %s을(를) 실행할 수 없습니다" + +#: ../src/main/url.cc:202 +msgid "Viewer error:\n" +msgstr "보기 프로그램 오류:\n" + +#: ../src/main/url.cc:273 +#, c-format +msgid "Show %s in main window" +msgstr "%s 메인 창 표시" + +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 +#, c-format +msgid "Document not created successfully. \n" +msgstr "문서를 성공적으로 만들지 않았습니다.\n" + +#: ../src/main/xml.c:99 +msgid "What must I do to be saved?" +msgstr "저장하려면 어떻게 해야 합니까?" + +#: ../src/main/xml.c:100 ../src/main/xml.c:101 +msgid "Acts 16:31" +msgstr "Acts 16:31" + +#: ../src/main/xml.c:102 ../src/main/xml.c:103 +msgid "Eph 2:8,9" +msgstr "Eph 2:8,9" + +#: ../src/main/xml.c:104 ../src/main/xml.c:105 +msgid "Romans 1:16" +msgstr "Romans 1:16" + +#: ../src/main/xml.c:107 +msgid "What is the Gospel?" +msgstr "찬송가란 무엇입니까?" + +#: ../src/main/xml.c:108 ../src/main/xml.c:109 +msgid "1 Cor 15:1-4" +msgstr "1 Cor 15:1-4" + +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 +#, c-format +msgid "Document not parsed successfully. \n" +msgstr "문서를 제대로 해석하지 않았습니다.\n" + +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 +#, c-format +msgid "empty document \n" +msgstr "빈 문서 \n" + +#: ../src/main/xml.c:275 +#, c-format +msgid "wrong type, root node != SwordBookmarks\n" +msgstr "잘못된 형식입니다. root node != SwordBookmarks\n" + +#: ../src/main/xml.c:421 +#, c-format +msgid "wrong type, root node != Copy_Export\n" +msgstr "잘못된 형식입니다 root node != Copy_Export\n" + +#: ../src/main/xml.c:498 +#, c-format +msgid "%s
%s
Chapter %d

" +msgstr "%s
%s
%d장

" + +#: ../src/main/xml.c:502 +#, c-format +msgid "
Chapter %d

" +msgstr "
%d장

" + +#: ../src/main/xml.c:505 +#, c-format +msgid "" +"%s\n" +"\n" +"Chapter %d\n" +"\n" +msgstr "" +"%s\n" +"\n" +"%d장\n" +"\n" + +#: ../src/main/xml.c:508 +#, c-format +msgid "" +"\n" +"\n" +"Chapter %d\n" +"\n" +msgstr "" +"\n" +"\n" +"%d장\n" +"\n" + +#: ../src/main/xml.c:517 +#, c-format +msgid "%s%s: %s Chapter %d

" +msgstr "%s%s: %s %d장

" + +#: ../src/main/xml.c:520 +#, c-format +msgid "" +"%s: %s Chapter %d\n" +"\n" +msgstr "" +"%s: %s %d장\n" +"\n" + +#: ../src/main/xml.c:528 +#, c-format +msgid "  [%d]" +msgstr "  [%d]" + +#: ../src/main/xml.c:531 +#, c-format +msgid " [%d]" +msgstr " [%d]" + +#: ../src/main/xml.c:540 +#, c-format +msgid "%s%s (%s %d:%d%s)" +msgstr "%s%s (%s %d:%d%s)" + +#: ../src/main/xml.c:543 +#, c-format +msgid "%s(%s %d:%d%s)%s " +msgstr "%s(%s %d:%d%s)%s " + +#: ../src/main/xml.c:545 +#, c-format +msgid "%s (%s %d:%d%s)" +msgstr "%s (%s %d:%d%s)" + +#: ../src/main/xml.c:548 +#, c-format +msgid "(%s %d:%d%s) %s" +msgstr "(%s %d:%d%s) %s" + +#: ../src/main/xml.c:556 +#, c-format +msgid " %s%s" +msgstr " %s%s" + +#: ../src/main/xml.c:558 ../src/main/xml.c:562 +#, c-format +msgid "%s(%s %d:%d-%d%s)" +msgstr "%s(%s %d:%d-%d%s)" + +#: ../src/main/xml.c:560 +#, c-format +msgid "(%s %d:%d-%d%s)
" +msgstr "(%s %d:%d-%d%s)
" + +#: ../src/main/xml.c:565 +#, c-format +msgid "(%s %d:%d-%d%s)\n" +msgstr "(%s %d:%d-%d%s)\n" + +#: ../src/main/xml.c:614 +msgid "Old Testament" +msgstr "Old Testament" + +#: ../src/main/xml.c:616 +msgid "Gen - Mal" +msgstr "Gen - Mal" + +#: ../src/main/xml.c:622 +msgid "New Testament" +msgstr "New Testament" + +#: ../src/main/xml.c:624 +msgid "Mat - Rev" +msgstr "Mat - Rev" + +#: ../src/main/xml.c:633 +msgid "Sample Module List" +msgstr "예제 모듈 목록" + +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 +#, c-format +msgid "wrong type, root node != %s\n" +msgstr "잘못된 형식입니다. root node != %s\n" + +#: ../src/main/xml.c:1549 +#, c-format +msgid "" +"Save of settings failed! stat %d, size %d\n" +"%s" +msgstr "" +"설정 저장에 실패했습니다! 상태 %d, 크기 %d\n" +"%s" + +#: ../src/main/xml.c:1551 +msgid "Attempting to revert to previous save." +msgstr "이전 저장 내용으로 복구 시도 중." + +#: ../ui/bookmarks.glade.h:1 ../ui/bookmarks.gtkbuilder.h:1 +msgid "Add Bookmark" +msgstr "책갈피 추가" + +#: ../ui/bookmarks.glade.h:2 ../ui/bookmarks.gtkbuilder.h:13 +#: ../ui/markverse.glade.h:2 ../ui/markverse.gtkbuilder.h:11 +msgid "Bookmark Dialog" +msgstr "책갈피 대화상자" + +#: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 +msgid "Create new folder" +msgstr "새 폴더 만들기" + +#: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 +msgid "New Folder" +msgstr "새 폴더" + +#: ../ui/bookmarks.glade.h:5 ../ui/bookmarks.gtkbuilder.h:3 +msgid "New ..." +msgstr "새로 만들기 ..." + +#: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 +msgid "Cancel Bookmark" +msgstr "책갈피 취소" + +#: ../ui/bookmarks.glade.h:7 ../ui/bookmarks.gtkbuilder.h:6 +msgid "Label:" +msgstr "레이블:" + +#: ../ui/bookmarks.glade.h:8 ../ui/bookmarks.gtkbuilder.h:7 +msgid "Label Entry" +msgstr "레이블 항목" + +#: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 +msgid "Verse:" +msgstr "절:" + +#: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 +msgid "Verse Entry" +msgstr "절 항목" + +#: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 +msgid "Module:" +msgstr "모듈:" + +#: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 +msgid "Module Entry" +msgstr "모듈 항목" + +#: ../ui/bookmarks.glade.h:13 ../ui/bookmarks.gtkbuilder.h:12 +msgid "Bookmark Folder Treeview" +msgstr "책갈피 폴더 트리 보기" + +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "링크 삽입" + +#: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 +#: ../ui/export-dialog.gtkbuilder.h:16 +msgid "Verse" +msgstr "절" + +#: ../ui/editor_link_dialog.xml.h:4 +msgid "Link Text" +msgstr "링크 문구" + +#: ../ui/editor_link_dialog.xml.h:5 +msgid "Link directly" +msgstr "직접 링크" + +#: ../ui/editor_link_dialog.xml.h:6 +msgid "Link via verse list" +msgstr "절 목록으로 링크" + +#: ../ui/editor_link_dialog.xml.h:7 +msgid "Test Link" +msgstr "링크 시험" + +#: ../ui/editor_note.xml.h:1 ../ui/editor_studypad.xml.h:1 +msgid "Exit the program" +msgstr "프로그램을 빠져 나갑니다" + +#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:2 +msgid "Exit" +msgstr "나가기" + +#: ../ui/editor_note.xml.h:3 +msgid "Print this note" +msgstr "이 메모 인쇄" + +#: ../ui/editor_note.xml.h:4 +msgid "Preview the note to be printed" +msgstr "인쇄할 메모 미리보기" + +#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:5 +msgid "HTML Format switch" +msgstr "HTML 형식 전환" + +#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:6 +msgid "HTML mode" +msgstr "HTML 모드" + +#: ../ui/editor_note.xml.h:7 +msgid "Delete the current note" +msgstr "현재 메모 삭제" + +#: ../ui/editor_note.xml.h:8 +msgid "_Delete Personal Comment" +msgstr "현재 개인 주석 삭제(_D)" + +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "파일(_F)" + +#: ../ui/editor_note.xml.h:10 +msgid "Save the current note" +msgstr "현재 메모 저장" + +#: ../ui/editor_note.xml.h:11 +msgid "_Save (Personal Comment)" +msgstr "저장(개인 메모)(_S)" + +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "인쇄 미리보기(_V)" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "인쇄(_P)..." + +#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 +msgid "E_xit" +msgstr "나가기(_X)" + +#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21 +msgid "For_mat" +msgstr "형식(_M)" + +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "저장" + +#: ../ui/editor_studypad.xml.h:3 +msgid "Print this document" +msgstr "이 문서 인쇄" + +#: ../ui/editor_studypad.xml.h:4 +msgid "Preview the document to be printed" +msgstr "인쇄할 문서 미리보기" + +#: ../ui/editor_studypad.xml.h:8 +msgid "Open a file in Studypad" +msgstr "학습장에 파일 열기" + +#: ../ui/editor_studypad.xml.h:10 +msgid "Save the current file" +msgstr "현재 파일 저장" + +#: ../ui/editor_studypad.xml.h:12 +msgid "Save the current file as" +msgstr "다른 이름으로 현재 파일 저장" + +#: ../ui/editor_studypad.xml.h:13 +msgid "Save AS" +msgstr "다른 이름으로 저장" + +#: ../ui/editor_studypad.xml.h:14 +msgid "Add this file to your bookmarks" +msgstr "이 파일을 책갈피에 추가" + +#: ../ui/editor_studypad.xml.h:16 +msgid "Create a new document" +msgstr "새 문서 만들기" + +#: ../ui/editor_studypad.xml.h:17 +msgid "New Document" +msgstr "새 문서" + +#: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 +msgid "Copy/Export Passage" +msgstr "과정 기록 복사/내보내기" + +#: ../ui/export-dialog.glade.h:2 ../ui/export-dialog.gtkbuilder.h:2 +msgid "Export Passage Cancel" +msgstr "과정 기록 내보내기 취소" + +#: ../ui/export-dialog.glade.h:3 ../ui/export-dialog.gtkbuilder.h:3 +msgid "Export Passage OK" +msgstr "과정 기록 내보내기 확인" + +#: ../ui/export-dialog.glade.h:5 ../ui/export-dialog.gtkbuilder.h:5 +msgid "Version" +msgstr "버전" + +#: ../ui/export-dialog.glade.h:6 ../ui/export-dialog.gtkbuilder.h:6 +msgid ": " +msgstr ": " + +#: ../ui/export-dialog.glade.h:7 ../ui/export-dialog.gtkbuilder.h:7 +msgid "Key" +msgstr "키" + +#: ../ui/export-dialog.glade.h:8 ../ui/export-dialog.gtkbuilder.h:8 +msgid "Copy" +msgstr "복사" + +#: ../ui/export-dialog.glade.h:9 ../ui/export-dialog.gtkbuilder.h:9 +msgid "Export" +msgstr "내보내기" + +#: ../ui/export-dialog.glade.h:10 ../ui/export-dialog.gtkbuilder.h:11 +msgid "Export complete book" +msgstr "전체 책 내보내기" + +#: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +msgid "Book" +msgstr "책" + +#: ../ui/export-dialog.glade.h:12 ../ui/export-dialog.gtkbuilder.h:12 +msgid "Book Radio Button" +msgstr "책 라디오 단추" + +#: ../ui/export-dialog.glade.h:13 ../ui/export-dialog.gtkbuilder.h:14 +msgid "Export complete chapter" +msgstr "전체 장 내보내기" + +#: ../ui/export-dialog.glade.h:15 ../ui/export-dialog.gtkbuilder.h:15 +msgid "Chapter Radio Button" +msgstr "장 라디오 단추" + +#: ../ui/export-dialog.glade.h:16 ../ui/export-dialog.gtkbuilder.h:17 +msgid "Export single verse" +msgstr "단일 절 내보내기" + +#: ../ui/export-dialog.glade.h:18 ../ui/export-dialog.gtkbuilder.h:18 +msgid "Verse Radio Button" +msgstr "절 라디오 단추" + +#: ../ui/export-dialog.glade.h:19 ../ui/export-dialog.gtkbuilder.h:19 +msgid "Verse range" +msgstr "절 범위" + +#: ../ui/export-dialog.glade.h:20 ../ui/export-dialog.gtkbuilder.h:20 +msgid "Format" +msgstr "형식" + +#: ../ui/export-dialog.glade.h:21 ../ui/export-dialog.gtkbuilder.h:21 +msgid "Plain Text" +msgstr "일반 텍스트" + +#: ../ui/export-dialog.glade.h:22 ../ui/export-dialog.gtkbuilder.h:22 +msgid "Plain Text Radio Button" +msgstr "일반 텍스트 라디오 단추" + +#: ../ui/export-dialog.glade.h:23 ../ui/export-dialog.gtkbuilder.h:23 +msgid "HTML" +msgstr "HTML" + +#: ../ui/export-dialog.glade.h:24 ../ui/export-dialog.gtkbuilder.h:24 +msgid "HTML Radio Button" +msgstr "HTML 라디오 단추" + +#: ../ui/export-dialog.glade.h:25 +msgid "" +"Indicates whether verse numbers should appear inline in the text for more " +"than 1 verse." +msgstr "1절 이상 검색했을 경우 절 마다 번호를 표시할 지를 나타냅니다." + +#: ../ui/export-dialog.glade.h:26 ../ui/export-dialog.gtkbuilder.h:25 +msgid "_Verse numbers in text" +msgstr "본문에 절 번호(_V)" + +#: ../ui/export-dialog.glade.h:27 ../ui/export-dialog.gtkbuilder.h:27 +msgid "Verse Number button" +msgstr "절 번호 단추" + +#: ../ui/export-dialog.glade.h:28 ../ui/export-dialog.gtkbuilder.h:29 +msgid "Indicates whether reference is placed first or last." +msgstr "참조를 처음 부분에 놓을지 마지막 부분에 놓을지를 나타냅니다." + +#: ../ui/export-dialog.glade.h:29 ../ui/export-dialog.gtkbuilder.h:28 +msgid "Reference last" +msgstr "참조를 마지막에 위치" + +#: ../ui/export-dialog.glade.h:30 ../ui/export-dialog.gtkbuilder.h:30 +msgid "Reference last button" +msgstr "참조를 마지막에 위치하는 단추" + +#: ../ui/export-dialog.glade.h:31 ../ui/export-dialog.gtkbuilder.h:32 +msgid "Indicates whether or not version name is included in reference." +msgstr "참조에 버전 이름을 넣을 지 여부를 나타냅니다." + +#: ../ui/export-dialog.glade.h:32 +msgid "Include Version" +msgstr "버전 포함" + +#: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 +msgid "Version button" +msgstr "버전 단추" + +#: ../ui/export-dialog.glade.h:34 +msgid "Save Export As" +msgstr "다른 이름으로 내보내기 저장" + +#: ../ui/export-dialog.gtkbuilder.h:26 +msgid "Indicates whether verse numbers should appear inline in the text." +msgstr "본문에 절 번호를 표시할 지를 나타냅니다." + +#: ../ui/export-dialog.gtkbuilder.h:31 +msgid "Include version" +msgstr "버전 포함" + +#: ../ui/gtk2_webedit.ui.h:1 ../ui/gtk_webedit.ui.h:1 +msgid "About Studypad" +msgstr "학습장 정보" + +#: ../ui/gtk2_webedit.ui.h:3 ../ui/gtk_webedit.ui.h:3 +msgid "Open about dialog" +msgstr "정보 대화상자 열기" + +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 +msgid "Bold" +msgstr "굵게" + +#: ../ui/gtk2_webedit.ui.h:5 ../ui/gtk_webedit.ui.h:5 +msgid "Make selection bold" +msgstr "선택 부분을 굵게" + +#: ../ui/gtk2_webedit.ui.h:6 ../ui/gtk_webedit.ui.h:6 +msgid "Copy" +msgstr "복사" + +#: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 +msgid "Copy selection to clipboard" +msgstr "선택 부분을 클립보드에 복사" + +#: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 +msgid "Cut" +msgstr "잘라내기" + +#: ../ui/gtk2_webedit.ui.h:9 ../ui/gtk_webedit.ui.h:9 +msgid "Cut selection" +msgstr "선택 부분 잘라내기" + +#: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 +msgid "Decrease indent" +msgstr "들여쓰기 줄이기" + +#: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 +msgid "Decrease" +msgstr "줄이기" + +#: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 +msgid "Decrease paragraph indent" +msgstr "문단 들여쓰기 깊이를 줄입니다" + +#: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 +msgid "Delete selection" +msgstr "선택 부분 삭제" + +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "삭제" + +#: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 +msgid "Remove selection" +msgstr "선택 부분 제거" + +#: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 +msgid "Delete Item" +msgstr "항목 삭제" + +#: ../ui/gtk2_webedit.ui.h:17 ../ui/gtk_webedit.ui.h:17 +msgid "Delete current item" +msgstr "현재 항목 삭제" + +#: ../ui/gtk2_webedit.ui.h:19 ../ui/gtk_webedit.ui.h:19 +msgid "Search current document" +msgstr "현재 문서 검색" + +#: ../ui/gtk2_webedit.ui.h:20 ../ui/gtk_webedit.ui.h:20 +msgid "Font" +msgstr "글꼴" + +#: ../ui/gtk2_webedit.ui.h:21 ../ui/gtk_webedit.ui.h:21 +msgid "Change font" +msgstr "글꼴 바꾸기" + +#: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 +msgid "Increase indent" +msgstr "들여쓰기 늘이기" + +#: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 +msgid "Increase" +msgstr "늘이기" + +#: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 +msgid "Increase paragraph indent" +msgstr "문단 들여쓰기 깊이를 늘입니다" + +#: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 +msgid "Insert emoticon" +msgstr "이모티콘 삽입" + +#: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 +msgid "Emoticon" +msgstr "이모티콘" + +#: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 +msgid "Insert an emoticon" +msgstr "이모티콘을 삽입합니다" + +#: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 +msgid "Insert image" +msgstr "그림 삽입" + +#: ../ui/gtk2_webedit.ui.h:29 ../ui/gtk_webedit.ui.h:29 +msgid "Image" +msgstr "그림" + +#: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 +msgid "Insert image at cursor" +msgstr "커서 위치에 그림을 삽입합니다" + +#: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 +msgid "Insert link" +msgstr "링크 삽입" + +#: ../ui/gtk2_webedit.ui.h:32 ../ui/gtk_webedit.ui.h:32 +msgid "Link" +msgstr "링크" + +#: ../ui/gtk2_webedit.ui.h:33 ../ui/gtk_webedit.ui.h:33 +msgid "Insert a link" +msgstr "링크를 삽입합니다" + +#: ../ui/gtk2_webedit.ui.h:34 ../ui/gtk_webedit.ui.h:34 +msgid "Insert Outline" +msgstr "개요 삽입" + +#: ../ui/gtk2_webedit.ui.h:35 ../ui/gtk_webedit.ui.h:35 +msgid "Outline" +msgstr "개요" + +#: ../ui/gtk2_webedit.ui.h:36 ../ui/gtk_webedit.ui.h:36 +msgid "Insert outline" +msgstr "개요를 삽입합니다" + +#: ../ui/gtk2_webedit.ui.h:37 ../ui/gtk_webedit.ui.h:37 +msgid "Insert rule" +msgstr "구분선 삽입" + +#: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 +msgid "Rule" +msgstr "구분선" + +#: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 +msgid "Insert horizontal rule" +msgstr "수평 구분선 삽입" + +#: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 +msgid "Xiphos Link" +msgstr "xiphos 링크" + +#: ../ui/gtk2_webedit.ui.h:41 ../ui/gtk_webedit.ui.h:41 +msgid "Xiphos" +msgstr "xiphos" + +#: ../ui/gtk2_webedit.ui.h:42 ../ui/gtk_webedit.ui.h:42 +msgid "Insert a link to a sword module" +msgstr "sword 모듈에 링크 삽입" + +#: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 +msgid "Insert table" +msgstr "표 삽입" + +#: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 +msgid "Table" +msgstr "표" + +#: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 +msgid "Insert a table" +msgstr "표를 삽입합니다" + +#: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 +msgid "Italic" +msgstr "기울기" + +#: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 +msgid "Change selection to italic font" +msgstr "선택한 영역을 기울기체로 바꿉니다" + +#: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 +msgid "Center" +msgstr "가운데로" + +#: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 +msgid "Center justify paragraph" +msgstr "문단 정렬을 가로 방향 가운데로 합니다" + +#: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 +msgid "Full" +msgstr "전체" + +#: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 +msgid "full justify" +msgstr "전체 좌우 균형 정렬" + +#: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 +msgid "Left" +msgstr "왼쪽" + +#: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 +msgid "Left justify paragraph" +msgstr "문단 정렬을 가로 방향 왼쪽으로 합니다" + +#: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 +msgid "Right" +msgstr "오른쪽" + +#: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 +msgid "Right justify paragraph" +msgstr "문단 정렬을 가로 방향 오른쪽으로 합니다" + +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "새로 만들기" + +#: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 +msgid "Create new file" +msgstr "새 파일 만들기" + +#: ../ui/gtk2_webedit.ui.h:59 ../ui/gtk_webedit.ui.h:59 +msgid "Open file" +msgstr "파일 열기" + +#: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 +msgid "Paste" +msgstr "붙여넣기" + +#: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 +msgid "Paste clipboard at cursor." +msgstr "커서 위치에 클립보드 내용을 붙여넣습니다." + +#: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 +msgid "Print Document" +msgstr "문서 인쇄" + +#: ../ui/gtk2_webedit.ui.h:63 ../ui/gtk_webedit.ui.h:63 +msgid "Print" +msgstr "인쇄" + +#: ../ui/gtk2_webedit.ui.h:64 ../ui/gtk_webedit.ui.h:64 +msgid "Print the current document" +msgstr "현재 문서를 인쇄합니다" + +#: ../ui/gtk2_webedit.ui.h:65 ../ui/gtk_webedit.ui.h:65 +msgid "Print Preview" +msgstr "인쇄 미리보기" + +#: ../ui/gtk2_webedit.ui.h:66 ../ui/gtk_webedit.ui.h:66 +msgid "Preview" +msgstr "미리보기" + +#: ../ui/gtk2_webedit.ui.h:67 ../ui/gtk_webedit.ui.h:67 +msgid "Print preview of current document" +msgstr "현재 문서에 대한 인쇄 미리보기입니다" + +#: ../ui/gtk2_webedit.ui.h:68 ../ui/gtk_webedit.ui.h:68 +msgid "Quit" +msgstr "끝내기" + +#: ../ui/gtk2_webedit.ui.h:69 ../ui/gtk_webedit.ui.h:69 +msgid "Shut down editor" +msgstr "편집기를 끕니다." + +#: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 +msgid "Redo" +msgstr "재 실행" + +#: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 +msgid "Redo last undo" +msgstr "마지막에 실행 취소한 작업을 다시 실행합니다" + +#: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 +msgid "Find and replace" +msgstr "찾아 바꾸기" + +#: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 +msgid "Replace" +msgstr "바꾸기" + +#: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 +msgid "Search and replace" +msgstr "검색하고 바꿉니다" + +#: ../ui/gtk2_webedit.ui.h:76 ../ui/gtk_webedit.ui.h:76 +msgid "Save changes to file" +msgstr "바뀐 내용 파일에 저장" + +#: ../ui/gtk2_webedit.ui.h:77 ../ui/gtk_webedit.ui.h:77 +msgid "Save as" +msgstr "다른 이름으로 저장" + +#: ../ui/gtk2_webedit.ui.h:78 ../ui/gtk_webedit.ui.h:78 +msgid "Save file as ..." +msgstr "다른 이름으로 파일 저장 ..." + +#: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 +msgid "Strikethrough" +msgstr "취소선" + +#: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 +msgid "Strikethrough selection" +msgstr "선택 영역 취소선" + +#: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 +msgid "Underline" +msgstr "밑줄" + +#: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 +msgid "Underline selection" +msgstr "선택 영역 밑줄" + +#: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 +msgid "Undo" +msgstr "실행 취소" + +#: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 +msgid "Undo last change" +msgstr "마지막 바꾼 동작 실행 취소" + +#: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 +msgid "Editor" +msgstr "편집기" + +#: ../ui/gtk2_webedit.ui.h:87 ../ui/gtk_webedit.ui.h:87 +msgid "Recent files" +msgstr "죄근 파일" + +#: ../ui/gtk2_webedit.ui.h:88 ../ui/gtk_webedit.ui.h:88 +#: ../ui/xi-menus.glade.h:9 ../ui/xi-menus.gtkbuilder.h:6 +msgid "_Edit" +msgstr "편집(_E)" + +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 +#: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 +msgid "_Help" +msgstr "도움말(_H)" + +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +msgid "Normal" +msgstr "일반" + +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 +msgid "Header 1" +msgstr "제목 1" + +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 +msgid "Header 2" +msgstr "제목 2" + +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 +msgid "Header 3" +msgstr "제목 3" + +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 +msgid "Header 4" +msgstr "제목 4" + +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 +msgid "Header 5" +msgstr "제목 5" + +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 +msgid "Header 6" +msgstr "제목 6" + +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 +msgid "Address" +msgstr "주소" + +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +msgid "Preformatted" +msgstr "선 형식 맞춤" + +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +msgid "Bulleted List" +msgstr "비순서 목록" + +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +msgid "Roman Numeral List" +msgstr "로마 숫자 목록" + +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +msgid "Numbered List" +msgstr "숫자 목록" + +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +msgid "Alphabetical List" +msgstr "영문자 목록" + +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" +msgstr "취소선" + +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +msgid "Set font color of selected text." +msgstr "선택한 텍스트의 글꼴 색상을 설정합니다." + +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +msgid "Highlight selected text by setting background color." +msgstr "배경색을 설정하여 선택한 텍스트를 강조합니다." + +#: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 +msgid "Mark/Unmark Verse" +msgstr "장 표시/표시 취소" + +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 +msgid "Mark" +msgstr "표시" + +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 +msgid "Unmark" +msgstr "표시 취소" + +#: ../ui/module-manager.glade.h:1 ../ui/module-manager.gtkbuilder.h:1 +msgid "Module Manager" +msgstr "모듈 관리자" + +#: ../ui/module-manager.glade.h:2 ../ui/module-manager.gtkbuilder.h:2 +msgid "_View Intro" +msgstr "인트로 보기(_V)" + +#: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3 +msgid "Open a brief introductory explanation of how the Module Manager works." +msgstr "모듈 관리자 동작 방식에 대한 간단한 설명을 엽니다." + +#: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4 +msgid "_Load Standard" +msgstr "표준 불러오기(_L)" + +#: ../ui/module-manager.glade.h:5 ../ui/module-manager.gtkbuilder.h:5 +msgid "" +"Load and synchronize the standard set of known repositories, as maintained " +"at crosswire.org, with your current remote sources." +msgstr "" +"crosswire.org에서 관리하는 저장소 및 현재 원격 원본과 같이 알려져 있는 저장소" +"의 표준 모음을 불러오고 동기화합니다." + +#: ../ui/module-manager.glade.h:6 ../ui/module-manager.gtkbuilder.h:6 +msgid "" +"Refresh Xiphos' knowledge of what modules are available at the selected " +"remote repository" +msgstr "선택한 원격 저장소에 있는 모듈 정보를 xiphos에서 새로 고칩니다" + +#: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8 +msgid "_Install" +msgstr "설치(_I)" + +#: ../ui/module-manager.glade.h:8 ../ui/module-manager.gtkbuilder.h:7 +msgid "Install or update the selected modules" +msgstr "선택한 모듈을 설치하거나 업데이트합니다" + +#: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9 +msgid "Remove the selected modules from your system" +msgstr "선택한 모듈을 시스템에서 제거합니다" + +#: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10 +msgid "_Archive" +msgstr "보관(_A)" + +#: ../ui/module-manager.glade.h:11 ../ui/module-manager.gtkbuilder.h:11 +msgid "Create a zip archive of the selected modules." +msgstr "선택한 모듈에 대한 ZIP 아카이브를 만듭니다." + +#: ../ui/module-manager.glade.h:12 ../ui/module-manager.gtkbuilder.h:12 +msgid "_Index" +msgstr "인덱스(_I)" + +#: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13 +msgid "" +"Build an index of the selected modules, for optimized (\"lucene\") searching." +msgstr "선택한 모듈의 인덱스를 만듭니다. 최적화(\"루씬\") 검색용입니다." + +#: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14 +msgid "_Delete Index" +msgstr "인덱스 삭제(_D)" + +#: ../ui/module-manager.glade.h:15 ../ui/module-manager.gtkbuilder.h:15 +msgid "Delete the fast-search index of the selected modules." +msgstr "선택한 모듈의 빠른 검색 인덱스를 삭제합니다." + +#: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "오래된 항목 검색(_O)" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "오래된 모듈을 검색하여 제거할 모듈을 표시합니다." + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 +msgid "Continue" +msgstr "계속" + +#. do not translate and they are html formating +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 +msgid "Sword" +msgstr "SWORD" + +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 +msgid "Module Manager" +msgstr "모듈 관리자" + +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 +msgid "WARNING: If you live in a persecuted country use with care." +msgstr "경고 비허가 국가에서 거주하는 경우 저작권에 유의하여 활용하십시오." + +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 +msgid "Add and Remove Sources" +msgstr "원본 추가 및 제거" + +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 +msgid "Current local sources" +msgstr "현재 로컬 원본" + +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 +msgid "" +"Add a local folder as an install source, typically on a cdrom or flash " +"drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." +msgstr "" +"CD-ROM 또는 USB 메모리와 같이 설치 원본으로 사용할 로컬 폴더를 추가합니다. 해" +"당 폴더에는 \"mods.d\"와 \"modules\" 하위 폴더가 있습니다." + +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 +msgid "Remove one of your local folders as an install source." +msgstr "설치 원본으로 사용하는 로컬 폴더 중 하나를 제거합니다." + +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 +msgid "Current Remote Sources" +msgstr "현재 원격 원본" + +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 +msgid "" +"Add a custom remote install source. You must know its hostname and the " +"folder where its repository lives." +msgstr "" +"개별 원격 설치 원본을 추가합니다. 저장소가 있는 호스트의 이름과 폴더 이름을 " +"알고 있어야합니다." + +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 +msgid "Remove a remote install source." +msgstr "원격 설치 원본을 제거합니다." + +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 +msgid "Install Source" +msgstr "설치 원본" + +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 +msgid "Local" +msgstr "로컬" + +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 +msgid "Remote" +msgstr "원격" + +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 +msgid "Install Destination" +msgstr "설치 대상" + +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 +msgid "Personal area, for your use only:" +msgstr "개인용으로 사적 공간에서 사용할 수 있습니다" + +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 +msgid "Home dir" +msgstr "내 폴더 디렉터리" + +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 +msgid "System area, for all users:" +msgstr "시스템 영역이며, 모든 사용자에게 적용합니다." + +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 +msgid "Sword sys dir" +msgstr "sword 시스템 디렉터리" + +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 +msgid "" +"Warning: If you live in a persecuted country and do not wish to risk " +"detection you should NOT use the remote installation feature! " +msgstr "" +"경고: 비허가 국가에서 거주중이며 법적 손해를 감수하지 않으려면 원격 " +"설치 기능을 사용하면 안됩니다!" + +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 +msgid "Local Install Folder" +msgstr "로컬 설치 폴더" + +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "취소(_C)" + +#: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 +msgid "Drop down history list" +msgstr "드롭다운 기록 목록" + +#: ../ui/navbar_versekey.glade.h:2 +msgid "Choose book to display" +msgstr "표시할 책 선택" + +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 +msgid "Book Selector Button" +msgstr "책 선택자 단추" + +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 +msgid "Revelation of John" +msgstr "Revelation of John" + +#: ../ui/navbar_versekey.glade.h:5 +msgid "Choose chapter to display" +msgstr "표시할 장 선택" + +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 +msgid "Toggle Chapter Button" +msgstr "장 토글 단추" + +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 +msgid "1" +msgstr "1" + +#: ../ui/navbar_versekey.glade.h:8 +msgid "Choose Verse to display" +msgstr "표시할 절 선택" + +#: ../ui/navbar_versekey.glade.h:9 ../ui/navbar_versekey.gtkbuilder.h:6 +msgid "Toggle Verse Button" +msgstr "절 토글 단추" + +#: ../ui/navbar_versekey.glade.h:10 ../ui/navbar_versekey.gtkbuilder.h:7 +msgid "Enter a Verse reference in Book 1:1 format and press Return" +msgstr "1:1 형식으로 책의 절 참조를 입력하고 리턴 키를 누르십시오" + +#: ../ui/navbar_versekey.glade.h:11 ../ui/navbar_versekey.gtkbuilder.h:8 +msgid "Reference Entry" +msgstr "참조 항목" + +#: ../ui/prefs.glade.h:2 ../ui/prefs.gtkbuilder.h:10 +msgid "Cover" +msgstr "표지" + +#: ../ui/prefs.glade.h:3 ../ui/prefs.gtkbuilder.h:11 +msgid "Font Colors" +msgstr " 글꼴 색상" + +#: ../ui/prefs.glade.h:4 ../ui/prefs.gtkbuilder.h:12 +msgid "Background" +msgstr "배경" + +#: ../ui/prefs.glade.h:5 ../ui/prefs.gtkbuilder.h:13 +msgid " " +msgstr " " + +#: ../ui/prefs.glade.h:6 ../ui/prefs.gtkbuilder.h:14 +msgid "Foreground" +msgstr "전경" + +#: ../ui/prefs.glade.h:7 ../ui/prefs.gtkbuilder.h:15 +msgid "Current Verse" +msgstr "현재 절" + +#: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16 +msgid "Verse Number" +msgstr "절 번호" + +#: ../ui/prefs.glade.h:9 ../ui/prefs.gtkbuilder.h:17 +msgid "Links" +msgstr "링크" + +#: ../ui/prefs.glade.h:10 ../ui/prefs.gtkbuilder.h:18 +msgid "Highlight Foreground" +msgstr "강조 전경색" + +#: ../ui/prefs.glade.h:11 ../ui/prefs.gtkbuilder.h:19 +msgid "Highlight Background" +msgstr "강조 배경색" + +#: ../ui/prefs.glade.h:12 ../ui/prefs.gtkbuilder.h:20 +msgid "Invert color pairs" +msgstr "색상 반전" + +#: ../ui/prefs.glade.h:13 ../ui/prefs.gtkbuilder.h:21 +msgid "Normal Text" +msgstr "일반 텍스트" + +#: ../ui/prefs.glade.h:14 ../ui/prefs.gtkbuilder.h:22 +msgid "Highlight" +msgstr "강조" + +#: ../ui/prefs.glade.h:15 ../ui/prefs.gtkbuilder.h:23 +msgid "Font Colors" +msgstr "글꼴 색상" + +#: ../ui/prefs.glade.h:16 ../ui/prefs.gtkbuilder.h:24 +msgid "Font Sizes" +msgstr "글꼴 크기" + +#: ../ui/prefs.glade.h:17 ../ui/prefs.gtkbuilder.h:25 +msgid "All displayed font sizes are relative to this choice" +msgstr "표시한 모든 글꼴의 크기는 선택에 따라 다릅니다." + +#: ../ui/prefs.glade.h:18 ../ui/prefs.gtkbuilder.h:26 +msgid "Base font size" +msgstr "기본 글꼴 크기" + +#: ../ui/prefs.glade.h:19 +msgid "" +"-2\n" +"-1\n" +"+0\n" +"+1\n" +"+2\n" +"+3\n" +"+4\n" +"+5" +msgstr "" +"-2\n" +"-1\n" +"+0\n" +"+1\n" +"+2\n" +"+3\n" +"+4\n" +"+5" + +#: ../ui/prefs.glade.h:27 ../ui/prefs.gtkbuilder.h:27 +msgid "Commonly -1, to make verse numbers less obtrusive" +msgstr "절 번호를 덜 눈에 띄게 하는 일반 값은 -1입니다" + +#: ../ui/prefs.glade.h:28 ../ui/prefs.gtkbuilder.h:28 +msgid "Verse number size" +msgstr "절 번호 크기" + +#: ../ui/prefs.glade.h:29 ../ui/prefs.gtkbuilder.h:29 +msgid "" +"Name and size choice for any module in a given language; still overridden by " +"a specific choice on a particular module" +msgstr "" +"설정 언어로 이루어진 임의의 모듈에 대해 선택한 이름과 크기이며, 각각의 모듈" +"에 대해 개별 설정한 내용이 여전히 우선합니다." + +#: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30 +msgid "Font preferences, per language" +msgstr "언어별 글꼴 크기" + +#: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 +msgid "Language Font Combo" +msgstr "언어 글꼴 추가 기능" + +#: ../ui/prefs.glade.h:32 ../ui/prefs.gtkbuilder.h:32 +msgid "Font Misc" +msgstr "글꼴 기타" + +#: ../ui/prefs.glade.h:33 ../ui/prefs.gtkbuilder.h:33 +msgid "BibleSync" +msgstr "BibleSync" + +#: ../ui/prefs.glade.h:34 ../ui/prefs.gtkbuilder.h:34 +msgid "" +"Xiphos is the first Bible study program to provide an implementation of " +"BibleSync, a synchronization protocol for Bible programs. If you work with " +"multiple Bible programs, or if you work in a team, or if you have classroom " +"activities using shared study, BibleSync can be a useful tool for you. " +"BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible " +"applications of your own, or in a working team; Speaker, to drive a lecture " +"audience's Bible programs to follow along; Audience, to receive the " +"speaker's navigation." +msgstr "" +"xiphos는 성경 프로그램을 동기화 할 BibleSync의 구현 기능을 제공하는 성경 공" +"부 프로그램입니다. 여러 성경 프로그램으로 작업하거나, 모임에서 작업하거나, 열" +"린 공부 모임에서 교리 공부 활동을 한다면, BibleSync가 그 해답을 제공해줄 수 " +"있습니다. BibleSync는 총 세가지 방식 중 한가지 방식으로 동작합니다. 사용자 여" +"러분 또는 모임에서 여러 성경 프로그램으로 동기화할 개인용 사용 방식, 청중" +"이 성경 프로그램을 따라오도록 이끄는 독서자 내지는 연사용 사용 방식, 마지막으" +"로 일반 성도가 연사의 탐색 내용을 받아 보는 청중용 사용 방식이 있습니다." + +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" +msgstr " 모드:" + +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 +msgid "Select the mode in which BibleSync should operate." +msgstr "BibleSync가 동작할 모드를 선택하십시오." + +#: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 +msgid "_Off" +msgstr "끔(_O)" + +#: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 +msgid "Disable BibleSync." +msgstr "BibleSync를 비활성화합니다." + +#: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 +msgid "BSP off radio button" +msgstr "BSP 끔 라디오 단추" + +#: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 +msgid "_Speaker" +msgstr "독서자(_S)" + +#: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 +msgid "Enable BibleSync as the speaker." +msgstr "BibleSync를 독서자로 활성화합니다." + +#: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 +msgid "BSP speaker radio button" +msgstr "BSP 독서자 라디오 단추" + +#: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 +msgid "_Audience" +msgstr "청자(_A)" + +#: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 +msgid "Enable BibleSync as a member of the audience." +msgstr "BibleSync를 청중 구성원으로 활성화합니다." + +#: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 +msgid "BSP audience radio button" +msgstr "BSP 청중 라디오 단추" + +#: ../ui/prefs.glade.h:46 ../ui/prefs.gtkbuilder.h:46 +msgid "_Personal" +msgstr "개인(_P)" + +#: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 +msgid "Enable BibleSync for personal or team use." +msgstr "개인 또는 조직이 사용할 용도로 BibleSync를 활성화합니다." + +#: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 +msgid "BSP personal radio button" +msgstr "BSP 개인 라디오 단추" + +#: ../ui/prefs.glade.h:49 ../ui/prefs.gtkbuilder.h:49 +msgid "Private" +msgstr "개인용" + +#: ../ui/prefs.glade.h:50 ../ui/prefs.gtkbuilder.h:50 +msgid "" +"When in Personal mode, only programs running on this machine will hear your " +"navigation." +msgstr "" +"개인용 모드를 선택하면, 이 머신에서 실행하는 프로그램만 탐색요청을 받아들입니" +"다." + +#: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 +msgid "BSP privacy button" +msgstr "BSP 개인 정보 단추" + +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" +msgstr "탐색:" + +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 +msgid "Choose how to accept incoming navigation synchronization." +msgstr "탐색 동기화를 어떻게 받아들일지지 선택하십시오." + +#: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 +msgid "_Direct" +msgstr "직접(_D)" + +#: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 +msgid "BibleSync navigation will send Xiphos directly to the verse indicated." +msgstr "BibleSync 탐색에서는 표시 구절을 xiphos로 바로 보냅니다." + +#: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 +msgid "BSP nav direct radio button" +msgstr "BSP 탐색 직접 라디오 단추" + +#: ../ui/prefs.glade.h:57 ../ui/prefs.gtkbuilder.h:57 +msgid "_Verse list" +msgstr "절 목록(_V)" + +#: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 +msgid "BibleSync navigation will use Xiphos' sidebar verse list." +msgstr "BibleSync 탐색에서는 xiphos 측면의 절 목록을 사용합니다." + +#: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 +msgid "BSP nav verse list radio button" +msgstr "BSP 탐색 절 목록 라디오 단추" + +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" +msgstr "듣기:" + +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 +msgid "Xiphos will listen to Speakers according to choice here." +msgstr "xiphos는 여기에서 선택한 대로 연사의 전송 내용을 감청합니다." + +#: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 +msgid "Selective" +msgstr "선택" + +#: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 +msgid "Choose the Speakers to be followed." +msgstr "팔로잉할 독서자를 선택하십시오." + +#: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 +msgid "BSP listen some radio button" +msgstr "BSP에서 일부 라디오 단추 선택 내용 감청" + +#: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 +msgid "All" +msgstr "모두" + +#: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 +msgid "All Speakers will be followed." +msgstr "모든 독서자를 끌어옵니다." + +#: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 +msgid "BSP listen all radio button" +msgstr "BSP 모두 듣기 라디오 단추" + +#: ../ui/prefs.glade.h:68 ../ui/prefs.gtkbuilder.h:68 +msgid "None" +msgstr "없음" + +#: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 +msgid "No Speakers will be followed." +msgstr "청자를 끌어오지 않습니다." + +#: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 +msgid "BSP listen none radio button" +msgstr "BSP에서 라디오 단추 선택 내용 감청하지 않음" + +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "특수:" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 +msgid "" +"Additional traces can be presented during BibleSync operation by enabling " +"presence, mismatch, and debug. Beware enabling these, they can be very " +"chatty. Also, decide whether to allow group parameter as Xiphos' tab number." +msgstr "" +"과정 기록, 불일치, 디버깅을 활성화하면 BibleSync가 동작하는 과정에 추가 기록" +"이 나타납니다. 이들 항목을 활성화하면 로그 내용이 수다스러워질 수 있음을 참고" +"하십시오. 또한 xiphos 탭 번호 처럼 그룹 매개 변수를 허용할지 여부도 결정하십" +"시오." + +#: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 +msgid "Presence" +msgstr "과정 기록" + +#: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 +msgid "Presence announcements will be shown in dialogs." +msgstr "과정 기록은 대화상자에 나타납니다." + +#: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 +msgid "BSP presence button" +msgstr "BSP 과정 기록 표시 단추" + +#: ../ui/prefs.glade.h:76 ../ui/prefs.gtkbuilder.h:76 +msgid "Mismatch" +msgstr "불일치" + +#: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 +msgid "Mismatches from your session will be shown in dialogs." +msgstr "세션 불일치 내용은 대화상자에 나타납니다." + +#: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 +msgid "BSP mismatch button" +msgstr "BSP 불일치 단추" + +#: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 +msgid "Debug" +msgstr "디버깅" + +#: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 +msgid "Packet tracing." +msgstr "패킷 추적 중." + +#: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 +msgid "BSP event debug button" +msgstr "BSP 이벤트 디버깅 단추" + +#: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 +msgid "_Group as tab" +msgstr "탭 그룹(_G)" + +#: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 +msgid "" +"Interpret the protocol's group number parameter as Xiphos' tab number. " +"Disabling this may be necessary if some Speakers' use of group number is not " +"appropriate as a tab number." +msgstr "" +"프로토콜의 그룹 번호 매개변수를 xiphos의 탭 번호로 해석합니다. 일부 독서자의 " +"그룹 번호가 탭 번호로 적합하지 않다면 이 설정의 비활성화가 필요합니다." + +#: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 +msgid "BSP event group-as-tab button" +msgstr "BSP 이벤트 탭 그룹 단추" + +#: ../ui/prefs.glade.h:86 ../ui/prefs.gtkbuilder.h:86 +msgid "General" +msgstr "일반" + +#: ../ui/prefs.glade.h:87 ../ui/prefs.gtkbuilder.h:87 +msgid "" +"Select a particular language for interface display, other than your usual " +"setting" +msgstr "다른 설정 내용이 아닌 인터페이스를 표시할 각각의 언어를 선택하십시오" + +#: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88 +msgid "Special Locale (requires restart)" +msgstr "특수 로캘(다시 시작해야 함)" + +#: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 +msgid "Special Locale Combo" +msgstr "특수 로캘 추가 기능" + +#: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 +msgid "Show splash screen at start up" +msgstr "시작할 때 스플래시 화면 표시" + +#: ../ui/prefs.glade.h:91 ../ui/prefs.gtkbuilder.h:91 +msgid "Show Daily Devotion at start up" +msgstr "시작할 때 매일 말씀 표시" + +#: ../ui/prefs.glade.h:92 ../ui/prefs.gtkbuilder.h:92 +msgid "" +"If you have set a preferred daily devotion module, its entry for today will " +"be shown at startup." +msgstr "" +"올바른 매일 말씀 모듈을 설정하지 않았다면, 프로그램을 시작할 때 오늘의 항목" +"이 나타납니다." + +#: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93 +msgid "Use default Dictionary" +msgstr "기본 사전 사용" + +#: ../ui/prefs.glade.h:94 ../ui/prefs.gtkbuilder.h:94 +msgid "" +"Make double-click of a word always use default dictionary instead of " +"dictionary currently displayed" +msgstr "현재 표시한 사전 대신 기본 사전을 항상 사용하려면 두 번 누릅니다" + +#: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 +msgid "Use default Dictionary Checkbox" +msgstr "기본 사전을 사용하도록 하는 확인 상자" + +#: ../ui/prefs.glade.h:96 ../ui/prefs.gtkbuilder.h:96 +msgid "Scroll to Previous/Next Chapter" +msgstr "이전/다음 장으로 스크롤" + +#: ../ui/prefs.glade.h:97 ../ui/prefs.gtkbuilder.h:97 +msgid "Use Bible Text scroll bar to scroll to previous or next chapter" +msgstr "성경의 이전 또는 다음 장으로 스크롤 하도록 스크롤바를 사용합니다" + +#: ../ui/prefs.glade.h:98 ../ui/prefs.gtkbuilder.h:98 +msgid "Scroll to Previous/Next Chapter Checkbox" +msgstr "이전/다음 장으로 스크롤하는 확인 상자" + +#: ../ui/prefs.glade.h:99 ../ui/prefs.gtkbuilder.h:99 +msgid "Resize images" +msgstr "그림 크기 조절" + +#: ../ui/prefs.glade.h:100 ../ui/prefs.gtkbuilder.h:100 +msgid "Automatically resize image content to fit the pane" +msgstr "그림을 창에 자동으로 맞추려 크기 조절합니다" + +#: ../ui/prefs.glade.h:101 ../ui/prefs.gtkbuilder.h:101 +msgid "Resize images checkbox" +msgstr "그림 크기를 조절하도록 하는 확인 상자" + +#: ../ui/prefs.glade.h:102 ../ui/prefs.gtkbuilder.h:102 +msgid "Highlight current verse" +msgstr "현재 절 강조" + +#: ../ui/prefs.glade.h:103 ../ui/prefs.gtkbuilder.h:103 +msgid "Apply high-contrast highlight to current verse - see color pickers" +msgstr "현재 절을 고대비로 강조합니다 - 색 선택 창 참고" + +#: ../ui/prefs.glade.h:104 ../ui/prefs.gtkbuilder.h:104 +msgid "Highlight current verse check box" +msgstr "현재 절을 강조하는 확인 상자" + +#: ../ui/prefs.glade.h:105 ../ui/prefs.gtkbuilder.h:105 +msgid "Highlight user annotations" +msgstr "사용자 주석 강조" + +#: ../ui/prefs.glade.h:106 ../ui/prefs.gtkbuilder.h:106 +msgid "Use inverted highlight on user-annotated verses" +msgstr "사용자가 별도로 주석을 단 절을 역상 강조하는 기능을 사용합니다" + +#: ../ui/prefs.glade.h:107 ../ui/prefs.gtkbuilder.h:107 +msgid "Highlight user annotations check box" +msgstr "사용자 주석 강조 확인 상자" + +#: ../ui/prefs.glade.h:108 ../ui/prefs.gtkbuilder.h:108 +msgid "Cross-references in verse list" +msgstr "절 목록 교차 참조" + +#: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109 +msgid "Use the verse list for Bible cross-references instead of the previewer" +msgstr "미리보기 대신 성경 교차 참조의 절 목록을 사용합니다" + +#: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 +msgid "Xrefs in verse list check box" +msgstr "절 목록 교차 참조 확인 상자" + +#: ../ui/prefs.glade.h:111 ../ui/prefs.gtkbuilder.h:111 +msgid "Enable Prayer Lists" +msgstr "기도 목록 활성화" + +#: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112 +msgid "Make journals/prayer lists available" +msgstr "묵상 일기/기도 목록을 활성화합니다" + +#: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113 +msgid "Enable Prayer Lists Checkbox" +msgstr "기도 목록 활성화 확인 상자" + +#: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "상태 표시줄 활성화" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "상태 표시줄을 활성화/비활성화합니다." + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 +msgid "Verse number" +msgstr "절 번호" + +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 +msgid "Offset the verse number in several ways" +msgstr "다양한 방식의 절 번호 오프셋입니다" + +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +msgid "Show verse number in bold text" +msgstr "절 번호를 굵은 문자로 표시" + +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +msgid "Verse number bold checkbox" +msgstr "절 번호를 굵게 하는 확인 상자" + +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +msgid "Brackets" +msgstr "꺽쇠괄호" + +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +msgid "Show verse number with [surrounding brackets]" +msgstr "절 번호를 [꺽쇠 괄호로 둘러싸서] 표시합니다" + +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +msgid "Verse number bracket checkbox" +msgstr "절 번호를 꺽쇠 괄호로 표시하는 확인 상자" + +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +msgid "Superscript" +msgstr "위첨자" + +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +msgid "Show verse number as a superscript" +msgstr "절 번호를 위첨자로 표시" + +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +msgid "Verse number superscript checkbox" +msgstr "절 번호 위첨자로 표시하는 확인 상자" + +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +msgid "StudyPad default directory" +msgstr "학습장 기본 디렉터리" + +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +msgid "Select A Directory" +msgstr "디렉터리 선택" + +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +msgid "StudyPad default directory combo" +msgstr "학습장 기본 디렉터리 기능을 붙입니다" + +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +msgid "General Misc" +msgstr "일반 기타" + +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +msgid "Main Window Modules" +msgstr "메인 창 모듈" + +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 +msgid "Biblical Text" +msgstr "성경 문구" + +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +msgid "Change Biblical Text Combo" +msgstr "성경 문구 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +msgid "Change Commentary Combo" +msgstr "해설 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +msgid "Change Dictionary Combo" +msgstr "사전 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +msgid "Change Book Combo" +msgstr "책 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 +msgid "Modules" +msgstr "모듈" + +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 +msgid "Clear all modules from the list" +msgstr "목록에서 모든 모듈 지우기" + +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 +msgid "Clear Modules from List Button" +msgstr "목록 단추에서 모듈 지우기" + +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 +msgid "Remove the selected module from the list" +msgstr "목록에서 선택한 모듈 제거" + +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 +msgid "Delete Selected Module From List Button" +msgstr "목록 단추에서 선택한 모듈 삭제" + +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +msgid "Open a dialog to select modules" +msgstr "선택한 모듈을 대화상자로 열기" + +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 +msgid "Add Modules" +msgstr "모듈 추가" + +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 +msgid "Open Selection Dialog Button" +msgstr "선택 대화상자 단추 열기" + +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +msgid "Modules Parallel" +msgstr "모듈 병렬" + +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +msgid "Special Purpose Modules" +msgstr "특정 용도 모듈" + +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +msgid "Daily Devotional" +msgstr "매일 묵상" + +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +msgid "Daily Devotional Combo" +msgstr "매일 묵상 추가 기능" + +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +msgid "Hebrew Lexicon" +msgstr "히브리어 어휘" + +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +msgid "Hebrew Lexicon Combo" +msgstr "희브리어 어휘 추가 기능" + +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +msgid "Greek Lexicon" +msgstr "그리스어 어휘" + +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +msgid "Greek Lexicon Combo" +msgstr "그리스어 어휘 추가 기능" + +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +msgid "Default Dictionary" +msgstr "기본 사전" + +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +msgid "Change Default Dictionary Combo" +msgstr "기본 사전 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +msgid "Personal Notes" +msgstr "개인 메모" + +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 +msgid "Change Personal Notes Combo" +msgstr "개별 참고 추가 기능 바꾸기" + +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 +msgid "Modules Misc" +msgstr "모듈 기타" + +#: ../ui/prefs.gtkbuilder.h:1 +msgid "-2" +msgstr "-2" + +#: ../ui/prefs.gtkbuilder.h:2 +msgid "-1" +msgstr "-1" + +#: ../ui/prefs.gtkbuilder.h:4 +msgid "+1" +msgstr "+1" + +#: ../ui/prefs.gtkbuilder.h:5 +msgid "+2" +msgstr "+2" + +#: ../ui/prefs.gtkbuilder.h:6 +msgid "+3" +msgstr "+3" + +#: ../ui/prefs.gtkbuilder.h:7 +msgid "+4" +msgstr "+4" + +#: ../ui/prefs.gtkbuilder.h:8 +msgid "+5" +msgstr "+5" + +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "상태 표시줄 활성화/비활성화" + +#: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 +msgid "Advanced Search" +msgstr "고급 검색" + +#: ../ui/search-dialog.glade.h:2 ../ui/search-dialog.gtkbuilder.h:2 +msgid "_Lucene Search Syntax" +msgstr "루씬 검색 문법(_L)" + +#: ../ui/search-dialog.glade.h:3 ../ui/search-dialog.gtkbuilder.h:3 +msgid "" +"Open a brief explanation of the syntax used for optimized \"lucene\" " +"searches." +msgstr "최적화 \"루씬\" 검색에 사용하는 문법의 개요 설명을 엽니다." + +#: ../ui/search-dialog.glade.h:4 ../ui/search-dialog.gtkbuilder.h:4 +msgid "_Attribute Search" +msgstr "속성 검색(_A)" + +#: ../ui/search-dialog.glade.h:5 ../ui/search-dialog.gtkbuilder.h:5 +msgid "Open a brief explanation of attribute-based searches." +msgstr "속성 기반 검색에서 개요 설명 부분을 엽니다." + +#: ../ui/search-dialog.glade.h:6 ../ui/search-dialog.gtkbuilder.h:7 +msgid "for " +msgstr "대상 " + +#: ../ui/search-dialog.glade.h:7 ../ui/search-dialog.gtkbuilder.h:8 +msgid "Main Search Entry" +msgstr "메인 검색 항목" + +#: ../ui/search-dialog.glade.h:8 ../ui/search-dialog.gtkbuilder.h:9 +msgid "Start/stop searching" +msgstr "검색 시작/멈춤" + +#: ../ui/search-dialog.glade.h:9 ../ui/search-dialog.gtkbuilder.h:10 +msgid "Find Button" +msgstr "찾기 단추" + +#: ../ui/search-dialog.glade.h:10 ../ui/search-dialog.gtkbuilder.h:11 +msgid "Search Criteria Treeview" +msgstr "검색 기준 트리 보기" + +#: ../ui/search-dialog.glade.h:11 ../ui/search-dialog.gtkbuilder.h:12 +msgid "Scope" +msgstr "범위" + +#: ../ui/search-dialog.glade.h:12 ../ui/search-dialog.gtkbuilder.h:14 +msgid "Search entire module" +msgstr "전체 모듈을 검색합니다" + +#: ../ui/search-dialog.glade.h:13 ../ui/search-dialog.gtkbuilder.h:13 +msgid "Entire module" +msgstr "전체 모듈" + +#: ../ui/search-dialog.glade.h:14 ../ui/search-dialog.gtkbuilder.h:15 +msgid "Entire module radiobutton" +msgstr "전체 모듈 라디오 단추" + +#: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17 +msgid "Use the results of the last search as the scope of the search" +msgstr "마지막 결과를 검색 범위로 활용합니다" + +#: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16 +msgid "Current results" +msgstr "현재 결과" + +#: ../ui/search-dialog.glade.h:17 ../ui/search-dialog.gtkbuilder.h:18 +msgid "Current results radiobutton" +msgstr "현재 결과 라디오 단추" + +#: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20 +msgid "Use a custom range for the scope of the search" +msgstr "검색 범위 지정시 개별 범위를 활용합니다" + +#: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19 +msgid "Custom verse range" +msgstr "개별 절 범위" + +#: ../ui/search-dialog.glade.h:20 ../ui/search-dialog.gtkbuilder.h:21 +msgid "Custom verse range radiobutton" +msgstr "개별 절 범위 라디오 단추" + +#: ../ui/search-dialog.glade.h:21 ../ui/search-dialog.gtkbuilder.h:22 +msgid "Custom Range Selector Combo" +msgstr "개별 범위 선택 추가 기능" + +#: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25 +msgid "Use a single module for the search" +msgstr "검색에 단일 모듈을 사용합니다" + +#: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24 +msgid "Single module" +msgstr "단일 모듈" + +#: ../ui/search-dialog.glade.h:25 ../ui/search-dialog.gtkbuilder.h:26 +msgid "Single module radiobutton" +msgstr "단일 모듈 라디오 단추" + +#: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28 +msgid "Use the current module list for the search" +msgstr "검색시 현재 모듈 목록을 사용합니다" + +#: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27 +msgid "Module list" +msgstr "모듈 목록" + +#: ../ui/search-dialog.glade.h:28 ../ui/search-dialog.gtkbuilder.h:29 +msgid "Module list radiobutton" +msgstr "모듈 목록 라디오 단추" + +#: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31 +msgid "Use a custom module list for the search" +msgstr "검색시 개별 모듈 목록을 사용합니다" + +#: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30 +msgid "Custom module list" +msgstr "개별 모듈 목록" + +#: ../ui/search-dialog.glade.h:31 ../ui/search-dialog.gtkbuilder.h:32 +msgid "Custom module list radiobutton" +msgstr "개별 모듈 목록 라디오 단추" + +#: ../ui/search-dialog.glade.h:32 +msgid "Custom Module List Combo" +msgstr "개별 모듈 목록 추가 기능" + +#: ../ui/search-dialog.glade.h:33 ../ui/search-dialog.gtkbuilder.h:33 +msgid "Search Type" +msgstr "검색 형식" + +#: ../ui/search-dialog.glade.h:34 ../ui/search-dialog.gtkbuilder.h:35 +msgid "" +"Fast, featureful, index-based search\n" +"Indexes must have been built beforehand:\n" +"See Module Manager's maintenance functions" +msgstr "" +"빠르고, 기능에 충실하며, 색인 기반으로 검색합니다\n" +"색인은 사전에 처리했어야 합니다:\n" +"모듈 관리자 관리 기능을 참고하십시오" + +#: ../ui/search-dialog.glade.h:37 ../ui/search-dialog.gtkbuilder.h:34 +msgid "Optimized (\"Lucene\")" +msgstr "최적화(\"루씬\")" + +#: ../ui/search-dialog.glade.h:38 ../ui/search-dialog.gtkbuilder.h:38 +msgid "Optimized (\"Lucene\") radiobutton" +msgstr "최적화(\"루씬\") 라디오 단추" + +#: ../ui/search-dialog.glade.h:40 ../ui/search-dialog.gtkbuilder.h:40 +msgid "Multi word radiobutton" +msgstr "여러 단어 일치 라디오 단추" + +#: ../ui/search-dialog.glade.h:42 ../ui/search-dialog.gtkbuilder.h:42 +msgid "Regular expression radiobutton" +msgstr "정규 표현식 라디오 단추" + +#: ../ui/search-dialog.glade.h:44 ../ui/search-dialog.gtkbuilder.h:44 +msgid "Exact phrase radiobutton" +msgstr "어구 일치 라디오 단추" + +#: ../ui/search-dialog.glade.h:45 ../ui/search-dialog.gtkbuilder.h:46 +msgid "Make selections on the Attribute Search tab" +msgstr "속성 검색 탭에서 선택하십시오" + +#: ../ui/search-dialog.glade.h:46 ../ui/search-dialog.gtkbuilder.h:45 +msgid "Attributes" +msgstr "속성" + +#: ../ui/search-dialog.glade.h:47 ../ui/search-dialog.gtkbuilder.h:47 +msgid "Attributes radiobutton" +msgstr "속성 라디오 단추" + +#: ../ui/search-dialog.glade.h:48 ../ui/search-dialog.gtkbuilder.h:48 +msgid "Options" +msgstr "옵션" + +#: ../ui/search-dialog.glade.h:50 ../ui/search-dialog.gtkbuilder.h:50 +msgid "Match case checkbox" +msgstr "대소문자를 일치하는 확인 상자입니다" + +#: ../ui/search-dialog.glade.h:51 ../ui/search-dialog.gtkbuilder.h:51 +msgid "Search Criteria" +msgstr "검색 기준" + +#: ../ui/search-dialog.glade.h:52 ../ui/search-dialog.gtkbuilder.h:52 +msgid "Show in main window" +msgstr "메인 창 표시" + +#: ../ui/search-dialog.glade.h:53 ../ui/search-dialog.gtkbuilder.h:53 +msgid "Save search results as bookmarks" +msgstr "검색 결과를 책갈피로 저장" + +#: ../ui/search-dialog.glade.h:54 ../ui/search-dialog.gtkbuilder.h:54 +msgid "Export current search results" +msgstr "현재 검색 결과 내보내기" + +#: ../ui/search-dialog.glade.h:55 ../ui/search-dialog.gtkbuilder.h:55 +msgid "Export" +msgstr "내보내기" + +#: ../ui/search-dialog.glade.h:56 ../ui/search-dialog.gtkbuilder.h:56 +msgid "Clear lists for new search" +msgstr "새 검색 목록 지우기" + +#: ../ui/search-dialog.glade.h:57 ../ui/search-dialog.gtkbuilder.h:57 +msgid "Found" +msgstr "찾음" + +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 +msgid "Result Summary Window" +msgstr "결과 요약 창" + +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 +msgid "Result Summary Table" +msgstr "결과 요약 표" + +#: ../ui/search-dialog.glade.h:60 ../ui/search-dialog.gtkbuilder.h:60 +msgid "Search Results" +msgstr "검색 결과" + +#: ../ui/search-dialog.glade.h:61 ../ui/search-dialog.gtkbuilder.h:61 +msgid "Preview" +msgstr "미리보기" + +#: ../ui/search-dialog.glade.h:62 ../ui/search-dialog.gtkbuilder.h:62 +msgid "Results" +msgstr "결과" + +#: ../ui/search-dialog.glade.h:63 ../ui/search-dialog.gtkbuilder.h:63 +msgid "Create new custom range" +msgstr "새 사용자 범위 만드릭" + +#: ../ui/search-dialog.glade.h:64 ../ui/search-dialog.gtkbuilder.h:64 +msgid "New Range Button" +msgstr "범위를 새로 정의하는 단추입니다" + +#: ../ui/search-dialog.glade.h:65 ../ui/search-dialog.gtkbuilder.h:65 +msgid "Save custom range" +msgstr "개별 범위 저장" + +#: ../ui/search-dialog.glade.h:66 ../ui/search-dialog.gtkbuilder.h:66 +msgid "Save Range Button" +msgstr "범위를 저장하는 단추입니다" + +#: ../ui/search-dialog.glade.h:67 ../ui/search-dialog.gtkbuilder.h:67 +msgid "Delete selected range" +msgstr "선택한 범위 삭제" + +#: ../ui/search-dialog.glade.h:68 ../ui/search-dialog.gtkbuilder.h:68 +msgid "Delete Range Button" +msgstr "범위를 삭제하는 단추입니다" + +#: ../ui/search-dialog.glade.h:69 ../ui/search-dialog.gtkbuilder.h:69 +msgid "Ranges" +msgstr "범위" + +#: ../ui/search-dialog.glade.h:70 ../ui/search-dialog.gtkbuilder.h:70 +msgid "Range Name" +msgstr "범위 이름" + +#: ../ui/search-dialog.glade.h:71 ../ui/search-dialog.gtkbuilder.h:71 +msgid "Range Name Entry" +msgstr "범위 이름 항목" + +#: ../ui/search-dialog.glade.h:72 ../ui/search-dialog.gtkbuilder.h:72 +msgid "Range Definition" +msgstr "범위 정의" + +#: ../ui/search-dialog.glade.h:73 ../ui/search-dialog.gtkbuilder.h:73 +msgid "Range Definition Entry" +msgstr "범위 정의 항목" + +#: ../ui/search-dialog.glade.h:74 ../ui/search-dialog.gtkbuilder.h:74 +msgid "e.g. Matt-John;Rev4" +msgstr "e.g. 마태-요한;4장" + +#: ../ui/search-dialog.glade.h:75 ../ui/search-dialog.gtkbuilder.h:75 +msgid "Custom Range Preview" +msgstr "개별 범위 미리보기" + +#: ../ui/search-dialog.glade.h:76 ../ui/search-dialog.gtkbuilder.h:76 +msgid "Custom Verse Ranges" +msgstr "구절 범위 개별" + +#: ../ui/search-dialog.glade.h:77 ../ui/search-dialog.gtkbuilder.h:77 +msgid "Create a new module list" +msgstr "새 모듈 목록 만들기" + +#: ../ui/search-dialog.glade.h:78 ../ui/search-dialog.gtkbuilder.h:78 +msgid "New Custom Module List Button" +msgstr "개별 모듈 목록을 새로 만드는 단추" + +#: ../ui/search-dialog.glade.h:79 ../ui/search-dialog.gtkbuilder.h:79 +msgid "Save the module list" +msgstr "모듈 목록 저장" + +#: ../ui/search-dialog.glade.h:80 ../ui/search-dialog.gtkbuilder.h:80 +msgid "Save Custom Module List Button" +msgstr "개별 모듈 목록을 저장하는 단추" + +#: ../ui/search-dialog.glade.h:81 ../ui/search-dialog.gtkbuilder.h:81 +msgid "Delete the selected list" +msgstr "선택한 목록 삭제" + +#: ../ui/search-dialog.glade.h:82 ../ui/search-dialog.gtkbuilder.h:82 +msgid "Clear Custom Module List Button" +msgstr "개별 모듈 목록을 지우는 단추" + +#: ../ui/search-dialog.glade.h:83 ../ui/search-dialog.gtkbuilder.h:83 +msgid "Module Lists" +msgstr "모듈 목록" + +#: ../ui/search-dialog.glade.h:84 ../ui/search-dialog.gtkbuilder.h:84 +msgid "List Name" +msgstr "목록 이름" + +#: ../ui/search-dialog.glade.h:85 ../ui/search-dialog.gtkbuilder.h:85 +msgid "Custom Module List Name Entry" +msgstr "개별 목록 이름 항목" + +#: ../ui/search-dialog.glade.h:90 ../ui/search-dialog.gtkbuilder.h:90 +msgid "Open a dialog to select modules to add to the list" +msgstr "목록에 추가하려 선택한 모듈을 대화상자에 엽니다" + +#: ../ui/search-dialog.glade.h:93 ../ui/search-dialog.gtkbuilder.h:93 +msgid "Custom Module Lists" +msgstr "개별 모듈 목록" + +#: ../ui/search-dialog.glade.h:94 ../ui/search-dialog.gtkbuilder.h:94 +msgid "Attribute" +msgstr "속성" + +#: ../ui/search-dialog.glade.h:95 ../ui/search-dialog.gtkbuilder.h:96 +msgid "Search for Strongs Numbers like G4442 or H1121" +msgstr "G4442 또는 H1121와 같은 스트롱 번호로 검색" + +#: ../ui/search-dialog.glade.h:96 ../ui/search-dialog.gtkbuilder.h:95 +msgid "Strongs Numbers" +msgstr "스트롱 번호" + +#: ../ui/search-dialog.glade.h:97 ../ui/search-dialog.gtkbuilder.h:97 +msgid "Strongs Numbers radiobutton" +msgstr "스트롱 번호 라디오 단추" + +#: ../ui/search-dialog.glade.h:98 ../ui/search-dialog.gtkbuilder.h:99 +msgid "Search for Morphological tags" +msgstr "어형론상 태그 검색" + +#: ../ui/search-dialog.glade.h:100 ../ui/search-dialog.gtkbuilder.h:100 +msgid "Morphological Tags radiobutton" +msgstr "어형론상 태그 라디오 단추" + +#: ../ui/search-dialog.glade.h:101 ../ui/search-dialog.gtkbuilder.h:102 +msgid "Search in footnotes" +msgstr "각주에서 검색" + +#: ../ui/search-dialog.glade.h:103 ../ui/search-dialog.gtkbuilder.h:103 +msgid "Footnotes radiobutton" +msgstr "각주 라디오 단추" + +#: ../ui/search-dialog.glade.h:104 ../ui/search-dialog.gtkbuilder.h:104 +msgid "Results Display Options" +msgstr "결과 표시 옵션" + +#: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106 +msgid "In modules that have Strong's Numbers" +msgstr "스트롱 번호를 가진 모듈에서" + +#: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105 +msgid "Show Strong's Numbers" +msgstr "스트롱 번호 표시" + +#: ../ui/search-dialog.glade.h:107 ../ui/search-dialog.gtkbuilder.h:107 +msgid "Show Strong's Numbers checkbox" +msgstr "스트롱 번호 확인 상자 표시" + +#: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109 +msgid "In modules that have Morphological Tags" +msgstr "어형론상 태그를 보유한 모듈에서" + +#: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108 +msgid "Show Morphological Tags" +msgstr "어형론상 태그 표시" + +#: ../ui/search-dialog.glade.h:110 ../ui/search-dialog.gtkbuilder.h:110 +msgid "Show Morphological Tags checkbox" +msgstr "어형론상 태그를 표시하는 표시 상자" + +#: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112 +msgid "In modules that have Footnotes" +msgstr "각주가 있는 모듈에서" + +#: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111 +msgid "Show Footnotes" +msgstr "각주 표시" + +#: ../ui/search-dialog.glade.h:113 ../ui/search-dialog.gtkbuilder.h:113 +msgid "Show Footnotes checkbox" +msgstr "각주 확인 상자 표시" + +#: ../ui/search-dialog.glade.h:114 ../ui/search-dialog.gtkbuilder.h:114 +msgid "Attribute Search" +msgstr "속성 검색" + +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "모듈 선택" + +#: ../ui/search-dialog.gtkbuilder.h:6 +msgid "search module" +msgstr "검색 모듈" + +#: ../ui/xi-export-bookmarks.glade.h:1 +msgid "Export Bookmark Folder" +msgstr "책갈피 폴더 내보내기" + +#: ../ui/xi-export-bookmarks.glade.h:2 +msgid "Export to:" +msgstr "내보내기 대상:" + +#: ../ui/xi-export-bookmarks.glade.h:3 +msgid "Xiphos bookmarks" +msgstr "xiphos 책갈피" + +#: ../ui/xi-export-bookmarks.glade.h:4 +msgid "Html" +msgstr "HTML" + +#: ../ui/xi-export-bookmarks.glade.h:5 +msgid "Plain text" +msgstr "일반 본문" + +#: ../ui/xi-export-bookmarks.glade.h:6 +msgid "Include Bible text" +msgstr "성경 본문 포함" + +#: ../ui/xi-export-bookmarks.glade.h:7 +msgid "gtk-cancel" +msgstr "gtk-cancel" + +#: ../ui/xi-export-bookmarks.glade.h:8 +msgid "gtk-ok" +msgstr "gtk-ok" + +#: ../ui/xi-menus.glade.h:2 ../ui/xi-menus.gtkbuilder.h:2 +msgid "Open Study_pad" +msgstr "학습장 열기(_P)" + +#: ../ui/xi-menus.glade.h:3 ../ui/xi-menus.gtkbuilder.h:3 +msgid "_Open Session" +msgstr "세션 열기(_O)" + +#: ../ui/xi-menus.glade.h:4 +msgid "Open a saved tab settings collection" +msgstr "저장한 탭 설정 모음을 엽니다" + +#: ../ui/xi-menus.glade.h:5 ../ui/xi-menus.gtkbuilder.h:4 +msgid "_Save Session" +msgstr "세션 저장(_S)" + +#: ../ui/xi-menus.glade.h:6 +msgid "Save this collection of tab settings" +msgstr "이 탭 설정 모음을 저장합니다" + +#: ../ui/xi-menus.glade.h:7 ../ui/xi-menus.gtkbuilder.h:5 +msgid "_New Prayerlist/Journal" +msgstr "새 기도 목록/묵상 일기(_N)" + +#: ../ui/xi-menus.glade.h:8 +msgid "Create a new journal or prayerlist from a template" +msgstr "양식을 활용하여 새 묵상 일기 또는 기도 목록을 만듭니다" + +#: ../ui/xi-menus.glade.h:10 ../ui/xi-menus.gtkbuilder.h:7 +msgid "_Search" +msgstr "검색(_S)" + +#: ../ui/xi-menus.glade.h:11 +msgid "Bring the simple sidebar search forward" +msgstr "간단한 가장자리 표시줄 검색창을 띄웁니다" + +#: ../ui/xi-menus.glade.h:12 ../ui/xi-menus.gtkbuilder.h:8 +msgid "_Advanced Search" +msgstr "고급 검색(_A)" + +#: ../ui/xi-menus.glade.h:13 +msgid "Open the advanced search dialog, to run complex queries" +msgstr "복잡한 검색어를 처리할 고급 검색 대화상자를 엽니다." + +#: ../ui/xi-menus.glade.h:14 ../ui/xi-menus.gtkbuilder.h:9 +msgid "_Preferences" +msgstr "기본 설정(_P)" + +#: ../ui/xi-menus.glade.h:15 +msgid "Use module manager to install and remove Sword modules" +msgstr "sword 모듈을 설치하고 제거할 때 모듈 관리자를 사용합니다" + +#: ../ui/xi-menus.glade.h:16 ../ui/xi-menus.gtkbuilder.h:10 +msgid "_Module Manager" +msgstr "모듈 관리자(_M)" + +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "보기(_V)" + +#: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 +msgid "Preview _Daily Devotion" +msgstr "매일 말씀 미리보기(_D)" + +#: ../ui/xi-menus.glade.h:19 +msgid "Show today's entry from your selected daily devotional in the previewer" +msgstr "미리보기에서 선택한 매일 말씀으로 오늘의 항목을 표시합니다" + +#: ../ui/xi-menus.glade.h:20 ../ui/xi-menus.gtkbuilder.h:13 +msgid "_Bible" +msgstr "성경(_B)" + +#: ../ui/xi-menus.glade.h:21 ../ui/xi-menus.gtkbuilder.h:14 +msgid "_Preview" +msgstr "미리보기(_P)" + +#: ../ui/xi-menus.glade.h:22 ../ui/xi-menus.gtkbuilder.h:15 +msgid "_Commentary/Book" +msgstr "해설/책(_C)" + +#: ../ui/xi-menus.glade.h:23 ../ui/xi-menus.gtkbuilder.h:16 +msgid "Dictionar_y" +msgstr "사전(_Y)" + +#: ../ui/xi-menus.glade.h:24 ../ui/xi-menus.gtkbuilder.h:17 +msgid "L_ink Tabs" +msgstr "탭 연결(_I)" + +#: ../ui/xi-menus.glade.h:25 +msgid "Make all tabs' Bibles navigate together" +msgstr "모든 탭에 대해 성경 탐색을 처리합니다" + +#: ../ui/xi-menus.glade.h:26 ../ui/xi-menus.gtkbuilder.h:18 +msgid "_Read Aloud" +msgstr "소리내어 읽기(_R)" + +#: ../ui/xi-menus.glade.h:27 +msgid "Turn on text-to-speech reading of Bible verses as they are selected" +msgstr "선택한 성경 절의 TTS 읽기 기능을 켭니다" + +#: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19 +msgid "Show Verse _Numbers" +msgstr "절 번호 표시(_N)" + +#: ../ui/xi-menus.glade.h:29 +msgid "Display verse numbers in the text" +msgstr "본문 절 번호를 표시합니다" + +#: ../ui/xi-menus.glade.h:30 ../ui/xi-menus.gtkbuilder.h:20 +msgid "_Highlight Current Verse" +msgstr "현재 절 강조(_H)" + +#: ../ui/xi-menus.glade.h:31 +msgid "Apply a high-contrast highlight to the current verse" +msgstr "현재 절을 고대비 강조 표시합니다" + +#: ../ui/xi-menus.glade.h:32 ../ui/xi-menus.gtkbuilder.h:21 +msgid "_Attach/Detach Sidebar" +msgstr "가장자리 표시줄 붙이기/떼어내기(_A)" + +#: ../ui/xi-menus.glade.h:33 +msgid "Operate the sidebar as a separate window" +msgstr "가장자리 표시줄을 별도의 창으로 취급합니다" + +#: ../ui/xi-menus.glade.h:34 ../ui/xi-menus.gtkbuilder.h:22 +msgid "_Show/Hide Attached Sidebar" +msgstr "창에 붙인 가장자리 표시줄 표시/숨김(_S)" + +#: ../ui/xi-menus.glade.h:35 +msgid "Remove the sidebar entirely from view" +msgstr "보기 화면에서 가장자리 표시줄을 완전히 제거합니다" + +#: ../ui/xi-menus.glade.h:36 ../ui/xi-menus.gtkbuilder.h:23 +msgid "Show Parallel View in a _Tab" +msgstr "나란히 보기를 탭에 표시(_T)" + +#: ../ui/xi-menus.glade.h:37 +msgid "Provide the full-chapter parallel Bible window as another tab" +msgstr "전체 장에 대한 성경 나란히 보기 창을 다른 탭처럼 표시합니다" + +#: ../ui/xi-menus.glade.h:38 ../ui/xi-menus.gtkbuilder.h:24 +msgid "Show Previe_wer in the Sidebar" +msgstr "가장자리 표시줄에 미리보기 표시(_W)" + +#: ../ui/xi-menus.glade.h:39 +msgid "Select Previewer position between sidebar or beneath Bible" +msgstr "" +"미리보기 위치를 가장자리 표시줄로 할 지 성경 아랫 부분에 할 지 선택합니다" + +#: ../ui/xi-menus.glade.h:41 ../ui/xi-menus.gtkbuilder.h:26 +msgid "_Contents" +msgstr "내용(_C)" + +#: ../ui/xi-menus.glade.h:42 +msgid "Open the help viewer on the Xiphos manual" +msgstr "도움말 보기 창에 xiphos 도움말을 엽니다" + +#: ../ui/xi-menus.glade.h:43 ../ui/xi-menus.gtkbuilder.h:27 +msgid "_Mailing List" +msgstr "메일링 리스트(_M)" + +#: ../ui/xi-menus.glade.h:44 +msgid "Open a browser on the users' mailing list webpage" +msgstr "사용자 메일링 리스트 웹 페이지를 브라우저에 엽니다" + +#: ../ui/xi-menus.glade.h:45 ../ui/xi-menus.gtkbuilder.h:28 +msgid "_Live Chat" +msgstr "실시간 대화(_L)" + +#: ../ui/xi-menus.glade.h:46 +msgid "Open a browser on an interface to live IRC chat" +msgstr "실시간 IRC 대화 인터페이스를 브라우저에 엽니다" + +#: ../ui/xi-menus.glade.h:47 ../ui/xi-menus.gtkbuilder.h:29 +msgid "_Report Bug" +msgstr "문제점 보고(_R)" + +#: ../ui/xi-menus.glade.h:48 +msgid "Open a browser on our bug tracker" +msgstr "문제점 추적 시스템을 브라우저에 엽니다" + +#: ../ui/xi-menus.glade.h:49 ../ui/xi-menus.gtkbuilder.h:30 +msgid "About _Translation" +msgstr "번역 정보(_T)" + +#: ../ui/xi-menus.glade.h:50 +msgid "Learn about translating the Xiphos interface to other languages" +msgstr "xiphos 인터페이스를 다른 언어로 번역하는 방법을 알아봅니다" + +#: ../ui/xi-menus.glade.h:51 ../ui/xi-menus.gtkbuilder.h:31 +msgid "_About The SWORD Project" +msgstr "SWORD 프로젝트 정보(_A)" + +# 참고: Sword 는 프로젝트 이름 고유 명사이므로 번역하지 말 것. +#: ../ui/xi-menus.glade.h:52 +msgid "Learn about The Sword Project, of which Xiphos is one application" +msgstr "xiphos에 있는 프로그램 중 하나인 sword 프로젝트를 알아봅니다" + +#: ../ui/xi-menus.glade.h:53 ../ui/xi-menus.gtkbuilder.h:32 +msgid "About _Xiphos" +msgstr "xiphos 정보(_X)" + +#: ../ui/xi-menus.glade.h:54 +msgid "Learn about Xiphos" +msgstr "xiphos 배우기" + +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 +msgid "Annotate Verse" +msgstr "절 주석" + +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 +msgid "Open Module" +msgstr "모듈 열기" + +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 +msgid "Note" +msgstr "메모" + +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 +msgid "Open in editor" +msgstr "편집기에서 열기" + +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 +msgid "Verse Per Line" +msgstr "줄 단위 절" + +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 +msgid "Footnote/Cross-ref Markers" +msgstr "각주/교차참조 표시" + +#: ../ui/xi-menus.glade.h:74 +msgid "Show non-anonymous markers e.g. \"*n23\"" +msgstr "\"*n23\" 같은 비 익명 마커 표시" + +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 +msgid "Variants" +msgstr "변형" + +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 +msgid "Image Content" +msgstr "그림 컨텐트" + +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 +msgid "Respect Font Faces" +msgstr "개별 글꼴" + +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 +msgid "Commentary by Chapter" +msgstr "절 단위 해설" + +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 +msgid "Doublespace" +msgstr "이중 공백" + +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 +msgid "Lookup Selection" +msgstr "선택 찾아보기" + +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 +msgid "Use Current Dictionary" +msgstr "현재 사전 사용" + +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 +msgid "Browse in BibleMap.org" +msgstr "BibleMap.org 탐색" + +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 +msgid "Unlock This Module" +msgstr "이 모듈 잠금 해제" + +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 +msgid "Display Book Heading" +msgstr "책 제목 표시" + +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 +msgid "Display Chapter Heading" +msgstr "장 제목 표시" + +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 +msgid "Rename Pers.Comm." +msgstr "개별 해설 이름 바꾸기" + +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 +msgid "Dump Pers.Comm." +msgstr "전체 개별 해설 내보내기" + +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 +msgid "Read Selection Aloud" +msgstr "선택 항목 소리내어 읽기" + +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 +msgid "Save these results as a single bookmark" +msgstr "이 결과를 단일 책갈피로 저장합니다" + +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 +msgid "Save list as a single bookmark" +msgstr "목록을 단일 책갈피로 저장" + +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 +msgid "Save these results as a series of bookmarks in their own folder" +msgstr "이 결과를 자체 폴더안에 여러 책갈피로 저장합니다." + +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 +msgid "Save list as a series of bookmarks" +msgstr "목록을 책갈피 모음으로 저장" + +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 +msgid "" +"Provide a dialog in which to paste a line of verse references, to fill the " +"verse list." +msgstr "절 목록을 채우는 절 참조 줄을 표시할 대화상자를 제공합니다." + +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 +msgid "Populate verse list" +msgstr "절 목록 내보내기" + +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "전체 절 목록내용을 기록 목록에 바로 넣습니다." + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +msgid "Preload history from verse list" +msgstr "절 목록에서 기록 미리 불러오기" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 +msgid "" +"Send this verse list via BibleSync to others, if you are in Personal or " +"Speaker mode." +msgstr "" +"개인 또는 독서자 모드일 때, BibleSync로 다른 대상에 절 목록을 보냅니다." + +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 +msgid "Send list via BibleSync" +msgstr "BibleSync로 내보낼 목록입니다" + +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 +msgid "Export List" +msgstr "내보내기 목록" + +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 +msgid "Open this bookmark in a new tab" +msgstr "이 책갈피를 새 탭에서 엽니다" + +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 +msgid "Open in new tab" +msgstr "새 탭에서 열기" + +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 +msgid "Open this bookmark in a dialog" +msgstr "대화상자에서 이 책갈피를 엽니다" + +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 +msgid "Open in a dialog" +msgstr "대화상자에서 열기" + +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 +msgid "Add new folder to selected folder" +msgstr "선택한 폴더에 새 폴더 추가" + +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 +msgid "Insert new bookmark here" +msgstr "새 책갈피를 여기에 삽입합니다" + +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 +msgid "Insert Bookmark" +msgstr "책갈피 삽입" + +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 +msgid "Edit bookmark item" +msgstr "책갈피 항목을 편집합니다" + +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 +msgid "_Edit Item" +msgstr "항목 편집(_E)" + +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 +msgid "Delete item" +msgstr "항목 삭제" + +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 +msgid "Expand all Bookmarks groups" +msgstr "모든 책갈피 그룹을 확장합니다" + +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 +msgid "Expand All" +msgstr "모두 확장" + +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 +msgid "Collapse all Bookmarks groups" +msgstr "모든 책갈피 그룹을 접습니다" + +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 +msgid "Collapse All" +msgstr "모두 접기" + +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 +msgid "Allow items to be moved from one folder to another" +msgstr "한 폴더에서 다른 곳으로 항목 옮기기를 허용합니다" + +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 +msgid "Allow Reordering" +msgstr "재정렬 허용" + +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 +msgid "Load other bookmarks file (default: from BibleTime)" +msgstr "다른 책갈피 파일을 불러옵니다(기본: BiboeTime 에서)" + +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 +msgid "Import Bookmarks" +msgstr "책갈피 가져오기" + +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 +msgid "Remove folder and save it" +msgstr "폴더를 제거하고 저장" + +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 +msgid "Export Folder" +msgstr "폴더 내보내기" + +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 +msgid "Open selected module in a new tab" +msgstr "새 탭에 선택한 모듈을 엽니다" + +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 +msgid "" +"Open selected module in a\n" +"\tseparate ['dialog'] window" +msgstr "" +"선택한 모듈을 분리한\n" +"\t['대화상자'] 창에서 엽니다" + +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 +msgid "Open in a separate window" +msgstr "새 창에서 열기" + +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +msgid "Create a new simple prayer list" +msgstr "간단한 새 기도 목록을 만듭니다" + +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +msgid "Simple" +msgstr "단순" + +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +msgid "Create a new subject prayer list" +msgstr "새 주제의 기도 목록을 만듭니다" + +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +msgid "Subject" +msgstr "주제" + +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +msgid "Create a new monthly journal" +msgstr "월별 묵상 일기를 만듭니다" + +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +msgid "Monthly" +msgstr "월별" + +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 +msgid "Create a new daily journal" +msgstr "묵상 일기를 만듭니다" + +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 +msgid "Daily" +msgstr "매일" + +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 +msgid "Create a new outlined topic" +msgstr "개요 서술 주제를 만듭니다" + +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 +msgid "Outlined" +msgstr "개요 서술" + +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 +msgid "Open module in editor or plain display window" +msgstr "편집기 또는 빈 표시 창에서 모듈을 엽니다" + +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 +msgid "Open in separate window" +msgstr "새 창에서 열기" + +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 +msgid "Add a sub-item" +msgstr "하위 항목 추가" + +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 +msgid "Add Sub-Item" +msgstr "하위 항목 추가" + +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 +msgid "Add an item" +msgstr "항목 추가" + +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 +msgid "Add Item" +msgstr "항목 추가" + +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 +msgid "Remove this item" +msgstr "이 항목 제거" + +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 +msgid "Edit this item" +msgstr "이 항목 편집" + +#: ../xiphos.desktop.in.in.h:1 +msgid "Xiphos Bible Guide" +msgstr "xiphos 성경 안내" + +#: ../xiphos.desktop.in.in.h:2 +msgid "Study the Bible" +msgstr "성경 공부" diff -Nru xiphos-4.0.0+dfsg1/po/LINGUAS xiphos-4.0.4+dfsg1/po/LINGUAS --- xiphos-4.0.0+dfsg1/po/LINGUAS 2014-12-21 19:54:38.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/LINGUAS 2015-07-15 14:34:29.000000000 +0000 @@ -1 +1 @@ -ar cs cy da de en_GB es fa fi fr he hu ja lt lv nb nl pl pt pt_BR ro ru sk sl sv tr zh_CN zh_TW +ar cs cy da de en_GB es fa fi fr he hu ja ko_KR lt lv nb nl pl pt pt_BR ro ru sk sl sv tr zh_CN zh_TW diff -Nru xiphos-4.0.0+dfsg1/po/lt.po xiphos-4.0.4+dfsg1/po/lt.po --- xiphos-4.0.0+dfsg1/po/lt.po 2014-12-21 19:54:38.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/lt.po 2015-06-16 17:44:26.000000000 +0000 @@ -9,310 +9,277 @@ msgstr "" "Project-Id-Version: Xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-21 14:43-0500\n" "Last-Translator: Moo \n" "Language-Team: Lithuanian <>\n" +"Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -"Language: Lithuanian\n" - -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "tinklo nustatymo klaidos." -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "kliento jungtis" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "serverio jungtis" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" +msgstr "" +"Xiphos gedimas: \"can't happen\", display_mod: null\n" +"Prašome pranešti tai. sword_main.cc:set_treekey\n" +"Ką jūs darėte, kai visa tai atsirado?" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "bloga magija" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Sąranka nerasta" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "bloga protokolo versija" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "blogas msg tipas" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Atidaryti" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "blogas duomenų paketo skaičiavimas" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Dokumentas be pavadinimo" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "blogas duomenų paketo indeksas" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Išsaugoti dokumento pakeitimus" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "blogas laiško teksto formatas" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "prieš uždarant?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "trūksta reikiamos antraštės" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Jeigu neišsaugosite, pakeitimai bus negrįžtamai prarasti." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "UUID apsimeta kitu: neteisingas ipaddr." +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Failas" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "Aidas ignoruojamas." +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domenas ne 'BIBLE-VERSE':" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Užrašų Redaktorius" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "Neteisinga grupė:" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Maldos sąrašo/Žurnalo Redaktorius" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Apie Sword Modulį" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "[nėra paruoštos atminties išklotinės]" - -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Modulių Tvarkytuvė" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "Perdavimas nepavyko.\n" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Parinktys" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -"Nepavyko daugiaabonentis transliavimas; BibleSync dabar yra išjungtas. " -"Jeigu, kol ši programa buvo įjungta, pasikeitė jūsų tinklo ryšys, gali " -"užtekti tik įjungti iš naujo." -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Xiphos gedimas: \"can't happen\", display_mod: null\n" -"Prašome pranešti tai. sword_main.cc:set_treekey\n" -"Ką jūs darėte, kai visa tai atsirado?" - -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Sąranka nerasta" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Sritis" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Puslapis %d iš %d" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Kasdienis Pašventimas" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Atidaryti" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Žemėlapiai" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Išsaugoti Kaip" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Paveikslai" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Dokumentas be pavadinimo" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Aiškinamieji/Terminų Žodynai" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML Išvestis" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML Šaltinis" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Paprastas Šaltinis" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblija" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "S_pausdinti..." +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Komentarai" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Spaudinio Pe_ržiūra" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Žodynas" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Išeiti" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Bendros Knygos" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Atidaryti" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "Iš_saugoti" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Išsaugoti _Kaip..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Pervadinti Komentarą" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Naujas" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "KasdienisZurnalas" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Atidaryti naują dokumentą" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Nežinoma" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Ištrinti" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Modulių Sąrašai" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Ištrinti esamą užrašą" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Ribos" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Failas" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML Išv_estis" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML Šaltinis" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Paprastas Šaltinis" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Rodinys" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Diegimo Šaltinis" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Išsaugoti" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Pagrindinio Lango Moduliai" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Įterpti Nuorodą" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formatas" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Išsaugoti dokumento pakeitimus" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Antraštės" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "prieš uždarant?" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Išnašos" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Jeigu neišsaugosite, pakeitimai bus negrįžtamai prarasti." +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Kryžminės nuorodos" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Failas" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strongo Numeriai" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologinės Žymės" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Užrašų Redaktorius" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemos" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Maldos sąrašo/Žurnalo Redaktorius" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Kristaus Žodžiai Raudona spalva" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Atrakinti" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Graikų kirčiai" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Ruošiamasi spausdinti" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Hebrajų Balsių Taškai" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Spausdinimas šiuo spausdintuvu nepalaikomas" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebrajų Kantiliacija" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Spausdintuvas %s nepalaiko PostScript spausdinimo." +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Spausdinama" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteracija" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Laukiama spausdinti" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Spausdinant, įvyko klaida" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Neįmanoma atspausdinti jūsų dokumento: %s" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morfemų Segmentavimas" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Apie Sword Modulį" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Šis modulis neturi Apie informacijos." +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Požymis" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Parinktys" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -332,18 +299,20 @@ "\n" " Knygos gali būti atsisiųstos iš SWORD Projekto." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD Projektas" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Ar jums patinka Biblijos studijavimui naudoti programą Xiphos? Ar norėtumėte " "matyti ją savo gimtąja kalba? Jūs galėtumėte išversti Xiphos! \n" @@ -352,25 +321,25 @@ "jūs galite mums padėti išversti, prašome žiūrėti nuorodą apačioje ir " "susisiekti su mumis bei dalyvauti mūsų pastangose." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Apie Xiphos Vertimą" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Žiūrėti VERTIMO ŽINYNĄ Xiphos šaltinyje" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos kūrimas" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Autorinės Teisės © 2000-2014 Xiphos Kūrėjų Komanda" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Autorinės Teisės © 2000-2015 Xiphos Kūrėjų Komanda" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 +#, fuzzy msgid "" -"(formerly known as GnomeSword)\n" "\n" "Powered by The SWORD Project.\n" "We would like to thank Troy Griffitts and all the other folks who have given " @@ -383,79 +352,79 @@ "padovanojo mums The SWORD Projektą." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Įtraukti į adresyną" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Įveskite Aplanko Pavadinimą" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Aplanko Pavadinimas" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Aplankas:" -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Nurodykite adresyno failą" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Redaguoti" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Aplanko pavadinimas:" -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Adresyno įrašo pavadinimas:" -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Eilutė:" -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modulis:" -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Šalinti pasirinktą aplanką" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(ir visą jo turinį)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Ištrinti pasirinktą adresyno įrašą" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Pridėti" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etiketė:" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Paieškos rezultatas: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -463,154 +432,154 @@ "Kelių nuorodų adresyno įrašo atidarymas\n" "atskirose kortelėse nėra palaikomas." -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Adresynas" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Šifro raktas moduliui %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Įveskite Raktą:" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Uždaryti ir neišsaugoti" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "_Uždaryti ir neišsaugoti" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Eilučių Sąrašas" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "EilučiųSąrašas" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "PaieškosRezultatai" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Prašome prieš eksportuojant, patikrinti autorines teises!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Rasti" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Įveskite Žodį ar Frazę" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Ieškoti atvirkštine tvarka" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Rasti Kitą" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Nustatyti Modulio Šriftą" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Pakeisti šriftą moduliui" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modulis" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Dabartinis šriftas:" -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Šiam moduliui naudoti numatytąjį šriftą" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "KLAIDA! Xiphos tuoj užstrigs dėl \"STRDUP\" klaidos." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "KLAIDA! Xiphos tuoj užstrigs dėl \"STRING\" klaidos." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Modulis nepalaiko %s." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Nėra langų." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Dabartinis naršymas išsiųstas." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Nekalba." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Biblijos Studijavimo Programinė Įranga" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Atverti naujoje kortelėje" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standartinis Rodinys" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Komentarų Rodinys" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Knygos Rodinys" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Sveiki atvykę į Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -629,33 +598,33 @@ "Dėl to, asmeninių komentarų pervadinimas\n" "Windows aplinkoje yra negalimas." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Pervadinti Komentarą" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Pasirinkite Komentaro Pavadinimą" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Naujas Pavadinimas" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Pavadinimas:" -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modulio pavadinime turi būti tik [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos jau žino modulį tokiu pavadinimu." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -664,7 +633,7 @@ "Nepavyko sukurti naujos konfigūracijos:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -672,7 +641,7 @@ "Konfigūracijos kūrimo klaida:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Šiame polangyje modulio nėra." @@ -795,20 +764,20 @@ "Šį pažingsninių nurodymų langą ir bendrą įžangos langą, galite užverti bet " "kuriuo metu." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Šalinti šiuos modulius?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Ruošiamasi šalinti" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Šalinama" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Šalinti" @@ -828,23 +797,23 @@ msgid "Install" msgstr "Įdiegti" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archyvuoti šiuos modulius?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Ruošiamasi archyvuoti" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archyvuojama" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archyvuoti" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -852,56 +821,60 @@ "Sukurti šiems moduliams greitos paieškos\n" "indeksą (gali užtrukti minutes/moduliui)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Ruošiamasi indeksuoti" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indeksuojama" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeksas" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Ištrinti greitos paieškos indeksą šiems moduliams?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Ruošiamasi ištrinti indeksą" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Ištrinamas indeksas" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Ištrynimas" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Šis modulis neturi Apie informacijos." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modulio Pavadinimas" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Varnelė reiškia, kad šis modulis jau įdiegtas" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Spustelėkite langelį, kad pradėtumėte darbą su šiuo moduliu" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Spustelėkite ant langelio, kad pasirinktumėte įdiegti/atnaujinti šį modulį" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Įdiegtas" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -909,7 +882,7 @@ "Indekso piktograma reiškia, kad greitai paieškai, šiam moduliui esatę sukūrę " "optimizuotą ('lucene') indeksą (šiai funkcijai žr. Priežūros polangį)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -917,13 +890,13 @@ "Spynos piktograma reiškia, kad šis modulis yra užšifruotas ir reikalauja, " "kad jūs įsigytumėte iššifravimo raktą, kurį galima gauti iš turinio savininko" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Apie" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -931,19 +904,19 @@ "Naujinimo piktograma reiškia, kad įdiegtas modulis yra senesnis negu " "Prieinamas naujesnis modulis: Jūs turėtumėte atnaujinti modulį" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Pasiekiamas" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Dydis" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Aprašas" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -952,33 +925,33 @@ "`mkdir %s' nepavyko:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Žurnalai ir maldos sąrašai negali būti indeksuojami." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s nepavyko" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Užbaigta" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Nežinoma" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -987,7 +960,7 @@ "Saugykla:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -995,54 +968,44 @@ "Sugrupuota pagal\n" "Modulių Tipus" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bibliniai Tekstai" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Komentarai" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Žodynai" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Aiškinamieji/Terminų Žodynai" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Kasdieniai Pašventimai" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Bendros Knygos" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Žemėlapiai" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Paveikslai" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kultai/Netradiciniai" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1050,95 +1013,95 @@ "Sugrupuota pagal\n" "Pasiekiamumą" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Atnaujinimai" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Neįdiegta" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Maldos Sąrašas/Žurnalas" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Atnaujinamas nuotolinis šaltinis" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Nuotolinis šaltinis nerastas" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigūruoti" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tipas" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Pavadinimas" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Šaltinis" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Katalogas" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Naudotojas" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Slaptažodis" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Modulių šaltiniai" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Pridėti/Šalinti" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Pasirinkti" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduliai" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Įdiegti/Atnaujinti" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Priežiūra" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Prašome Naujinti" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Jūsų modulių sąrašas nėra atnaujintas!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1146,7 +1109,7 @@ "Jūs pašalinote paskutinę savo Bibliją.\n" "Xiphos reikalauja bent vienos." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1154,111 +1117,123 @@ "Vis dar nėra įdiegtų Biblijų.\n" "Xiphos negali tęsti be Biblijos." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standartiniai nuotoliniai šaltiniai įkelti." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Nepavyko iš CrossWire įkelti standartinių šaltinių." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Šalinti pasirinktą šaltinį" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Įveskite nuotolinį šaltinį" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Pavadinimas:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tipas:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Serveris:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Katalogas:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Naudotojas (nebūtinas):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Slaptažodis (nebūtinas):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Šaltinis tokiu pavadinimu jau yra." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Ištrinti nuotolinį šaltinį" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[nėra modulio]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Pereiti prie ankstesnio elemento" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Pereiti prie kito elemento" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Sinchronizuoti šio lango slinktį su pagrindiniu langu" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Lygiagretus" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Atskirti/Prisegti" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Modulio Parametrai" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Lygiagretus Rodinys" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "BibleSync sesijos slapta frazė" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Frazė:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1266,97 +1241,96 @@ "Veiksenos pasirinkimas nepavyko.\n" "Nustatykite \"Debug\" ir bandykite vėl, norėdami sužinoti kodėl." -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Veiksenos pasirinkimas nepavyko.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (slapta frazė \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Išjungta" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Asmeninė" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Kalbėtojo" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Klausytojo" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Pasirinkite --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Lokalė įsigalios po programos paleidimo iš naujo." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Nuostatos" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Bendra" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Parinktys" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Šriftai" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Spalva" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Dydžiai ir Išvaizda" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Ypatinga" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Išvalyti Sąrašą?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Ar tikrai norite išvalyti modulių sąrašą?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Šalinti Modulį?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Ar tikrai norite pašalinti pasirinktą modulį?" @@ -1375,20 +1349,20 @@ msgid "found in " msgstr "rasta modulyje" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Naujas Sąrašas %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Paskutinysis modulių sąrašas gali būti neištrintas" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Ištrinti sąrašą?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Ar tikrai norite ištrinti:" @@ -1408,7 +1382,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1480,7 +1454,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1515,15 +1489,15 @@ "\"noun, accusative singular feminine\" (daiktavardis, moteriškos giminės " "vienaskaitos galininkas) -- išsamiau apie tai žiūrėkite Robinson modulyje." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Modulis nėra nei Biblija, nei komentarai" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync nėra aktyvus perdavimui." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1531,105 +1505,95 @@ "Tai yra įtraukiama (\"AND\") paieška:\n" "Rasti atiti" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Atidaryti Išsamią Paiešką" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Atidaryti atskirą Išsamios Paieškos langelį." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Paieška Modulyje" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblija" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Komentarai" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Paieškos Tipas" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Keli žodžiai" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Reguliari išraiška" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Tiksli frazė" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Paieškos Parinktys" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Skirti raidžių registrą" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Paieškos Sritis" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Nėra srities" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Naudoti rėžius" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Paskutinė paieška" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Rėžiai" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Atidaryti modulį redaktoriuje?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Įdėkite eilučių nuorodas" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Sąrašas:" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Paieška" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Parankinė" @@ -1637,73 +1601,73 @@ msgid "Powered by the SWORD Project" msgstr "Veikia su SWORD Project" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Maldos Sąrašo/Žurnalo Elementas" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Naujas pavadinimas" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Šalinti pasirinktą elementą" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Sausis" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Vasaris" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Kovas" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Balandis" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Gegužė" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Birželis" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Liepa" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Rugpjūtis" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Rugsėjis" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Spalis" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Lapkritis" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Gruodis" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1711,7 +1675,99 @@ "Nepavyko nustatyti paveikslo failo dydį.\n" "Xiphos negali pakeisti paveikslo dydį, kad priderintų paveikslą prie lango." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "[nėra modulio]" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Spustelėkite langelį, kad pradėtumėte darbą su šiuo moduliu" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Pasiekiamas" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Naršyti" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "IP address: " +msgstr "Adresas" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1720,247 +1776,270 @@ "Netinkamai koduota asmeninės pastabos etiketė:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Skyrius" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nesupranta daugiau negu vieną argumentą." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Pradedamas HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Kuriama sąsaja" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Paleidžiamas Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Įkeliami Nustatymai" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Rodoma Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Peržiūros langelis" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Išnaša" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Kryžminė nuoroda" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologija" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Grįžti į" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongo Numeriai" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Išnašos" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologinės Žymės" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebrajų Balsių Taškai" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrajų Kantiliacija" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Graikų kirčiai" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Kryžminės nuorodos" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemos" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Antraštės" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfemų Segmentavimas" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Kristaus Žodžiai Raudona spalva" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteracija" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Teksto Variantai" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Pirminis Skaitymas" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Antrinis Skaitymas" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Visi Skaitymai" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteracija" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Aiškinamieji/Terminų Žodynai" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "žiūrėti kontekstą" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Augimas" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Už Augimą
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Išgelbėjimas" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Už Išgelbėjimą
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Sveikata" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Už Sveikatą
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Kita" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Kita
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punktas x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punktas y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punktas z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Antraeilė Tema 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Potemė 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Antraeilė Tema 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Potemė 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Antraeilė Tema 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Potemė 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Antraeilė Tema 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Potemė 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Naujo maldos sąrašo ar žurnalo pavadinimas" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos jau randa tokį maldos sąrašą." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1969,19 +2048,19 @@ "Xiphos nepavyko sukurti modulio kelio:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Elementarus maldos sąrašas. \\par\\par Xiphos sukurtas modulis." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "PaprastasMaldosSarasas" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "ManoMaldosSarasas" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1989,102 +2068,102 @@ "Žmonės:
Jonas
Gintaras
Judita

Bažnyčia:
suolai
bendravimas
Biblijos misionieriams


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Teminis maldos sąrašas. \\par\\par Xiphos sukurtas modulis." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "TeminisMaldosSarasas" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Jonas
Gintaras
Judita
Andrius
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Dvasinis Augimas" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Romanas
Audrius
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Judita
Andrius
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Mėnesinis maldos sąrašas. \\par\\par Xiphos sukurtas modulis." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MenesinisMaldosSarasas" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Kasdienis žurnalas. \\par\\par Xiphos sukurtas modulis." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "KasdienisZurnalas" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Temos kontūrai (pvz. pamokslo). \\par\\par Xiphos sukurtas modulis." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "TemosKonturai" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Pagrindinė Tema A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Pagrindinė Tema A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Pagrindinė Tema B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Pagrindinė Tema B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Pagrindinė Tema C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Pagrindinė Tema C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Vartotojo Pastaba" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Paieškos rezultatas %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Ištrinti Rėžį?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Ar tikrai norite ištrinti šį rėžį?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Paieška:" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2095,16 +2174,16 @@ "Tokio įdiegto modulio nėra.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Prašome priderinti modulių sąrašą." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Nėra greitos paieškos indekso moduliui %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2112,7 +2191,7 @@ "\n" "Paieška šiame modulyje dabar yra `keli žodžiai'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2120,41 +2199,35 @@ "\n" "Žr. Modulių Tvarkytuvės, Priežiūros polangį." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Paieška užbaigta" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "atitikčių" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Nėra komentarų modulio." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME yra nenustatyti!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos negali sukurti .xiphos:\n" -"%s\n" -"\n" -"Xiphos negali tęsti." +"Xiphos nepavyko sukurti modulio kelio:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nepavyko sukurti" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2162,12 +2235,12 @@ "Tuščias nustatymų failas - bandoma atkurti atsarginę kopiją.\n" "Kai kuri informacija gali būti prarasta." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "Tuščias nustatymų failas - nėra atsarginės kopijos?!? Informacija prarasta!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2183,11 +2256,11 @@ "Xiphos negali tęsti\n" "ir tuoj pat išeis." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Biblijos modulio diegimas baigtas." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2199,11 +2272,11 @@ msgid "verse" msgstr "eilutė" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "skyrius" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2211,7 +2284,7 @@ "Nėra Xiphos programos failo,\n" "skirto kalbos santrumpoms." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2219,7 +2292,7 @@ "Nepavyko atidaryti Xiphos programos\n" "kalbos santrumpų failo." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2227,7 +2300,7 @@ "Xiphos negali paskirstyti vietos\n" "kalbos santrumpoms." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2236,7 +2309,7 @@ "kalbos santrumpų failo." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2245,11 +2318,11 @@ "`%s' atitinkanti lokalė nerasta.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Knygų pavadinimai ir meniu gali būti neišversti." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2260,7 +2333,7 @@ "%s.\n" "Ar norėtumėte atidaryti ir juos?%s" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2268,11 +2341,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Buvo užklaustas kasdienis pašventimas, tačiau nėra jokio įdiegta." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2296,89 +2369,94 @@ "\n" "Prašome įrašyti raktą į langelį." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Išvalyti Žurnalą" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Eilučių Sąrašas" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nerasta:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nepavyko įvykdyti %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Žiūryklės klaida:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Rodyti %s pagrindiniame lange" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Ką aš turiu daryti, kad būčiau išgelbėtas?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apašalų darbai 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef. 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romiečiams 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Kas yra Evangelija?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "tuščias dokumentas \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Skyrius %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Skyrius %d

" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2391,7 +2469,7 @@ "Skyrius %d\n" "\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2404,12 +2482,12 @@ "Skyrius %d\n" "\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Skyrius %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2418,82 +2496,82 @@ "%s: %s Skyrius %d\n" "\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Senasis Testamentas" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Pr - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Naujasis Testamentas" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mato - Apr" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Pavyzdinis Modulių Sąrašas" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2502,7 +2580,7 @@ "Nustatymų išsaugojimas nepavyko! stat %d, size %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Bandoma atkurti ankstesnį išsaugotą įrašą." @@ -2516,13 +2594,13 @@ msgstr "Adresyno Įrašo Dialogo Langas" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Sukurti naują aplanką" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Naujas Aplankas" @@ -2531,7 +2609,7 @@ msgstr "Naujas ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Atšaukti Adresyno Įrašą" @@ -2544,22 +2622,22 @@ msgstr "Etiketės Įrašas" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Eilutė:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Biblinės Eilutės Įrašas" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modulis:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Modulio Įrašas" @@ -2567,6 +2645,10 @@ msgid "Bookmark Folder Treeview" msgstr "Bookmark Folder Treeview" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Įterpti Nuorodą" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2620,6 +2702,12 @@ msgid "_Delete Personal Comment" msgstr "Iš_trinti Asmeninį Komentarą" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Failas" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Išsaugoti esamą užrašą" @@ -2628,6 +2716,14 @@ msgid "_Save (Personal Comment)" msgstr "Iš_saugoti (Asmeninį Komentarą)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Spaudinio Pe_ržiūra" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "S_pausdinti..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Išeiti" @@ -2636,6 +2732,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Išsaugoti" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Spausdinti šį dokumentą" @@ -2673,7 +2774,7 @@ msgstr "Naujas Dokumentas" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopijuoti/Eksportuoti Ištrauką" @@ -2710,7 +2811,7 @@ msgstr "Eksportuoti visą knygą" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Knyga" @@ -2818,8 +2919,8 @@ msgid "Open about dialog" msgstr "Atidaryti Apie langą" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Paryškintai" @@ -2859,12 +2960,16 @@ msgid "Delete selection" msgstr "Ištrinti žymėjimą" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Ištrinti" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Pašalinti pasirinkimą" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Ištrinti Elementą" @@ -3020,6 +3125,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Naujas" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "Sukurti naują failą" @@ -3137,120 +3246,85 @@ msgid "_Edit" msgstr "_Keisti" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Pagalba" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normal" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Antraštė 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Antraštė 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Antraštė 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Antraštė 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Antraštė 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Antraštė 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adresas" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Preformatted" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Suženklintasis Sąrašas" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Numeruojamas Sąrašas" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Numeruotas Sąrašas" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Abėcėlinis sąrašas" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Perbraukti" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Nustatyti pažymėto teksto spalvą" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Paryškinti pažymėtą tekstą, nustatant fono spalvą." -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Pažymėti/Nežymėti Eilutę" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Pažymėti" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Nuimti žymėjimą" @@ -3326,33 +3400,41 @@ msgstr "Ištrinti pasirinktų modulių greitos paieškos indeksą." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Tęsti" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulių Tvarkytuvė" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "ĮSPĖJIMAS: Jei gyvenate šalyje, kurioje yra persekiojimai, programa " "naudokitės atsargiai." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Pridėti ir Šalinti Šaltinius" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Esami vietiniai šaltiniai" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3361,15 +3443,15 @@ "USB atmintinės. Tokiame aplanke yra vidiniai aplankai \"mods.d\" ir \"modules" "\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Pašalinti viena iš jūsų vietinių aplankų iš diegimo šaltinių." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Esami Nuotoliniai Šaltiniai" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3377,43 +3459,43 @@ "Pridėti tinkintą nuotolinio diegimo šaltinį. Jūs privalote žinoti šaltinio " "kompiuterio pavadinimą ir aplanką kuriame yra jo saugyklos." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Pašalinti nuotolinį diegimo šaltinį." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Diegimo Šaltinis" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Vietinis" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Nuotolinis" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Diegimo Paskirtis" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Asmeninė sritis, tik jūsų naudojimui:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Namų kat" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Sistemos sritis, visiems naudotojams:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword sis kat" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3422,10 +3504,14 @@ "nenorite rizikuoti bei būti aptikti, jūs NETURĖTUMĖTE naudoti nuotolinio " "diegimo funkcijos!" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Vietinis Diegimo Aplankas" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Išskleidžiamasis žurnalo sąrašas" @@ -3434,11 +3520,11 @@ msgid "Choose book to display" msgstr "Pasirinkite knygą, kurią rodyti" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Knygų Pasirinkimo Mygtukas" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Apreiškimas Jonui" @@ -3446,11 +3532,11 @@ msgid "Choose chapter to display" msgstr "Pasirinkite norimą rodyti skyrių" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Perjungti Skyriaus Mygtuką" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3612,11 +3698,12 @@ "Kalbėtojo, kad vesti paskaitą, kartu sekantiems klausytojams; Klausytojo, " "kad gauti kalbėtojo nuorodas." -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "Veiksena" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Moduliai" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Pasirinkite veikseną, kurioje BibleSync turėtų veikti." @@ -3684,11 +3771,12 @@ msgid "BSP privacy button" msgstr "BSP privacy button" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +#, fuzzy +msgid "Navigate:" msgstr "Naršyti" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Pasirinkite kaip priimti gaunamą naršymo sinchronizaciją." @@ -3716,11 +3804,12 @@ msgid "BSP nav verse list radio button" msgstr "BSP nav verse list radio button" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "Klausyti" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Sąrašo Pavadinimas" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos klausys Kalbėtojų pagal šį pasirinkimą." @@ -3760,7 +3849,12 @@ msgid "BSP listen none radio button" msgstr "BSP listen none radio button" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Ypatinga" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3954,185 +4048,184 @@ msgstr "Enable Prayer Lists Checkbox" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Eilutės numeris" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Keliais būdais paslinkti eilučių numerius" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Rodyti eilutės numerį pusjuodžiai" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Verse number bold checkbox" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Skliaustuose" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Rodyti eilutės numerį [skliaustuose]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Verse number bracket checkbox" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Viršutiniame indekse" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Rodyti eilutę viršutiniame indekse" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Verse number superscript checkbox" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Numatytasis StudyPad katalogas" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Pasirinkite Katalogą" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudyPad default directory combo" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "General Misc" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Pagrindinio Lango Moduliai" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblinis Tekstas" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Change Biblical Text Combo" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Change Commentary Combo" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Žodynas" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Change Dictionary Combo" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Change Book Combo" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduliai" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Išvalyti visus modulius iš sąrašo" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Clear Modules from List Button" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Pašalinti pasirinktą modulį iš sąrašo" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Delete Selected Module From List Button" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Atidaryti langelį modulių pasirinkimui" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Pridėti Modulius" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Open Selection Dialog Button" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modules Parallel" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Ypatingos Paskirties Moduliai" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Kasdienis Pašventimas" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Daily Devotional Combo" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebrajų Leksika" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebrew Lexicon Combo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Graikų Leksika" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Greek Lexicon Combo" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Numatytasis Žodynas" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Change Default Dictionary Combo" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Asmeniniai Užrašai" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Change Personal Notes Combo" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modules Misc" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Modulių Pasirinkimas" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4161,6 +4254,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Įjungti BibleSync kaip kalbėtoją." + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Išsami Paieška" @@ -4370,11 +4468,11 @@ msgid "Found" msgstr "Rasta" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Result Summary Window" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Result Summary Table" @@ -4567,6 +4665,11 @@ msgid "Attribute Search" msgstr "Požymių Paieška" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Modulių Pasirinkimas" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "paieškos modulis" @@ -4660,6 +4763,10 @@ msgid "_Module Manager" msgstr "_Modulių Tvarkytuvė" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Rodinys" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Peržiūrėti Kas_dienį Pašventimą" @@ -4809,27 +4916,27 @@ msgid "Learn about Xiphos" msgstr "Sužinoti apie Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Rašyti Pastabas Eilutei" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Atidaryti Modulį" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Užrašas" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Atidaryti redaktoriuje" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Vienoje linijoje viena Biblijos eilutė" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Išnašų/Kryžminių nuorodų Žymekliai" @@ -4837,80 +4944,80 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Rodyti neanoniminius žymeklius, pvz., \"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variantai" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Paveikslo Turinys" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Atsižvelgti į Šrifto Išvaizdą" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Komentarai pagal Skyrių" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Dvigubi intervalai" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Ieškoti Žymėjimo" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Naudoti Esamą Žodyną" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Naršyti BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Atrakinti Šį Modulį" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Rodyti Knygos Antraštę" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Rodyti Skyriaus Antraštę" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Pervadinti Asm. Koment." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Garsiai Skaityti Žymėjimą" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Išsaugoti šiuos rezultatus kaip vieną adresyno įrašą" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Išsaugoti sąrašą kaip vieną adresyno įrašą" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" "Išsaugoti šiuos rezultatus kaip adresyno įrašų seriją atskirame aplanke" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Išsaugoti sąrašą kaip adresyno įrašų seriją" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." @@ -4918,11 +5025,20 @@ "Pateikti langą, į kurį įdėti Biblijos eilučių nuorodas, kurios užpildys " "eilučių sąrašą." -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Užpildyti eilučių sąrašą" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Išskleidžiamasis žurnalo sąrašas" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." @@ -4930,99 +5046,99 @@ "Siųsti šį eilučių sąrašą kitiems per BibleSync, jeigu esate Asmeninėje arba " "Kalbėtojo veiksenoje." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Siųsti sąrašą per BibleSync" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Eksportuoti Sąrašą" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Atidaryti šį adresyno įrašą naujoje kortelėje" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Atverti naujoje kortelėje" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Atidaryti šį adresyno įrašą lange" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Atidaryti lange" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Į pasirinktą aplanką pridėti naują aplanką" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Įterpti čia naują adresyno įrašą" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Įterpti Adresyno Įrašą" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Redaguoti adresyno įrašo elementą" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "R_edaguoti Elementą" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Ištrinti elementą" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Išskleisti visas Adresyno įrašų grupes" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Viską Išskleisti" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Suskleisti visas Adresyno įrašų grupes" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Viską Suskleisti" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Leisti perkelti elementus iš vieno aplanko į kitą" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Leisti Pertvarkymą" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Įkelti kitų adresyno įrašų failą (pagal numatymą: iš BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importuoti Adresyno Įrašus" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Eksportuoti Aplanką" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Atverti pasirinktą modulį naujoje kortelėje" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5030,79 +5146,79 @@ "Atidaryti pasirinktą modulį\n" "\tatskirame ['dialogo'] lange" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Atverti atskirame lange" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Sukurti naują paprastą maldos sąrašą" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Paprastas" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Sukurti naują teminį maldos sąrašą" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Teminis" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Sukurti naują mėnesinį žurnalą" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Mėnesinis" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Sukurti naują kasdienį žurnalą" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Kasdienis" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Sukurti naujos temos kontūrus" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Kontūrų" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Atidaryti modulį redaktoriuje arba paprastame rodymo lange" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Atidaryti atskirame lange" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Pridėti elementą" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Pridėti Elementą" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Šalinti šį elementą" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Redaguoti šį elementą" @@ -5113,3 +5229,179 @@ #: ../xiphos.desktop.in.in.h:2 msgid "Study the Bible" msgstr "Studijuoti Bibliją" + +#~ msgid "network setup errors." +#~ msgstr "tinklo nustatymo klaidos." + +#~ msgid " client socket" +#~ msgstr "kliento jungtis" + +#~ msgid " server socket" +#~ msgstr "serverio jungtis" + +#~ msgid "bad magic" +#~ msgstr "bloga magija" + +#~ msgid "bad protocol version" +#~ msgstr "bloga protokolo versija" + +#~ msgid "bad msg type" +#~ msgstr "blogas msg tipas" + +#~ msgid "bad packet count" +#~ msgstr "blogas duomenų paketo skaičiavimas" + +#~ msgid "bad packet index" +#~ msgstr "blogas duomenų paketo indeksas" + +#~ msgid "bad body format" +#~ msgstr "blogas laiško teksto formatas" + +#~ msgid "missing required header " +#~ msgstr "trūksta reikiamos antraštės" + +#~ msgid "UUID spoofed: wrong ipaddr." +#~ msgstr "UUID apsimeta kitu: neteisingas ipaddr." + +#~ msgid "Ignoring echo." +#~ msgstr "Aidas ignoruojamas." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domenas ne 'BIBLE-VERSE':" + +#~ msgid "Invalid group: " +#~ msgstr "Neteisinga grupė:" + +#~ msgid "[no dump ready]" +#~ msgstr "[nėra paruoštos atminties išklotinės]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Perdavimas nepavyko.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Nepavyko daugiaabonentis transliavimas; BibleSync dabar yra išjungtas. " +#~ "Jeigu, kol ši programa buvo įjungta, pasikeitė jūsų tinklo ryšys, gali " +#~ "užtekti tik įjungti iš naujo." + +#~ msgid "Page %d of %d" +#~ msgstr "Puslapis %d iš %d" + +#~ msgid "Save As" +#~ msgstr "Išsaugoti Kaip" + +#~ msgid "HTML Output" +#~ msgstr "HTML Išvestis" + +#~ msgid "HTML Source" +#~ msgstr "HTML Šaltinis" + +#~ msgid "Plain Source" +#~ msgstr "Paprastas Šaltinis" + +#~ msgid "_Quit" +#~ msgstr "_Išeiti" + +#~ msgid "_Open" +#~ msgstr "_Atidaryti" + +#~ msgid "_Save" +#~ msgstr "Iš_saugoti" + +#~ msgid "Save _As..." +#~ msgstr "Išsaugoti _Kaip..." + +#~ msgid "Open new document" +#~ msgstr "Atidaryti naują dokumentą" + +#~ msgid "Delete current note" +#~ msgstr "Ištrinti esamą užrašą" + +#~ msgid "HTML _Output" +#~ msgstr "HTML Išv_estis" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML Šaltinis" + +#~ msgid "_Plain Source" +#~ msgstr "_Paprastas Šaltinis" + +#~ msgid "Unlock " +#~ msgstr "Atrakinti" + +#~ msgid "Preparing to print" +#~ msgstr "Ruošiamasi spausdinti" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Spausdinimas šiuo spausdintuvu nepalaikomas" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Spausdintuvas %s nepalaiko PostScript spausdinimo." + +#~ msgid "Printing" +#~ msgstr "Spausdinama" + +#~ msgid "Waiting to print" +#~ msgstr "Laukiama spausdinti" + +#~ msgid "An error occurred while printing" +#~ msgstr "Spausdinant, įvyko klaida" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Neįmanoma atspausdinti jūsų dokumento: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos negali sukurti .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos negali tęsti." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + +#~ msgid "Mode" +#~ msgstr "Veiksena" + +#~ msgid "Listen" +#~ msgstr "Klausyti" diff -Nru xiphos-4.0.0+dfsg1/po/lv.po xiphos-4.0.4+dfsg1/po/lv.po --- xiphos-4.0.0+dfsg1/po/lv.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/lv.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-03-21 01:28+0000\n" "Last-Translator: Dmitrijs Ledkovs \n" "Language-Team: Latvian \n" @@ -18,294 +18,246 @@ "X-Launchpad-Export-Date: 2010-03-22 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" msgstr "" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Atvērt" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Nenosaukts dokuments" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" msgstr "" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" msgstr "" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs." -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Fails" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" msgstr "" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" msgstr "" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " msgstr "" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Opcijas" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Opcijas" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Dzēšana" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Kartes" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Attēli" + +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" msgstr "" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Lapa %d no %d" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Atvērt" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Vārdnīca" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Saglabāt kā" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Vispārēji" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Nenosaukts dokuments" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Personīgās piezīmes" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Nezināms" -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Formāts" -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Drukāt..." - -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Drukas pirms_skate" - -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Iziet" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Atvērt" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Saglabāt" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Saglabāt _kā..." +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Jauna" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formāts" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Dzēst" - -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fails" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Iestatījumi" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" msgstr "" -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" msgstr "" -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" msgstr "" -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Skats" - -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "_Saglabāt" - -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Ievietot Saiti" - -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" msgstr "" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" msgstr "" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs." - -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Fails" - -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Gatavojas drukāt" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Drukāšana uz šī printera nav atbalstīta" - -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Drukāšana" - -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Gaida, lai drukātu" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Drukāšanas laikā radusies kļūda" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Jūsu dokumentu nebija iespējams izdrukāt: %s" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Opcijas" + +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -317,37 +269,38 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" msgstr "" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -356,232 +309,232 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Grāmatzīme" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Mapes nosaukums" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mape: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Rediģēt" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Nodzēst iezīmēto grāmatzīmi" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Pievienot" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Grāmatzīmes" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Nesaglabāt un aizvērt" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Aizvērt _bez saglabāšanas" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Meklēt" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Meklēt nākamo" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modulis" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "" -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Atvērt jaunu cilni" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -593,46 +546,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Jaunais nosaukums" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nosaukums: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -699,20 +652,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Izņemu" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Izņemt" @@ -732,513 +685,518 @@ msgid "Install" msgstr "Instalēt" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arhivē" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arhīvs" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indeksēšana" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Saturs" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Dzēšana" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Uzinstalēta" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Par programmu" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Izmērs" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Aparaksts" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Pabeigts" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Nezināms" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Vārdnīcas" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Kartes" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Attēli" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Atjauninājumi" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurēt" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Veids" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Apraksts" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Avots" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Mape" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Lietotājs" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Parole" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Izvēlēties" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduļi" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Apkalpošana" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Apraksts:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tips:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Hosts:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralēlais" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Dzēšana" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Iestatījumi" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Vispārēji" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opcijas" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Fonti" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Krāsa" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Speciāls" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1257,20 +1215,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1290,7 +1248,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1335,7 +1293,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1353,121 +1311,111 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Paplašinātā Meklēšana" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulāra izteiksme" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Meklēšnas opcijas" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Saskaņot reģistru" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Meklēšanas apgabals" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Zemākais" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Augšējais" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Iestatījumi" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Meklēt" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sānjosla" @@ -1475,449 +1423,558 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Jauns nosaukums" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Nezināms" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Nodaļa" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Priekšskatītājs" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "Formāts" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "Formāts" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "Formāts" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1925,68 +1982,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -1996,11 +2049,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2010,47 +2063,47 @@ msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2058,7 +2111,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2066,11 +2119,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2084,89 +2137,93 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2175,7 +2232,7 @@ "\n" msgstr "Nodaļa" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2184,101 +2241,101 @@ "\n" msgstr "Nodaļa" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2292,13 +2349,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Jauna mape" @@ -2307,7 +2364,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2320,22 +2377,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2343,6 +2400,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Ievietot Saiti" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2398,6 +2459,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fails" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2406,6 +2473,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Drukas pirms_skate" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Drukāt..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "Izi_et" @@ -2414,6 +2489,11 @@ msgid "For_mat" msgstr "For_māts" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "_Saglabāt" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Drukāt šo dokumentu" @@ -2451,7 +2531,7 @@ msgstr "Jauns dokuments" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2488,7 +2568,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Grāmata" @@ -2598,8 +2678,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2641,13 +2721,17 @@ msgid "Delete selection" msgstr "Dzēšana" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Dzēst" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Dzēšana" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2816,6 +2900,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Jauna" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -2948,120 +3036,84 @@ msgid "_Edit" msgstr "R_ediģēt" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Palīdzība" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Atzīmēt" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Noņemt iezīmējumu" @@ -3137,96 +3189,108 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Turpināt" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokālā" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3235,11 +3299,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3247,11 +3311,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3404,11 +3468,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3477,11 +3541,11 @@ msgid "BSP privacy button" msgstr "Versija" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3510,11 +3574,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3557,7 +3621,12 @@ msgid "BSP listen none radio button" msgstr "Versija" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Speciāls" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3736,186 +3805,185 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Aparaksts" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Vārdnīca" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Personīgās piezīmes" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -3944,6 +4012,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Paplašinātā Meklēšana" @@ -4150,11 +4222,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4346,6 +4418,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4438,6 +4515,10 @@ msgid "_Module Manager" msgstr "Moduļu menedžeris" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Skats" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4582,27 +4663,27 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Piezīme" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4610,266 +4691,274 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +msgid "Preload history from verse list" +msgstr "" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Atvērt šo grāmatzīmi jaunā cilnī" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Iespraust Grāmatzīmi" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Dzēst ierakstu" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Izplest visu" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Sakļaut visu" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Iespraust Grāmatzīmi" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Vienkāršs" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Temats" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Ik mēnesi" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Ikdienas" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Pievienot ierakstu" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Izņemt šo vienību" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4881,6 +4970,42 @@ msgid "Study the Bible" msgstr "" +#~ msgid "Page %d of %d" +#~ msgstr "Lapa %d no %d" + +#~ msgid "Save As" +#~ msgstr "Saglabāt kā" + +#~ msgid "_Quit" +#~ msgstr "_Iziet" + +#~ msgid "_Open" +#~ msgstr "_Atvērt" + +#~ msgid "_Save" +#~ msgstr "_Saglabāt" + +#~ msgid "Save _As..." +#~ msgstr "Saglabāt _kā..." + +#~ msgid "Preparing to print" +#~ msgstr "Gatavojas drukāt" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Drukāšana uz šī printera nav atbalstīta" + +#~ msgid "Printing" +#~ msgstr "Drukāšana" + +#~ msgid "Waiting to print" +#~ msgstr "Gaida, lai drukātu" + +#~ msgid "An error occurred while printing" +#~ msgstr "Drukāšanas laikā radusies kļūda" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Jūsu dokumentu nebija iespējams izdrukāt: %s" + #~ msgid "Main" #~ msgstr "Galvenais" diff -Nru xiphos-4.0.0+dfsg1/po/nb.po xiphos-4.0.4+dfsg1/po/nb.po --- xiphos-4.0.0+dfsg1/po/nb.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/nb.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Xiphos 2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-30 00:22+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: \n" @@ -21,300 +21,268 @@ "X-Language: nb_NO\n" "X-Source-Language: C\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"Xiphos-feil: \"kan ikke skje\", display_mod: null\n" +"Vennligst rapportér dette. sword_main.cc:set_treekey\n" +"Hva gjorde du når dette skjedde?" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Konfigurasjonen ikke funnet" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Er du sikker på at du vil slette notatet for" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Åpne" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Navnløst dokument" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Lagre endringer i dokumentet" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "før du avslutter?" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Hvis du ikke lagrer vil du miste alle endringer du har gjort." -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Fil" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Studieblokk" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Notatblokk" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Bønne Liste/Journal Editor" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Om programbiblioteket Sword" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Modulhåndterer" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:415 #, fuzzy -msgid "[no dump ready]" -msgstr "[ingen moduler]" +msgid "Version: " +msgstr "Valg" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Skop" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:423 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s·feilet" +msgid "Daily Devotion" +msgstr "Dagens tekst" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Kart" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Xiphos-feil: \"kan ikke skje\", display_mod: null\n" -"Vennligst rapportér dette. sword_main.cc:set_treekey\n" -"Hva gjorde du når dette skjedde?" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Bilder" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Konfigurasjonen ikke funnet" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Ordlister" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Side %d av %d" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Åpne" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bibel" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Lagre som" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Kommentar" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Navnløst dokument" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Ordbok" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Er du sikker på at du vil slette notatet for" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Andre bøker" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML Ut" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML Kilde" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Enkel Kilde" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Endre navn på kommentar" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Skriv ut..." +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Dagens notater" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "For hånds_visning" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Ukjent" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Avslutt" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Navn på modul" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Åpne" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Lagre" +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Områder" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Lagre _som..." +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Ny" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Kilde for installasjon" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Åpne nytt dokument" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Hovedmoduler for vinduer" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Slett" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Format" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Slett dette notatet" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Overskrifter" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fil" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Fotnoter" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML _Ut" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML Kilde" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Enkel Kilde" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Vis" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Kryssreferanser" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Lagre" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Referanser til kildetekst" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Sett inn lenke" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologiske merker" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Lagre endringer i dokumentet" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Oppslag" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "før du avslutter?" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Jesu ord er skrevet i rødt" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Hvis du ikke lagrer vil du miste alle endringer du har gjort." +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Greske apostrofer" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Fil" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Hebraiske vokaltegn" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Studieblokk" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebraisk betoning" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Notatblokk" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Bønne Liste/Journal Editor" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transkripsjon fra et alfabet til et annet" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Lås opp " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Forbereder utskrift" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Utskrift har ikke støtte for denne printer" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Printer·%s·støtter ikke PostScript·printing." +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Skriver ut" - -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Avventer utskrift" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "En feil oppstod ved utskrift" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morfem-segmentering" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "klarte ikke å skrive ut dokumentet:·%s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Om programbiblioteket Sword" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Egenskap" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Finner ikke noen informasjon om denne modulen." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Valg" # Changed order of lexicon/dictionaries in the translation, to avoid redundant-sounding "leksikon, ordbøker og andre bøker" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -334,19 +302,21 @@ "\n" " Man kan laste ned bøker fra SWORD-prosjektet." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD-prosjektet" # Lightened the sentence a bit. -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Liker du å bruke Xiphos til å studere Bibelen? Ville du likt å se ditt eget " "språk? Du kan oversette Xiphos! \n" @@ -355,24 +325,24 @@ "Vennligst ta kontakt om du har muligheten til oversette for oss og ta del i " "dette viktige arbeidet." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Om Xiphos Oversettelsen" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Se HVORDAN OVERSETTE i Xiphos kilde" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos utvikling" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright·2000-2009·The·Xiphos·Development·Team" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright·2000-2015·The·Xiphos·Development·Team" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -385,233 +355,233 @@ "The·SWORD·Project." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Bokmerke" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Skriv inn navn på mappe" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Navn på mappe" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mappe: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Spesifisér bokmerke-fil" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Rediger" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Navn på mappe: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Navn på bokmerke: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Fjern mappa" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(og alt som ligger i den)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Fjern bokmerket" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Legg til" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Merke: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Søkeresultat: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Bokmerker" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Krypteringsnøkkel for modulen %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "for:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Skriv inn kodenøkkel: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Lukk uten å lagre" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Lukk _uten å lagre" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Liste over vers" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Versliste" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Søkeresultater" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Vennligst sjekk kopirettigheter før eksportering!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Finn" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Skriv inn ord eller uttrykk" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Søk bakover" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Finn neste" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Sett skrifttype for modul" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Endre tegnsett for" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Nåværende tegnsett: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Bruk standard tegnsett for denne modulen" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "FEIL: Xiphos krasjer nå, på grunn av en \"STRDUP\"-feil." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Vær så snill å rapportere denne feilen til Xiphos-teamet med:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "FEIL: Xiphos krasjer nå, på grunn av en \"STRING\"-feil." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "I moduler som har referanser til kildetekst" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Program for bibelstudier" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Åpne ny arkfane" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standardvisning" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Kommentarvisning" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Bokvisning" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Velkommen til Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -631,33 +601,33 @@ "Derfor er det heller ikke mulig å endre navn i\n" "personlige kommentarer, i ett windows oppsett." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Endre navn på kommentar" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Velg et navn på kommentaren" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nytt navn" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Navn: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modulnavn kan kun inneholde·[A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos har allerede en modul med dette navnet." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -666,7 +636,7 @@ "Kunne ikke lage nytt oppsett:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -674,7 +644,7 @@ "Feil ved bygging av oppsett:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Ingen moduler på denne siden." @@ -794,20 +764,20 @@ "Både denne trinnvise anvisningen og den generelle informasjonen kan lukkes " "når du måtte ønske." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Vil du slette disse modulene?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Forbereder sletting" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Sletter" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Slett" @@ -827,78 +797,82 @@ msgid "Install" msgstr "Installer" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Vil du arkivere disse modulene?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Gjør klar for å arkivere" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arkiverer" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arkiv" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" "Vil du bygge søkeindeks for disse modulene (kan ta flere minutter per modul)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Forbereder indeksering" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indeksering" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeks" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Vil du slette søkeindeksen for disse modulene?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Forbereder sletting av indeks" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Sletter indeks" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Utstryking" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Finner ikke noen informasjon om denne modulen." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modulnavn" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Sjekkmerket betyr at modulen er allerede innstallert" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Klikk boksen for å bruke denne modulen" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Klikk i boksen for å velge denne modulen for innstallasjon/oppdatering" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installert" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -906,7 +880,7 @@ "Inndeks ikonet betyr at du har laget en optimalisert ('lucene') indeks for " "denne modulen for raskt søking (see vedlikeholdspanel for denne funksjonen)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -914,13 +888,13 @@ "Lås ikonet betyr at denne modulen er kryptert, og at du må kjøpe en " "opplåsingskode fra eier av dette innhold" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Om" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -928,19 +902,19 @@ "Oppdateringsikonet betyr at den innstallerte modulen er eldre en den nyeste " "tilgjengelige modulen: Du burde oppdatere denne modulen" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Tilgjengelig" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Størrelse" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Beskrivelse" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -949,33 +923,33 @@ "Kunne ikke opprette mappa %s:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arkivert i: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Kunne ikke indeksere Journal og Bønneliste." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s·feilet" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Ferdig" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Ukjent" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -984,7 +958,7 @@ "Oppbevaringssted:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -992,54 +966,44 @@ "Kategorisert ved\n" "Modul Type" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bibeltekster" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Kommentarer" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Ordbøker" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Ordlister" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Dagens Andakt" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Andre bøker" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Kart" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Bilder" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kult / Uortodokse" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1047,95 +1011,95 @@ "Kategorisert ved\n" "Tilgjengelighet" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Oppdateringer" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Avinstallert" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Bønneliste/Journal" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Henter oppdatering fra ekstern kilde" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Fant ikke den eksterne kilden" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Oppsett" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Type" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Bildetekst" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Kilde" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Mappe" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Bruker" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Passord" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Modulkilder" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Legg til/Fjern" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Velg" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduler" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Installer/Oppdater" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Vedlikehold" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Vennligst oppdater" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Lista over moduler er ikke oppdatert!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1143,7 +1107,7 @@ "Du har avinstallert alle biblene.\n" "Xiphos trenger minst én for å fungere som tenkt." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1151,211 +1115,222 @@ "Du har fortsatt ingen bibler installert.\n" "Du trenger minst én for å bruke Xiphos." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Lastet inn standard eksterne kilder." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Kunne ikke laste ned standardkildene fra CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Fjern den valgte kilden" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Skriv inn en ekstern kilde" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Bildetekst:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Type:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Vert:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Mappe:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Bruker (valgfritt):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Passord (valgfritt):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "En kilde med dette navnet finnes allerede." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Slett en ekstern kilde" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[ingen moduler]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Gå utover til seksjonen som inneholder denne" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Gå til forrige" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Gå til neste" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Gå innover til den første subseksjonen" # missing dot in original? -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synkronisér vinduets rulling med hovedvinduet" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallell" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Koble til / fra" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Valg for moduler" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Parallellvisning" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Les utvalget høyt" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personlig" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Velg --" # Original text should probably say restart/ing Xiphos/, or someone might restart their _computer_... -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Lokaliseringen blir tatt i bruk etter at du starter Xiphos på nytt." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Innstillinger" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Generelt" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Muligheter" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Bibel" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Skrift" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Farge" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Størrelser og Fonter" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Spesial" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Tøm lista?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Er du sikker på at du vil slette lista med moduler?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Slett modul?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Er du sikker på at du vil slette denne modulen?" @@ -1374,20 +1349,20 @@ msgid "found in " msgstr "funnet i " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Ny liste: %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Den siste modul listen kan ikke slettes" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Slett lista?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Er du sikker på at du vil slette:" @@ -1407,7 +1382,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1478,7 +1453,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1511,15 +1486,15 @@ "\"Substanvtiv (Noun), Akusativ Entall (Singular) Feminin\" -- se Robinson-" "modulen for mer informasjon." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1527,107 +1502,97 @@ "Dette er et \"Inklusive OG\"-søk:\n" "Finner søketreff som inneholder ALLE ordene." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Åpne Avansert Søk" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Åpne dialogvinduet Avansert Søk." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Søkemodul" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Bibel" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Kommentar" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Type søk" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Flere ord" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulært uttrykk" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Nøyaktig det du skriver" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Søkevalg" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Skill mellom store og små bokstaver" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Tekst det skal søkes i" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Søk i hele teksten" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Søk i bare deler av teksten" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Forrige søk" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Grenser" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Nedre" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Øvre" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Åpne i editor" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Sett bruker innstillinger" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Søk" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sidefelt" @@ -1635,73 +1600,73 @@ msgid "Powered by the SWORD Project" msgstr "Med SWORD-prosjektet i bånn" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Kunne ikke opprette tab-katalog." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Bønne liste/Journal Emne" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nytt navn" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Fjern merket objekt" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januar" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februar" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marker" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mai" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juni" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juli" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Oktober" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Desember" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1711,254 +1676,369 @@ "(Bildet har annen filtype enn·bmp/gif/jpg/png.)\n" "Xiphos·kan ikke gjøre om bilde til å passe." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "[ingen moduler]" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Klikk boksen for å bruke denne modulen" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Tilgjengelig" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Frelse" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "Om dette programmet" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "Feil i kodingen av tittelen på det personlige notatet '%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapittel" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos forstår ikke mer enn ett argument." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Starter HTML-visning" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Bygger grensesnitt" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Starter Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Last innstillinger" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Viser Gbomesword" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Program for forhåndsvisning" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Fotnote" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Kryssreferanse" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Referanser til kildetekst" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologi" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Tilbake til " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Referanser til kildetekst" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Fotnoter" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologiske merker" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebraiske vokaltegn" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebraisk betoning" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Greske apostrofer" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Kryssreferanser" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Oppslag" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Overskrifter" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfem-segmentering" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Jesu ord er skrevet i rødt" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transkripsjon fra et alfabet til et annet" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Tekst-varianter" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Hoved lesning" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Annen lesning" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Alle lesninger" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transkripsjon fra et alfabet til et annet" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Ordlister" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "se innhold" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Vekst" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "For Vekst
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Frelse" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "For·Frelse
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Helse" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "For·Helse
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Diverse" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Blandet
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punkt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punkt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punkt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Mindre Emne 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subemne·1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Mindre·Emne·2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subemne 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Mindre·Emne·3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subemne 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Mindre·Emne·4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subemne 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Navn for ny bønne liste eller journal" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos finner denne bønnelisten allerede." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1967,19 +2047,19 @@ "Xiphos·kan ikke lage module's·path:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "En grunnleggende bønneliste. \\par\\par·Module·created·by·Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "Grunnleggende Bønneliste" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MinBønneListe" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1987,104 +2067,104 @@ "Mennesker:
Bjarne
Sigurd
Siri

Kirke:
pews
felleskap
Bibler for misjonærer


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "En subjekt basert bønneliste. \\par\\par·Module·created·by·Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "Tematisk Bønneliste" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Åndelig Vekst" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "En månedlig bønne liste.·\\par\\par·Moduler laget av Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "Månedlig Bønneliste" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "En daglig journal. \\par\\par·Moduler·laget av Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Dagens notater" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "En understreket linje (eks. forkynnelse). \\par" "\\par·Module·created·by·Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "Disposisjon" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Hoved Emne A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Hoved Emne·A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Hoved Emne B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Hoved Emne B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Hoved Emne C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Hoved Emne C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Brukernotat" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Søkeresultat av %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Slett området?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Er du sikker på at du vil slette dette området?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Søk: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2095,17 +2175,17 @@ "Ingen slik modul er installert.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Vennligst justér modullisten." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Det finnes ikke noen søkeindeks for %s. %s%s" # NOTE: the original has a blank line in the beginning -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2113,7 +2193,7 @@ "\n" "Søkeoppsettet er nå 'multi-ord'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2121,41 +2201,35 @@ "\n" "Se Vedlikehold-fanen i Modulbehandleren." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Søk fullført" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "søkeresultater" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Ingen kommentar-moduler installert." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME er ikke satt!" -#: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#: ../src/main/settings.c:120 +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos kan ikke lage mappen .xiphos:\n" -"%s\n" -"\n" -"Xiphos kan ikke fortsette." +"Xiphos·kan ikke lage module's·path:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "kan ikke skape " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2163,13 +2237,13 @@ "Filen med innstillinger er tom - prøvde å gjenopprette sikkerhetskopien.\n" "Noe informasjon kan ha gått tapt." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "Filen med innstillinger er tom - og det finnes ingen sikkerhetskopi(!?). Noe " "informasjon har gått tapt!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2185,11 +2259,11 @@ "kan ikke Xiphos·fortsette,\n" "og vil nå ende økt." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Bibeltekst er nå installert." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2199,11 +2273,11 @@ msgid "verse" msgstr "vers" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "kapittel" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2211,7 +2285,7 @@ "Xiphos's fil for språk\n" "forkortelser mangler." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2219,7 +2293,7 @@ "Xiphos's språk forkortelse\n" "filen kan ikke åpnes." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2228,7 +2302,7 @@ "for språk forkortelser." # NOTE linebreak in the middle of a sentence, in original -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2237,7 +2311,7 @@ "filen med språkforkortelser." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2246,11 +2320,11 @@ "Fant ikke noe passende lokale for '%s'.\n" "%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Det kan være at boknavn og menyer ikke er oversatt." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2258,7 +2332,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2266,12 +2340,12 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" "Dagens tekst er slått på, men ingen modul for dagens tekst er installert." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2295,89 +2369,94 @@ "\n" "Vennligst skriv inn nøkkelen i dialogvinduet." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Slett Historie" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Liste over vers" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "Fant ikke URLen:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos kunne ikke starte%s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Visningsfeil:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Vis %s i hovedvinduet" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokumentet kunne ikke opprettes. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Hva kan jeg gjøre for å bli frelst?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apg 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8, 9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Rom 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Hva er evangeliet?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokumentet kunne ikke leses. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "tomt dokument \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "feil type, root node != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "feil type, rot er ikke %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2386,7 +2465,7 @@ "\n" msgstr "Kapittel" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2395,94 +2474,94 @@ "\n" msgstr "Kapittel" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Gamle testamentet" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Fra Mosebøkene til Malaki" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nye testamentet" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Fra Matteus' Evangelium til Johannes' Åpenbaring" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Utvalgte moduler" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "feil type, rot er ikke %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2491,7 +2570,7 @@ "Kunne ikke lagre innstillingene! stat %d, størrelse %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Prøver å gjennopprette forrige tilstand." @@ -2505,13 +2584,13 @@ msgstr "Bokmerke Dialog" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Lag ny mappe" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Ny mappe" @@ -2520,7 +2599,7 @@ msgstr "Ny ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Angre Bokmerke" @@ -2533,22 +2612,22 @@ msgstr "Inngangsmerke" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Vers Inngang" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Modul Inngang" @@ -2556,6 +2635,10 @@ msgid "Bookmark Folder Treeview" msgstr "Bokmerker Mappe 3 Visning" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Sett inn lenke" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2611,6 +2694,12 @@ msgid "_Delete Personal Comment" msgstr "S_lett egen kommentar" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fil" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Lagre nåværende notat" @@ -2619,6 +2708,14 @@ msgid "_Save (Personal Comment)" msgstr "_Lagre (egen kommentar)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "For hånds_visning" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Skriv ut..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Avslutt" @@ -2627,6 +2724,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Lagre" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Skriv ut dokumentet" @@ -2664,7 +2766,7 @@ msgstr "Nytt dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopiér/Eksporter avsnitt" @@ -2701,7 +2803,7 @@ msgstr "Eksporter komplett bok" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Bok" @@ -2815,8 +2917,8 @@ msgid "Open about dialog" msgstr "Åpne i et dialogvindu" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Halvfet" @@ -2859,13 +2961,17 @@ msgid "Delete selection" msgstr "Slett valgt område" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Slett" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Fjern merket objekt" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Slett element" @@ -3042,6 +3148,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Ny" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3174,123 +3284,87 @@ msgid "_Edit" msgstr "_Endre" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Hjelp" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #, fuzzy msgid "Normal" msgstr "Normal tekst" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Slett lista?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Liste over vers" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Merk/Fjern merke på vers" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Merke" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Fjern merke" @@ -3367,33 +3441,41 @@ msgstr "Slett søkeindeksen for de valgte modulene." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Fortsett" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulhåndterer" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "PASS PÅ Hvis du er i et land der det ikke er tillatt å bruke bibel, " "bruk med forsiktighet." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Legg til/fjern kilder" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Lokale kilder" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3401,15 +3483,15 @@ "Legg til en lokal mappe som kilde, for eksempel en CD-ROM eller minnepinne. " "En slik mappe inneholder undermappene \"mods.d\" og \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Fjern en av dine lokale kilder." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Kilder på Internett" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3417,43 +3499,43 @@ "Legg til en egendefinert ekstern kilde. Du må vite vetsnavnet og katalogen " "hvor samlingen er lagret." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Slett en ekstern kilde." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Kilde for installasjon" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokal" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Fjern" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Installer til" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Personelig område, for bruk av bare deg:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Hjemmemappe" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "System område, for alle brukere:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword system-mappe" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3461,10 +3543,14 @@ "Advarsel: Hvis du er i et land med forfølgelse og ikke vil bli " "oppdaget, bør du IKKE installere fra Internett!" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokal mappe for installasjon" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Dropdown historieliste" @@ -3473,11 +3559,11 @@ msgid "Choose book to display" msgstr "Velg hvilken bok du vil vise" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Bokvalg Knapp" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Johannes Åpenbaring" @@ -3485,11 +3571,11 @@ msgid "Choose chapter to display" msgstr "Velg hvilket kapittel du vil se" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Vippebryter Kapittel Knapp" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3642,11 +3728,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Moduler" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3718,12 +3805,12 @@ msgid "BSP privacy button" msgstr "Vers Radio Knapp" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Frelse" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3755,11 +3842,12 @@ msgid "BSP nav verse list radio button" msgstr "Modul-liste radioknapp" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Navn på liste" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3802,7 +3890,12 @@ msgid "BSP listen none radio button" msgstr "Enkel Tekst Radio Knapp" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Spesial" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3988,187 +4081,186 @@ msgstr "Aktivere Bønneliste Sjekkboks" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Versnummer:" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Vis versnummer i halvfete typer" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Avkrysningsboksen Versnummer i halvfet" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Klammer" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Vis versnummer i [klammer]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Avkrysningsboksen Versnummer i klammer" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Hevet skrift" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Vis versnumre i hevet skrift" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Avkrysningsboksen Versnummer i hevet skrift" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Studieblokk standard oppslag combo" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Velg en mappe" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Studieblokk standard oppslag combo" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Ymse forskjellig" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Hovedmoduler for vinduer" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Bibelutdrag" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Endre Bibelske Tekster Combo" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Endre Kommentar Combo" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Ordbok" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Endre Ordbok Combo" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Endre Bok Combo" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduler" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Fjern alle moduler fra lista" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Fjern Moduler fra Lista Knapp" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Fjern valgt modul fra lista" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Fjern Valgt Modul Fra Liste Knapp" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Åpner et dialogvindu hvor du kan velge moduler" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Legg inn moduler" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Åpne Utvalg Dialog Knapp" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Parallell-moduler" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Spesial Moduler" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Dagens tekst" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Dagens Andakt Combo" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebraisk Leksikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebraisk Leksikon Combo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Gresk Leksikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Gresk Leksikon Combo" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Standard ordbok" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Endre Forhåndsvalg Ordbok Combo" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Personlige notater" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Endre Personlige Notater Combo" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Diverse moduler" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Modulvalg" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -4197,6 +4289,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Avansert søk" @@ -4405,11 +4501,11 @@ msgid "Found" msgstr "Funnet" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Resultat Oppsummering Vindu" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Resultat Oppsummering Oppslag" @@ -4601,6 +4697,11 @@ msgid "Attribute Search" msgstr "Søk etter egenskaper" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Modulvalg" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4694,6 +4795,10 @@ msgid "_Module Manager" msgstr "_Modulhåndterer" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Vis" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Forhåndsvis _Dagens Tekst" @@ -4840,27 +4945,27 @@ msgid "Learn about Xiphos" msgstr "Om _Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Kommentér vers" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Åpne modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Notat" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Åpne i editor" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "_Vers Pr Linje" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4868,188 +4973,197 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianter" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Inneholder" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respekt Font Visning" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Kapittel Kommentarer" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "D_obbelt mellomrom" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Slå opp utvalg" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Bruk den valgte ordlista" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Let på BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Lås opp modulen" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Vis tittel på bok" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Vis overskrift for hvert kapittel" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Endre navn på personlig kommentar." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Dump personlig kommentar." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Les utvalget høyt" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Lagre disse resultatene som ett enkelt bokmerke" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Lagre listen som ett enkelt bokmerke" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Lagre disse resultatene som en gruppe bokmerker i en separat mappe" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Lagre listen som en gruppe bokmerker" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Liste over vers" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Slett historie" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Eksportliste" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Åpne bokmerket i ny arkfane" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Åpne i ny flik" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Åpne bokmerket i et dialogvindu" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Åpne i et dialogvindu" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Legg ny mappe i den valgte mappa" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Sett inn nytt bokmerke her" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Sett inn bokmerke" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Rediger bokmerke" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Rediger element" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Slett element" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Utvid alle grupper av bokmerker" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Utvid alt" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Fold sammen alle grupper av bokmerker" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Fold sammen alt" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Tillat at elementer flyttes fra en mappe til en annen" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Tillat sortering" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Last inn bokmerker fra Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Sett inn bokmerke" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Fjern mappe og lagre den" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Eksporter mappe" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Åpne valgt modul i ny fane" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5057,81 +5171,81 @@ "Åpne den valgte modulen i ett\n" "\tuavhengig ['dialog']vindu" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Åpne i ett separat vindu" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Lag en ny lenkel bønne liste" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Enkel" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Opprett en ny tematisk bønneliste" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Subjekt" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Opprett en månedlig journal" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Månedlig" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Opprett en daglig journal" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Daglig" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Opprett en disposisjon" # (supposing outline view) -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Disposisjonsvisning" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Åpne i ett separat vindu" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Legg til et under-element" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Legg til under-element" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Legg til sak" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Legg til element" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Fjern denne saken" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Rediger denne saken" @@ -5143,6 +5257,91 @@ msgid "Study the Bible" msgstr "Studér Bibelen" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "[ingen moduler]" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s·feilet" + +#~ msgid "Page %d of %d" +#~ msgstr "Side %d av %d" + +#~ msgid "Save As" +#~ msgstr "Lagre som" + +#~ msgid "HTML Output" +#~ msgstr "HTML Ut" + +#~ msgid "HTML Source" +#~ msgstr "HTML Kilde" + +#~ msgid "Plain Source" +#~ msgstr "Enkel Kilde" + +#~ msgid "_Quit" +#~ msgstr "_Avslutt" + +#~ msgid "_Open" +#~ msgstr "_Åpne" + +#~ msgid "_Save" +#~ msgstr "_Lagre" + +#~ msgid "Save _As..." +#~ msgstr "Lagre _som..." + +#~ msgid "Open new document" +#~ msgstr "Åpne nytt dokument" + +#~ msgid "Delete current note" +#~ msgstr "Slett dette notatet" + +#~ msgid "HTML _Output" +#~ msgstr "HTML _Ut" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML Kilde" + +#~ msgid "_Plain Source" +#~ msgstr "_Enkel Kilde" + +#~ msgid "Unlock " +#~ msgstr "Lås opp " + +#~ msgid "Preparing to print" +#~ msgstr "Forbereder utskrift" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Utskrift har ikke støtte for denne printer" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Printer·%s·støtter ikke PostScript·printing." + +#~ msgid "Printing" +#~ msgstr "Skriver ut" + +#~ msgid "Waiting to print" +#~ msgstr "Avventer utskrift" + +#~ msgid "An error occurred while printing" +#~ msgstr "En feil oppstod ved utskrift" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "klarte ikke å skrive ut dokumentet:·%s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos kan ikke lage mappen .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos kan ikke fortsette." + #~ msgid "Tabs" #~ msgstr "Arkfaner" @@ -5556,9 +5755,6 @@ #~ msgid "C_lear" #~ msgstr "_Slett" -#~ msgid "Clear history list" -#~ msgstr "Slett historie" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "Vis dagens tekst" @@ -5583,9 +5779,6 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "Mer informasjon om SWORD-prosjektet" -#~ msgid "About this application" -#~ msgstr "Om dette programmet" - #~ msgid "Hi_story" #~ msgstr "Hi_storie" diff -Nru xiphos-4.0.0+dfsg1/po/nl.po xiphos-4.0.4+dfsg1/po/nl.po --- xiphos-4.0.0+dfsg1/po/nl.po 2014-12-23 17:35:57.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/nl.po 2015-06-16 17:44:26.000000000 +0000 @@ -8,105 +8,17 @@ msgstr "" "Project-Id-Version: Xiphos 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-21 21:51+0000\n" -"PO-Revision-Date: 2014-12-22 18:05-0500\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" +"PO-Revision-Date: 2015-01-18 19:40-0500\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Xiphos-developers \n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2010-03-21 04:49+0000\n" "X-Generator: Poedit 1.5.4\n" -#: ../src/biblesync/biblesync.cc:130 -msgid "network setup errors." -msgstr "netwerkinstellingen fouten" - -#: ../src/biblesync/biblesync.cc:176 -msgid " client socket" -msgstr "client-socket" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr " server socket" - -#: ../src/biblesync/biblesync.cc:371 -msgid "bad magic" -msgstr "slechte magie" - -#: ../src/biblesync/biblesync.cc:375 -msgid "bad protocol version" -msgstr "slechte protocol versie" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad msg type" -msgstr "slechte berichttype" - -#: ../src/biblesync/biblesync.cc:385 -msgid "bad packet count" -msgstr "slecht pakket telling" - -#: ../src/biblesync/biblesync.cc:389 -msgid "bad packet index" -msgstr "slecht pakket index" - -#: ../src/biblesync/biblesync.cc:433 -msgid "bad body format" -msgstr "slechte lichaam formaat" - -#: ../src/biblesync/biblesync.cc:447 -msgid "missing required header " -msgstr "ontbrekende vereiste header" - -#: ../src/biblesync/biblesync.cc:474 -msgid "Spoof stopped: " -msgstr "Spoof gestopt:" - -#: ../src/biblesync/biblesync.cc:505 -msgid "Ignoring echo." -msgstr "Het negeren van echo." - -#: ../src/biblesync/biblesync.cc:534 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domein niet BIJBEL-VERS" - -#: ../src/biblesync/biblesync.cc:542 -msgid "Invalid group: " -msgstr "Ongeldige groep:" - -#: ../src/biblesync/biblesync.cc:572 -msgid " present at " -msgstr "aanwezig op" - -#: ../src/biblesync/biblesync.cc:574 -msgid " using " -msgstr "gebruik" - -#: ../src/biblesync/biblesync.cc:692 -msgid "[no dump ready]" -msgstr "[geen dumpen klaar]" - -#: ../src/biblesync/biblesync.cc:700 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:711 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" - -#: ../src/biblesync/biblesync.cc:801 -msgid "Transmit failed.\n" -msgstr "Overbrengen mislukt.\n" - -#: ../src/biblesync/biblesync.cc:802 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" -"Niet in staat om multicast; BibleSync is nu uitgeschakeld. Als uw " -"netwerkverbinding gewijzigd terwijl dit programma actief was, kan het " -"voldoende zijn om opnieuw in te schakelen zijn." - #: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" @@ -117,7 +29,7 @@ "Meld dit dan. sword_main.cc:set_treekey\n" "Wat deed je toen dit gebeurde?" -#: ../src/backend/sword_main.cc:1155 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Configuratie niet gevonden" @@ -125,53 +37,228 @@ msgid "Are you sure you want to delete the note for" msgstr "Weet u zeker dat u de notitie wilt verwijderen voor" -#: ../src/editor/webkit_editor.c:593 ../ui/editor_studypad.xml.h:9 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 #: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Openen" -#: ../src/editor/webkit_editor.c:685 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Niet-opgeslagen document" -#: ../src/editor/webkit_editor.c:1227 ../src/editor/webkit_editor.c:1270 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Wijzigingen opslaan" -#: ../src/editor/webkit_editor.c:1228 ../src/editor/webkit_editor.c:1271 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "voor afsluiten?" -#: ../src/editor/webkit_editor.c:1235 ../src/editor/webkit_editor.c:1278 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "Wijzigingen gaan verloren als u niet opslaat." -#: ../src/editor/webkit_editor.c:1269 ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "Bestand" -#: ../src/editor/webkit_editor.c:1319 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "Notitieblok" -#: ../src/editor/webkit_editor.c:1334 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Notitieblok" -#: ../src/editor/webkit_editor.c:1349 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Gebedslijst/Berichten-editor" -#: ../src/gnome2/about_modules.c:148 +#: ../src/gnome2/about_modules.c:138 msgid "About Sword Module" msgstr "Module over SWORD" -#: ../src/gnome2/about_modules.c:358 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "De module heeft geen \"Over\" informatie" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "" + +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " +msgstr "Module naam: " + +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " +msgstr "Versie: " + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "Geen versie stempel gevonden" + +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Zoekgebied" + +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Dagboek" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Landkaarten" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Illustraties" + +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Woordenlijsten" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bijbel" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Commentaar" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Woordenboek" + +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Boeken" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Commentaar hernoemen" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DailyJournal" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Onbekend" + +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "Module afkorting: " + +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "Taal: " + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "Niet gespecificeerd" + +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "Geïnstalleerd grootte: " + +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "Metgezel module(s):
" + +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "Kenmerken:" + +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "* Rubrieken" + +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "* Voetnoten" + +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "* Kruisverwijzingen" + +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "* Strong's nummers" + +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "* Morfologische markeringen" + +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "* Lemmas" + +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "* Uitspraken van Jezus rood weergeven" + +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "* Griekse Leestekens" + +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "* Hebreeuwse Klinkertekens" + +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "* Hebreeuwse Cantillation" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "* Variant lezingen" + +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "* Getranslitereerde Formulieren" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "* Opsommingen" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "* Woordenlijsten" + +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "* Morfeem Segmentatie" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "* Er zijn geen kenmerken gevonden" + +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "Distributie licentie:" + +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "Promotionele: " + +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -191,41 +278,43 @@ "\n" " Boeken kunnen worden gedownload van de SWORD Project." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Het SWORD-project" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Bevalt Xiphos u als bijbelstudiehulp? Wilt u dat het programma ook uw taal " "ondersteund? U kunt ook een bijdrage leveren.Wij zijn altijd op zoek naar " "nieuwe vertalingen van Xiphos. Als u daarvoor de tijd heeft, klik dan op de " "link hieronder voor meer informatie." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Xiphos vertaling" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Lees de TRANSLATION HOWTO in de broncode van Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos ontwikkeling" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Auteursrecht 2000-2014 Het ontwikkelteam van Xiphos" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Auteursrecht 2000-2015 Het ontwikkelteam van Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -238,79 +327,79 @@ "SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:370 -#: ../src/gnome2/bookmarks_menu.c:670 ../src/gnome2/bookmarks_menu.c:769 -#: ../src/gnome2/bookmarks_treeview.c:135 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Bladwijzer" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:771 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Mapnaam invoeren" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:773 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Mapnaam" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:774 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Map: " -#: ../src/gnome2/bookmarks_menu.c:208 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Specificeren bladwijzers bestand" -#: ../src/gnome2/bookmarks_menu.c:356 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Bewerken" -#: ../src/gnome2/bookmarks_menu.c:373 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Mapnaam: " -#: ../src/gnome2/bookmarks_menu.c:376 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Bladwijzernaam: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:678 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:380 ../src/gnome2/bookmarks_menu.c:679 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Module: " -#: ../src/gnome2/bookmarks_menu.c:502 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Geselecteerde map verwijderen" -#: ../src/gnome2/bookmarks_menu.c:504 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(en de gehele inhoud)?" -#: ../src/gnome2/bookmarks_menu.c:507 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Toevoegen" -#: ../src/gnome2/bookmarks_menu.c:677 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Label: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Zoekresultaat: %s" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -318,89 +407,89 @@ "Het openen van een multi-referentie-bladwijzer in\n" "aparte tabbladen wordt niet ondersteund." -#: ../src/gnome2/bookmarks_treeview.c:867 ../src/gnome2/sidebar.c:1508 -#: ../src/gnome2/sidebar.c:1541 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Cipher key voor module %s" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "voor:" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Geef sleutelcode: " -#: ../src/gnome2/dialog.c:291 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Sluiten zonder opslaan" -#: ../src/gnome2/dialog.c:736 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:872 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Sluiten _zonder opslaan" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1557 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Verslijst" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Vers van de lijst" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Zoekresultaten" -#: ../src/gnome2/export_dialog.c:324 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Controleer de auteursrechten voordat u exporteert!" -#: ../src/gnome2/find_dialog.c:188 ../src/gnome2/find_dialog.c:367 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Zoeken" -#: ../src/gnome2/find_dialog.c:207 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Geef een woord of een zin" -#: ../src/gnome2/find_dialog.c:222 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Terugwaarts zoeken" -#: ../src/gnome2/find_dialog.c:283 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Volgende zoeken" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Lettertype voor module" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Wijzig lettertype van" -#: ../src/gnome2/font_dialog.c:342 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Module" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Huidige lettertype: " -#: ../src/gnome2/font_dialog.c:378 ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" @@ -409,63 +498,63 @@ msgid "Use the default font for this module" msgstr "Gebruik het standaardlettertype voor deze module" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos punt staat te crashen als gevolg van een \"STRDUP\" error." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Meld deze fout aan de xiphos team met:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos punt staat te crashen als gevolg van een \"STRING\" error." -#: ../src/gnome2/main_window.c:594 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Module heeft geen ondersteuning voor %s." -#: ../src/gnome2/main_window.c:664 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Geen ramen." -#: ../src/gnome2/main_window.c:720 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Actueel navigatie gestuurd." -#: ../src/gnome2/main_window.c:724 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Niet spreken." -#: ../src/gnome2/main_window.c:908 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Bijbelstudieprogramma" -#: ../src/gnome2/main_window.c:971 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../src/gnome2/main_window.c:1051 ../src/gnome2/sidebar.c:621 -#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standaardweergave" -#: ../src/gnome2/main_window.c:1112 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Commentaar" -#: ../src/gnome2/main_window.c:1128 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Boek" -#: ../src/gnome2/main_window.c:1155 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Welkom op Xiphos" -#: ../src/gnome2/menu_popup.c:1247 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -483,33 +572,33 @@ "om geopende bestanden te hernoemen,\n" "zoals de inhoud van dit commentaar." -#: ../src/gnome2/menu_popup.c:1266 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Commentaar hernoemen" -#: ../src/gnome2/menu_popup.c:1269 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Commentaarnaam kiezen" -#: ../src/gnome2/menu_popup.c:1271 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nieuwe naam" -#: ../src/gnome2/menu_popup.c:1272 ../src/gnome2/treekey-editor.c:141 -#: ../src/gnome2/treekey-editor.c:204 ../src/gnome2/treekey-editor.c:300 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Naam: " -#: ../src/gnome2/menu_popup.c:1282 ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modulenamen kunnen alleen letters en getallen.bevatten." -#: ../src/gnome2/menu_popup.c:1289 ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos kent al een module met die naam." -#: ../src/gnome2/menu_popup.c:1330 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -518,7 +607,7 @@ "Maken van een nieuwe configuratie is mislukt:\n" "%s" -#: ../src/gnome2/menu_popup.c:1339 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -526,7 +615,7 @@ "Fout bij het aanmaken van de configuratie:\n" "\n" -#: ../src/gnome2/menu_popup.c:1939 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Geen module in dit deelvenster." @@ -648,20 +737,20 @@ "Zowel deze stap-voor-stap dialoogvenster instructie en de algemene " "dialoogvenster introductie kan op elk moment worden afgesloten." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Verwijder deze modules?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Verwijderen wordt voorbereid" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Verwijderen" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:152 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Verwijder" @@ -681,23 +770,23 @@ msgid "Install" msgstr "Installeer" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archief deze modules?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Back-up wordt voorbereid" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Bezig met maken back-up" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Back-up maken" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -705,56 +794,60 @@ "Bouw fast-index voor deze\n" "modules (kan minuten duren/module)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Indexeren wordt voorbereid" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexeren" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Zoekindex maken" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Verwijder fast-search-index voor deze modules?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Verwijderen index wordt voorbereid" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Index wordt verwijderd" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Verwijderen" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "De module heeft geen \"Over\" informatie" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modulenaam" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Het markeringssymbool betekent dat deze module al geïnstalleerd is." -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Klik op het vakje om te werken aan deze module" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Klik op het vakje te selecteren voor deze module te installeren/updaten" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Geïnstalleerd" -#: ../src/gnome2/mod_mgr.c:628 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -763,7 +856,7 @@ "gebouwd voor deze module voor snel zoeken (zie de Maintenance paneel voor " "deze functie)" -#: ../src/gnome2/mod_mgr.c:646 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -771,13 +864,13 @@ "Het slot pictogram betekent deze module is gecodeerd, en vereist dat u koopt " "een unlock sleutel van de eigenaar van de inhoud" -#: ../src/gnome2/mod_mgr.c:663 ../src/main/biblesync_glue.cc:629 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 #: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "In_fo" -#: ../src/gnome2/mod_mgr.c:689 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -785,19 +878,19 @@ "Het vernieuwen icoon betekent dat de geïnstalleerde module is ouder dan de " "nieuwere Beschikbaar module: U moet de module update" -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Beschikbaar" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Grootte" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Beschrijving" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -806,33 +899,33 @@ "`mkdir %s' is mislukt:\n" "%s." -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " gearchiveerd in: \n" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Berichten en gebedslijsten kunnen niet geïndexeerd worden." -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s is mislukt" -#: ../src/gnome2/mod_mgr.c:1000 ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Voltooid" -#: ../src/gnome2/mod_mgr.c:1168 ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Onbekend" -#: ../src/gnome2/mod_mgr.c:1496 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -841,7 +934,7 @@ "Bron:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -849,54 +942,44 @@ "Gesorteerd bij\n" "moduletype" -#: ../src/gnome2/mod_mgr.c:1513 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Bijbelvertalingen" -#: ../src/gnome2/mod_mgr.c:1517 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Commentaren" -#: ../src/gnome2/mod_mgr.c:1521 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Woordenboeken" -#: ../src/gnome2/mod_mgr.c:1525 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Woordenlijsten" -#: ../src/gnome2/mod_mgr.c:1529 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Dagboeken" -#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Boeken" -#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "Landkaarten" - -#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "Illustraties" - -#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Cult/Onorthodoxe" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -904,57 +987,57 @@ "Gecategoriseerd bij\n" "beschikbaarheid" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Updates" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Niet geïnstalleerd" -#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/sidebar.c:637 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Gebedslijst/Bericht" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Verfrissend afgelegen bron" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Remote source not found" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configureren" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Type" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Titel" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Bron" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Map" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Gebruiker" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Wachtwoord" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" @@ -966,12 +1049,12 @@ msgid "Add/Remove" msgstr "Toevoegen/Verwijderen" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Kiezen" -#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2066 -#: ../src/gnome2/sidebar.c:1526 ../src/gnome2/sidebar.c:1565 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modules" @@ -979,19 +1062,20 @@ msgid "Install/Update" msgstr "Installeren/Bijwerken" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Onderhoud" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Verversen alstublieft" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Uw modelelijst is niet actueel!" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -999,7 +1083,7 @@ "U hebt verwijderd uw laatste Bijbel.\n" "Xiphos vereist ten minste een." -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1007,111 +1091,126 @@ "Er zijn nog geen bijbels geïnstalleerd.\n" "Xiphos kan niet doorgaan zonder een." -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" +"%s obsoletes %s.\n" +"Wilt u %s wilt verwijderen?\n" +"Let op: Dit kan niet ongedaan gemaakt worden." + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "Geen verouderde modules werden gevonden." + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standaard afstandsbediening bronnen zijn geladen." -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Kan niet laden standaard bronnen van CrossWire." -#: ../src/gnome2/mod_mgr.c:2787 ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Geselecteerde bron verwijderen" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Externe bron invoeren" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Titel:" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Type:" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Map:" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Gebruiker (optioneel):" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Wachtwoord (optioneel):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Een bron met die naam bestaat al." -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Verwijder een externe bron" -#: ../src/gnome2/mod_mgr.c:3554 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[Gehele module]" -#: ../src/gnome2/navbar_book.c:371 ../src/gnome2/navbar_book_dialog.c:312 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Ga naar buiten, naar de sectie die deze bevat." -#: ../src/gnome2/navbar_book.c:393 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Vorig item" -#: ../src/gnome2/navbar_book.c:414 ../src/gnome2/navbar_book_dialog.c:352 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Volgend item" -#: ../src/gnome2/navbar_book.c:436 ../src/gnome2/navbar_book_dialog.c:372 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Ga naar binnen, naar de eerste subsectie" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:855 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synchroniseer's dit venster scrollen met het hoofdvenster" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2073 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Koppel/Ontkoppel" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Moduleopties" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:620 -#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:250 -#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Parallelweergave" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "BibleSync sessie wachtwoordzin" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "uitdrukking" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1119,96 +1218,96 @@ "Mode selectie is mislukt.\n" "Stel \"Debug\" en probeer het opnieuw om te zien waarom." -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Mode selectie is mislukt.\n" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (wachtwoordzin \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Invalide" -#: ../src/gnome2/preferences_dialog.c:1021 ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Persoonlijk" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Spreker" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Toehoorders" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1926 -#: ../src/gnome2/preferences_dialog.c:2403 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Selecteer --" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Locale wordt van kracht na herstarten." -#: ../src/gnome2/preferences_dialog.c:1961 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Voorkeuren" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Algemeen" -#: ../src/gnome2/preferences_dialog.c:2049 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opties" -#: ../src/gnome2/preferences_dialog.c:2052 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Lettertypes" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Kleur" -#: ../src/gnome2/preferences_dialog.c:2062 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Tabbladen en panelen" -#: ../src/gnome2/preferences_dialog.c:2076 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Geavanceerd" -#: ../src/gnome2/preferences_dialog.c:2785 ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Lijst wissen?" -#: ../src/gnome2/preferences_dialog.c:2786 ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Weet u zeker dat u de module lijst wilt wissen?" -#: ../src/gnome2/preferences_dialog.c:2837 ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Module verwijderen?" -#: ../src/gnome2/preferences_dialog.c:2838 ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Weet u zeker dat u de selecteerde module wilt wissen?" @@ -1227,20 +1326,20 @@ msgid "found in " msgstr "gevonden in " -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nieuwe Lijst %s" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "De laatste module lijst mag niet worden verwijderd." -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Lijst verwijderen?" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Weet u zeker dat u het volgende wilt verwijderen:" @@ -1260,7 +1359,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1330,7 +1429,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1365,15 +1464,15 @@ "\"zelfstandig naamwoord, accusatief enkelvoud vrouwelijk\" - zie de Robinson-" "module voor details." -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Module is noch Bijbel noch commentaar" -#: ../src/gnome2/search_dialog.c:1247 ../src/gnome2/sidebar.c:996 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync niet actief voor zenden." -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1381,105 +1480,95 @@ "Inclusief (\"AND\") zoeken:\n" "Een resultaat bevat alle woorden." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Geavanceerd zoeken" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Open de afzonderlijke Advanced Search dialoogvenster." -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Module zoeken" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "Bijbel" - -#: ../src/gnome2/search_sidebar.c:259 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Commentaar" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Zoektype" -#: ../src/gnome2/search_sidebar.c:287 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Meerdere woorden" -#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Reguliere expressie" -#: ../src/gnome2/search_sidebar.c:306 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Exacte zin" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Zoekopties" -#: ../src/gnome2/search_sidebar.c:333 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Hoofdlettergevoelig" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Zoekruimte" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Overal zoeken" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Grenzen gebruiken" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Laatste zoekactie" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Grenzen" -#: ../src/gnome2/search_sidebar.c:410 ../src/gnome2/search_sidebar.c:443 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Onder" -#: ../src/gnome2/search_sidebar.c:422 ../src/gnome2/search_sidebar.c:450 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Boven" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "In editor openen?" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Zo nee, zal het te openen voor alleen display." -#: ../src/gnome2/sidebar.c:950 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Plakken versverwijzingen" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Lijst:" -#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1549 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Zoeken" -#: ../src/gnome2/sidebar_dialog.c:164 ../src/gnome2/sidebar_dialog.c:173 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Zijbalk" @@ -1487,73 +1576,73 @@ msgid "Powered by the SWORD Project" msgstr "Mede mogelijk gemaakt door het SWORD-project" -#: ../src/gnome2/tabbed_browser.c:359 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Kan geen tabs directory." -#: ../src/gnome2/treekey-editor.c:139 ../src/gnome2/treekey-editor.c:202 -#: ../src/gnome2/treekey-editor.c:298 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Gebedspunt/Bericht" -#: ../src/gnome2/treekey-editor.c:140 ../src/gnome2/treekey-editor.c:203 -#: ../src/gnome2/treekey-editor.c:299 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nieuwe naam" -#: ../src/gnome2/treekey-editor.c:260 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Geselecteerde item verwijderen" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januari" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februari" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Maart" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mei" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juni" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juli" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Augustus" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "October" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1563,7 +1652,7 @@ "(Mogelijks is het bestandstype iets anders dan bm/gif/jpg/png.)\n" "Xiphos kan illustraties niet aanpassen aan de schermgrootte." -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" @@ -1571,7 +1660,7 @@ "Mismatched pakket\n" "\n" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" @@ -1579,7 +1668,7 @@ "Aanwezigheid aankondiging:\n" "\n" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" @@ -1587,11 +1676,11 @@ "Navigatie-pakket:\n" " \n" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "[Gehele module]" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." @@ -1599,43 +1688,43 @@ ".\n" "Indirect genavigeerd met behulp van vers lijst." -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " msgstr "FOUT: onbekend BibleSync indicator:" -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" msgstr "Andere indicaties zijn:" -#: ../src/main/biblesync_glue.cc:579 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "Vink het vakje aan deze luidspreker te luisteren" -#: ../src/main/biblesync_glue.cc:592 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "Beschikbaar Sprekers" -#: ../src/main/biblesync_glue.cc:601 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "D/I" -#: ../src/main/biblesync_glue.cc:611 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" msgstr "Laatste navigatie was direct of indirect kunnen" -#: ../src/main/biblesync_glue.cc:620 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "Laatste Navigatie" -#: ../src/main/biblesync_glue.cc:639 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" msgstr "UUID" -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "IP adres:" -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " @@ -1643,7 +1732,7 @@ "\n" "Toepassing:" -#: ../src/main/biblesync_glue.cc:663 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " @@ -1651,7 +1740,7 @@ "\n" "Apparaat:" -#: ../src/main/biblesync_glue.cc:664 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " @@ -1659,13 +1748,13 @@ "\n" "UUID: " -#: ../src/main/display.cc:88 +#: ../src/main/display.cc:89 msgid "" "

This module has no content at this point.
" msgstr "" "
Deze module heeft geen inhoud op dit punt.
" -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1674,63 +1763,63 @@ "Onjuist gecodeerde persoonlijke annotatie label:\n" "'%s'" -#: ../src/main/display.cc:1110 ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Hoofdstuk" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos ondersteund niet meer dan één argument." -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "initiëren HTML" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Interface wordt opgebouwd" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Sword wordt gestart" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Instellingen worden geladen" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Opbouwen interface" -#: ../src/main/module_dialogs.cc:188 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Voorbeeldweergave" -#: ../src/main/module_dialogs.cc:243 ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Voetnoot" -#: ../src/main/module_dialogs.cc:249 ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Kruisverwijzing" -#: ../src/main/module_dialogs.cc:255 ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:261 ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 ../src/main/module_dialogs.cc:386 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologie" -#: ../src/main/module_dialogs.cc:1012 ../src/main/url.cc:529 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Terug naar " @@ -1739,196 +1828,203 @@ msgstr "Onbekend parallel module:" #: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongs getallen" -#: ../src/main/parallel_view.cc:410 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Voetnoten" -#: ../src/main/parallel_view.cc:420 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologische Markeringen" -#: ../src/main/parallel_view.cc:430 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebreeuwse Klinkertekens" -#: ../src/main/parallel_view.cc:440 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebreeuwse Cantillation" -#: ../src/main/parallel_view.cc:450 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Griekse Leestekens" -#: ../src/main/parallel_view.cc:460 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Kruisverwijzingen" -#: ../src/main/parallel_view.cc:470 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmas" -#: ../src/main/parallel_view.cc:480 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Rubrieken" -#: ../src/main/parallel_view.cc:490 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfeem Segmentatie" -#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Uitspraken van Jezus rood weergeven" -#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteration" -#: ../src/main/parallel_view.cc:524 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Tekstuele Varianten" -#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Primaire Lezing" -#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Secundaire Lezing" -#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Alle lezingen" -#: ../src/main/parallel_view.cc:560 ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 msgid "Transliterated Forms" msgstr "Getranslitereerde Formulieren" -#: ../src/main/parallel_view.cc:570 ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 msgid "Enumerations" msgstr "Opsommingen" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "Woordenlijsten" + #: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "context bekijken" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Groei" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Voor groei
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Verlossing" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Voor verlossing
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Gezondheid" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Voor gezondheid
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Overig" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Overig
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Deelonderwerp 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Deelonderwerp 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Deelonderwerp 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Deelonderwerp 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Deelonderwerp 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Deelonderwerp 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Deelonderwerp 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Deelonderwerp 4
" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Naam voor gebedslijst of bericht" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos heeft al zo'n gebedslijst." -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1937,20 +2033,20 @@ "Xiphos kunt geen pad module:\n" "%s" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" "Een standaard gebedslijst. \\par\\par Module is aangemaakt door Xiphos." -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "BasicPrayerList" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MijnGebedslijst" -#: ../src/main/prayerlists.cc:335 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1958,105 +2054,105 @@ "Personen:
Bob
Sam
Sue

Kerk:
Veiligheid
Eenheid
Bijbels voor zendelingen


" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Een gebedslijst op onderwerp. \\par\\par Module aangemaakt met Xiphos." -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "OnderwerpPrayerList" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Geestelijke groei" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" "Een maandelijkse gebedslijst. \\par\\par Module is aangemaakt bij Xiphos." -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MaandelijksPrayerList" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Een dagelijks bericht. \\par\\par Module is aangemaakt door Xiphos." -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DailyJournal" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Een uitgelijnd onderwerp(e.g. preek). \\par\\par Module aangemaakt met " "Xiphos." -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "GeschetstTopic" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Hoofdonderwerp A" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Hoofdondewerp A
" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Hoofdonderwerp B" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Hoofdondewerp B
" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Hoofdonderwerp C" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Hoofdondewerp C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Gebruiker Annotatie" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Zoekresultaat %s: %s" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Reeks verwijderen?" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Wilt u deze reeks echt verwijderen?" -#: ../src/main/search_dialog.cc:645 ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Zoeken in: " -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2067,16 +2163,16 @@ "Deze module is niet geïnstalleerd.\n" "%s" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Pas de modulelijst aan." -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Geen snelle-index bestaat voor %s.%s%s" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2084,7 +2180,7 @@ "\n" "Zoek op deze module is nu `multi woord '." -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2092,19 +2188,19 @@ "\n" "Zie module Manager, Maintenance ruit." -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Zoeken voltooid" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "resultaten" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Er is geen commentaar module." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME is niet ingesteld!" @@ -2113,12 +2209,12 @@ msgid "Xiphos can not create directory " msgstr "Xiphos kan geen map maken" -#: ../src/main/settings.c:135 ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "aanmaken niet gelukt van " -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2130,7 +2226,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Leeg instellingenbestand - geen back-up?!? Informatie verloren!" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2146,11 +2242,11 @@ "Xiphos kan niet worden voortgezet,\n" "en zal nu verlaten." -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Installatie van Bijbelmodules is voltooid." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2158,15 +2254,15 @@ "Module fout: Onbruikbare xref encoding\n" ".Meld dit dan, met een module en vers." -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "vers" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "hoofdstuk" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2174,7 +2270,7 @@ "Xiphos's bestand voor taal\n" "afkortingen is niet gevonden." -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2182,7 +2278,7 @@ "Xiphos's taalafkortingen bestand\n" "kan niet worden geopend." -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2190,7 +2286,7 @@ "Xiphos niet toewijzen ruimte\n" "voor taal afkortingen." -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2199,7 +2295,7 @@ "taal afkorting bestand." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2208,11 +2304,11 @@ "Geen overeenkomende locale gevonden voor `%s '.\n" "%s" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Boek namen en menu's mogen niet worden vertaald" -#: ../src/main/sword.cc:1052 ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2223,7 +2319,7 @@ "%s.\n" "Wilt u deze openen ook?%s" -#: ../src/main/sword.cc:1056 ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2235,11 +2331,11 @@ "De eerste wordt geopend in het hoofdvenster\n" "en anderen in aparte vensters." -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Dagboeken werd opgevraagd, maar zijn niet geïnstalleerd." -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2263,93 +2359,93 @@ "\n" "Vul de sleutel in het dialoogvenster." -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Geschiedenis wissen" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "Geschiedenis ➛ Vers Lijst" -#: ../src/main/url.cc:103 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL niet gevonden:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos kon %s niet uitvoeren" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Viewer fout:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "%s in hoofdscherm tonen" -#: ../src/main/xml.c:86 ../src/main/xml.c:478 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Aanmaken document is mislukt. \n" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Wat moet ik doen om gered te worden?" -#: ../src/main/xml.c:98 ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Handelingen 16:31" -#: ../src/main/xml.c:103 ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Eph 2:8,9" -#: ../src/main/xml.c:108 ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romeinen 1:16" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Wat is het Evangelie?" -#: ../src/main/xml.c:114 ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:270 ../src/main/xml.c:416 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Document kon niet worden gelezen. \n" -#: ../src/main/xml.c:276 ../src/main/xml.c:422 ../src/main/xml.c:444 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "leeg document \n" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "verkeerd type, sleutelnode != SwordBookmarks\n" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "verkeerd type, sleutelnode != Copy_Export\n" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Hoofdstuk %d

" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Hoofdstuk %d

" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2362,7 +2458,7 @@ "Hoofdstuk %d\n" "\n" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2375,12 +2471,12 @@ "Hoofdstuk %d\n" "\n" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Hoofdstuk %d

" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2389,82 +2485,82 @@ "%s: %s Hoofdstuk %d\n" "\n" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:529 ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Oude Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Genesis - Maleachi" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nieuwe Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Matth. - Openbaring" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Voorbeeld modulelijst" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "verkeerd type, sleutelnode != %s\n" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2473,7 +2569,7 @@ "Opslaan van instellingen mislukt! stat %d, grootte %d\n" "%s" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Een poging om terug te keren naar de vorige redden." @@ -2487,13 +2583,13 @@ msgstr "Bladwijzervenster" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Map aanmaken" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nieuwe map" @@ -2502,7 +2598,7 @@ msgstr "Nieuw ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Bladwijzer verwijderen" @@ -2515,22 +2611,22 @@ msgstr "Label Entry" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Vers Entry" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Module:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Module Entry" @@ -2667,7 +2763,7 @@ msgstr "Nieuw document" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copy/Export Passage" @@ -2704,7 +2800,7 @@ msgstr "Volledig boek exporteren" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Boek" @@ -2812,8 +2908,8 @@ msgid "Open about dialog" msgstr "Open zijn over dialoogvenster" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Vet" @@ -2862,7 +2958,7 @@ msgstr "Verwijderen is mislukt" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Item verwijderen" @@ -3140,124 +3236,83 @@ msgstr "B_ewerken" #: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "Beel_d" - -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Hulp" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normaal" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Kop 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Kop 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Kop 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Kop 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Kop 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Kop 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adres" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Maak vooraf op" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Ongenummerde lijst" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Romeinse cijfer Lijst" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Genummerde lijst" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Alfabetische lijst" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" +msgstr "Doorhalen" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Stel font color van de geselecteerde tekst." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Markeer geselecteerde tekst door het instellen van achtergrond kleur." -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Mark/Deselect Vers" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Merken" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Deselect" @@ -3333,33 +3388,41 @@ msgstr "Verwijder fast-search-index voor deze modules?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "Scan _Verouderde" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "Scannen op verouderde modules en bieden om ze te verwijderen." + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Doorgaan" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulebeheer" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "WAARSCHUWING: Wees voorzichtig als u in een land leeft waar u wordt " "vervolgd." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Externe bronnen toevoegen en verwijderen" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Huidige lokale bronnen" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3367,15 +3430,15 @@ "Voeg een lokale map als een installatie bron, meestal op een cd-rom of flash " "drive. Zo'n map bevat submappen \"mods.d\" en \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Verwijder een van uw lokale mappen als een installatie bron." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Huidige externe bronnen" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3383,43 +3446,43 @@ "Voeg een custom remote installatie bron. U moet de hostnaam en de map waar " "de repository woont kennen." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Verwijder een externe bron" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Installatiebron" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokaal" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Extern" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Installatiedoelmap" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Persoonlijk map, alleen voor eigen gebruik:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Persoonlijke map" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Gedeelde map, voor alle gebruikers:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "SWORD systeemmap" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3427,10 +3490,14 @@ "WAARSCHUWING: Als u wordt vervolgd en niet wilt worden opgemerkt, " "gebruik dan geen externe bronnen! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokale installatiemap" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Vervolgkeuzelijst geschiedenis lijst" @@ -3439,11 +3506,11 @@ msgid "Choose book to display" msgstr "Kies een boek om weer te geven" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Boek Selector Button" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Openbaringen van Johannes" @@ -3451,11 +3518,11 @@ msgid "Choose chapter to display" msgstr "Kies het hoofdstuk weer te geven" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Hoofdstuk Toggle Button" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3615,11 +3682,11 @@ "een team werken; Spreker, om de Bijbel programma een lezing publiek rijden " "om mee te volgen; Publiek, de navigatie van de spreker te ontvangen." -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "Mode:" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Selecteer de modus waarin BibleSync moet functioneren." @@ -3687,11 +3754,11 @@ msgid "BSP privacy button" msgstr "BSP privacy button" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "Navigeren:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Kies hoe u inkomende navigatie synchronisatie accepteren." @@ -3719,11 +3786,11 @@ msgid "BSP nav verse list radio button" msgstr "BSP nav verse list radio button" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "Luister:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos zal naar Sprekers luisteren naar keuze hier." @@ -3763,11 +3830,11 @@ msgid "BSP listen none radio button" msgstr "BSP listen none radio button" -#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "Special:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3961,177 +4028,181 @@ msgstr "Enable Gebed Lijsten selectievakje" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Vers nummer" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Offset het vers nummer op verschillende manieren" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Toon vers nummer vetgedrukt" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Verse number bold checkbox" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Beugels" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Toon vers nummer met [omliggende haken]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Verse number bracket checkbox" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Superscript" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Toon vers nummer als een superscript" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Verse number superscript checkbox" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "StudiePad standaard directory" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Map kiezen" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudiePad standaard directory combo" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Algemene instellingen" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Algemeen Modulescherm" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Bijbelse tekst" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Verander bijbelse tekst Combo" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Verander Commentary Combo" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Woordenboek" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Verander Woordenboek Combo" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Verander Boek Combo" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modules" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Verwijder alle modules uit de lijst" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Duidelijke Modules uit lijst Button" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Geselecteerde modules uit lijst verwijderen" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Geselecteerde module uit knop Lijst" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Open een venster om modules te selecteren" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Modules toevoegen" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Open Selectie Dialog Button" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modules in parallelweergave" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Overige Modules" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Dagboek" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Daily Devotional Checkbox" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebreeuws Lexicon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Hebreeuws Lexicon Combo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Grieks Lexicon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Grieks Lexicon Combo" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Standaard woordenboek" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Verander Standaard Woordenboek Combo" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Persoonlijke aantekeningen" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Verander Persoonlijke notities Combo" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modules overig" @@ -4163,6 +4234,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Enable BibleSync als de spreker." + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Geavanceerd zoeken" @@ -4373,11 +4449,11 @@ msgid "Found" msgstr "Gevonden" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Uitslag samenvatting venster" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Uitslag overzichtstabel" @@ -4668,6 +4744,10 @@ msgid "_Module Manager" msgstr "Modulebeheer" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "Beel_d" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Voorbeeld Dagelijks Toewijding" @@ -4816,27 +4896,27 @@ msgid "Learn about Xiphos" msgstr "Over _Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Commenteren Vers" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Module openen" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Notitie" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "In editor openen" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Eén vers per regel" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Voetnoot/Cross-ref Markers" @@ -4844,79 +4924,79 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Toon niet-anonieme markers bijv.\"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianten" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Illustratie Inhoud" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Letterbeeld behouden" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Commentaar per hoofdstuk" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Dubbele spatiëring" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Selectie bekijken" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Gebruik huidig woordenboek" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Bladeren in BibleMap.org" -#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Open deze module" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Toon boektitel" -#: ../ui/xi-menus.glade.h:94 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Toon hoofdstuktitel" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Persoonlijk commentaar hernoemen." -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Persoonlijk commentaar verwijderen." -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Selectie hardop voorlezen" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Sla deze resultaten als een bladwijzer" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Lijst opslaan als een bladwijzer" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Sla deze resultaten als een reeks van bladwizjers in hun eigen map" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Lijst opslaan als een reeks van bladwijzers" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." @@ -4924,19 +5004,19 @@ "Zorg voor een dialoogvenster waarin om een lijn van versverwijzingen " "plakken, om het vers lijst invullen." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Bevolken vers lijst" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." msgstr "Duw de gehele inhoud vers lijst direct in de geschiedenis lijst." -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "Preload geschiedenis vanaf vers lijst" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:95 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." @@ -4944,99 +5024,99 @@ "Stuur dit vers lijst via BibleSync aan anderen, als je in een persoonlijke " "of Spreker-modus." -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Stuur lijst via BibleSync" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:96 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Ausfuhrliste" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Open deze bladwijzer in een nieuw tabblad" -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Openen in nieuw tabblad" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Open deze bladwijzer in een venster" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Open in een venster" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Nieuwe map toevoegen aan de geselecteerde map" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Bladwijzer hier toevoegen" -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Bladwijzer toevoegen" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Bladwijzeritem bewerken" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "It_em bewerken" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Item verwijderen" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Alle bladwijzergroepen uitklappen" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Alles uitklappen" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Alle referenties inklappen" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Alles inklappen" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Items tussen mappen verplaatsen toestaan" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Herschikken toestaan" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Bladwijzers van Bibletime laden" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Bladwijzers importeren" -#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Map verwijderen en opslaan" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Export Folder" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Geselecteerde module in een nieuw tabblad openen" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5044,79 +5124,79 @@ "Open geselecteerde module in een\n" "\t aparte [ 'dialoog'] venster" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Openen in een nieuw scherm" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Een eenvoudige gebedslijst maken" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Eenvoudig" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Maak een nieuw onderwerp gebed lijst" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Onderwerp" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Maak een nieuw maandblad" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Maandelijks" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Maak een nieuwe dagelijkse journaal" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Dagelijks" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Maak een nieuw onderwerp geschetste" -#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Outlined" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Open module editor of gewone etalage" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Open in apart venster" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Voeg een sub-item" -#: ../ui/xi-menus.glade.h:148 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Voeg Sub-item" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Item toevoegen" -#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Add Item" -#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Item verwijderen" -#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Item bewerken" @@ -5128,6 +5208,105 @@ msgid "Study the Bible" msgstr "Onderzoek de Bijbel" +#~ msgid "network setup errors." +#~ msgstr "netwerkinstellingen fouten" + +#~ msgid " client socket" +#~ msgstr "client-socket" + +#~ msgid " server socket" +#~ msgstr " server socket" + +#~ msgid "bad magic" +#~ msgstr "slechte magie" + +#~ msgid "bad protocol version" +#~ msgstr "slechte protocol versie" + +#~ msgid "bad msg type" +#~ msgstr "slechte berichttype" + +#~ msgid "bad packet count" +#~ msgstr "slecht pakket telling" + +#~ msgid "bad packet index" +#~ msgstr "slecht pakket index" + +#~ msgid "bad body format" +#~ msgstr "slechte lichaam formaat" + +#~ msgid "missing required header " +#~ msgstr "ontbrekende vereiste header" + +#~ msgid "Spoof stopped: " +#~ msgstr "Spoof gestopt:" + +#~ msgid "Ignoring echo." +#~ msgstr "Het negeren van echo." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domein niet BIJBEL-VERS" + +#~ msgid "Invalid group: " +#~ msgstr "Ongeldige groep:" + +#~ msgid " present at " +#~ msgstr "aanwezig op" + +#~ msgid " using " +#~ msgstr "gebruik" + +#~ msgid "[no dump ready]" +#~ msgstr "[geen dumpen klaar]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Overbrengen mislukt.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Niet in staat om multicast; BibleSync is nu uitgeschakeld. Als uw " +#~ "netwerkverbinding gewijzigd terwijl dit programma actief was, kan het " +#~ "voldoende zijn om opnieuw in te schakelen zijn." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + #~ msgid "UUID spoofed: wrong ipaddr." #~ msgstr "UUID vervalst: verkeerde IP-adres" diff -Nru xiphos-4.0.0+dfsg1/po/pl.po xiphos-4.0.4+dfsg1/po/pl.po --- xiphos-4.0.0+dfsg1/po/pl.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/pl.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-03-20 18:15+0000\n" "Last-Translator: Dmitrijs Ledkovs \n" "Language-Team: Polish \n" @@ -18,296 +18,262 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Nie znaleziono konfiguracji" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Czy jesteś pewien, że chcesz usunąć notatkę" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Otwórz" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Dokument bez tytułu" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Zapisz zmiany w dokumencie" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "przed zamknięciem?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Jeśli nie zapiszesz, zmiany zostaną trwale utracone." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Plik" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Edytor notek" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Lista modlitw/Edytor dziennika" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "O module Sword" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr " Moduł" +msgid "Module name: " +msgstr "Menedżer Modułów" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Opcje" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s zawiódł" +msgid "Type: " +msgstr "Zakres" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Codzienne Nabożeństwo" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapy" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Nie znaleziono konfiguracji" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Obrazy" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Strona %d z %d" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Otwórz" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Zapisz Jako" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblia" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Dokument bez tytułu" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Komentarz" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Czy jesteś pewien, że chcesz usunąć notatkę" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Słownik" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Wyjście HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Źródło HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Tekst źródłowy" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Księgi Powszechne" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Drukuj…" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Zmień nazwę Komentarza" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Podgląd _wydruku" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Dziennik" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Wyjdź" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Nieznane" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Otwórz" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Zapisz" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Listy Modułów" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Zapisz _jako..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Zakresy" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nowy" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Otwórz nowy dokument" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Źródło Instalacji" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Usuń" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Główne Moduły Okna" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Usuń obecną notatkę" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formatuj" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Plik" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Nagłówki" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Wyjście HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_Źródło HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Tekst źródłowy" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Widok" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Przypisy dolne" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Zapisz" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Odwołania" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Wstaw odnośnik" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Zapisz zmiany w dokumencie" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Tagi Morfologiczne" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "przed zamknięciem?" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lematy" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Jeśli nie zapiszesz, zmiany zostaną trwale utracone." +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Słowa Chrystusa w Czerwieni" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Plik" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Greckie akcenty" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Punkty samogłosek hebrajskich" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Edytor notek" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebrajska kantylacja" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Lista modlitw/Edytor dziennika" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Otwórz " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Przygotowywanie do drukowania" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Drukowanie nie jest obsługiwane na tej drukarce" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteracja" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Drukarka %s nie obsługuje drukowania PostScript." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Drukowanie" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Oczekiwanie na wydruk" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Wystąpił błąd podczas drukowania" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Segmentacja morfemu" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Wydrukowanie dokumentu: %s nie było możliwe." +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "O module Sword" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Atrybut" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Nie ma informacji o tym module." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Opcje" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -319,18 +285,20 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Projekt SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Lubisz używać Xiphos do badania Biblii? Chciałbyś zobaczyć go działającego w " "Twoim narodowym języku? Możesz go przetłumaczyć! \n" @@ -339,24 +307,24 @@ "języki. Jeśli jesteś w stanie dla nas tłumaczyć, użyj proszę oodnośnika " "poniżej by skontaktować się z nami i wspomóc nasze starania." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "O tłumaczeniu Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Zobacz TRANSLATION-HOWTO w źródle Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Rozwój Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Prawa autorskie 2000-2009 Zespół Rozwojowy Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Prawa autorskie 2000-2015 Zespół Rozwojowy Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -365,234 +333,234 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Zakładka" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Wprowadź nazwę folderu" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nazwa folderu" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Folder " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Edytuj" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nazwa folderu " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nazwa zakładki " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Wiersz: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Moduł: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Usuń wybrany folder" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(i całą jego zawartość)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Usuń wybraną zakładkę" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Dodaj" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etykieta: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Wynik wyszukiwania: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Zakładki" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "dla:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Wprowadź Klucz Szyfrujący: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Zamknij bez zapisywania" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Lista Wierszy" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Sprawdź prawa autorskie przed eksportowaniem!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Znajdź" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Wprowadź Słowo lub Wyrażenie" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Szukaj wstecz" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Znajdź następny" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Ustaw Czcionkę Modułu" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Zmień czcionkę na" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Moduł" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Obecna czcionka: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Użyj domyślnej czcionki dla tego modułu" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BŁĄD! Xiphos zaraz się wyłączy z powodu błędu \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Proszę zgłosić ten błąd do ekipy Xiphos z:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BŁĄD! Xiphos zaraz się wyłączy z powodu błędu \"STRING\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "Nie ma informacji o tym module." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Oprogramowanie do Badania Biblii" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Otwórz nową kartę" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Widok Starnardowy" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Widok z Komentarzem" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Widok Książki" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Witamy w Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -612,33 +580,33 @@ "Zatem, osobista zmiana nazwy komentarza jest\n" "niedostępna środowisku Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Zmień nazwę Komentarza" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Wybierz Nazwę Komentarza" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nowa nazwa" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nazwa: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Nazwy modułów muszą zawierać tylko następujące znaki: [A-Za-z0-9_]" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos już zna moduł o tej nazwie." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -647,7 +615,7 @@ "Nie udało się utworzyć nowej konfiguracji:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -655,7 +623,7 @@ "Błąd budowy konfiguracji:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -748,20 +716,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Usunąć te moduły?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Przygotowanie do usunięcia" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Usuwanie" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Usuń" @@ -781,23 +749,23 @@ msgid "Install" msgstr "Instaluj" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Zarchiwizować te moduły?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Przygotowywanie do archiwizacji" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archiwizacja" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archiwizuj" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -805,55 +773,59 @@ "Zbudować indeks szybkiego wyszukiwania dla tych\n" "modułów? (może zająć minutę/moduł)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Przygotowywanie do indeksowania" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indeksowanie" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeks" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Usunąć indeks szybkiego wyszukiwania dla tych modułów?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Przygotowywanie do usunięcia indeksu" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Usuwanie indeksu" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Usunięcie" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Nie ma informacji o tym module." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nazwa modułu" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Zaznaczenie oznacze, że ten moduł jest już zainstalowany" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Kliknij pole by pracować nad tym modułem" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Kliknij pole by zaznaczyć ten moduł do instalacji/aktualizacji" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Zainstalowano" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -862,7 +834,7 @@ "modułu, dla szybkiego wyszukiwania (patrz - Okienko zarządzania dla tej " "funkcji)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -870,13 +842,13 @@ "Ikona zamka oznacza, że ten moduł jest zaszyfrowany i wymaga zakupienia " "klucza od właściciela" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "O" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -884,19 +856,19 @@ "Ikona odświeżania oznacza, że zainstalowany moduł jest starszy od dostępnego " "modułu: Powinieneś zaktualizować moduł" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Dostępny" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Rozmiar" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Opis" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -905,33 +877,33 @@ "'mkdir %s' zawiódł:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " zarchiwizowano w: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Dzienniki i listy modlitw nie mogą być zaindeksowane." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s zawiódł" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Ukończono" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Nieznane" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -940,7 +912,7 @@ "Repozytorium:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -948,54 +920,44 @@ "Skategoryzowano ze względu na\n" "Typ Modułu" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Teksty Biblijne" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Komentarze" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Słowniki" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Codzienne Nabożeństwa" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Księgi Powszechne" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Mapy" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Obrazy" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1003,95 +965,95 @@ "Skategoryzowano ze względu na:\n" "Dostępność" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Aktualizacje" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Odinstalowano" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Lista modlitw/Dziennik" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Odświeżanie ze zdalnego źródła" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Zdalne źródło nie znalezione" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfiguruj" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Typ" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Nagłówek" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Źródło" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Katalog" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Użytkownik" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Hasło" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Źródła Modułów" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Dodaj/Usuń" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Wybierz" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduły" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Zainstaluj/Aktualizuj" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Konserwacja" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Proszę odświeżyć" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Twoja lista modułów nie jest aktualna!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1099,7 +1061,7 @@ "Usunąłeś poprzednią Biblię.\n" "Xiphos wymaga co najmniej jednej." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1107,211 +1069,222 @@ "Nadal brak zainstalowanej Biblii.\n" "Xiphos nie może bez niej kontynuować." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Stanrardowe źródła zdalne zostały załadowane." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Nie można było załadować standardowych źródeł z CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Usuń wybrane źródło" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Wprowadź źródło zdalne" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Podpis:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Typ:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Katalog:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Użytkownik (opcjonalnie):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Hasło (opcjonalne):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Źródło o tej nazwie już istnieje." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Usuń zdalne źródło" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr " Moduł" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Idź na zewnątrz, do sekcji zawierającej ten" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Idź do poprzedniego przedmiotu" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Idź do następnego przedmiotu" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Idź do wewnątrz, do pierwszej pod-sekcji" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Równoległe" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Odłącz/Dołącz" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Opcje Modułu" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Widok Równoległy" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Usuń zaznaczony element" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Osobiste" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Wybierz --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Ustawienia regionalne wejdą w życie po ponownym urchomieniu." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferencje" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Ogólne" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opcje" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Biblia" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Czcionki" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Kolor" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Karty i okienka" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Specjalny" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Wyczyścić listę?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Czy jesteś pewny, że chcesz wyczyścić listę modułów?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Usunąć Moduł?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Jesteś pewien, że chcesz usunąć wybrany moduł?" @@ -1330,20 +1303,20 @@ msgid "found in " msgstr "znaleniono w " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Ostatni moduł nie może zostać usunięty." -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Usunąć listę?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Czy jesteś pewien, że chcesz usunąć:" @@ -1363,7 +1336,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1408,7 +1381,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1426,15 +1399,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1442,107 +1415,97 @@ "To jest wyszukiwanie łączne (\"AND\"):\n" "Znajdź trafienie pokazujące wszystkie słowa." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Wyszukiwanie Zaawansowane" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Moduł Wyszukiwania" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblia" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Komentarz" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Typ wyszukiwania" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Frazes" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Wyrażenie potoczne" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Dokładne wyrażenie" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Opcje wyszukiwania" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Uwzględnij wielkość liter" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Zakres wyszukiwania" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Brak zekresu" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Użyj ograniczeń" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Ostatnie wyszukiwanie" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Granice" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Mniejszy" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Wyżej" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Preferencje" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Szukaj" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Pasek boczny" @@ -1550,73 +1513,73 @@ msgid "Powered by the SWORD Project" msgstr "Napędzany przez Projekt SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Lista Modlitw/Przedmiot Dziennika" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nowa nazwa" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Usuń zaznaczony element" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Styczeń" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Luty" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marzec" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Kwiecień" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Maj" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Czerwiec" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Lipiec" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Sierpień" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Wrzesień" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Październik" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Listopad" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Grudzień" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1627,7 +1590,98 @@ "(Lub plik ma inny typ niż bmp/gif/jpg/png.)\n" "Xiphos nie może zmienić rozmiaru obrazów, by dopasować je do rozmiaru okna." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr " Moduł" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Kliknij pole by pracować nad tym modułem" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Dostępny" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Zbawienie" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1636,259 +1690,281 @@ "Nieprawidłowo zakodowana etykieta adnotacji osobistej:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Rozdział" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nie rozumie więcej niż jednego argumentu." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Inicjacja Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Bududowanie Interfejsu" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Uruchamianie Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Ładowanie Ustawień" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Wyświetlanie Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Podgląd" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Przypis dolny" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Odniesienie" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologia" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Powrót do " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Przypisy dolne" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Tagi Morfologiczne" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Punkty samogłosek hebrajskich" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrajska kantylacja" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Greckie akcenty" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Odwołania" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lematy" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Nagłówki" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentacja morfemu" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Słowa Chrystusa w Czerwieni" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteracja" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Warianty Tekstowe" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Pierwsze Czytanie" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Drugie Czytanie" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Wszystkie Czytania" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteracja" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "Pokaż kontekst" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Wzrost" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" msgstr "Dla Wzrostu
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Zbawienie" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" msgstr "Dla Zbawienia
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Zdrowie" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" msgstr "Dla Zdrowia
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Różne" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" msgstr "Różne
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punkt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 #, fuzzy msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punkt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 #, fuzzy msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punkt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 #, fuzzy msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Podrzędny Temat 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 #, fuzzy msgid "Subtopic 1
" msgstr "Pod-temat 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Podrzędny Temat 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 #, fuzzy msgid "Subtopic 2
" msgstr "Pod-temat 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Podrzędny Temat 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 #, fuzzy msgid "Subtopic 3
" msgstr "Pod-temat 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Podrzędny Temat 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 #, fuzzy msgid "Subtopic 4
" msgstr "Pod-temat 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Nazwa dla nowej listy modlitw lub dziennika" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphon znajduje już taką listę." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1897,19 +1973,19 @@ "Xiphos nie może utworzyć ścieżki modułu:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Prosta lista modlitw. \\par\\par Moduł utworzony przez Xiphos" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ProstaListaModlitw" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MojaListaModlitw" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 #, fuzzy msgid "" "People:
Bob
Sam
Sue

Church:
pews
Ludzie:
Bob
Sam
Sue

Kościół:
ławki
bractwo
Biblie dla misjonarzy


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Lista modlitw oparta na tematach. \\par\\par Moduł utworzony przez Xiphos" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "ListaTematówModlitw" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 #, fuzzy msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Wzrost Duchowy" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 #, fuzzy msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 #, fuzzy msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Miesięczna lista modlitw. \\par\\par Moduł utworzony przez Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MiesięcznaListaModlitw" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Dziennik. \\par\\par Moduł utworzon przez Xiphos" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Dziennik" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Przedstawiony temat (n.p. kazanie). \\par\\par Moduł utworzony przez Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "PrzedstawionyTemat" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Główny Temat A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 #, fuzzy msgid "Major Topic A
" msgstr "Główny Temat A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Główny Temat B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 #, fuzzy msgid "Major Topic B
" msgstr "Główny Temat B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Główny Temat C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 #, fuzzy msgid "Major Topic C
" msgstr "Główny Temat C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Adnotacja Użytkownika" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Wynik wyszukiwania %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Usunąć Zakres?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Jesteś pewien, że chcesz usunąć ten zakres?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Znajdź: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2032,16 +2108,16 @@ "Taki moduł nie jest zainstalowany.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Proszę dostosować listę modułów." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Nie istnieje indeksu szybkiego wyszukiwania dla %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2049,7 +2125,7 @@ "\n" "Wyszukiwanie w tym module jest teraz 'multi word'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2057,51 +2133,45 @@ "\n" "Patrz - Menedżer Modułów, okienko Konserwacja." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Wyszukiwanie zakończone" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "trafienia" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME nie jest ustawiony!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos nie może utworzyć .xiphos:\n" -"%s\n" -"\n" -"Xiphos nie może kontynuować." +"Xiphos nie może utworzyć ścieżki modułu:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nie można utworzyć " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2118,11 +2188,11 @@ "Xiphos nie może kontynuować,\n" "i teraz zakończy działanie." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Instalacja modułu Biblii zakończona." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2132,11 +2202,11 @@ msgid "verse" msgstr "wiersz" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "rozdział" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2144,7 +2214,7 @@ "Brakuje pliku dla skrótów\n" "językowych Xiphos." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2152,7 +2222,7 @@ "Plik skrótów językowych Xiphos\n" "nie może zostać otwarty." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2160,7 +2230,7 @@ "XIphos nie może przydzielić przestrzeni\n" "dla skrótów językowych." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2169,19 +2239,19 @@ "pliku skrótów językowych" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "Nie znaleziono odpowiednich ustawień regionalnych dla" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Nazwy książek i menu mogą nie być przetłumaczone" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2189,7 +2259,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2197,11 +2267,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Dzienne nabożeństwa żądane, lecz żadne nie są zainstalowane." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2215,89 +2285,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Wyczyść Historię" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Lista Wierszy" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nie znaleziony:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nie mógł wykonać %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Błąd Wyświetlania:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Pokaż %s w głównym oknie" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokument nie utworzony pomyślnie. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Co muszę zrobić, by być uratowanym?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Dziejów 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Efezjan 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Rzymian 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Czym jest Gospel?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Koryntian 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokument nie przeanalizowany pomyślnie. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "pusty dokument \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "zły typ, węzeł root !=ZakładkiSwork\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "zły typ, węzeł root !=ZakładkiSwork\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2306,7 +2381,7 @@ "\n" msgstr "Rozdział" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2315,101 +2390,101 @@ "\n" msgstr "Rozdział" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Stary Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nowy Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Lista Modułów Próbkowych" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2423,13 +2498,13 @@ msgstr "Okienko Zakładek" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Utwórz nowy folder" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nowy folder" @@ -2438,7 +2513,7 @@ msgstr "Nowy ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Anuluj Zakładkę" @@ -2451,22 +2526,22 @@ msgstr "Zapis Etykiety" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Wiersz:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Zapis Wiersza" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Moduł:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Zapis Modułu" @@ -2474,6 +2549,10 @@ msgid "Bookmark Folder Treeview" msgstr "Folder Zakładek Widok Drzewa" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Wstaw odnośnik" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2529,6 +2608,12 @@ msgid "_Delete Personal Comment" msgstr "_Usuń Osobisty Komentarz" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Plik" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Zapisz obecną notatkę" @@ -2537,6 +2622,14 @@ msgid "_Save (Personal Comment)" msgstr "_Zapisz (Osobisty Komentarz)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Podgląd _wydruku" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Drukuj…" + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "Za_kończ" @@ -2545,6 +2638,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Zapisz" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Drukuj ten dokument" @@ -2582,7 +2680,7 @@ msgstr "Nowy dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopiuj/Eksportuj Fragment" @@ -2619,7 +2717,7 @@ msgstr "Eksportuj całą książkę" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Książka" @@ -2733,8 +2831,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2776,13 +2874,17 @@ msgid "Delete selection" msgstr "Usunięcie" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Usuń" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Usuń zaznaczony element" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2957,6 +3059,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nowy" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3089,122 +3195,86 @@ msgid "_Edit" msgstr "" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Usunąć listę?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Lista Wierszy" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Zaznacz/Odznacz Wiersz" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Zaznacz" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Odznaczyć" @@ -3284,89 +3354,97 @@ msgstr "Usunąć indeks szybkiego wyszukiwania dla tych modułów?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Kontynuuj" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Menedżer Modułów" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "OSTRZEŻENIE: Jeśli żyjesz w prześladowanym kraju, używaj ostrożnie." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Dodaj i Usuń Źródła" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Obecne źródła lokalne" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Obecne Źródła Zdalne" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Usuń zdalne źródło" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Źródło Instalacji" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokalne" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Zdalny" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Cel Instalacji" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Przestrzeń osobista, tylko do twojego użytku:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Katalog Domowy" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Przestrzeń systemowa, dla wszystkich użytkowników:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Katalog systemowy Sword" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3374,10 +3452,14 @@ "Ostrzeżenie: Jeśli żyjesz w prześladowanym kraju, i nie chesz " "ryzykować wykrycia, NIE powinieneś używać opcji zdalnej instalacji! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Folder Instalacji Lokalnej" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Opuść listę historii" @@ -3386,11 +3468,11 @@ msgid "Choose book to display" msgstr "Wybierz książkę do wyświetlenia" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Przycisk Wyboru Książki" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Objawienie Jana" @@ -3399,11 +3481,11 @@ msgid "Choose chapter to display" msgstr "Wybierz książkę do wyświetlenia" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Przycisk Przełączania Rozdziałów" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3558,11 +3640,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Moduły" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3634,12 +3717,12 @@ msgid "BSP privacy button" msgstr "Przycisk Opcji Wiersza" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Zbawienie" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3671,11 +3754,12 @@ msgid "BSP nav verse list radio button" msgstr "Przycisk opcji obecnych wyników" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Nazwa Listy" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3718,7 +3802,12 @@ msgid "BSP listen none radio button" msgstr "Przycisk Opcji Zwykłego Tekstu" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Specjalny" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3910,191 +3999,190 @@ msgstr "Włącz Pole Wyboru Listy Modlitw" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Numer Wiersza" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Rozmiar numeru wiersza" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Użyj Pola Wyboru Wierszy Na Linię" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Opis" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Rozmiar numeru wiersza" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Połączenie domyślnych katalogów StudyPad" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Wybierz Słownik" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Połączenie domyślnych katalogów StudyPad" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Różne - ogólne" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Główne Moduły Okna" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Tekst Biblijny" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Zmień Połączenie Tekstów Biblijnych" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Zmień Połączenie Komentarzy" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Słownik" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Zmień Połączenie Słowników" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Zmień Połączenie Książek" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduły" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Wyczyść wszystkie moduły z listy" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Przycisk Czyszczenia Modułów z Listy" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Dodaj Moduły" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Moduły Równoległe" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Moduły Specjanego Przeznaczenia" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Codzienne Nabożeństwo" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Połączenie Codziennych Nabożeństw" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Leksykon Hebrajski" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Połączenie Leksykonów Hebrajskich" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Leksykon Grecki" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Połączenie Leksykonów Greckich" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Domyślny Słownik" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Zmień Domyślne Połączenie Słowników" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Osobiste Notatki" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Zmień Połączenie Notatek Osobistych" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Moduły Różne" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4125,6 +4213,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Wyszukiwanie Zaawansowane" @@ -4331,11 +4423,11 @@ msgid "Found" msgstr "Znalezione" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4527,6 +4619,11 @@ msgid "Attribute Search" msgstr "Wyszukiwanie Atrybutów" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4621,6 +4718,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Widok" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4767,28 +4868,28 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "_Wiersze na Linię" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4796,267 +4897,276 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Lista Wierszy" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Opuść listę historii" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Zakładki" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -5068,6 +5178,91 @@ msgid "Study the Bible" msgstr "Studiuj Biblię" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr " Moduł" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s zawiódł" + +#~ msgid "Page %d of %d" +#~ msgstr "Strona %d z %d" + +#~ msgid "Save As" +#~ msgstr "Zapisz Jako" + +#~ msgid "HTML Output" +#~ msgstr "Wyjście HTML" + +#~ msgid "HTML Source" +#~ msgstr "Źródło HTML" + +#~ msgid "Plain Source" +#~ msgstr "Tekst źródłowy" + +#~ msgid "_Quit" +#~ msgstr "_Wyjdź" + +#~ msgid "_Open" +#~ msgstr "_Otwórz" + +#~ msgid "_Save" +#~ msgstr "_Zapisz" + +#~ msgid "Save _As..." +#~ msgstr "Zapisz _jako..." + +#~ msgid "Open new document" +#~ msgstr "Otwórz nowy dokument" + +#~ msgid "Delete current note" +#~ msgstr "Usuń obecną notatkę" + +#~ msgid "HTML _Output" +#~ msgstr "_Wyjście HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_Źródło HTML" + +#~ msgid "_Plain Source" +#~ msgstr "_Tekst źródłowy" + +#~ msgid "Unlock " +#~ msgstr "Otwórz " + +#~ msgid "Preparing to print" +#~ msgstr "Przygotowywanie do drukowania" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Drukowanie nie jest obsługiwane na tej drukarce" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Drukarka %s nie obsługuje drukowania PostScript." + +#~ msgid "Printing" +#~ msgstr "Drukowanie" + +#~ msgid "Waiting to print" +#~ msgstr "Oczekiwanie na wydruk" + +#~ msgid "An error occurred while printing" +#~ msgstr "Wystąpił błąd podczas drukowania" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Wydrukowanie dokumentu: %s nie było możliwe." + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos nie może utworzyć .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos nie może kontynuować." + #~ msgid "Tabs" #~ msgstr "Karty" diff -Nru xiphos-4.0.0+dfsg1/po/POTFILES.in xiphos-4.0.4+dfsg1/po/POTFILES.in --- xiphos-4.0.0+dfsg1/po/POTFILES.in 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/POTFILES.in 2015-01-18 16:25:40.000000000 +0000 @@ -1,6 +1,4 @@ [encoding: UTF-8] -## Legacy BibleSync class -src/biblesync/biblesync.cc ## Backend source files src/backend/gs_stringmgr.cpp src/backend/module_manager.cc diff -Nru xiphos-4.0.0+dfsg1/po/pt_BR.po xiphos-4.0.4+dfsg1/po/pt_BR.po --- xiphos-4.0.0+dfsg1/po/pt_BR.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/pt_BR.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-05-28 02:08+0000\n" "Last-Translator: Douglas Santos \n" "Language-Team: Brazilian Portuguese \n" @@ -18,295 +18,243 @@ "X-Launchpad-Export-Date: 2010-09-20 05:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Configuração não encontrada" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Você tem certeza que quer apagar a nota de" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" msgstr "" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Documento sem título" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Salvar alterações para o documento" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "antes de fechar?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Se você não salvar, as alterações serão permanentemente perdidas." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Arquivo" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Bloco de Estudo" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Editor de Notas" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Lista de Oração/Diário" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Sobre o Módulo Sword" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 -msgid "[no dump ready]" -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Nome do Módulo" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s falhou" - -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +msgid "Type: " +msgstr "Nome do Módulo" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Devocionais Diários" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Configuração não encontrada" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapas" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Página %d de %d" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Imagens" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Salvar Como..." - -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Documento sem título" - -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Você tem certeza que quer apagar a nota de" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Saída HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Código-fonte HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Código-fonte simples" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Imprimir..." +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "_Visualizar Impressão" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Sair" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Livros Gerais" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Abrir" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Salvar" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Renomear comentário" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Salvar _Como..." +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Novo" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Desconhecido" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Abrir um novo documento" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Excluir" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Apagar nota atual" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Arquivo" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Saída HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "Código-fonte _HTML:" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "Código-fonte _simples" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Ver" +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Salvar" +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Inserir Link" +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Salvar alterações para o documento" +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "antes de fechar?" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Preferências" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Se você não salvar, as alterações serão permanentemente perdidas." +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Arquivo" +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Bloco de Estudo" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Editor de Notas" +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Lista de Oração/Diário" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Desbloquear " +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Preparando para imprimir" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Impressão não suportada nesta impressora" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Impressora %s não suporta impressão PostScript." +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Imprimindo" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Aguardando para imprimir" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Ocorreu um erro ao imprimir" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Não foi possível imprimir o seu documento: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Sobre o Módulo Sword" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "O módulo não tem informação sobre." +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -324,18 +272,20 @@ "base nesta plataforma. Um conjunto de módulos instalados pode ser partilhado " "entre quaisquer dessas interfaces." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "O Projeto SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Gostaria de usar Xiphos para estudar a Bíblia? Gostaria de uma interface no " "seu idioma nativo? Você pode traduzir o Xiphos!\n" @@ -344,24 +294,24 @@ "outros idiomas. Se consegue traduzir para nós, veja por favor o link abaixo, " "contate-nos e junte-se aos nossos esforços." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Sobre a tradução do Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Veja TRANSLATION-HOWTO no código-fonte do Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Desenvolvimento do Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2010 Equipe de Desenvolvimento do Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright 2000-2015 Equipe de Desenvolvimento do Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -374,233 +324,233 @@ "forneceram o Projeto SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Favorito" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Entre com o Nome da Pasta" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nome da Pasta" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Pasta " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Especifique o arquivo de favoritos" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Editar" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nome de pasta: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nome do Bookmark: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Versículo: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Módulo: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Remover a pasta selecionada" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(e todo o seu conteúdo)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Remover o Bookmark selecionado" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Adicionar" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Rótulo: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Resultado da pesquisa: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Favoritos" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "para:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Informe a chave: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Fechar sem Salvar" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Fechar _sem Salvar" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Lista de Versículos" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "ListadeVersículo" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "ResultadosDaPesquisa" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Por favor verifique os direitos autorais antes de exportar!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Procurar" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Entre com Palavra ou Frase" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Pesquisa Anterior" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Localizar Próximo" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Definir Fonte do Módulo" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Mudar fonte para" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Módulo" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Fonte atual: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Usar a fonte padrão para este módulo" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "ERRO! O Xiphos está falhando devido a um erro \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Por favor, comunique este erro à equipe Xiphos com:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "ERRO! O Xiphos está falhando devido a um erro \"STRING\".<" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "O módulo não tem informação sobre." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Software de Estudo Bíblico" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Abrir uma nova aba" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Visão padrão" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Ver comentário" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Ver livro" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Bemvindo ao Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -629,35 +579,35 @@ "\n" "ambiente Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Renomear comentário" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Escolher nome para o comentário" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Novo nome" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nome: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" "Os nomes dos módulos devem conter apenas caracteres de \"A\" à \"Z\" " "maiúsculos ou e minusculos e números." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "O Xiphos já conhece um módulo com esse nome." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -666,7 +616,7 @@ "Falhou ao criar uma nova configuração:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -674,7 +624,7 @@ "Erro de construção da configuração:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -765,20 +715,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Remover estes módulos?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Preparando-se para remover" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Removendo" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Remover" @@ -798,23 +748,23 @@ msgid "Install" msgstr "Instalar" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arquivar estes módulos?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Preparando-se para arquivar" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arquivando" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arquivo" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -822,55 +772,59 @@ "Construir índice de pesquisa rápida para estes\n" "módulos (pode demorar alguns minutos/módulo)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Preparando para indexar" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexando" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Índice" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Excluir índice de pesquisa rápida para estes módulos?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Preparando para excluir índice" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Excluindo índice" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Exclusão" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "O módulo não tem informação sobre." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nome do Módulo" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Uma marca singnifica que este módulo já está instalado" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Clique na caixa para trabalhar neste módulo" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Clique na caixa para selecionar este módulo para instalar/atualizar" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Instalado" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -879,7 +833,7 @@ "para este módulo de pesquisa rápida (veja o Painel de Manutenção para esta " "função)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -887,13 +841,13 @@ "O ícone do cadeado indica que este módulo está criptografado, e exige que " "você adquira uma chave para desbloquear seu conteúdo" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Sobre" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -901,19 +855,19 @@ "O ícone de atualização indica que o módulo instalado é mais antigo que o " "módulo disponível: Você deveria atualizar este módulo" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Disponível" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Tamanho" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Descrição" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -922,33 +876,33 @@ "`mkdir %s' falhou:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arquivado em: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Revistas e listas de oração não podem ser indexadas" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s falhou" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Concluído" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Desconhecido" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -957,7 +911,7 @@ "Repositório:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -965,54 +919,44 @@ "Categorizado por\n" "Tipo de Módulo" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Textos Bíblicos" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Comentários" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Dicionários" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Devocionais Diários" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Livros Gerais" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Mapas" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Imagens" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1020,95 +964,95 @@ "Categorizados por\n" "Disponibilidade" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Atualizações" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Desinstalado" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Lista/Diário de Oração" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Atualizando a partir de fonte remota" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Fonte remota não encontrada" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configurar" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tipo" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Subtítulo" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Fonte" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Diretório" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Usuário" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Senha" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Módulos Fontes" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Adicionar/Remover" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Escolher" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Módulos" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Inslatar/Atualizar" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Manutenção" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Por favor Recarregue" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Sua lista de módulo não está atualizada!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1116,7 +1060,7 @@ "Você desinstalou sua última Bíblia.\n" "Xiphos exige pelo menos uma." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1124,208 +1068,219 @@ "Ainda não existem Bíblias instaladas.\n" "Xiphos não pode continuar sem uma." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Padrão fontes remotas foi carregado" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Não foi possível carregar padrão de fontes da CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Remover a fonte selecionada" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Entre com uma fonte remota" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Título:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tipo:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Diretório:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Usuário (opcional)" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Senha (opcional)" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Uma fonte com esse nome já existe" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Excluir uma fonte remota" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Vá até a sessão que contem isso" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Volte ao item anterior" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Vá para o próximo item" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Dentro, na primeira sub sessão" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Sincronizar rolagem desta janela com janela principal" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralelo" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Desanexado/Anexado" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Opções do Módulo" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Visualização Paralela" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Remover a pasta selecionada" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "--Selecione--" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Locale terá efeito após a reinicialização" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferências" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Cor" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Tamanho e Superficie" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1344,20 +1299,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1377,7 +1332,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1422,7 +1377,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1440,120 +1395,110 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Expressão regular" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Diferenciar maiúsculas de minúsculas" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Preferências" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "" @@ -1561,446 +1506,557 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Desconhecido" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Clique na caixa para trabalhar neste módulo" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Disponível" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 -msgid "Textual Variants" +#: ../src/main/parallel_view.cc:512 +msgid "Textual Variants" +msgstr "" + +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 +msgid "Primary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 +msgid "Secondary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 +msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 -msgid "Primary Reading" +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 -msgid "Secondary Reading" +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 -msgid "All Readings" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2008,68 +2064,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2079,11 +2131,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2093,47 +2145,47 @@ msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2141,7 +2193,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2149,11 +2201,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2167,89 +2219,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Lista de Versículos" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2258,7 +2315,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2267,101 +2324,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2375,13 +2432,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "" @@ -2390,7 +2447,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2403,22 +2460,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2426,6 +2483,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Inserir Link" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2480,6 +2541,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Arquivo" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2488,6 +2555,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "_Visualizar Impressão" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Imprimir..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "" @@ -2496,6 +2571,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Salvar" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "" @@ -2533,7 +2613,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2570,7 +2650,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2680,8 +2760,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2723,13 +2803,17 @@ msgid "Delete selection" msgstr "Exclusão" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Excluir" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Remover a pasta selecionada" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2901,6 +2985,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Novo" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "" @@ -3029,122 +3117,86 @@ msgid "_Edit" msgstr "" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Lista de Versículos" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Lista de Versículos" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3214,96 +3266,108 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3312,11 +3376,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3324,11 +3388,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3470,11 +3534,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3540,11 +3604,11 @@ msgid "BSP privacy button" msgstr "" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3574,11 +3638,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3618,7 +3682,11 @@ msgid "BSP listen none radio button" msgstr "" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3796,187 +3864,186 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Versículo: " -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Descrição" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4005,6 +4072,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "" @@ -4210,11 +4281,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4406,6 +4477,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4498,6 +4574,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Ver" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4643,27 +4723,27 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4671,266 +4751,275 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Lista de Versículos" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Lista de Versículos" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4942,6 +5031,76 @@ msgid "Study the Bible" msgstr "Estude a Bíblia" +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s falhou" + +#~ msgid "Page %d of %d" +#~ msgstr "Página %d de %d" + +#~ msgid "Save As" +#~ msgstr "Salvar Como..." + +#~ msgid "HTML Output" +#~ msgstr "Saída HTML" + +#~ msgid "HTML Source" +#~ msgstr "Código-fonte HTML" + +#~ msgid "Plain Source" +#~ msgstr "Código-fonte simples" + +#~ msgid "_Quit" +#~ msgstr "_Sair" + +#~ msgid "_Open" +#~ msgstr "_Abrir" + +#~ msgid "_Save" +#~ msgstr "_Salvar" + +#~ msgid "Save _As..." +#~ msgstr "Salvar _Como..." + +#~ msgid "Open new document" +#~ msgstr "Abrir um novo documento" + +#~ msgid "Delete current note" +#~ msgstr "Apagar nota atual" + +#~ msgid "HTML _Output" +#~ msgstr "_Saída HTML" + +#~ msgid "_HTML Source" +#~ msgstr "Código-fonte _HTML:" + +#~ msgid "_Plain Source" +#~ msgstr "Código-fonte _simples" + +#~ msgid "Unlock " +#~ msgstr "Desbloquear " + +#~ msgid "Preparing to print" +#~ msgstr "Preparando para imprimir" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Impressão não suportada nesta impressora" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Impressora %s não suporta impressão PostScript." + +#~ msgid "Printing" +#~ msgstr "Imprimindo" + +#~ msgid "Waiting to print" +#~ msgstr "Aguardando para imprimir" + +#~ msgid "An error occurred while printing" +#~ msgstr "Ocorreu um erro ao imprimir" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Não foi possível imprimir o seu documento: %s" + #~ msgid "" #~ "URL references using \"sword://\" (similar to web page\n" #~ "references) can be used by programs to look up\n" diff -Nru xiphos-4.0.0+dfsg1/po/pt.po xiphos-4.0.4+dfsg1/po/pt.po --- xiphos-4.0.0+dfsg1/po/pt.po 2014-12-24 17:27:54.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/pt.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-24 16:33+0000\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-24 16:44+0100\n" "Last-Translator: Ari Constancio \n" "Language-Team: Xiphos Project\n" @@ -18,90 +18,6 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:130 -msgid "network setup errors." -msgstr "erros de preparação de rede." - -#: ../src/biblesync/biblesync.cc:176 -msgid " client socket" -msgstr "socket de cliente" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "socket de servidor" - -#: ../src/biblesync/biblesync.cc:371 -msgid "bad magic" -msgstr "má 'magia'" - -#: ../src/biblesync/biblesync.cc:375 -msgid "bad protocol version" -msgstr "má versão de protocolo" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad msg type" -msgstr "mau tipo de mensagem" - -#: ../src/biblesync/biblesync.cc:385 -msgid "bad packet count" -msgstr "mau número de pacotes" - -#: ../src/biblesync/biblesync.cc:389 -msgid "bad packet index" -msgstr "mau índice de pacote" - -#: ../src/biblesync/biblesync.cc:433 -msgid "bad body format" -msgstr "mau formato de corpo" - -#: ../src/biblesync/biblesync.cc:447 -msgid "missing required header " -msgstr "cabeçalho necessário em falta" - -#: ../src/biblesync/biblesync.cc:474 -msgid "Spoof stopped: " -msgstr "Forjamento parado:" - -#: ../src/biblesync/biblesync.cc:505 -msgid "Ignoring echo." -msgstr "Ignorando echo." - -#: ../src/biblesync/biblesync.cc:534 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "Domínio não é 'BIBLE-VERSE':" - -#: ../src/biblesync/biblesync.cc:542 -msgid "Invalid group: " -msgstr "Grupo inválido:" - -#: ../src/biblesync/biblesync.cc:572 -msgid " present at " -msgstr "presente em" - -#: ../src/biblesync/biblesync.cc:574 -msgid " using " -msgstr "usando" - -#: ../src/biblesync/biblesync.cc:692 -msgid "[no dump ready]" -msgstr "[sem descarga pronta]" - -#: ../src/biblesync/biblesync.cc:700 -msgid "select < 0" -msgstr "select < 0" - -#: ../src/biblesync/biblesync.cc:711 -msgid "recvfrom < 0" -msgstr "recvfrom < 0" - -#: ../src/biblesync/biblesync.cc:801 -msgid "Transmit failed.\n" -msgstr "Transmissão falhou.\n" - -#: ../src/biblesync/biblesync.cc:802 -msgid "Unable to multicast; BibleSync is now disabled. If your network connection changed while this program was active, it may be sufficient to re-enable." -msgstr "Incapaz de multicast; BibleSync está agora desativado. Se a sua ligação de rede mudou enquanto este programa estava ativo, pode ser suficiente reativá-la." - #: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" @@ -112,199 +28,399 @@ "Reporte por favor. sword_main.cc:set_treekey\n" "O que estava fazendo quando isto sucedeu?" -#: ../src/backend/sword_main.cc:1155 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Configuração não encontrada" -#: ../src/editor/webkit_editor.c:316 +#: ../src/editor/webkit_editor.c:311 msgid "Are you sure you want to delete the note for" msgstr "Tem a certeza de que quer apagar a nota para" -#: ../src/editor/webkit_editor.c:598 -#: ../ui/editor_studypad.xml.h:9 -#: ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Abrir" -#: ../src/editor/webkit_editor.c:825 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Documento sem título" -#: ../src/editor/webkit_editor.c:1367 -#: ../src/editor/webkit_editor.c:1410 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Guardar as alterações ao documento" -#: ../src/editor/webkit_editor.c:1368 -#: ../src/editor/webkit_editor.c:1411 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "antes de fechar?" -#: ../src/editor/webkit_editor.c:1375 -#: ../src/editor/webkit_editor.c:1418 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "Se não guardar, as alterações serão definitivamente perdidas." -#: ../src/editor/webkit_editor.c:1409 -#: ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "Ficheiro" -#: ../src/editor/webkit_editor.c:1459 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "StudyPad" -#: ../src/editor/webkit_editor.c:1474 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Editor de Notas" -#: ../src/editor/webkit_editor.c:1489 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Lista de Oração/Editor de Diário" -#: ../src/gnome2/about_modules.c:148 +#: ../src/gnome2/about_modules.c:138 msgid "About Sword Module" msgstr "Sobre o Módulo Sword" -#: ../src/gnome2/about_modules.c:358 -#: ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "O módulo não tem informação Sobre." +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "" + +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Gestor de Módulos" + +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Opções" + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "" + +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Âmbito" + +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Devocional Diário" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapas" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Imagens" + +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Glossários" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bíblia" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Comentário" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Dicionário" + +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Livros Gerais" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Renomear Comentário" + +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Devocional Diário" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Desconhecido" + +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Lista de Módulos" + +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Extensões" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" + +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Fonte de instalação" + +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Módulos da Janela Principal" + +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formatar" + +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Cabeçalhos" + +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Notas de rodapé" + +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Referências cruzadas" + +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Números Strong" + +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Etiquetas morfológicas" + +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemas" + +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Palavras de Cristo a vermelho" + +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Acentos Gregos" + +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Pontos Vogais do Hebraico" + +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Cantilação do Hebraico" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" + +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Formas Transliteradas" + +#: ../src/gnome2/about_modules.c:583 +#, fuzzy +msgid "* Enumerations" +msgstr "Enumerações" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" + +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Segmentação de Morfema" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" + +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Atributo" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Opções" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" -"The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework.\n" +"The SWORD Project is an effort to create an ever-expanding software package " +"for research and study of God and His Word. The SWORD Project framework " +"allows easy use and study of Bible texts, commentaries, lexicons, " +"dictionaries, and other books. Many frontends are built using this " +"framework. An installed set of books may be shared among all frontends using " +"the framework.\n" "\n" " Books can be downloaded from the SWORD Project." -msgstr "O Projeto SWORD é uma iniciativa para criar um pacote de software expansível para pesquisa e estudo de Deus e da Sua Palavra. A Plataforma do Projeto SWORD permite fácil manipulação de textos da Bíblia, comentários, léxicos, dicionários e outros livros. Várias interfaces são construídas com base nesta plataforma. Um conjunto de módulos instalados pode ser partilhado entre quaisquer dessas interfaces." +msgstr "" +"O Projeto SWORD é uma iniciativa para criar um pacote de software expansível " +"para pesquisa e estudo de Deus e da Sua Palavra. A Plataforma do Projeto " +"SWORD permite fácil manipulação de textos da Bíblia, comentários, léxicos, " +"dicionários e outros livros. Várias interfaces são construídas com base " +"nesta plataforma. Um conjunto de módulos instalados pode ser partilhado " +"entre quaisquer dessas interfaces." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "O Projeto SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" -"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts." +"We are always looking for contributions of new translations of Xiphos into " +"other languages. If you are able to translate for us, please see the link " +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -"Gostaria de usar Xiphos para estudar a Bíblia? Gostaria de uma interface na sua língua materna? Você pode traduzir Xiphos!\n" +"Gostaria de usar Xiphos para estudar a Bíblia? Gostaria de uma interface na " +"sua língua materna? Você pode traduzir Xiphos!\n" "\n" -"Estamos sempre procurando contribuições de novas traduções de Xiphos noutras línguas. Se consegue traduzir para nós, veja por favor a ligação abaixo, contacte-nos e junte-se aos nossos esforços." +"Estamos sempre procurando contribuições de novas traduções de Xiphos noutras " +"línguas. Se consegue traduzir para nós, veja por favor a ligação abaixo, " +"contacte-nos e junte-se aos nossos esforços." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Sobre a tradução de Xiphos ..." -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Veja TRANSLATION-HOWTO no código de Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Desenvolvimento de Xiphos" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2014 Equipa de Desenvolvimento Xiphos" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright 2000-2015 Equipa de Desenvolvimento Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" -"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project." +"We would like to thank Troy Griffitts and all the other folks who have given " +"us The SWORD Project." msgstr "" "\n" "Movido pelo Projeto SWORD.\n" -"Gostaríamos de agradecer a Troy Griffitts e aos outros colaboradores que nos deram o Projeto SWORD." +"Gostaríamos de agradecer a Troy Griffitts e aos outros colaboradores que nos " +"deram o Projeto SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 -#: ../src/gnome2/bookmarks_menu.c:374 -#: ../src/gnome2/bookmarks_menu.c:674 -#: ../src/gnome2/bookmarks_menu.c:773 -#: ../src/gnome2/bookmarks_treeview.c:135 -#: ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 -#: ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Marca" -#: ../src/gnome2/bookmark_dialog.c:177 -#: ../src/gnome2/bookmarks_menu.c:775 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Introduzir Nome da Pasta" -#: ../src/gnome2/bookmark_dialog.c:179 -#: ../src/gnome2/bookmarks_menu.c:777 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nome da Pasta" -#: ../src/gnome2/bookmark_dialog.c:180 -#: ../src/gnome2/bookmarks_menu.c:778 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Pasta: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Especificar ficheiro de marca" -#: ../src/gnome2/bookmarks_menu.c:360 -#: ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Editar" -#: ../src/gnome2/bookmarks_menu.c:377 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nome de pasta: " -#: ../src/gnome2/bookmarks_menu.c:380 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nome de marca: " -#: ../src/gnome2/bookmarks_menu.c:383 -#: ../src/gnome2/bookmarks_menu.c:682 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Versículo: " -#: ../src/gnome2/bookmarks_menu.c:384 -#: ../src/gnome2/bookmarks_menu.c:683 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Módulo: " -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Remover a pasta selecionada" -#: ../src/gnome2/bookmarks_menu.c:508 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(e todo o seu conteúdo)?" -#: ../src/gnome2/bookmarks_menu.c:511 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Remover a marca selecionada" -#: ../src/gnome2/bookmarks_menu.c:675 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Adicionar" -#: ../src/gnome2/bookmarks_menu.c:681 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Rótulo: " -#: ../src/gnome2/bookmarks_treeview.c:104 -#: ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Resultado da Pesquisa: %s" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -312,97 +428,89 @@ "Abrir uma marca multi-referência em\n" "abas separadas não é suportado." -#: ../src/gnome2/bookmarks_treeview.c:867 -#: ../src/gnome2/sidebar.c:1515 -#: ../src/gnome2/sidebar.c:1548 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Marcas" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Chave de cifra para o módulo %s" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "para:" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Introduza Chave: " -#: ../src/gnome2/dialog.c:291 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Fechar sem guardar" -#: ../src/gnome2/dialog.c:736 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:872 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Fechar se_m Guardar" -#: ../src/gnome2/export_bookmarks.c:197 -#: ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1527 -#: ../src/gnome2/sidebar.c:1564 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Lista de Versículos" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Lista de Versículos" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Resultados da Pesquisa" -#: ../src/gnome2/export_dialog.c:324 -#: ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Por favor verifique os direitos de autor antes de exportar!" -#: ../src/gnome2/find_dialog.c:188 -#: ../src/gnome2/find_dialog.c:367 -#: ../ui/gtk2_webedit.ui.h:18 -#: ../ui/gtk_webedit.ui.h:18 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 +#: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Procurar" -#: ../src/gnome2/find_dialog.c:207 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Introduza Palavra ou Frase" -#: ../src/gnome2/find_dialog.c:222 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Pesquisar para trás" -#: ../src/gnome2/find_dialog.c:283 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Procurar Próximo" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Definir Fonte do Módulo" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Mudar fonte para" -#: ../src/gnome2/font_dialog.c:342 -#: ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Módulo" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Fonte corrente: " -#: ../src/gnome2/font_dialog.c:378 -#: ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" @@ -411,67 +519,63 @@ msgid "Use the default font for this module" msgstr "Usar a fonte por omissão para este módulo" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "ERRO! Xiphos está prestes a estourar devido a um erro \"STRDUP\"." -#: ../src/gnome2/gui.c:187 -#: ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Por favor, comunique este erro à equipa Xiphos com:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "ERRO! Xiphos está prestes a estourar devido a um erro \"STRING\".<" -#: ../src/gnome2/main_window.c:596 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Módulo sem suporte para %s." -#: ../src/gnome2/main_window.c:666 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Sem janelas." -#: ../src/gnome2/main_window.c:722 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Navegação corrente enviada." -#: ../src/gnome2/main_window.c:726 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Não falando." -#: ../src/gnome2/main_window.c:910 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Software de Estudo Bíblico" -#: ../src/gnome2/main_window.c:973 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Abrir uma nova aba" -#: ../src/gnome2/main_window.c:1053 -#: ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 -#: ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 -#: ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Vista Normal" -#: ../src/gnome2/main_window.c:1114 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Vista de Comentário" -#: ../src/gnome2/main_window.c:1130 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Vista de Livro" -#: ../src/gnome2/main_window.c:1157 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Bem-vindo(a) a Xiphos" -#: ../src/gnome2/menu_popup.c:1251 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -491,37 +595,33 @@ "Por isso, não é possível renomear\n" "comentários pessoais no ambiente Windows." -#: ../src/gnome2/menu_popup.c:1270 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Renomear Comentário" -#: ../src/gnome2/menu_popup.c:1273 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Escolher Nome de Comentário" -#: ../src/gnome2/menu_popup.c:1275 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Novo Nome" -#: ../src/gnome2/menu_popup.c:1276 -#: ../src/gnome2/treekey-editor.c:147 -#: ../src/gnome2/treekey-editor.c:210 -#: ../src/gnome2/treekey-editor.c:306 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nome: " -#: ../src/gnome2/menu_popup.c:1286 -#: ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Os nomes de módulos devem conter apenas [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1293 -#: ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos já conhece um módulo por esse nome." -#: ../src/gnome2/menu_popup.c:1334 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -530,7 +630,7 @@ "Falhou a criação de nova configuração:\n" "%s" -#: ../src/gnome2/menu_popup.c:1343 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -538,7 +638,7 @@ "Erro de compilação da configuração:\n" "\n" -#: ../src/gnome2/menu_popup.c:1943 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Sem módulo nesta vista" @@ -552,94 +652,127 @@ "This is Xiphos' mechanism to get new and updated content.\n" "If you have never been here before, please take a moment to look it over.\n" "\n" -"Modules come from different repositories. Module Sources: Add/Remove will show you what repositories are currently known.\n" +"Modules come from different repositories. Module Sources: Add/" +"Remove will show you what repositories are currently known.\n" "\n" -"Module Sources: Choose is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set Install Source and Install Destination, then click Refresh.\n" +"Module Sources: Choose is for deciding from where modules should " +"come, that is, from which repository Xiphos should obtain them, as well as " +"where they should be placed on your system. Set Install Source and " +"Install Destination, then click Refresh.\n" "\n" -"Modules: Install/Update is for selecting and obtaining modules after choosing source and destination.\n" +"Modules: Install/Update is for selecting and obtaining modules after " +"choosing source and destination.\n" "\n" "Modules: Maintenance is for archive and index creation.\n" "\n" -"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n" +"See section 5 of our manual for Module Manager detail, or ask for help via " +"Live Chat, or (if no one is responsive in chat) send mail to our users' " +"mailing list.\n" msgstr "" "Vista geral do Gestor de Módulos.\n" "\n" "Este é o mecanismo de Xiphos para obter conteúdo novo e atualizado.\n" "Aparentemente, nunca esteve aqui. Por isso, gaste um momento para analisar.\n" "\n" -"Os módulos vêm de diferentes repositórios. Fontes de Módulos: Adicionar/Remover mostra quais os repositórios conhecidos presentemente.\n" -"\n" -"Fontes de Módulos: Escolher permite decidir de onde devem vir os módulos (isto é, de que repositório Xiphos deve obtê-los), bem como onde guardá-los no sistema. Ative Fonte de Instalação e Destino de Instalação, e clique Atualizar.\n" +"Os módulos vêm de diferentes repositórios. Fontes de Módulos: " +"Adicionar/Remover mostra quais os repositórios conhecidos " +"presentemente.\n" +"\n" +"Fontes de Módulos: Escolher permite decidir de onde devem vir os " +"módulos (isto é, de que repositório Xiphos deve obtê-los), bem como onde " +"guardá-los no sistema. Ative Fonte de Instalação e Destino de " +"Instalação, e clique Atualizar.\n" "\n" -"Módulos: Instalar/Atualizar permite selecionar e obter módulos depois de escolher a fonte e o destino.\n" +"Módulos: Instalar/Atualizar permite selecionar e obter módulos depois " +"de escolher a fonte e o destino.\n" "\n" "Módulos: Manutenção é para criação de arquivo e índices.\n" "\n" -"Veja a Secção 5 do nosso manual para detalhes sobre o Gestor de Módulos, ou peça ajuda através do Chat, ou ainda (se não obtiver resposta no Chat) envie mail para a nossa lista de utilizadores.\n" +"Veja a Secção 5 do nosso manual para detalhes sobre o Gestor de Módulos, ou " +"peça ajuda através do Chat, ou ainda (se não obtiver resposta no Chat) envie " +"mail para a nossa lista de utilizadores.\n" #: ../src/gnome2/mod_mgr.c:67 msgid "" "Welcome to Xiphos.\n" "\n" -"There are no Bibles installed. In order to initialize, Xiphos needs at least one Bible module. To facilitate this, the Module Manager has been opened so that you may install one or more Bibles, either from a local module set (cdrom, flash drive) or over the network from CrossWire Bible Society. Please refer to these step-by-step instructions, and to the general module manager overview that has also been opened.\n" +"There are no Bibles installed. In order to initialize, Xiphos needs at least " +"one Bible module. To facilitate this, the Module Manager has been opened so " +"that you may install one or more Bibles, either from a local module set " +"(cdrom, flash drive) or over the network from CrossWire Bible Society. " +"Please refer to these step-by-step instructions, and to the general module " +"manager overview that has also been opened.\n" "\n" "For local install:\n" -"- In Module Sources: Add/Remove, add a new local folder name where modules can be found.\n" +"- In Module Sources: Add/Remove, add a new local folder name where " +"modules can be found.\n" " (This is where folders exist named mods.d and modules.)\n" -"- In Module Sources: Choose, click the \"Local\" button, and select your folder from the pulldown.\n" +"- In Module Sources: Choose, click the \"Local\" button, and select " +"your folder from the pulldown.\n" "\n" "For network install from CrossWire:\n" -"- In Module Sources: Choose, click the \"Remote\" button and select CrossWire from the pulldown.\n" +"- In Module Sources: Choose, click the \"Remote\" button and select " +"CrossWire from the pulldown.\n" "- Click the \"Refresh\" button at the bottom.\n" "\n" "In either case:\n" -"- In Modules: Install/Update, select Bibles and other modules of your preference.\n" +"- In Modules: Install/Update, select Bibles and other modules of your " +"preference.\n" "- Click \"Install\".\n" "- Close the Module Manager when you are done.\n" "\n" "Warning: If you live in a persecuted country, use with care.\n" "\n" -"Both this step-by-step instruction dialog and the general introduction dialog may be closed at any time." +"Both this step-by-step instruction dialog and the general introduction " +"dialog may be closed at any time." msgstr "" "Bem-vindo(a) a Xiphos.\n" "\n" -"Não há Bíblias instaladas. Para inicializar, Xiphos precisa no mínimo de um módulo de Bíblia.\n" -"Para isso, Xiphos lançou o Gestor de Módulos para instalar uma ou mais Bíblias de um conjunto local (cdrom, drive flash) ou pela rede da CrossWire Bible Society.\n" -"Veja por favor as instruções passo-a-passo e a vista geral sobre o Gestor de Módulos.\n" +"Não há Bíblias instaladas. Para inicializar, Xiphos precisa no mínimo de um " +"módulo de Bíblia.\n" +"Para isso, Xiphos lançou o Gestor de Módulos para instalar uma ou mais " +"Bíblias de um conjunto local (cdrom, drive flash) ou pela rede da CrossWire " +"Bible Society.\n" +"Veja por favor as instruções passo-a-passo e a vista geral sobre o Gestor de " +"Módulos.\n" "\n" "Para instalação local:\n" -"- Em Fontes de Módulos: Adicionar/Remover, adicione uma nova pasta local para localizar módulos.\n" +"- Em Fontes de Módulos: Adicionar/Remover, adicione uma nova pasta " +"local para localizar módulos.\n" " (Haverá aí pastas designadas mods.d e modules.)\n" -"- Em Fontes de Módulos: Escolher, clique no botão \"Local\" e selecione a sua pasta.\n" +"- Em Fontes de Módulos: Escolher, clique no botão \"Local\" e " +"selecione a sua pasta.\n" "\n" "Para instalação via rede de Crosswire:\n" -"- Em Fontes de Módulos: Escolher, clique no botão \"Remoto\" e selecione Crosswire.\n" +"- Em Fontes de Módulos: Escolher, clique no botão \"Remoto\" e " +"selecione Crosswire.\n" "- Clique no botão \"Atualizar\" ao fundo.\n" "\n" "Em qualquer dos casos:\n" -" - Em Módulos: Instalar/Atualizar, escolha Bíblias da sua preferência.\n" +" - Em Módulos: Instalar/Atualizar, escolha Bíblias da sua " +"preferência.\n" " - Clique \"Instalar\".\n" " - Feche o Gestor de Módulos quando terminar.\n" "\n" "Aviso: Use com cuidado, se estiver num país com perseguições.\n" "\n" -"As instruções passo-a-passo e a vista geral sobre o Gestor de Módulos podem ser fechadas em qualquer momento." +"As instruções passo-a-passo e a vista geral sobre o Gestor de Módulos podem " +"ser fechadas em qualquer momento." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Remover estes módulos?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Preparando remoção" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Removendo" -#: ../src/gnome2/mod_mgr.c:192 -#: ../ui/xi-menus.glade.h:152 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Remover" @@ -659,23 +792,23 @@ msgid "Install" msgstr "Instalar" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arquivar estes módulos?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Preparando arquivo" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arquivando" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arquivar" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -683,88 +816,101 @@ "Construir índice de busca rápida para estes\n" "módulos (pode demorar minutos por módulo)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Preparando indexação" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexando" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indexar" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Apagar índice de busca rápida para estes módulos?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Preparando para apagar index" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Apagando index" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Remoção" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "O módulo não tem informação Sobre." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nome de Módulo" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Uma marca significa que o módulo já está instalado" -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Clique na caixa para trabalhar neste módulo" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Clique na caixa para selecionar este módulo para instalar/atualizar" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Instalado" -#: ../src/gnome2/mod_mgr.c:628 -msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)" -msgstr "O ícone de índice significa que tem um índice otimizado ('lucene') para este módulo para pesquisa rápida (veja no painel de Manutenção sobre esta função)" - -#: ../src/gnome2/mod_mgr.c:646 -msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner" -msgstr "O ícone de fechadura significa que este módulo está encriptado e requer a compra de uma chave de abertura ao proprietário do conteúdo" - -#: ../src/gnome2/mod_mgr.c:663 -#: ../src/main/biblesync_glue.cc:629 -#: ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:625 +msgid "" +"The index icon means you have built an optimized ('lucene') index for this " +"module for fast searching (see the Maintenance pane for this function)" +msgstr "" +"O ícone de índice significa que tem um índice otimizado ('lucene') para este " +"módulo para pesquisa rápida (veja no painel de Manutenção sobre esta função)" + +#: ../src/gnome2/mod_mgr.c:649 +msgid "" +"The lock icon means this module is encrypted, and requires that you purchase " +"an unlock key from the content owner" +msgstr "" +"O ícone de fechadura significa que este módulo está encriptado e requer a " +"compra de uma chave de abertura ao proprietário do conteúdo" + +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Sobre" -#: ../src/gnome2/mod_mgr.c:689 -msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module" -msgstr "O ícone de refrescar significa que o módulo instalado é mais antigo do que o módulo disponível: deve atualizar o módulo" +#: ../src/gnome2/mod_mgr.c:688 +msgid "" +"The refresh icon means the Installed module is older than the newer " +"Available module: You should update the module" +msgstr "" +"O ícone de refrescar significa que o módulo instalado é mais antigo do que o " +"módulo disponível: deve atualizar o módulo" -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Disponível" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Tamanho" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Descrição" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -773,40 +919,33 @@ "`mkdir %s' falhou:\n" "%s." -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arquivado em: \n" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Diários e listas de oração não podem ser indexados." -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s falhou" -#: ../src/gnome2/mod_mgr.c:1000 -#: ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Terminado" -#: ../src/gnome2/mod_mgr.c:1168 -#: ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 -#: ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 -#: ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 -#: ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 -#: ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 -#: ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Desconhecido" -#: ../src/gnome2/mod_mgr.c:1496 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -815,7 +954,7 @@ "Repositório:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -823,72 +962,44 @@ "Categorizado por \n" "Tipo de Módulo" -#: ../src/gnome2/mod_mgr.c:1513 -#: ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 -#: ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Textos Bíblicos" -#: ../src/gnome2/mod_mgr.c:1517 -#: ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 -#: ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Comentários" -#: ../src/gnome2/mod_mgr.c:1521 -#: ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 -#: ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Dicionários" -#: ../src/gnome2/mod_mgr.c:1525 -#: ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 -#: ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glossários" -#: ../src/gnome2/mod_mgr.c:1529 -#: ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 -#: ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Devocionais Diários" -#: ../src/gnome2/mod_mgr.c:1533 -#: ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 -#: ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Livros Gerais" -#: ../src/gnome2/mod_mgr.c:1537 -#: ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 -#: ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "Mapas" - -#: ../src/gnome2/mod_mgr.c:1541 -#: ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 -#: ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "Imagens" - -#: ../src/gnome2/mod_mgr.c:1545 -#: ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 -#: ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Culto/Não ortodoxo" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -896,60 +1007,57 @@ "Categorizado por \n" "Disponibilidade" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Atualizações" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Desinstalado" -#: ../src/gnome2/mod_mgr.c:1566 -#: ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 -#: ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 -#: ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Lista de Oração/Diário" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Atualizando de fonte remota" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Fonte remota não encontrada" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configurar" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tipo" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Nome" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Fonte" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Directório" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Utilizador" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Palavra-passe" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" @@ -961,14 +1069,12 @@ msgid "Add/Remove" msgstr "Adicionar/Remover" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Escolher" -#: ../src/gnome2/mod_mgr.c:1946 -#: ../src/gnome2/preferences_dialog.c:2067 -#: ../src/gnome2/sidebar.c:1533 -#: ../src/gnome2/sidebar.c:1572 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Módulos" @@ -976,19 +1082,20 @@ msgid "Install/Update" msgstr "Instalar/Atualizar" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Manutenção" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Por favor atualize" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "A sua lista de módulos não está atualizada!" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -996,7 +1103,7 @@ "Desinstalou a sua última Bíblia.\n" "Xiphos requer no mínimo uma." -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1004,122 +1111,123 @@ "Ainda não tem Bíblias instaladas.\n" "Xiphos não pode continuar sem nenhuma." -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Fontes remotas habituais foram carregadas." -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Não foi possível carregar as fontes habituais de CrossWire." -#: ../src/gnome2/mod_mgr.c:2787 -#: ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Remover a fonte selecionada" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Introduzir uma fonte remota" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Nome:" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tipo:" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Máquina:" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Directório:" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Utilizador (opcional):" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Palavra-passe (opcional):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Já existe uma fonte com esse nome." -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Apagar uma fonte remota" -#: ../src/gnome2/mod_mgr.c:3554 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[sem módulo]" -#: ../src/gnome2/navbar_book.c:371 -#: ../src/gnome2/navbar_book_dialog.c:312 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Ir para fora, para a secção que contém este" -#: ../src/gnome2/navbar_book.c:393 -#: ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Ir para item anterior" -#: ../src/gnome2/navbar_book.c:414 -#: ../src/gnome2/navbar_book_dialog.c:352 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Ir para próximo item" -#: ../src/gnome2/navbar_book.c:436 -#: ../src/gnome2/navbar_book_dialog.c:372 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Ir para dentro, para a primeira subsecção" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:935 -#: ../src/gnome2/navbar_versekey_parallel.c:855 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Sincronizar esta janela com a janela principal" -#: ../src/gnome2/parallel_dialog.c:356 -#: ../src/gnome2/preferences_dialog.c:2074 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralelo" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Desanexar/Anexar" -#: ../src/gnome2/parallel_view.c:121 -#: ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Opções do Módulo" -#: ../src/gnome2/parallel_view.c:215 -#: ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 -#: ../src/gnome2/tabbed_browser.c:252 -#: ../src/main/sidebar.cc:655 -#: ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 -#: ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Vista Paralela" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "Frase-passe de sessão BibleSync" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Frase:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1127,138 +1235,128 @@ "Seleção de modo falhou.\n" "Defina \"Depurar\" e tente de novo para ver porquê." -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Seleção de mod falhou.\n" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (frase-passe \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Desativado" -#: ../src/gnome2/preferences_dialog.c:1021 -#: ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Pessoal" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Orador" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Audiência" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1927 -#: ../src/gnome2/preferences_dialog.c:2404 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Selecionar --" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Locale tem efeito após reinício do programa." -#: ../src/gnome2/preferences_dialog.c:1962 -#: ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferências" -#: ../src/gnome2/preferences_dialog.c:2047 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Geral" -#: ../src/gnome2/preferences_dialog.c:2050 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opções" -#: ../src/gnome2/preferences_dialog.c:2053 -#: ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2057 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Fontes" -#: ../src/gnome2/preferences_dialog.c:2060 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Cor" -#: ../src/gnome2/preferences_dialog.c:2063 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Tamanhos e faces" -#: ../src/gnome2/preferences_dialog.c:2077 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Especial" -#: ../src/gnome2/preferences_dialog.c:2786 -#: ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Limpar Lista?" -#: ../src/gnome2/preferences_dialog.c:2787 -#: ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Tem a certeza de que pretende limpar a lista de módulos?" -#: ../src/gnome2/preferences_dialog.c:2838 -#: ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Remover Módulo?" -#: ../src/gnome2/preferences_dialog.c:2839 -#: ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Tem a certeza de que pretende remover o módulo selecionado?" -#: ../src/gnome2/search_dialog.c:62 -#: ../src/main/search_dialog.cc:52 +#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:52 #: ../src/main/search_sidebar.cc:51 msgid "Searching the " msgstr "Pesquisando " -#: ../src/gnome2/search_dialog.c:63 -#: ../src/main/search_dialog.cc:53 +#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:53 #: ../src/main/search_sidebar.cc:52 msgid " Module" msgstr " Módulo" -#: ../src/gnome2/search_dialog.c:64 -#: ../src/main/search_dialog.cc:54 +#: ../src/gnome2/search_dialog.c:64 ../src/main/search_dialog.cc:54 #: ../src/main/search_sidebar.cc:53 msgid "found in " msgstr "encontrado em " -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nova Lista %s" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "A última lista de módulos não pode ser apagada" -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Apagar Lista?" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Tem a certeza de que pretende apagar:" @@ -1278,7 +1376,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1321,14 +1419,16 @@ " A palavra \"loved\" e a palavra \"one\"\n" " && pode ser usado em vez de AND\n" "+loved one\n" -" Versículos que devem conter \"loved\" e podem conter \"one\"\n" +" Versículos que devem conter \"loved\" e podem conter " +"\"one\"\n" "loved NOT one\n" " \"loved\" mas não \"one\"\n" "(loved one) AND God\n" " \"loved\" ou \"one\" e \"God\"\n" "lemma:G2316\n" " Procura a palavra número 2316 do Strong's Greek (\"G\").\n" -" Também seleciona a vista de Strong's na aba Pesquisar Atributo.\n" +" Também seleciona a vista de Strong's na aba Pesquisar Atributo.\n" "\n" "Para detalhes completos, pesquise na web por \"lucene search syntax\"." @@ -1348,38 +1448,50 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" -"Searches for content contained in markup outside the main text. Attributes are footnotes, Strong's numbers, and morphological symbols.\n" +"Searches for content contained in markup outside the main text. Attributes " +"are footnotes, Strong's numbers, and morphological symbols.\n" "\n" -"Be aware that most such searches can now be done faster via optimized \"lucene\" searches using keyword qualifiers.\n" +"Be aware that most such searches can now be done faster via optimized " +"\"lucene\" searches using keyword qualifiers.\n" "\n" -"To use attribute searches, you must select the appropriate button on the Attribute Search tab.\n" +"To use attribute searches, you must select the appropriate button on the " +"Attribute Search tab.\n" "* Footnote text is searched just like regular text.\n" -"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" -"* Morphological tags are identified literally, e.g. N-ASF for \"noun, accusative singular feminine\" -- see the Robinson module for details." +"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) " +"and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n" +"* Morphological tags are identified literally, e.g. N-ASF for \"noun, " +"accusative singular feminine\" -- see the Robinson module for details." msgstr "" "Pesquisas baseadas em atributos\n" -"Pesquisas de conteúdo inserido em markup fora do texto principal. Atributos são notas de rodapé, números de Strong e símbolos morfológicos.\n" +"Pesquisas de conteúdo inserido em markup fora do texto principal. Atributos " +"são notas de rodapé, números de Strong e símbolos morfológicos.\n" "\n" -"Saiba que grande parte destas pesquisas pode ser feita mais rapidamente através de pesquisas otimizadas \"lucene\" usando qualificadores de palavra-chave.\n" +"Saiba que grande parte destas pesquisas pode ser feita mais rapidamente " +"através de pesquisas otimizadas \"lucene\" usando qualificadores de palavra-" +"chave.\n" "\n" -"Para usar pesquisas com atributos, deve selecionar o botão apropriado na aba Pesquisa por Atributo.\n" +"Para usar pesquisas com atributos, deve selecionar o botão apropriado na aba " +"Pesquisa por Atributo.\n" "* Texto de nota de rodapé é pesquisado tal como o texto regular.\n" -"* Palavras de Strong são especificados com uma letra de prefixo H ou G (Hebraico ou Grego) e o identificador numérico, p.ex. G2316 para encontrar \\\"θεός\\\" (\\\"Deus\").\n" -"* Etiquetas morfológicas são identificadas literalmente, p.ex. N-ASF para \"nome, aucsativo singular feminino\" -- veja o módulo de Robinson para detalhes." +"* Palavras de Strong são especificados com uma letra de prefixo H ou G " +"(Hebraico ou Grego) e o identificador numérico, p.ex. G2316 para encontrar \\" +"\"θεός\\\" (\\\"Deus\").\n" +"* Etiquetas morfológicas são identificadas literalmente, p.ex. N-ASF para " +"\"nome, aucsativo singular feminino\" -- veja o módulo de Robinson para " +"detalhes." -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Módulo não é Bíblia nem comentário" -#: ../src/gnome2/search_dialog.c:1247 -#: ../src/gnome2/sidebar.c:1003 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync não está ativo para transmissão." -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1387,114 +1499,95 @@ "Esta é uma pesquisa inclusiva (\"AND\"):\n" "Encontrar combinações com todas as palavras." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_AbrirPesquisa Avançada" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Abrir o diálogo de pesquisa avançada" -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Pesquisar Módulo" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "Bíblia" - -#: ../src/gnome2/search_sidebar.c:259 -#: ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Comentário" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Tipo de pesquisa" -#: ../src/gnome2/search_sidebar.c:287 -#: ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Palavra múltipla" -#: ../src/gnome2/search_sidebar.c:298 -#: ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Expressão Regular" -#: ../src/gnome2/search_sidebar.c:306 -#: ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Frase exata" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Opções de Pesquisa" -#: ../src/gnome2/search_sidebar.c:333 -#: ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Combinar capitalização" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Âmbito de Pesquisa" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Sem âmbito" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Usar limites" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Última pesquisa" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Limites" -#: ../src/gnome2/search_sidebar.c:410 -#: ../src/gnome2/search_sidebar.c:443 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Inferior" -#: ../src/gnome2/search_sidebar.c:422 -#: ../src/gnome2/search_sidebar.c:450 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Superior" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Abrir módulo no editor?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Se não, abrirá apenas para visualização." -#: ../src/gnome2/sidebar.c:957 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Colar referência de versíclo" -#: ../src/gnome2/sidebar.c:959 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Lista:" -#: ../src/gnome2/sidebar.c:1521 -#: ../src/gnome2/sidebar.c:1556 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Pesquisar" -#: ../src/gnome2/sidebar_dialog.c:164 -#: ../src/gnome2/sidebar_dialog.c:173 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Barra Lateral" @@ -1502,75 +1595,73 @@ msgid "Powered by the SWORD Project" msgstr "Movido pelo Projeto SWORD" -#: ../src/gnome2/tabbed_browser.c:361 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Não é possível criar directório de abas." -#: ../src/gnome2/treekey-editor.c:145 -#: ../src/gnome2/treekey-editor.c:208 -#: ../src/gnome2/treekey-editor.c:304 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Lista de oração/Item de Diário" -#: ../src/gnome2/treekey-editor.c:146 -#: ../src/gnome2/treekey-editor.c:209 -#: ../src/gnome2/treekey-editor.c:305 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Novo Nome" -#: ../src/gnome2/treekey-editor.c:266 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Remover o item selecionado" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Janeiro" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Fevereiro" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Março" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Abril" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Maio" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Junho" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Julho" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Agosto" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Setembro" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Outubro" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Novembro" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Dezembro" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1578,7 +1669,7 @@ "O tamanho de ficheiro de uma imagem não pôde ser determinado.\n" "Xiphos não pode redimensionar as imagens para ajustar à janela." -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" @@ -1586,7 +1677,7 @@ "Pacote incompatível\n" "\n" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" @@ -1594,7 +1685,7 @@ "Anúncio de presença:\n" "\n" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" @@ -1602,11 +1693,11 @@ "Pacote de navegação:\n" "\n" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "Módulo desconhecido" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." @@ -1614,43 +1705,43 @@ ".\n" "Navegado indiretamente usando lista de versículos." -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " msgstr "ERRO: indicador BibleSync desconhecido: " -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" msgstr "Outras indicações são:" -#: ../src/main/biblesync_glue.cc:579 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "Clique na opção para ouvir este orador" -#: ../src/main/biblesync_glue.cc:592 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "Oradores Disponíveis" -#: ../src/main/biblesync_glue.cc:601 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "D/I" -#: ../src/main/biblesync_glue.cc:611 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" msgstr "Última navegação foi Direta ou Indireta" -#: ../src/main/biblesync_glue.cc:620 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "Última Navegação" -#: ../src/main/biblesync_glue.cc:639 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" msgstr "UUID" -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "Endereço IP:" -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " @@ -1658,7 +1749,7 @@ "\n" "Aplicação: " -#: ../src/main/biblesync_glue.cc:663 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " @@ -1666,7 +1757,7 @@ "\n" "Dispositivo:" -#: ../src/main/biblesync_glue.cc:664 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " @@ -1674,11 +1765,13 @@ "\n" "UUID:" -#: ../src/main/display.cc:88 -msgid "

This module has no content at this point.
" -msgstr "

Este módulo não tem conteúdo neste ponto.
" +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" +"

Este módulo não tem conteúdo neste ponto.
" -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1687,75 +1780,63 @@ "Rótulo de anotação pessoal indevidamente codificado:\n" "'%s'" -#: ../src/main/display.cc:1110 -#: ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 -#: ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Capítulo" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos não aceita mais do que um argumento." -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Iniciando HTML" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Construindo Interface" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Iniciando Sword" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Carregando Definições" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Mostrando Xiphos" -#: ../src/main/module_dialogs.cc:188 -#: ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Pré-visualizador" -#: ../src/main/module_dialogs.cc:243 -#: ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Nota de rodapé" -#: ../src/main/module_dialogs.cc:249 -#: ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Referência cruzada" -#: ../src/main/module_dialogs.cc:255 -#: ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 -#: ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 -#: ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:261 -#: ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 -#: ../src/main/module_dialogs.cc:386 -#: ../src/main/previewer.cc:208 -#: ../src/main/previewer.cc:227 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 +#: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologia" -#: ../src/main/module_dialogs.cc:1012 -#: ../src/main/url.cc:534 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Voltar a " @@ -1763,217 +1844,205 @@ msgid "Unknown parallel module: " msgstr "Módulo paralelo desconhecido:" -#: ../src/main/parallel_view.cc:400 -#: ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Números Strong" -#: ../src/main/parallel_view.cc:410 -#: ../ui/search-dialog.glade.h:102 -#: ../ui/search-dialog.gtkbuilder.h:101 -#: ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 +#: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Notas de rodapé" -#: ../src/main/parallel_view.cc:420 -#: ../ui/search-dialog.glade.h:99 -#: ../ui/search-dialog.gtkbuilder.h:98 -#: ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 +#: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Etiquetas morfológicas" -#: ../src/main/parallel_view.cc:430 -#: ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Pontos Vogais do Hebraico" -#: ../src/main/parallel_view.cc:440 -#: ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Cantilação do Hebraico" -#: ../src/main/parallel_view.cc:450 -#: ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Acentos Gregos" -#: ../src/main/parallel_view.cc:460 -#: ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Referências cruzadas" -#: ../src/main/parallel_view.cc:470 -#: ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemas" -#: ../src/main/parallel_view.cc:480 -#: ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Cabeçalhos" -#: ../src/main/parallel_view.cc:490 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentação de Morfema" -#: ../src/main/parallel_view.cc:504 -#: ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Palavras de Cristo a vermelho" -#: ../src/main/parallel_view.cc:514 -#: ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteração" -#: ../src/main/parallel_view.cc:524 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Variantes Textuais" -#: ../src/main/parallel_view.cc:532 -#: ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Leitura Principal" -#: ../src/main/parallel_view.cc:541 -#: ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Leitura Secundária" -#: ../src/main/parallel_view.cc:550 -#: ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Todas as Leituras" -#: ../src/main/parallel_view.cc:560 -#: ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 msgid "Transliterated Forms" msgstr "Formas Transliteradas" -#: ../src/main/parallel_view.cc:570 -#: ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 msgid "Enumerations" msgstr "Enumerações" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Glossários" + #: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "contexto da vista" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Crescimento" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Para Crescimento
" -#: ../src/main/prayerlists.cc:114 -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Salvação" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Para Salvação
" -#: ../src/main/prayerlists.cc:116 -#: ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Saúde" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Para Saúde
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Variado" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Miscelâneo
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Ponto x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Ponto y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Ponto z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Tópico Menor 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subtópico 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Tópico Menor 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subtópico 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Tópico Menor 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subtópico 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Tópico Menor 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subtópico 4
" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Nome da nova lista de oração ou diário" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos já encontra essa lista de oração." -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1982,120 +2051,124 @@ "Xiphos não pode criar o caminho do módulo:\n" "%s" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Uma lista de oração básica. \\par\\par Módulo criado por Xiphos." -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "Lista Básica de Oração" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "Minha Lista de Oração" -#: ../src/main/prayerlists.cc:335 -msgid "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" -msgstr "Pessoas:
Bob
Sam
Sue

Igreja:
bancos
congregação
Bíblias para missionários


" +#: ../src/main/prayerlists.cc:323 +msgid "" +"People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" +msgstr "" +"Pessoas:
Bob
Sam
Sue

Igreja:
bancos
congregação
Bíblias para missionários


" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." -msgstr "Uma lista de oração baseada em assunto. \\par\\par Módulo criado por Xiphos." +msgstr "" +"Uma lista de oração baseada em assunto. \\par\\par Módulo criado por Xiphos." -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "Lista de Oração" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Crescimento Espiritual" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Uma lista de oração mensal. \\par\\par Módulo criado por Xiphos." -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "Lista de Oração Mensal" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Um diário. \\par\\par Módulo criado por Xiphos." -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Devocional Diário" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." -msgstr "Um tópico assinalado (ex. sermão). \\par\\par Módulo criado por Xiphos." +msgstr "" +"Um tópico assinalado (ex. sermão). \\par\\par Módulo criado por Xiphos." -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "Tópico Sublinhado" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Tópico Maior A" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Tópico Maior A
" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Tópico Maior B" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Tópico Maior B
" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Tópico Maior C" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Tópico Maior C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Anotação do Utilizador" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Resultado da Pesquisa %s: %s" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Apagar Extensão?" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Tem a certeza de que quer apagar esta extensão?" -#: ../src/main/search_dialog.cc:645 -#: ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 -#: ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Pesquisar: " -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2106,16 +2179,16 @@ "Esse módulo não está instalado.\n" "%s" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Por favor, ajuste a lista de módulos." -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Não existe qualquer índice de busca rápida para %s.%s%s" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2123,7 +2196,7 @@ "\n" "Pesquisa neste módulo é agora `multi palavras'." -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2131,19 +2204,19 @@ "\n" "Ver o Gestor de Módulos, Manutenção." -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Pesquisa concluída" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "combina com" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Não existe módulo de comentário." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME não está definido!" @@ -2152,13 +2225,12 @@ msgid "Xiphos can not create directory " msgstr "Xiphos não pode criar o diretório" -#: ../src/main/settings.c:135 -#: ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "não pode criar " -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2170,7 +2242,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Ficheiro de definições vazio -- sem backup?!? Informação perdida!" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2186,11 +2258,11 @@ "Xiphos não pode prosseguir \n" "e vai agora terminar." -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Instalação de módulo bíblico concluída." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2198,15 +2270,15 @@ "Erro de módulo: Codificação xref não-utilizável.\n" "Reporte isto por favor, juntamente com módulo e versículo" -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "versículo" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "capítulo" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2214,7 +2286,7 @@ "O ficheiro de Xiphos para \n" "as abreviaturas de linguagem está ausente." -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2222,7 +2294,7 @@ "O ficheiro de abreviaturas \n" "de Xiphos não pode ser aberto." -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2230,7 +2302,7 @@ "Xiphos não pode alocar espaço\n" "para abreviaturas de linguagens." -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2239,7 +2311,7 @@ "de abreviaturas de linguagens." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2248,12 +2320,11 @@ "Nenhum locale adequado foi encontrado para `%s'.\n" "%s" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Nomes de livros e menus podem não estar traduzidos." -#: ../src/main/sword.cc:1052 -#: ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2264,8 +2335,7 @@ "%s.\n" "Deseja abri-los também?%s" -#: ../src/main/sword.cc:1056 -#: ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2277,17 +2347,20 @@ "O primeiro abrirá na janela principal\n" "e outros em janelas separadas." -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Foi pedido um Devocional Diário, mas não há nenhum instalado." -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" "You are opening a module which requires a key.\n" "\n" -"The module is locked, meaning that the content is encrypted by its publisher, and you must enter its key in order for the content to become useful. This key should have been received by you on the web page which confirmed your purchase, or perhaps sent via email after purchase.\n" +"The module is locked, meaning that the content is encrypted by its " +"publisher, and you must enter its key in order for the content to become " +"useful. This key should have been received by you on the web page which " +"confirmed your purchase, or perhaps sent via email after purchase.\n" "\n" "Please enter the key in the dialog." msgstr "" @@ -2295,109 +2368,100 @@ "\n" "Está a abrir um módulo que requer uma chave.\n" "\n" -"O módulo está bloqueado, o seu conteúdo está encriptado pelo publicador e precisa de introduzir a sua chave para aceder ao conteúdo. Essa chave deve ter sido enviada na página web onde confirmou a sua aquisição, ou talvez enviada por email após a aquisição.\n" +"O módulo está bloqueado, o seu conteúdo está encriptado pelo publicador e " +"precisa de introduzir a sua chave para aceder ao conteúdo. Essa chave deve " +"ter sido enviada na página web onde confirmou a sua aquisição, ou talvez " +"enviada por email após a aquisição.\n" "\n" "Introduza por favor a chave no diálogo." -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Limpar Histórico" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "Histórico ➛ Lista de Versículos" -#: ../src/main/url.cc:108 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL não encontrado:" -#: ../src/main/url.cc:198 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos não conseguiu executar %s" -#: ../src/main/url.cc:206 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Erro de visualizador:\n" -#: ../src/main/url.cc:279 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Mostrar %s na janela principal" -#: ../src/main/xml.c:86 -#: ../src/main/xml.c:478 -#: ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Documento não criado com sucesso. \n" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "O que preciso de fazer para ser salvo?" -#: ../src/main/xml.c:98 -#: ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Atos 16:31" -#: ../src/main/xml.c:103 -#: ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Efésios 2:8,9" -#: ../src/main/xml.c:108 -#: ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romanos 1:16" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "O que é o Evangelho?" -#: ../src/main/xml.c:114 -#: ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:270 -#: ../src/main/xml.c:416 -#: ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Documento não processado com sucesso. \n" -#: ../src/main/xml.c:276 -#: ../src/main/xml.c:422 -#: ../src/main/xml.c:444 -#: ../src/main/xml.c:862 -#: ../src/main/xml.c:1176 -#: ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "documento vazio \n" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "tipo errado, root node != SwordBookmarks\n" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "tipo errado, nó raíz != Copiar_Exportar\n" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Capítulo %d

" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Capítulo %d

" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2410,7 +2474,7 @@ "Capítulo %d\n" "\n" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2423,12 +2487,12 @@ "Capítulo %d\n" "\n" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Capítulo %d

" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2437,84 +2501,82 @@ "%s: %s Capítulo %d\n" "\n" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:529 -#: ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Velho Testamento" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Novo Testamento" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Ap" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Amostra de Lista de Módulos" -#: ../src/main/xml.c:868 -#: ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "tipo errado, root node != %s\n" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2523,90 +2585,68 @@ "Não foi possível guardar as definições! stat %d, size %d\n" "%s" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Tentando reverter para uma versão anterior gravada." -#: ../ui/bookmarks.glade.h:1 -#: ../ui/bookmarks.gtkbuilder.h:1 +#: ../ui/bookmarks.glade.h:1 ../ui/bookmarks.gtkbuilder.h:1 msgid "Add Bookmark" msgstr "Adicionar Marca" -#: ../ui/bookmarks.glade.h:2 -#: ../ui/bookmarks.gtkbuilder.h:13 -#: ../ui/markverse.glade.h:2 -#: ../ui/markverse.gtkbuilder.h:11 +#: ../ui/bookmarks.glade.h:2 ../ui/bookmarks.gtkbuilder.h:13 +#: ../ui/markverse.glade.h:2 ../ui/markverse.gtkbuilder.h:11 msgid "Bookmark Dialog" msgstr "Diálogo de Marca" -#: ../ui/bookmarks.glade.h:3 -#: ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 -#: ../ui/markverse.gtkbuilder.h:6 +#: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Criar Nova Pasta" -#: ../ui/bookmarks.glade.h:4 -#: ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 -#: ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:114 -#: ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nova Pasta" -#: ../ui/bookmarks.glade.h:5 -#: ../ui/bookmarks.gtkbuilder.h:3 +#: ../ui/bookmarks.glade.h:5 ../ui/bookmarks.gtkbuilder.h:3 msgid "New ..." msgstr "Novo ..." -#: ../ui/bookmarks.glade.h:6 -#: ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 -#: ../ui/markverse.gtkbuilder.h:10 +#: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Cancelar Marca" -#: ../ui/bookmarks.glade.h:7 -#: ../ui/bookmarks.gtkbuilder.h:6 +#: ../ui/bookmarks.glade.h:7 ../ui/bookmarks.gtkbuilder.h:6 msgid "Label:" msgstr "Rótulo:" -#: ../ui/bookmarks.glade.h:8 -#: ../ui/bookmarks.gtkbuilder.h:7 +#: ../ui/bookmarks.glade.h:8 ../ui/bookmarks.gtkbuilder.h:7 msgid "Label Entry" msgstr "Entrada de Rótulo" -#: ../ui/bookmarks.glade.h:9 -#: ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 -#: ../ui/markverse.gtkbuilder.h:2 +#: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Versículo:" -#: ../ui/bookmarks.glade.h:10 -#: ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 -#: ../ui/markverse.gtkbuilder.h:3 +#: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Entrada de Versículo" -#: ../ui/bookmarks.glade.h:11 -#: ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 -#: ../ui/markverse.gtkbuilder.h:4 +#: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Módulo:" -#: ../ui/bookmarks.glade.h:12 -#: ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 -#: ../ui/markverse.gtkbuilder.h:5 +#: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Entrada de Módulo" -#: ../ui/bookmarks.glade.h:13 -#: ../ui/bookmarks.gtkbuilder.h:12 +#: ../ui/bookmarks.glade.h:13 ../ui/bookmarks.gtkbuilder.h:12 msgid "Bookmark Folder Treeview" msgstr "Vista de Árvore da Pasta de Marca" @@ -2614,8 +2654,7 @@ msgid "Insert Link" msgstr "Inserir Ligação" -#: ../ui/editor_link_dialog.xml.h:2 -#: ../ui/export-dialog.glade.h:17 +#: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" msgstr "Versículo" @@ -2636,13 +2675,11 @@ msgid "Test Link" msgstr "Testar Ligação" -#: ../ui/editor_note.xml.h:1 -#: ../ui/editor_studypad.xml.h:1 +#: ../ui/editor_note.xml.h:1 ../ui/editor_studypad.xml.h:1 msgid "Exit the program" msgstr "Sair do programa" -#: ../ui/editor_note.xml.h:2 -#: ../ui/editor_studypad.xml.h:2 +#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:2 msgid "Exit" msgstr "Sair" @@ -2654,13 +2691,11 @@ msgid "Preview the note to be printed" msgstr "Antever nota a ser impressa" -#: ../ui/editor_note.xml.h:5 -#: ../ui/editor_studypad.xml.h:5 +#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:5 msgid "HTML Format switch" msgstr "Mudança de formato HTML" -#: ../ui/editor_note.xml.h:6 -#: ../ui/editor_studypad.xml.h:6 +#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:6 msgid "HTML mode" msgstr "Modo HTML" @@ -2672,12 +2707,9 @@ msgid "_Delete Personal Comment" msgstr "_Apagar Comentário Pessoal" -#: ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 -#: ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 -#: ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 msgid "_File" msgstr "_Ficheiro" @@ -2689,30 +2721,24 @@ msgid "_Save (Personal Comment)" msgstr "_Guardar (Comentário Pessoal)" -#: ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 msgid "Print Pre_view" msgstr "Ante_visão de Impressão" -#: ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 msgid "_Print..." msgstr "Im_primir..." -#: ../ui/editor_note.xml.h:14 -#: ../ui/editor_studypad.xml.h:20 +#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Sair" -#: ../ui/editor_note.xml.h:15 -#: ../ui/editor_studypad.xml.h:21 +#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21 msgid "For_mat" msgstr "For_matar" -#: ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 -#: ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 msgid "Save" msgstr "Guardar" @@ -2752,146 +2778,121 @@ msgid "New Document" msgstr "Novo Documento" -#: ../ui/export-dialog.glade.h:1 -#: ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 -#: ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copiar/Exportar Passagem" -#: ../ui/export-dialog.glade.h:2 -#: ../ui/export-dialog.gtkbuilder.h:2 +#: ../ui/export-dialog.glade.h:2 ../ui/export-dialog.gtkbuilder.h:2 msgid "Export Passage Cancel" msgstr "Cancelar Exportação de Passagem" -#: ../ui/export-dialog.glade.h:3 -#: ../ui/export-dialog.gtkbuilder.h:3 +#: ../ui/export-dialog.glade.h:3 ../ui/export-dialog.gtkbuilder.h:3 msgid "Export Passage OK" msgstr "Exportar Passagem OK" -#: ../ui/export-dialog.glade.h:5 -#: ../ui/export-dialog.gtkbuilder.h:5 +#: ../ui/export-dialog.glade.h:5 ../ui/export-dialog.gtkbuilder.h:5 msgid "Version" msgstr "Versão" -#: ../ui/export-dialog.glade.h:6 -#: ../ui/export-dialog.gtkbuilder.h:6 +#: ../ui/export-dialog.glade.h:6 ../ui/export-dialog.gtkbuilder.h:6 msgid ": " msgstr ": " -#: ../ui/export-dialog.glade.h:7 -#: ../ui/export-dialog.gtkbuilder.h:7 +#: ../ui/export-dialog.glade.h:7 ../ui/export-dialog.gtkbuilder.h:7 msgid "Key" msgstr "Chave" -#: ../ui/export-dialog.glade.h:8 -#: ../ui/export-dialog.gtkbuilder.h:8 +#: ../ui/export-dialog.glade.h:8 ../ui/export-dialog.gtkbuilder.h:8 msgid "Copy" msgstr "Copiar" -#: ../ui/export-dialog.glade.h:9 -#: ../ui/export-dialog.gtkbuilder.h:9 +#: ../ui/export-dialog.glade.h:9 ../ui/export-dialog.gtkbuilder.h:9 msgid "Export" msgstr "Exportar" -#: ../ui/export-dialog.glade.h:10 -#: ../ui/export-dialog.gtkbuilder.h:11 +#: ../ui/export-dialog.glade.h:10 ../ui/export-dialog.gtkbuilder.h:11 msgid "Export complete book" msgstr "Exportar livro completo" -#: ../ui/export-dialog.glade.h:11 -#: ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 -#: ../ui/prefs.gtkbuilder.h:136 +#: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Livro" -#: ../ui/export-dialog.glade.h:12 -#: ../ui/export-dialog.gtkbuilder.h:12 +#: ../ui/export-dialog.glade.h:12 ../ui/export-dialog.gtkbuilder.h:12 msgid "Book Radio Button" msgstr "Botão de Rádio de Livro" -#: ../ui/export-dialog.glade.h:13 -#: ../ui/export-dialog.gtkbuilder.h:14 +#: ../ui/export-dialog.glade.h:13 ../ui/export-dialog.gtkbuilder.h:14 msgid "Export complete chapter" msgstr "Exportar capítulo completo" -#: ../ui/export-dialog.glade.h:15 -#: ../ui/export-dialog.gtkbuilder.h:15 +#: ../ui/export-dialog.glade.h:15 ../ui/export-dialog.gtkbuilder.h:15 msgid "Chapter Radio Button" msgstr "Botão de Rádio de Capítulo" -#: ../ui/export-dialog.glade.h:16 -#: ../ui/export-dialog.gtkbuilder.h:17 +#: ../ui/export-dialog.glade.h:16 ../ui/export-dialog.gtkbuilder.h:17 msgid "Export single verse" msgstr "Exportar versículo" -#: ../ui/export-dialog.glade.h:18 -#: ../ui/export-dialog.gtkbuilder.h:18 +#: ../ui/export-dialog.glade.h:18 ../ui/export-dialog.gtkbuilder.h:18 msgid "Verse Radio Button" msgstr "Botão de Rádio de Versículo" -#: ../ui/export-dialog.glade.h:19 -#: ../ui/export-dialog.gtkbuilder.h:19 +#: ../ui/export-dialog.glade.h:19 ../ui/export-dialog.gtkbuilder.h:19 msgid "Verse range" msgstr "Extensão de versículos" -#: ../ui/export-dialog.glade.h:20 -#: ../ui/export-dialog.gtkbuilder.h:20 +#: ../ui/export-dialog.glade.h:20 ../ui/export-dialog.gtkbuilder.h:20 msgid "Format" msgstr "Formatar" -#: ../ui/export-dialog.glade.h:21 -#: ../ui/export-dialog.gtkbuilder.h:21 +#: ../ui/export-dialog.glade.h:21 ../ui/export-dialog.gtkbuilder.h:21 msgid "Plain Text" msgstr "Texto Simples" -#: ../ui/export-dialog.glade.h:22 -#: ../ui/export-dialog.gtkbuilder.h:22 +#: ../ui/export-dialog.glade.h:22 ../ui/export-dialog.gtkbuilder.h:22 msgid "Plain Text Radio Button" msgstr "Botão de Rádio para Texto Simples" -#: ../ui/export-dialog.glade.h:23 -#: ../ui/export-dialog.gtkbuilder.h:23 +#: ../ui/export-dialog.glade.h:23 ../ui/export-dialog.gtkbuilder.h:23 msgid "HTML" msgstr "HTML" -#: ../ui/export-dialog.glade.h:24 -#: ../ui/export-dialog.gtkbuilder.h:24 +#: ../ui/export-dialog.glade.h:24 ../ui/export-dialog.gtkbuilder.h:24 msgid "HTML Radio Button" msgstr "Botão de Rádio HTML" #: ../ui/export-dialog.glade.h:25 -msgid "Indicates whether verse numbers should appear inline in the text for more than 1 verse." -msgstr "Indica se números de versículo devem aparecer dentro do texto para mais do que um versículo." +msgid "" +"Indicates whether verse numbers should appear inline in the text for more " +"than 1 verse." +msgstr "" +"Indica se números de versículo devem aparecer dentro do texto para mais do " +"que um versículo." -#: ../ui/export-dialog.glade.h:26 -#: ../ui/export-dialog.gtkbuilder.h:25 +#: ../ui/export-dialog.glade.h:26 ../ui/export-dialog.gtkbuilder.h:25 msgid "_Verse numbers in text" msgstr "Número de _versículo em texto" -#: ../ui/export-dialog.glade.h:27 -#: ../ui/export-dialog.gtkbuilder.h:27 +#: ../ui/export-dialog.glade.h:27 ../ui/export-dialog.gtkbuilder.h:27 msgid "Verse Number button" msgstr "Botão de Número de Versículo" -#: ../ui/export-dialog.glade.h:28 -#: ../ui/export-dialog.gtkbuilder.h:29 +#: ../ui/export-dialog.glade.h:28 ../ui/export-dialog.gtkbuilder.h:29 msgid "Indicates whether reference is placed first or last." msgstr "Indica se a referência é colocada no início ou no fim." -#: ../ui/export-dialog.glade.h:29 -#: ../ui/export-dialog.gtkbuilder.h:28 +#: ../ui/export-dialog.glade.h:29 ../ui/export-dialog.gtkbuilder.h:28 msgid "Reference last" msgstr "Referência Último" -#: ../ui/export-dialog.glade.h:30 -#: ../ui/export-dialog.gtkbuilder.h:30 +#: ../ui/export-dialog.glade.h:30 ../ui/export-dialog.gtkbuilder.h:30 msgid "Reference last button" msgstr "Último botão de Referência" -#: ../ui/export-dialog.glade.h:31 -#: ../ui/export-dialog.gtkbuilder.h:32 +#: ../ui/export-dialog.glade.h:31 ../ui/export-dialog.gtkbuilder.h:32 msgid "Indicates whether or not version name is included in reference." msgstr "Indica se o nome de versão é incluído na referência." @@ -2899,8 +2900,7 @@ msgid "Include Version" msgstr "Versão Include" -#: ../ui/export-dialog.glade.h:33 -#: ../ui/export-dialog.gtkbuilder.h:33 +#: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 msgid "Version button" msgstr "Botão de Versão" @@ -2916,764 +2916,606 @@ msgid "Include version" msgstr "Versão Include" -#: ../ui/gtk2_webedit.ui.h:1 -#: ../ui/gtk_webedit.ui.h:1 +#: ../ui/gtk2_webedit.ui.h:1 ../ui/gtk_webedit.ui.h:1 msgid "About Studypad" msgstr "Sobre Studypad" -#: ../ui/gtk2_webedit.ui.h:3 -#: ../ui/gtk_webedit.ui.h:3 +#: ../ui/gtk2_webedit.ui.h:3 ../ui/gtk_webedit.ui.h:3 msgid "Open about dialog" msgstr "Abrir diálogo 'Sobre'" -#: ../ui/gtk2_webedit.ui.h:4 -#: ../ui/gtk_webedit.ui.h:4 -#: ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Negrito" -#: ../ui/gtk2_webedit.ui.h:5 -#: ../ui/gtk_webedit.ui.h:5 +#: ../ui/gtk2_webedit.ui.h:5 ../ui/gtk_webedit.ui.h:5 msgid "Make selection bold" msgstr "Tornar seleção a negrito" -#: ../ui/gtk2_webedit.ui.h:6 -#: ../ui/gtk_webedit.ui.h:6 +#: ../ui/gtk2_webedit.ui.h:6 ../ui/gtk_webedit.ui.h:6 msgid "Copy" msgstr "Cópia" -#: ../ui/gtk2_webedit.ui.h:7 -#: ../ui/gtk_webedit.ui.h:7 +#: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 msgid "Copy selection to clipboard" msgstr "Copiar seleção para memória" -#: ../ui/gtk2_webedit.ui.h:8 -#: ../ui/gtk_webedit.ui.h:8 +#: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 msgid "Cut" msgstr "Cortar" -#: ../ui/gtk2_webedit.ui.h:9 -#: ../ui/gtk_webedit.ui.h:9 +#: ../ui/gtk2_webedit.ui.h:9 ../ui/gtk_webedit.ui.h:9 msgid "Cut selection" msgstr "Cortar selecção" -#: ../ui/gtk2_webedit.ui.h:10 -#: ../ui/gtk_webedit.ui.h:10 +#: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 msgid "Decrease indent" msgstr "Diminuir indentação" -#: ../ui/gtk2_webedit.ui.h:11 -#: ../ui/gtk_webedit.ui.h:11 +#: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 msgid "Decrease" msgstr "Diminuir" -#: ../ui/gtk2_webedit.ui.h:12 -#: ../ui/gtk_webedit.ui.h:12 +#: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 msgid "Decrease paragraph indent" msgstr "Diminuir indentação de parágrafo" -#: ../ui/gtk2_webedit.ui.h:13 -#: ../ui/gtk_webedit.ui.h:13 +#: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 msgid "Delete selection" msgstr "Apagar seleção" -#: ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 msgid "Delete" msgstr "Apagar" -#: ../ui/gtk2_webedit.ui.h:15 -#: ../ui/gtk_webedit.ui.h:15 +#: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Remover seleção" -#: ../ui/gtk2_webedit.ui.h:16 -#: ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:120 -#: ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Apagar Item" -#: ../ui/gtk2_webedit.ui.h:17 -#: ../ui/gtk_webedit.ui.h:17 +#: ../ui/gtk2_webedit.ui.h:17 ../ui/gtk_webedit.ui.h:17 msgid "Delete current item" msgstr "Apagar item corrente" -#: ../ui/gtk2_webedit.ui.h:19 -#: ../ui/gtk_webedit.ui.h:19 +#: ../ui/gtk2_webedit.ui.h:19 ../ui/gtk_webedit.ui.h:19 msgid "Search current document" msgstr "Pesquisar documento corrente" -#: ../ui/gtk2_webedit.ui.h:20 -#: ../ui/gtk_webedit.ui.h:20 +#: ../ui/gtk2_webedit.ui.h:20 ../ui/gtk_webedit.ui.h:20 msgid "Font" msgstr "Fonte" -#: ../ui/gtk2_webedit.ui.h:21 -#: ../ui/gtk_webedit.ui.h:21 +#: ../ui/gtk2_webedit.ui.h:21 ../ui/gtk_webedit.ui.h:21 msgid "Change font" msgstr "Mudar fonte" -#: ../ui/gtk2_webedit.ui.h:22 -#: ../ui/gtk_webedit.ui.h:22 +#: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 msgid "Increase indent" msgstr "Aumentar indentação" -#: ../ui/gtk2_webedit.ui.h:23 -#: ../ui/gtk_webedit.ui.h:23 +#: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 msgid "Increase" msgstr "Aumentar" -#: ../ui/gtk2_webedit.ui.h:24 -#: ../ui/gtk_webedit.ui.h:24 +#: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 msgid "Increase paragraph indent" msgstr "Aumentar indentação de parágrafo" -#: ../ui/gtk2_webedit.ui.h:25 -#: ../ui/gtk_webedit.ui.h:25 +#: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 msgid "Insert emoticon" msgstr "Inserir emoticon" -#: ../ui/gtk2_webedit.ui.h:26 -#: ../ui/gtk_webedit.ui.h:26 +#: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 msgid "Emoticon" msgstr "Emoticon" -#: ../ui/gtk2_webedit.ui.h:27 -#: ../ui/gtk_webedit.ui.h:27 +#: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 msgid "Insert an emoticon" msgstr "Inserir um emoticon" -#: ../ui/gtk2_webedit.ui.h:28 -#: ../ui/gtk_webedit.ui.h:28 +#: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 msgid "Insert image" msgstr "Inserir imagem" -#: ../ui/gtk2_webedit.ui.h:29 -#: ../ui/gtk_webedit.ui.h:29 +#: ../ui/gtk2_webedit.ui.h:29 ../ui/gtk_webedit.ui.h:29 msgid "Image" msgstr "Imagem" -#: ../ui/gtk2_webedit.ui.h:30 -#: ../ui/gtk_webedit.ui.h:30 +#: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 msgid "Insert image at cursor" msgstr "Inserir imagem no cursor" -#: ../ui/gtk2_webedit.ui.h:31 -#: ../ui/gtk_webedit.ui.h:31 +#: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 msgid "Insert link" msgstr "Inserir ligação" -#: ../ui/gtk2_webedit.ui.h:32 -#: ../ui/gtk_webedit.ui.h:32 +#: ../ui/gtk2_webedit.ui.h:32 ../ui/gtk_webedit.ui.h:32 msgid "Link" msgstr "Ligação" -#: ../ui/gtk2_webedit.ui.h:33 -#: ../ui/gtk_webedit.ui.h:33 +#: ../ui/gtk2_webedit.ui.h:33 ../ui/gtk_webedit.ui.h:33 msgid "Insert a link" msgstr "Inserir uma ligação" -#: ../ui/gtk2_webedit.ui.h:34 -#: ../ui/gtk_webedit.ui.h:34 +#: ../ui/gtk2_webedit.ui.h:34 ../ui/gtk_webedit.ui.h:34 msgid "Insert Outline" msgstr "Inserir Alinhamento" -#: ../ui/gtk2_webedit.ui.h:35 -#: ../ui/gtk_webedit.ui.h:35 +#: ../ui/gtk2_webedit.ui.h:35 ../ui/gtk_webedit.ui.h:35 msgid "Outline" msgstr "Alinhamento" -#: ../ui/gtk2_webedit.ui.h:36 -#: ../ui/gtk_webedit.ui.h:36 +#: ../ui/gtk2_webedit.ui.h:36 ../ui/gtk_webedit.ui.h:36 msgid "Insert outline" msgstr "Inserir alinhamento" -#: ../ui/gtk2_webedit.ui.h:37 -#: ../ui/gtk_webedit.ui.h:37 +#: ../ui/gtk2_webedit.ui.h:37 ../ui/gtk_webedit.ui.h:37 msgid "Insert rule" msgstr "Inserir regra" -#: ../ui/gtk2_webedit.ui.h:38 -#: ../ui/gtk_webedit.ui.h:38 +#: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 msgid "Rule" msgstr "Regra" -#: ../ui/gtk2_webedit.ui.h:39 -#: ../ui/gtk_webedit.ui.h:39 +#: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 msgid "Insert horizontal rule" msgstr "Inserir linha horizontal" -#: ../ui/gtk2_webedit.ui.h:40 -#: ../ui/gtk_webedit.ui.h:40 +#: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 msgid "Xiphos Link" msgstr "Ligação Xiphos" -#: ../ui/gtk2_webedit.ui.h:41 -#: ../ui/gtk_webedit.ui.h:41 +#: ../ui/gtk2_webedit.ui.h:41 ../ui/gtk_webedit.ui.h:41 msgid "Xiphos" msgstr "Xiphos" -#: ../ui/gtk2_webedit.ui.h:42 -#: ../ui/gtk_webedit.ui.h:42 +#: ../ui/gtk2_webedit.ui.h:42 ../ui/gtk_webedit.ui.h:42 msgid "Insert a link to a sword module" msgstr "Inserir ligação a módulo Sword" -#: ../ui/gtk2_webedit.ui.h:43 -#: ../ui/gtk_webedit.ui.h:43 +#: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 msgid "Insert table" msgstr "Inserir tabela" -#: ../ui/gtk2_webedit.ui.h:44 -#: ../ui/gtk_webedit.ui.h:44 +#: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 msgid "Table" msgstr "Tabela" -#: ../ui/gtk2_webedit.ui.h:45 -#: ../ui/gtk_webedit.ui.h:45 +#: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 msgid "Insert a table" msgstr "Inserir tabela" -#: ../ui/gtk2_webedit.ui.h:46 -#: ../ui/gtk_webedit.ui.h:46 +#: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 msgid "Italic" msgstr "Itálico" -#: ../ui/gtk2_webedit.ui.h:47 -#: ../ui/gtk_webedit.ui.h:47 +#: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 msgid "Change selection to italic font" msgstr "Mudar seleção para itálico" -#: ../ui/gtk2_webedit.ui.h:48 -#: ../ui/gtk_webedit.ui.h:48 +#: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 msgid "Center" msgstr "Centrar" -#: ../ui/gtk2_webedit.ui.h:49 -#: ../ui/gtk_webedit.ui.h:49 +#: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 msgid "Center justify paragraph" msgstr "Justificar parágrafo ao centro" -#: ../ui/gtk2_webedit.ui.h:50 -#: ../ui/gtk_webedit.ui.h:50 +#: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 msgid "Full" msgstr "Completo" -#: ../ui/gtk2_webedit.ui.h:51 -#: ../ui/gtk_webedit.ui.h:51 +#: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 msgid "full justify" msgstr "Justificar totalmente" -#: ../ui/gtk2_webedit.ui.h:52 -#: ../ui/gtk_webedit.ui.h:52 +#: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 msgid "Left" msgstr "Esquerda" -#: ../ui/gtk2_webedit.ui.h:53 -#: ../ui/gtk_webedit.ui.h:53 +#: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 msgid "Left justify paragraph" msgstr "Justificar parágrafo à esquerda" -#: ../ui/gtk2_webedit.ui.h:54 -#: ../ui/gtk_webedit.ui.h:54 +#: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 msgid "Right" msgstr "Direita" -#: ../ui/gtk2_webedit.ui.h:55 -#: ../ui/gtk_webedit.ui.h:55 +#: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 msgid "Right justify paragraph" msgstr "Justificar parágrafo à direita" -#: ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 msgid "New" msgstr "Novo" -#: ../ui/gtk2_webedit.ui.h:57 -#: ../ui/gtk_webedit.ui.h:57 +#: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "Criar novo ficheiro" -#: ../ui/gtk2_webedit.ui.h:59 -#: ../ui/gtk_webedit.ui.h:59 +#: ../ui/gtk2_webedit.ui.h:59 ../ui/gtk_webedit.ui.h:59 msgid "Open file" msgstr "Abrir ficheiro" -#: ../ui/gtk2_webedit.ui.h:60 -#: ../ui/gtk_webedit.ui.h:60 +#: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 msgid "Paste" msgstr "Colar" -#: ../ui/gtk2_webedit.ui.h:61 -#: ../ui/gtk_webedit.ui.h:61 +#: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 msgid "Paste clipboard at cursor." msgstr "Colar texto em memória no cursor" -#: ../ui/gtk2_webedit.ui.h:62 -#: ../ui/gtk_webedit.ui.h:62 +#: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 msgid "Print Document" msgstr "Imprimir Documento" -#: ../ui/gtk2_webedit.ui.h:63 -#: ../ui/gtk_webedit.ui.h:63 +#: ../ui/gtk2_webedit.ui.h:63 ../ui/gtk_webedit.ui.h:63 msgid "Print" msgstr "Imprimir" -#: ../ui/gtk2_webedit.ui.h:64 -#: ../ui/gtk_webedit.ui.h:64 +#: ../ui/gtk2_webedit.ui.h:64 ../ui/gtk_webedit.ui.h:64 msgid "Print the current document" msgstr "Imprimir este documento" -#: ../ui/gtk2_webedit.ui.h:65 -#: ../ui/gtk_webedit.ui.h:65 +#: ../ui/gtk2_webedit.ui.h:65 ../ui/gtk_webedit.ui.h:65 msgid "Print Preview" msgstr "Prever Impressão" -#: ../ui/gtk2_webedit.ui.h:66 -#: ../ui/gtk_webedit.ui.h:66 +#: ../ui/gtk2_webedit.ui.h:66 ../ui/gtk_webedit.ui.h:66 msgid "Preview" msgstr "Pré-visualizar" -#: ../ui/gtk2_webedit.ui.h:67 -#: ../ui/gtk_webedit.ui.h:67 +#: ../ui/gtk2_webedit.ui.h:67 ../ui/gtk_webedit.ui.h:67 msgid "Print preview of current document" msgstr "Pré-visualizar o documento corrente" -#: ../ui/gtk2_webedit.ui.h:68 -#: ../ui/gtk_webedit.ui.h:68 +#: ../ui/gtk2_webedit.ui.h:68 ../ui/gtk_webedit.ui.h:68 msgid "Quit" msgstr "Sair" -#: ../ui/gtk2_webedit.ui.h:69 -#: ../ui/gtk_webedit.ui.h:69 +#: ../ui/gtk2_webedit.ui.h:69 ../ui/gtk_webedit.ui.h:69 msgid "Shut down editor" msgstr "Fechar editor" -#: ../ui/gtk2_webedit.ui.h:70 -#: ../ui/gtk_webedit.ui.h:70 +#: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 msgid "Redo" msgstr "Refazer" -#: ../ui/gtk2_webedit.ui.h:71 -#: ../ui/gtk_webedit.ui.h:71 +#: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 msgid "Redo last undo" msgstr "Refazer última operação desfeita" -#: ../ui/gtk2_webedit.ui.h:72 -#: ../ui/gtk_webedit.ui.h:72 +#: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 msgid "Find and replace" msgstr "Localizar e substituir" -#: ../ui/gtk2_webedit.ui.h:73 -#: ../ui/gtk_webedit.ui.h:73 +#: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 msgid "Replace" msgstr "Substituir" -#: ../ui/gtk2_webedit.ui.h:74 -#: ../ui/gtk_webedit.ui.h:74 +#: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 msgid "Search and replace" msgstr "Pesquisar e substituir" -#: ../ui/gtk2_webedit.ui.h:76 -#: ../ui/gtk_webedit.ui.h:76 +#: ../ui/gtk2_webedit.ui.h:76 ../ui/gtk_webedit.ui.h:76 msgid "Save changes to file" msgstr "Guardar as alterações ao documento" -#: ../ui/gtk2_webedit.ui.h:77 -#: ../ui/gtk_webedit.ui.h:77 +#: ../ui/gtk2_webedit.ui.h:77 ../ui/gtk_webedit.ui.h:77 msgid "Save as" msgstr "Guardar como" -#: ../ui/gtk2_webedit.ui.h:78 -#: ../ui/gtk_webedit.ui.h:78 +#: ../ui/gtk2_webedit.ui.h:78 ../ui/gtk_webedit.ui.h:78 msgid "Save file as ..." msgstr "Guardar ficheiro como..." -#: ../ui/gtk2_webedit.ui.h:79 -#: ../ui/gtk_webedit.ui.h:79 +#: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 msgid "Strikethrough" msgstr "Atravessar" -#: ../ui/gtk2_webedit.ui.h:80 -#: ../ui/gtk_webedit.ui.h:80 +#: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 msgid "Strikethrough selection" msgstr "Atravessar seleção" -#: ../ui/gtk2_webedit.ui.h:81 -#: ../ui/gtk_webedit.ui.h:81 +#: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 msgid "Underline" msgstr "Sublinhar" -#: ../ui/gtk2_webedit.ui.h:82 -#: ../ui/gtk_webedit.ui.h:82 +#: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 msgid "Underline selection" msgstr "Sublinhar selecção" -#: ../ui/gtk2_webedit.ui.h:83 -#: ../ui/gtk_webedit.ui.h:83 +#: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 msgid "Undo" msgstr "Desfazer" -#: ../ui/gtk2_webedit.ui.h:84 -#: ../ui/gtk_webedit.ui.h:84 +#: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 msgid "Undo last change" msgstr "Desfazer última alteração" -#: ../ui/gtk2_webedit.ui.h:85 -#: ../ui/gtk_webedit.ui.h:85 +#: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 msgid "Editor" msgstr "Editor" -#: ../ui/gtk2_webedit.ui.h:87 -#: ../ui/gtk_webedit.ui.h:87 +#: ../ui/gtk2_webedit.ui.h:87 ../ui/gtk_webedit.ui.h:87 msgid "Recent files" msgstr "Ficheiros recentes" -#: ../ui/gtk2_webedit.ui.h:88 -#: ../ui/gtk_webedit.ui.h:88 -#: ../ui/xi-menus.glade.h:9 -#: ../ui/xi-menus.gtkbuilder.h:6 +#: ../ui/gtk2_webedit.ui.h:88 ../ui/gtk_webedit.ui.h:88 +#: ../ui/xi-menus.glade.h:9 ../ui/xi-menus.gtkbuilder.h:6 msgid "_Edit" msgstr "_Editar" -#: ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Ver" - -#: ../ui/gtk2_webedit.ui.h:90 -#: ../ui/gtk_webedit.ui.h:90 -#: ../ui/xi-menus.glade.h:40 -#: ../ui/xi-menus.gtkbuilder.h:25 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 +#: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "A_juda" -#: ../ui/gtk2_webedit.ui.h:91 -#: ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 -#: ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 -#: ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 -#: ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 -#: ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 -#: ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 -#: ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 -#: ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Normal" -#: ../ui/gtk2_webedit.ui.h:99 -#: ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Cabeçalho 1" -#: ../ui/gtk2_webedit.ui.h:100 -#: ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Cabeçalho 2" -#: ../ui/gtk2_webedit.ui.h:101 -#: ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Cabeçalho 3" -#: ../ui/gtk2_webedit.ui.h:102 -#: ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Cabeçalho 4" -#: ../ui/gtk2_webedit.ui.h:103 -#: ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Cabeçalho 5" -#: ../ui/gtk2_webedit.ui.h:104 -#: ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Cabeçalho 6" -#: ../ui/gtk2_webedit.ui.h:105 -#: ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Endereço" -#: ../ui/gtk2_webedit.ui.h:106 -#: ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Pré-formatado" -#: ../ui/gtk2_webedit.ui.h:107 -#: ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Lista" -#: ../ui/gtk2_webedit.ui.h:108 -#: ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Lista de numeral romano" -#: ../ui/gtk2_webedit.ui.h:109 -#: ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Lista Numerada" -#: ../ui/gtk2_webedit.ui.h:110 -#: ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Lista alfabética" -#: ../ui/gtk2_webedit.ui.h:111 -#: ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 -#: ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Atravessar" -#: ../ui/gtk2_webedit.ui.h:113 -#: ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Definir cor da fonte no texto selecionado." -#: ../ui/gtk2_webedit.ui.h:114 -#: ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Sublinhar o texto selecionado definindo a cor de fundo." -#: ../ui/gtk2_webedit.ui.h:115 -#: ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - -#: ../ui/markverse.glade.h:1 -#: ../ui/markverse.gtkbuilder.h:1 +#: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Marcar/desmarcar Versículo" -#: ../ui/markverse.glade.h:9 -#: ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Marcar" -#: ../ui/markverse.glade.h:10 -#: ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Desmarcar" -#: ../ui/module-manager.glade.h:1 -#: ../ui/module-manager.gtkbuilder.h:1 +#: ../ui/module-manager.glade.h:1 ../ui/module-manager.gtkbuilder.h:1 msgid "Module Manager" msgstr "Gestor de Módulos" -#: ../ui/module-manager.glade.h:2 -#: ../ui/module-manager.gtkbuilder.h:2 +#: ../ui/module-manager.glade.h:2 ../ui/module-manager.gtkbuilder.h:2 msgid "_View Intro" msgstr "_Ver Intro" -#: ../ui/module-manager.glade.h:3 -#: ../ui/module-manager.gtkbuilder.h:3 +#: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3 msgid "Open a brief introductory explanation of how the Module Manager works." -msgstr "Abrir uma breve explicação introdutória sobre o funcionamento do Gestor de Módulos." +msgstr "" +"Abrir uma breve explicação introdutória sobre o funcionamento do Gestor de " +"Módulos." -#: ../ui/module-manager.glade.h:4 -#: ../ui/module-manager.gtkbuilder.h:4 +#: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4 msgid "_Load Standard" msgstr "_Carregar Padrão" -#: ../ui/module-manager.glade.h:5 -#: ../ui/module-manager.gtkbuilder.h:5 -msgid "Load and synchronize the standard set of known repositories, as maintained at crosswire.org, with your current remote sources." -msgstr "Carregar e sincronizar o conjunto padrão de repositórios conhecidos, mantidos em crosswire.org, com as suas fontes remotas atuais." - -#: ../ui/module-manager.glade.h:6 -#: ../ui/module-manager.gtkbuilder.h:6 -msgid "Refresh Xiphos' knowledge of what modules are available at the selected remote repository" -msgstr "Atualizar Xiphos quanto aos módulos disponíveis no repositório remoto escolhido" +#: ../ui/module-manager.glade.h:5 ../ui/module-manager.gtkbuilder.h:5 +msgid "" +"Load and synchronize the standard set of known repositories, as maintained " +"at crosswire.org, with your current remote sources." +msgstr "" +"Carregar e sincronizar o conjunto padrão de repositórios conhecidos, " +"mantidos em crosswire.org, com as suas fontes remotas atuais." -#: ../ui/module-manager.glade.h:7 -#: ../ui/module-manager.gtkbuilder.h:8 +#: ../ui/module-manager.glade.h:6 ../ui/module-manager.gtkbuilder.h:6 +msgid "" +"Refresh Xiphos' knowledge of what modules are available at the selected " +"remote repository" +msgstr "" +"Atualizar Xiphos quanto aos módulos disponíveis no repositório remoto " +"escolhido" + +#: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8 msgid "_Install" msgstr "_Instalar" -#: ../ui/module-manager.glade.h:8 -#: ../ui/module-manager.gtkbuilder.h:7 +#: ../ui/module-manager.glade.h:8 ../ui/module-manager.gtkbuilder.h:7 msgid "Install or update the selected modules" msgstr "Instalar ou atualizar os módulos selecionados" -#: ../ui/module-manager.glade.h:9 -#: ../ui/module-manager.gtkbuilder.h:9 +#: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9 msgid "Remove the selected modules from your system" msgstr "Remover os módulos selecionados do seu sistema" -#: ../ui/module-manager.glade.h:10 -#: ../ui/module-manager.gtkbuilder.h:10 +#: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10 msgid "_Archive" msgstr "_Arquivar" -#: ../ui/module-manager.glade.h:11 -#: ../ui/module-manager.gtkbuilder.h:11 +#: ../ui/module-manager.glade.h:11 ../ui/module-manager.gtkbuilder.h:11 msgid "Create a zip archive of the selected modules." msgstr "Criar um arquivo zip dos módulos selecionados." -#: ../ui/module-manager.glade.h:12 -#: ../ui/module-manager.gtkbuilder.h:12 +#: ../ui/module-manager.glade.h:12 ../ui/module-manager.gtkbuilder.h:12 msgid "_Index" msgstr "_Indexar" -#: ../ui/module-manager.glade.h:13 -#: ../ui/module-manager.gtkbuilder.h:13 -msgid "Build an index of the selected modules, for optimized (\"lucene\") searching." -msgstr "Criar um índice dos módulos selecionados, para pesquisa otimizada (\"lucene\")." +#: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13 +msgid "" +"Build an index of the selected modules, for optimized (\"lucene\") searching." +msgstr "" +"Criar um índice dos módulos selecionados, para pesquisa otimizada (\"lucene" +"\")." -#: ../ui/module-manager.glade.h:14 -#: ../ui/module-manager.gtkbuilder.h:14 +#: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14 msgid "_Delete Index" msgstr "Apa_gar Índice" -#: ../ui/module-manager.glade.h:15 -#: ../ui/module-manager.gtkbuilder.h:15 +#: ../ui/module-manager.glade.h:15 ../ui/module-manager.gtkbuilder.h:15 msgid "Delete the fast-search index of the selected modules." msgstr "Apagar índice de busca rápida dos módulos selecionados." -#: ../ui/module-manager.glade.h:16 -#: ../ui/module-manager.gtkbuilder.h:16 +#: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Continuar" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 -#: ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 -#: ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Gestor de Módulos" -#: ../ui/module-manager.glade.h:20 -#: ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "AVISO: Use com cuidado se estiver num país com perseguições." -#: ../ui/module-manager.glade.h:21 -#: ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Adicionar e remover fontes" -#: ../ui/module-manager.glade.h:22 -#: ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Fontes Locais atuais" -#: ../ui/module-manager.glade.h:23 -#: ../ui/module-manager.gtkbuilder.h:23 -msgid "Add a local folder as an install source, typically on a cdrom or flash drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." -msgstr "Adicionar uma pasta local como fonte de instalação, tipicamente num cdrom ou drive flash. Essa pasta contém as subpastas \"mods.d\" e \"modules\"." +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 +msgid "" +"Add a local folder as an install source, typically on a cdrom or flash " +"drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." +msgstr "" +"Adicionar uma pasta local como fonte de instalação, tipicamente num cdrom ou " +"drive flash. Essa pasta contém as subpastas \"mods.d\" e \"modules\"." -#: ../ui/module-manager.glade.h:24 -#: ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "Remover uma das pastas locais como fonte de instalação." -#: ../ui/module-manager.glade.h:25 -#: ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Fontes Remotas atuais" -#: ../ui/module-manager.glade.h:26 -#: ../ui/module-manager.gtkbuilder.h:26 -msgid "Add a custom remote install source. You must know its hostname and the folder where its repository lives." -msgstr "Adicionar uma fonte de instalação remota personalizada. Deve conhecer o seu hostname e pasta onde reside o respositório." +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 +msgid "" +"Add a custom remote install source. You must know its hostname and the " +"folder where its repository lives." +msgstr "" +"Adicionar uma fonte de instalação remota personalizada. Deve conhecer o seu " +"hostname e pasta onde reside o respositório." -#: ../ui/module-manager.glade.h:27 -#: ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Apagar uma fonte remota de instalação." -#: ../ui/module-manager.glade.h:28 -#: ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Fonte de instalação" -#: ../ui/module-manager.glade.h:29 -#: ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Local" -#: ../ui/module-manager.glade.h:30 -#: ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Remoto" -#: ../ui/module-manager.glade.h:31 -#: ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Destino de instalação" -#: ../ui/module-manager.glade.h:32 -#: ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Área pessoal, para seu uso apenas:" -#: ../ui/module-manager.glade.h:33 -#: ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Directório local (home)" -#: ../ui/module-manager.glade.h:34 -#: ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Área do sistema, para todos os utilizadores:" -#: ../ui/module-manager.glade.h:35 -#: ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Directório de sistema Sword" -#: ../ui/module-manager.glade.h:36 -#: ../ui/module-manager.gtkbuilder.h:36 -msgid "Warning: If you live in a persecuted country and do not wish to risk detection you should NOT use the remote installation feature! " -msgstr "Aviso: Se vive num país com perseguições e não quer arriscar ser detectado, NÃO deve usar a instalação remota! " +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 +msgid "" +"Warning: If you live in a persecuted country and do not wish to risk " +"detection you should NOT use the remote installation feature! " +msgstr "" +"Aviso: Se vive num país com perseguições e não quer arriscar ser " +"detectado, NÃO deve usar a instalação remota! " -#: ../ui/module-manager.glade.h:37 -#: ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Pasta de instalação local" -#: ../ui/navbar_versekey.glade.h:1 -#: ../ui/navbar_versekey.gtkbuilder.h:1 +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + +#: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Lista de histórico (drop down)" @@ -3681,13 +3523,11 @@ msgid "Choose book to display" msgstr "Escolher livro para mostrar" -#: ../ui/navbar_versekey.glade.h:3 -#: ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Botão de Selecção de Livro" -#: ../ui/navbar_versekey.glade.h:4 -#: ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Apocalipse de João" @@ -3695,13 +3535,11 @@ msgid "Choose chapter to display" msgstr "Escolher capítulo para mostrar" -#: ../ui/navbar_versekey.glade.h:6 -#: ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Botão Mudar Capítulo" -#: ../ui/navbar_versekey.glade.h:7 -#: ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3709,103 +3547,84 @@ msgid "Choose Verse to display" msgstr "Escolher Versículo para mostrar" -#: ../ui/navbar_versekey.glade.h:9 -#: ../ui/navbar_versekey.gtkbuilder.h:6 +#: ../ui/navbar_versekey.glade.h:9 ../ui/navbar_versekey.gtkbuilder.h:6 msgid "Toggle Verse Button" msgstr "Botão Mudar Versículo" -#: ../ui/navbar_versekey.glade.h:10 -#: ../ui/navbar_versekey.gtkbuilder.h:7 +#: ../ui/navbar_versekey.glade.h:10 ../ui/navbar_versekey.gtkbuilder.h:7 msgid "Enter a Verse reference in Book 1:1 format and press Return" -msgstr "Introduza uma referência de versículo no formato Livro 1:1 e pressione Return" +msgstr "" +"Introduza uma referência de versículo no formato Livro 1:1 e pressione Return" -#: ../ui/navbar_versekey.glade.h:11 -#: ../ui/navbar_versekey.gtkbuilder.h:8 +#: ../ui/navbar_versekey.glade.h:11 ../ui/navbar_versekey.gtkbuilder.h:8 msgid "Reference Entry" msgstr "Entrada de Referência" -#: ../ui/prefs.glade.h:2 -#: ../ui/prefs.gtkbuilder.h:10 +#: ../ui/prefs.glade.h:2 ../ui/prefs.gtkbuilder.h:10 msgid "Cover" msgstr "Capa" -#: ../ui/prefs.glade.h:3 -#: ../ui/prefs.gtkbuilder.h:11 +#: ../ui/prefs.glade.h:3 ../ui/prefs.gtkbuilder.h:11 msgid "Font Colors" msgstr "Cores de fonte" -#: ../ui/prefs.glade.h:4 -#: ../ui/prefs.gtkbuilder.h:12 +#: ../ui/prefs.glade.h:4 ../ui/prefs.gtkbuilder.h:12 msgid "Background" msgstr "Fundo" -#: ../ui/prefs.glade.h:5 -#: ../ui/prefs.gtkbuilder.h:13 +#: ../ui/prefs.glade.h:5 ../ui/prefs.gtkbuilder.h:13 msgid " " msgstr " " -#: ../ui/prefs.glade.h:6 -#: ../ui/prefs.gtkbuilder.h:14 +#: ../ui/prefs.glade.h:6 ../ui/prefs.gtkbuilder.h:14 msgid "Foreground" msgstr "Primeiro plano" -#: ../ui/prefs.glade.h:7 -#: ../ui/prefs.gtkbuilder.h:15 +#: ../ui/prefs.glade.h:7 ../ui/prefs.gtkbuilder.h:15 msgid "Current Verse" msgstr "Versículo corrente" -#: ../ui/prefs.glade.h:8 -#: ../ui/prefs.gtkbuilder.h:16 +#: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16 msgid "Verse Number" msgstr "Número de Versículo" -#: ../ui/prefs.glade.h:9 -#: ../ui/prefs.gtkbuilder.h:17 +#: ../ui/prefs.glade.h:9 ../ui/prefs.gtkbuilder.h:17 msgid "Links" msgstr "Ligações" -#: ../ui/prefs.glade.h:10 -#: ../ui/prefs.gtkbuilder.h:18 +#: ../ui/prefs.glade.h:10 ../ui/prefs.gtkbuilder.h:18 msgid "Highlight Foreground" msgstr "Assinalar Primeiro Plano" -#: ../ui/prefs.glade.h:11 -#: ../ui/prefs.gtkbuilder.h:19 +#: ../ui/prefs.glade.h:11 ../ui/prefs.gtkbuilder.h:19 msgid "Highlight Background" msgstr "Assinalar Fundo" -#: ../ui/prefs.glade.h:12 -#: ../ui/prefs.gtkbuilder.h:20 +#: ../ui/prefs.glade.h:12 ../ui/prefs.gtkbuilder.h:20 msgid "Invert color pairs" msgstr "Inverter pares de cores" -#: ../ui/prefs.glade.h:13 -#: ../ui/prefs.gtkbuilder.h:21 +#: ../ui/prefs.glade.h:13 ../ui/prefs.gtkbuilder.h:21 msgid "Normal Text" msgstr "Texto Normal" -#: ../ui/prefs.glade.h:14 -#: ../ui/prefs.gtkbuilder.h:22 +#: ../ui/prefs.glade.h:14 ../ui/prefs.gtkbuilder.h:22 msgid "Highlight" msgstr "Realçar" -#: ../ui/prefs.glade.h:15 -#: ../ui/prefs.gtkbuilder.h:23 +#: ../ui/prefs.glade.h:15 ../ui/prefs.gtkbuilder.h:23 msgid "Font Colors" msgstr "Cores da Fonte" -#: ../ui/prefs.glade.h:16 -#: ../ui/prefs.gtkbuilder.h:24 +#: ../ui/prefs.glade.h:16 ../ui/prefs.gtkbuilder.h:24 msgid "Font Sizes" msgstr "Tamanhos de fonte" -#: ../ui/prefs.glade.h:17 -#: ../ui/prefs.gtkbuilder.h:25 +#: ../ui/prefs.glade.h:17 ../ui/prefs.gtkbuilder.h:25 msgid "All displayed font sizes are relative to this choice" msgstr "Todos os tamanhos de fonte visível são relativos a esta escolha" -#: ../ui/prefs.glade.h:18 -#: ../ui/prefs.gtkbuilder.h:26 +#: ../ui/prefs.glade.h:18 ../ui/prefs.gtkbuilder.h:26 msgid "Base font size" msgstr "Tamanho da fonte base" @@ -3829,657 +3648,581 @@ "+4\n" "+5" -#: ../ui/prefs.glade.h:27 -#: ../ui/prefs.gtkbuilder.h:27 +#: ../ui/prefs.glade.h:27 ../ui/prefs.gtkbuilder.h:27 msgid "Commonly -1, to make verse numbers less obtrusive" msgstr "Normalmente -1, para tornar números de versículo menos intrusivos" -#: ../ui/prefs.glade.h:28 -#: ../ui/prefs.gtkbuilder.h:28 +#: ../ui/prefs.glade.h:28 ../ui/prefs.gtkbuilder.h:28 msgid "Verse number size" msgstr "Tamanho do número de versículo" -#: ../ui/prefs.glade.h:29 -#: ../ui/prefs.gtkbuilder.h:29 -msgid "Name and size choice for any module in a given language; still overridden by a specific choice on a particular module" -msgstr "Escolha de nome e tamanho para qualquer módulo numa linguagem; suplantado por uma escolha específica num dado módulo" +#: ../ui/prefs.glade.h:29 ../ui/prefs.gtkbuilder.h:29 +msgid "" +"Name and size choice for any module in a given language; still overridden by " +"a specific choice on a particular module" +msgstr "" +"Escolha de nome e tamanho para qualquer módulo numa linguagem; suplantado " +"por uma escolha específica num dado módulo" -#: ../ui/prefs.glade.h:30 -#: ../ui/prefs.gtkbuilder.h:30 +#: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30 msgid "Font preferences, per language" msgstr "Preferências de fonte, por linguagem" -#: ../ui/prefs.glade.h:31 -#: ../ui/prefs.gtkbuilder.h:31 +#: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 msgid "Language Font Combo" msgstr "Combo de Fonte de Linguagem" -#: ../ui/prefs.glade.h:32 -#: ../ui/prefs.gtkbuilder.h:32 +#: ../ui/prefs.glade.h:32 ../ui/prefs.gtkbuilder.h:32 msgid "Font Misc" msgstr "Opções variadas da Fonte" -#: ../ui/prefs.glade.h:33 -#: ../ui/prefs.gtkbuilder.h:33 +#: ../ui/prefs.glade.h:33 ../ui/prefs.gtkbuilder.h:33 msgid "BibleSync" msgstr "BibleSync" -#: ../ui/prefs.glade.h:34 -#: ../ui/prefs.gtkbuilder.h:34 -msgid "Xiphos is the first Bible study program to provide an implementation of BibleSync, a synchronization protocol for Bible programs. If you work with multiple Bible programs, or if you work in a team, or if you have classroom activities using shared study, BibleSync can be a useful tool for you. BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible applications of your own, or in a working team; Speaker, to drive a lecture audience's Bible programs to follow along; Audience, to receive the speaker's navigation." -msgstr "Xiphos é o primeiro programa de estudo bíblico a fornecer uma implementação de BibleSync, um protocolo de sincronização de programas bíblicos. Se trabalha com múltiplos programas bíblicos, ou trabalha numa equipa, ou tem atividades de sala de aula com estudo partilhado, BibleSync pode ser uma ferramenta útil para si. BibleSync opera em um de 3 modos: Pessoal, para sincronizar múltiplas aplicações bíblicas na sua posse, ou na sua equipa; Oradpr, para dirigir os programas bíblicos da sua audiência; Audiência, para receber a navegação do orador." +#: ../ui/prefs.glade.h:34 ../ui/prefs.gtkbuilder.h:34 +msgid "" +"Xiphos is the first Bible study program to provide an implementation of " +"BibleSync, a synchronization protocol for Bible programs. If you work with " +"multiple Bible programs, or if you work in a team, or if you have classroom " +"activities using shared study, BibleSync can be a useful tool for you. " +"BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible " +"applications of your own, or in a working team; Speaker, to drive a lecture " +"audience's Bible programs to follow along; Audience, to receive the " +"speaker's navigation." +msgstr "" +"Xiphos é o primeiro programa de estudo bíblico a fornecer uma implementação " +"de BibleSync, um protocolo de sincronização de programas bíblicos. Se " +"trabalha com múltiplos programas bíblicos, ou trabalha numa equipa, ou tem " +"atividades de sala de aula com estudo partilhado, BibleSync pode ser uma " +"ferramenta útil para si. BibleSync opera em um de 3 modos: Pessoal, para " +"sincronizar múltiplas aplicações bíblicas na sua posse, ou na sua equipa; " +"Oradpr, para dirigir os programas bíblicos da sua audiência; Audiência, para " +"receber a navegação do orador." -#: ../ui/prefs.glade.h:35 -#: ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "Modo:" -#: ../ui/prefs.glade.h:36 -#: ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Selecionar o modo segundo o qual BibleSync deve operar." -#: ../ui/prefs.glade.h:37 -#: ../ui/prefs.gtkbuilder.h:37 +#: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 msgid "_Off" msgstr "_Desligado" -#: ../ui/prefs.glade.h:38 -#: ../ui/prefs.gtkbuilder.h:38 +#: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." msgstr "Desativar BibleSync." -#: ../ui/prefs.glade.h:39 -#: ../ui/prefs.gtkbuilder.h:39 +#: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 msgid "BSP off radio button" msgstr "Botão de Rádio de BSP desligado" -#: ../ui/prefs.glade.h:40 -#: ../ui/prefs.gtkbuilder.h:40 +#: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 msgid "_Speaker" msgstr "_Orador" -#: ../ui/prefs.glade.h:41 -#: ../ui/prefs.gtkbuilder.h:41 +#: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 msgid "Enable BibleSync as the speaker." msgstr "Ativar BibleSync como orador." -#: ../ui/prefs.glade.h:42 -#: ../ui/prefs.gtkbuilder.h:42 +#: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 msgid "BSP speaker radio button" msgstr "Botão de Rádio de orador BSP" -#: ../ui/prefs.glade.h:43 -#: ../ui/prefs.gtkbuilder.h:43 +#: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 msgid "_Audience" msgstr "_Audiência" -#: ../ui/prefs.glade.h:44 -#: ../ui/prefs.gtkbuilder.h:44 +#: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 msgid "Enable BibleSync as a member of the audience." msgstr "Ativar BibleSync como membro da audiência." -#: ../ui/prefs.glade.h:45 -#: ../ui/prefs.gtkbuilder.h:45 +#: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 msgid "BSP audience radio button" msgstr "Botão de Rádio de audiência BSP" -#: ../ui/prefs.glade.h:46 -#: ../ui/prefs.gtkbuilder.h:46 +#: ../ui/prefs.glade.h:46 ../ui/prefs.gtkbuilder.h:46 msgid "_Personal" msgstr "_Pessoal" -#: ../ui/prefs.glade.h:47 -#: ../ui/prefs.gtkbuilder.h:47 +#: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 msgid "Enable BibleSync for personal or team use." msgstr "Ativar BibleSync para uso pessoal ou de equipa." -#: ../ui/prefs.glade.h:48 -#: ../ui/prefs.gtkbuilder.h:48 +#: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 msgid "BSP personal radio button" msgstr "Botão de Rádio de BSP pessoal" -#: ../ui/prefs.glade.h:49 -#: ../ui/prefs.gtkbuilder.h:49 +#: ../ui/prefs.glade.h:49 ../ui/prefs.gtkbuilder.h:49 msgid "Private" msgstr "Privado" -#: ../ui/prefs.glade.h:50 -#: ../ui/prefs.gtkbuilder.h:50 -msgid "When in Personal mode, only programs running on this machine will hear your navigation." -msgstr "Em modo pessoal, apenas programas que correm nesta máquina escutarão a sua navegação." +#: ../ui/prefs.glade.h:50 ../ui/prefs.gtkbuilder.h:50 +msgid "" +"When in Personal mode, only programs running on this machine will hear your " +"navigation." +msgstr "" +"Em modo pessoal, apenas programas que correm nesta máquina escutarão a sua " +"navegação." -#: ../ui/prefs.glade.h:51 -#: ../ui/prefs.gtkbuilder.h:51 +#: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 msgid "BSP privacy button" msgstr "Botão de Rádio de privacidade BSP" -#: ../ui/prefs.glade.h:52 -#: ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "Navegar:" -#: ../ui/prefs.glade.h:53 -#: ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Escolher como aceitar sincronização recebida de navegação." -#: ../ui/prefs.glade.h:54 -#: ../ui/prefs.gtkbuilder.h:54 +#: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 msgid "_Direct" msgstr "_Direto" -#: ../ui/prefs.glade.h:55 -#: ../ui/prefs.gtkbuilder.h:55 +#: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 msgid "BibleSync navigation will send Xiphos directly to the verse indicated." -msgstr "Navegação BibleSync enviará Xiphos diretamente para o versículo indicado." +msgstr "" +"Navegação BibleSync enviará Xiphos diretamente para o versículo indicado." -#: ../ui/prefs.glade.h:56 -#: ../ui/prefs.gtkbuilder.h:56 +#: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 msgid "BSP nav direct radio button" msgstr "Botão de Rádio de navegação direta BSP" -#: ../ui/prefs.glade.h:57 -#: ../ui/prefs.gtkbuilder.h:57 +#: ../ui/prefs.glade.h:57 ../ui/prefs.gtkbuilder.h:57 msgid "_Verse list" msgstr "Lista de _versículos" -#: ../ui/prefs.glade.h:58 -#: ../ui/prefs.gtkbuilder.h:58 +#: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 msgid "BibleSync navigation will use Xiphos' sidebar verse list." msgstr "Navegação BibleSync usará lista lateral de versículos de Xiphos." -#: ../ui/prefs.glade.h:59 -#: ../ui/prefs.gtkbuilder.h:59 +#: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 msgid "BSP nav verse list radio button" msgstr "Botão de Rádio de navegação na lista de versículos BSP" -#: ../ui/prefs.glade.h:60 -#: ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "Escutar:" -#: ../ui/prefs.glade.h:61 -#: ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos seguirá oradores de acordo com esta escolha." -#: ../ui/prefs.glade.h:62 -#: ../ui/prefs.gtkbuilder.h:62 +#: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" msgstr "Seletivo" -#: ../ui/prefs.glade.h:63 -#: ../ui/prefs.gtkbuilder.h:63 +#: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." msgstr "Escolhar os oradores a seguir." -#: ../ui/prefs.glade.h:64 -#: ../ui/prefs.gtkbuilder.h:64 +#: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 msgid "BSP listen some radio button" msgstr "Botão de Rádio de BSP à escuta de alguns" -#: ../ui/prefs.glade.h:65 -#: ../ui/prefs.gtkbuilder.h:65 +#: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 msgid "All" msgstr "Todos" -#: ../ui/prefs.glade.h:66 -#: ../ui/prefs.gtkbuilder.h:66 +#: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 msgid "All Speakers will be followed." msgstr "Todos os oradores serão seguidos." -#: ../ui/prefs.glade.h:67 -#: ../ui/prefs.gtkbuilder.h:67 +#: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 msgid "BSP listen all radio button" msgstr "Botão de Rádio de BSP à escuta de todos" -#: ../ui/prefs.glade.h:68 -#: ../ui/prefs.gtkbuilder.h:68 +#: ../ui/prefs.glade.h:68 ../ui/prefs.gtkbuilder.h:68 msgid "None" msgstr "Nenhum" -#: ../ui/prefs.glade.h:69 -#: ../ui/prefs.gtkbuilder.h:69 +#: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." msgstr "Nenhum orador será seguido." -#: ../ui/prefs.glade.h:70 -#: ../ui/prefs.gtkbuilder.h:70 +#: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 msgid "BSP listen none radio button" msgstr "Botão de Rádio de BSP não à escuta" -#: ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "Especial:" -#: ../ui/prefs.glade.h:72 -#: ../ui/prefs.gtkbuilder.h:72 -msgid "Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number." -msgstr "Detalhes adicionais podem ser apresentados durante a operação de BibleSync ativando presença, mismatch e depurar. Tenha atenção de que estes elementos acrescentam muita informação. Decida ainda se deve permitir o parâmetro de grupo como número de aba Xiphos." +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 +msgid "" +"Additional traces can be presented during BibleSync operation by enabling " +"presence, mismatch, and debug. Beware enabling these, they can be very " +"chatty. Also, decide whether to allow group parameter as Xiphos' tab number." +msgstr "" +"Detalhes adicionais podem ser apresentados durante a operação de BibleSync " +"ativando presença, mismatch e depurar. Tenha atenção de que estes elementos " +"acrescentam muita informação. Decida ainda se deve permitir o parâmetro de " +"grupo como número de aba Xiphos." -#: ../ui/prefs.glade.h:73 -#: ../ui/prefs.gtkbuilder.h:73 +#: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 msgid "Presence" msgstr "Presença" -#: ../ui/prefs.glade.h:74 -#: ../ui/prefs.gtkbuilder.h:74 +#: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 msgid "Presence announcements will be shown in dialogs." msgstr "Anúncios de presença será mostrados em diálogos." -#: ../ui/prefs.glade.h:75 -#: ../ui/prefs.gtkbuilder.h:75 +#: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 msgid "BSP presence button" msgstr "Botão de Rádio de presença BSP" -#: ../ui/prefs.glade.h:76 -#: ../ui/prefs.gtkbuilder.h:76 +#: ../ui/prefs.glade.h:76 ../ui/prefs.gtkbuilder.h:76 msgid "Mismatch" msgstr "Imcompatibilidade" -#: ../ui/prefs.glade.h:77 -#: ../ui/prefs.gtkbuilder.h:77 +#: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 msgid "Mismatches from your session will be shown in dialogs." msgstr "Mismatches da sua sessão serão mostrados em diálogos." -#: ../ui/prefs.glade.h:78 -#: ../ui/prefs.gtkbuilder.h:78 +#: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 msgid "BSP mismatch button" msgstr "Botão de mismatch BSP" -#: ../ui/prefs.glade.h:79 -#: ../ui/prefs.gtkbuilder.h:79 +#: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 msgid "Debug" msgstr "Depurar" -#: ../ui/prefs.glade.h:80 -#: ../ui/prefs.gtkbuilder.h:80 +#: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." msgstr "Traçamento de pacote." -#: ../ui/prefs.glade.h:81 -#: ../ui/prefs.gtkbuilder.h:81 +#: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 msgid "BSP event debug button" msgstr "Botão para depurar evento BSP" -#: ../ui/prefs.glade.h:82 -#: ../ui/prefs.gtkbuilder.h:82 +#: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 msgid "_Group as tab" msgstr "_Grupo como aba" -#: ../ui/prefs.glade.h:83 -#: ../ui/prefs.gtkbuilder.h:83 -msgid "Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number." -msgstr "Interpretar o parâmetro de número de grupo do protocolo como número de aba Xiphos. Pode ser necessário desativar isto se o uso do número de grupo por alguns Oradores não for adequado como número de aba." +#: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 +msgid "" +"Interpret the protocol's group number parameter as Xiphos' tab number. " +"Disabling this may be necessary if some Speakers' use of group number is not " +"appropriate as a tab number." +msgstr "" +"Interpretar o parâmetro de número de grupo do protocolo como número de aba " +"Xiphos. Pode ser necessário desativar isto se o uso do número de grupo por " +"alguns Oradores não for adequado como número de aba." -#: ../ui/prefs.glade.h:84 -#: ../ui/prefs.gtkbuilder.h:84 +#: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 msgid "BSP event group-as-tab button" msgstr "Botão de rádio de evento grupo-como-aba BSP" -#: ../ui/prefs.glade.h:86 -#: ../ui/prefs.gtkbuilder.h:86 +#: ../ui/prefs.glade.h:86 ../ui/prefs.gtkbuilder.h:86 msgid "General" msgstr "Geral" -#: ../ui/prefs.glade.h:87 -#: ../ui/prefs.gtkbuilder.h:87 -msgid "Select a particular language for interface display, other than your usual setting" -msgstr "Selecionar uma dada linguagem para a interface, além da definição habitual" +#: ../ui/prefs.glade.h:87 ../ui/prefs.gtkbuilder.h:87 +msgid "" +"Select a particular language for interface display, other than your usual " +"setting" +msgstr "" +"Selecionar uma dada linguagem para a interface, além da definição habitual" -#: ../ui/prefs.glade.h:88 -#: ../ui/prefs.gtkbuilder.h:88 +#: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88 msgid "Special Locale (requires restart)" msgstr "Locale Especial (requer reinício do programa)" -#: ../ui/prefs.glade.h:89 -#: ../ui/prefs.gtkbuilder.h:89 +#: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 msgid "Special Locale Combo" msgstr "Combo de Locale Especial" -#: ../ui/prefs.glade.h:90 -#: ../ui/prefs.gtkbuilder.h:90 +#: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 msgid "Show splash screen at start up" msgstr "Mostrar janela splash no arranque" -#: ../ui/prefs.glade.h:91 -#: ../ui/prefs.gtkbuilder.h:91 +#: ../ui/prefs.glade.h:91 ../ui/prefs.gtkbuilder.h:91 msgid "Show Daily Devotion at start up" msgstr "Mostrar Devocional Diário no arranque" -#: ../ui/prefs.glade.h:92 -#: ../ui/prefs.gtkbuilder.h:92 -msgid "If you have set a preferred daily devotion module, its entry for today will be shown at startup." -msgstr "Se tiver definido um módulo de devocional diário preferido, a sua entrada para hoje aparecerá no arranque." +#: ../ui/prefs.glade.h:92 ../ui/prefs.gtkbuilder.h:92 +msgid "" +"If you have set a preferred daily devotion module, its entry for today will " +"be shown at startup." +msgstr "" +"Se tiver definido um módulo de devocional diário preferido, a sua entrada " +"para hoje aparecerá no arranque." -#: ../ui/prefs.glade.h:93 -#: ../ui/prefs.gtkbuilder.h:93 +#: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93 msgid "Use default Dictionary" msgstr "Usar Dicionário por omissão" -#: ../ui/prefs.glade.h:94 -#: ../ui/prefs.gtkbuilder.h:94 -msgid "Make double-click of a word always use default dictionary instead of dictionary currently displayed" -msgstr "Tornar o duplo clique de uma palavra abrir o dicionário por omissão em vez do dicionário corrente" +#: ../ui/prefs.glade.h:94 ../ui/prefs.gtkbuilder.h:94 +msgid "" +"Make double-click of a word always use default dictionary instead of " +"dictionary currently displayed" +msgstr "" +"Tornar o duplo clique de uma palavra abrir o dicionário por omissão em vez " +"do dicionário corrente" -#: ../ui/prefs.glade.h:95 -#: ../ui/prefs.gtkbuilder.h:95 +#: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 msgid "Use default Dictionary Checkbox" msgstr "Visto para Usar Dicionário por omissão" -#: ../ui/prefs.glade.h:96 -#: ../ui/prefs.gtkbuilder.h:96 +#: ../ui/prefs.glade.h:96 ../ui/prefs.gtkbuilder.h:96 msgid "Scroll to Previous/Next Chapter" msgstr "Deslizar para Capítulo Anterior/Seguinte" -#: ../ui/prefs.glade.h:97 -#: ../ui/prefs.gtkbuilder.h:97 +#: ../ui/prefs.glade.h:97 ../ui/prefs.gtkbuilder.h:97 msgid "Use Bible Text scroll bar to scroll to previous or next chapter" -msgstr "Use a barra de deslocamento do texto bíblico para passar ao capítulo anterior ou seguinte" +msgstr "" +"Use a barra de deslocamento do texto bíblico para passar ao capítulo " +"anterior ou seguinte" -#: ../ui/prefs.glade.h:98 -#: ../ui/prefs.gtkbuilder.h:98 +#: ../ui/prefs.glade.h:98 ../ui/prefs.gtkbuilder.h:98 msgid "Scroll to Previous/Next Chapter Checkbox" msgstr "Visto para Deslizar para Capítulo Anterior/Seguinte" -#: ../ui/prefs.glade.h:99 -#: ../ui/prefs.gtkbuilder.h:99 +#: ../ui/prefs.glade.h:99 ../ui/prefs.gtkbuilder.h:99 msgid "Resize images" msgstr "Redimensionar Imagens" -#: ../ui/prefs.glade.h:100 -#: ../ui/prefs.gtkbuilder.h:100 +#: ../ui/prefs.glade.h:100 ../ui/prefs.gtkbuilder.h:100 msgid "Automatically resize image content to fit the pane" -msgstr "Redimensionar automaticamente o conteúdo de imagem para caber na subjanela" +msgstr "" +"Redimensionar automaticamente o conteúdo de imagem para caber na subjanela" -#: ../ui/prefs.glade.h:101 -#: ../ui/prefs.gtkbuilder.h:101 +#: ../ui/prefs.glade.h:101 ../ui/prefs.gtkbuilder.h:101 msgid "Resize images checkbox" msgstr "Visto para Redimensionar Imagens" -#: ../ui/prefs.glade.h:102 -#: ../ui/prefs.gtkbuilder.h:102 +#: ../ui/prefs.glade.h:102 ../ui/prefs.gtkbuilder.h:102 msgid "Highlight current verse" msgstr "Assinalar versículo corrente" -#: ../ui/prefs.glade.h:103 -#: ../ui/prefs.gtkbuilder.h:103 +#: ../ui/prefs.glade.h:103 ../ui/prefs.gtkbuilder.h:103 msgid "Apply high-contrast highlight to current verse - see color pickers" -msgstr "Assinalar o versículo corrente com alto contraste - veja escolha de cores" +msgstr "" +"Assinalar o versículo corrente com alto contraste - veja escolha de cores" -#: ../ui/prefs.glade.h:104 -#: ../ui/prefs.gtkbuilder.h:104 +#: ../ui/prefs.glade.h:104 ../ui/prefs.gtkbuilder.h:104 msgid "Highlight current verse check box" msgstr "Visto para Assinalar versículo corrente" -#: ../ui/prefs.glade.h:105 -#: ../ui/prefs.gtkbuilder.h:105 +#: ../ui/prefs.glade.h:105 ../ui/prefs.gtkbuilder.h:105 msgid "Highlight user annotations" msgstr "Realçar notas do utilizador" -#: ../ui/prefs.glade.h:106 -#: ../ui/prefs.gtkbuilder.h:106 +#: ../ui/prefs.glade.h:106 ../ui/prefs.gtkbuilder.h:106 msgid "Use inverted highlight on user-annotated verses" msgstr "Usar realce invertido em versículos anotados pelo utilizador" -#: ../ui/prefs.glade.h:107 -#: ../ui/prefs.gtkbuilder.h:107 +#: ../ui/prefs.glade.h:107 ../ui/prefs.gtkbuilder.h:107 msgid "Highlight user annotations check box" msgstr "Visto para realçar notas do utilizador" -#: ../ui/prefs.glade.h:108 -#: ../ui/prefs.gtkbuilder.h:108 +#: ../ui/prefs.glade.h:108 ../ui/prefs.gtkbuilder.h:108 msgid "Cross-references in verse list" msgstr "Referências cruzadas em lista de versículos" -#: ../ui/prefs.glade.h:109 -#: ../ui/prefs.gtkbuilder.h:109 +#: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109 msgid "Use the verse list for Bible cross-references instead of the previewer" -msgstr "Usar a lista de versículos para referências bíblicas cruzadas ao invés do pré-visualizador" +msgstr "" +"Usar a lista de versículos para referências bíblicas cruzadas ao invés do " +"pré-visualizador" -#: ../ui/prefs.glade.h:110 -#: ../ui/prefs.gtkbuilder.h:110 +#: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 msgid "Xrefs in verse list check box" msgstr "Xrefs em visto de lista de versículos" -#: ../ui/prefs.glade.h:111 -#: ../ui/prefs.gtkbuilder.h:111 +#: ../ui/prefs.glade.h:111 ../ui/prefs.gtkbuilder.h:111 msgid "Enable Prayer Lists" msgstr "Ativar Listas de Oração" -#: ../ui/prefs.glade.h:112 -#: ../ui/prefs.gtkbuilder.h:112 +#: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112 msgid "Make journals/prayer lists available" msgstr "Disponibilizar listas de oração/diários" -#: ../ui/prefs.glade.h:113 -#: ../ui/prefs.gtkbuilder.h:113 +#: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113 msgid "Enable Prayer Lists Checkbox" msgstr "Visto para Ativar Listas de Oração" -#: ../ui/prefs.glade.h:114 -#: ../ui/prefs.gtkbuilder.h:114 +#: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Número de Versículo" -#: ../ui/prefs.glade.h:115 -#: ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Deslocar o número de versículo de várias formas" -#: ../ui/prefs.glade.h:117 -#: ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Mostrar número de versículo a negrito" -#: ../ui/prefs.glade.h:118 -#: ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Opção de negrito no número de versículo" -#: ../ui/prefs.glade.h:119 -#: ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Parêntesis" -#: ../ui/prefs.glade.h:120 -#: ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Mostrar número de versículo com [parêntesis retos]" -#: ../ui/prefs.glade.h:121 -#: ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Opção de parêntesis de número de versículo" -#: ../ui/prefs.glade.h:122 -#: ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Sobrescrito" -#: ../ui/prefs.glade.h:123 -#: ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Mostrar número de versículo como sobrescrito" -#: ../ui/prefs.glade.h:124 -#: ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Opção de sobrescrito do número de versículo" -#: ../ui/prefs.glade.h:125 -#: ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Directório StudyPad por omissão" -#: ../ui/prefs.glade.h:126 -#: ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Selecionar um directório" -#: ../ui/prefs.glade.h:127 -#: ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Combo de Directório StudyPad por omissão" -#: ../ui/prefs.glade.h:128 -#: ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Opções variadas Gerais" -#: ../ui/prefs.glade.h:129 -#: ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Módulos da Janela Principal" -#: ../ui/prefs.glade.h:130 -#: ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Texto Bíblico" -#: ../ui/prefs.glade.h:131 -#: ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Combo para alterar Texto Bíblico" -#: ../ui/prefs.glade.h:133 -#: ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Combo para Mudar Comentário" -#: ../ui/prefs.glade.h:134 -#: ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Dicionário" - -#: ../ui/prefs.glade.h:135 -#: ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Combo para mudar Dicionário" -#: ../ui/prefs.glade.h:137 -#: ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Combo para Mudar Livro" -#: ../ui/prefs.glade.h:138 -#: ../ui/prefs.gtkbuilder.h:138 -#: ../ui/search-dialog.glade.h:22 -#: ../ui/search-dialog.gtkbuilder.h:23 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Módulos" -#: ../ui/prefs.glade.h:139 -#: ../ui/prefs.gtkbuilder.h:139 -#: ../ui/search-dialog.glade.h:86 -#: ../ui/search-dialog.gtkbuilder.h:86 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Limpar todos os módulos da lista" -#: ../ui/prefs.glade.h:140 -#: ../ui/prefs.gtkbuilder.h:140 -#: ../ui/search-dialog.glade.h:87 -#: ../ui/search-dialog.gtkbuilder.h:87 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Botão para limpar módulos da lista" -#: ../ui/prefs.glade.h:141 -#: ../ui/prefs.gtkbuilder.h:141 -#: ../ui/search-dialog.glade.h:88 -#: ../ui/search-dialog.gtkbuilder.h:88 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Remover o módulo selecionado da lista" -#: ../ui/prefs.glade.h:142 -#: ../ui/prefs.gtkbuilder.h:142 -#: ../ui/search-dialog.glade.h:89 -#: ../ui/search-dialog.gtkbuilder.h:89 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Botão Remover o módulo selecionado da lista" -#: ../ui/prefs.glade.h:143 -#: ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Abrir um diálogo para selecionar módulos" -#: ../ui/prefs.glade.h:144 -#: ../ui/prefs.gtkbuilder.h:144 -#: ../ui/search-dialog.glade.h:91 -#: ../ui/search-dialog.gtkbuilder.h:91 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Adicionar Módulos" -#: ../ui/prefs.glade.h:145 -#: ../ui/prefs.gtkbuilder.h:145 -#: ../ui/search-dialog.glade.h:92 -#: ../ui/search-dialog.gtkbuilder.h:92 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Botão Abrir Selecção" -#: ../ui/prefs.glade.h:146 -#: ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Módulos Paralelo" -#: ../ui/prefs.glade.h:147 -#: ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Módulos especiais" -#: ../ui/prefs.glade.h:148 -#: ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Devocional Diário" -#: ../ui/prefs.glade.h:149 -#: ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Combo de Devocional Diário" -#: ../ui/prefs.glade.h:150 -#: ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Léxico Hebraico" -#: ../ui/prefs.glade.h:151 -#: ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Combo de Léxico Hebraico" -#: ../ui/prefs.glade.h:152 -#: ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Léxico Grego" -#: ../ui/prefs.glade.h:153 -#: ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Combo de Léxico Grego" -#: ../ui/prefs.glade.h:154 -#: ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Dicionário por omissão" -#: ../ui/prefs.glade.h:155 -#: ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Combo para mudar Dicionário por omissão" -#: ../ui/prefs.glade.h:156 -#: ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Notas Pessoais" -#: ../ui/prefs.glade.h:157 -#: ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Combo para mudar Notas Pessoais" -#: ../ui/prefs.glade.h:158 -#: ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Módulos Miscelâneo" @@ -4511,153 +4254,134 @@ msgid "+5" msgstr "+5" -#: ../ui/search-dialog.glade.h:1 -#: ../ui/search-dialog.gtkbuilder.h:1 +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Ativar BibleSync como orador." + +#: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Pesquisa Avançada" -#: ../ui/search-dialog.glade.h:2 -#: ../ui/search-dialog.gtkbuilder.h:2 +#: ../ui/search-dialog.glade.h:2 ../ui/search-dialog.gtkbuilder.h:2 msgid "_Lucene Search Syntax" msgstr "Sintaxe de pesquisa _Lucene" -#: ../ui/search-dialog.glade.h:3 -#: ../ui/search-dialog.gtkbuilder.h:3 -msgid "Open a brief explanation of the syntax used for optimized \"lucene\" searches." -msgstr "Abrir uma breve explicação introdutória sobre a sintaxe usada na pesquisa otimizada (\"lucene\")." +#: ../ui/search-dialog.glade.h:3 ../ui/search-dialog.gtkbuilder.h:3 +msgid "" +"Open a brief explanation of the syntax used for optimized \"lucene\" " +"searches." +msgstr "" +"Abrir uma breve explicação introdutória sobre a sintaxe usada na pesquisa " +"otimizada (\"lucene\")." -#: ../ui/search-dialog.glade.h:4 -#: ../ui/search-dialog.gtkbuilder.h:4 +#: ../ui/search-dialog.glade.h:4 ../ui/search-dialog.gtkbuilder.h:4 msgid "_Attribute Search" msgstr "Pesquisa de _Atributos" -#: ../ui/search-dialog.glade.h:5 -#: ../ui/search-dialog.gtkbuilder.h:5 +#: ../ui/search-dialog.glade.h:5 ../ui/search-dialog.gtkbuilder.h:5 msgid "Open a brief explanation of attribute-based searches." -msgstr "Abrir uma breve explicação introdutória sobre pesquisas com base em atributos." +msgstr "" +"Abrir uma breve explicação introdutória sobre pesquisas com base em " +"atributos." -#: ../ui/search-dialog.glade.h:6 -#: ../ui/search-dialog.gtkbuilder.h:7 +#: ../ui/search-dialog.glade.h:6 ../ui/search-dialog.gtkbuilder.h:7 msgid "for " msgstr "para " -#: ../ui/search-dialog.glade.h:7 -#: ../ui/search-dialog.gtkbuilder.h:8 +#: ../ui/search-dialog.glade.h:7 ../ui/search-dialog.gtkbuilder.h:8 msgid "Main Search Entry" msgstr "Entrada de Pesquisa Principal" -#: ../ui/search-dialog.glade.h:8 -#: ../ui/search-dialog.gtkbuilder.h:9 +#: ../ui/search-dialog.glade.h:8 ../ui/search-dialog.gtkbuilder.h:9 msgid "Start/stop searching" msgstr "Iniciar/parar busca" -#: ../ui/search-dialog.glade.h:9 -#: ../ui/search-dialog.gtkbuilder.h:10 +#: ../ui/search-dialog.glade.h:9 ../ui/search-dialog.gtkbuilder.h:10 msgid "Find Button" msgstr "Botão Procurar" -#: ../ui/search-dialog.glade.h:10 -#: ../ui/search-dialog.gtkbuilder.h:11 +#: ../ui/search-dialog.glade.h:10 ../ui/search-dialog.gtkbuilder.h:11 msgid "Search Criteria Treeview" msgstr "Vista de Critério de Pesquisa" -#: ../ui/search-dialog.glade.h:11 -#: ../ui/search-dialog.gtkbuilder.h:12 +#: ../ui/search-dialog.glade.h:11 ../ui/search-dialog.gtkbuilder.h:12 msgid "Scope" msgstr "Âmbito" -#: ../ui/search-dialog.glade.h:12 -#: ../ui/search-dialog.gtkbuilder.h:14 +#: ../ui/search-dialog.glade.h:12 ../ui/search-dialog.gtkbuilder.h:14 msgid "Search entire module" msgstr "Pesquisar módulo inteiro" -#: ../ui/search-dialog.glade.h:13 -#: ../ui/search-dialog.gtkbuilder.h:13 +#: ../ui/search-dialog.glade.h:13 ../ui/search-dialog.gtkbuilder.h:13 msgid "Entire module" msgstr "Módulo Inteiro" -#: ../ui/search-dialog.glade.h:14 -#: ../ui/search-dialog.gtkbuilder.h:15 +#: ../ui/search-dialog.glade.h:14 ../ui/search-dialog.gtkbuilder.h:15 msgid "Entire module radiobutton" msgstr "Rádio Módulo Inteiro" -#: ../ui/search-dialog.glade.h:15 -#: ../ui/search-dialog.gtkbuilder.h:17 +#: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17 msgid "Use the results of the last search as the scope of the search" msgstr "Usar os resultados da última pesquisa como âmbito da pesquisa" -#: ../ui/search-dialog.glade.h:16 -#: ../ui/search-dialog.gtkbuilder.h:16 +#: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16 msgid "Current results" msgstr "Resultados correntes" -#: ../ui/search-dialog.glade.h:17 -#: ../ui/search-dialog.gtkbuilder.h:18 +#: ../ui/search-dialog.glade.h:17 ../ui/search-dialog.gtkbuilder.h:18 msgid "Current results radiobutton" msgstr "Rádio Resultados correntes" -#: ../ui/search-dialog.glade.h:18 -#: ../ui/search-dialog.gtkbuilder.h:20 +#: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20 msgid "Use a custom range for the scope of the search" msgstr "Usar uma extensão personalizada no âmbito da pesquisa" -#: ../ui/search-dialog.glade.h:19 -#: ../ui/search-dialog.gtkbuilder.h:19 +#: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19 msgid "Custom verse range" msgstr "Extensão de versículos personalizada" -#: ../ui/search-dialog.glade.h:20 -#: ../ui/search-dialog.gtkbuilder.h:21 +#: ../ui/search-dialog.glade.h:20 ../ui/search-dialog.gtkbuilder.h:21 msgid "Custom verse range radiobutton" msgstr "Rádio Extensão de versículos personalizada" -#: ../ui/search-dialog.glade.h:21 -#: ../ui/search-dialog.gtkbuilder.h:22 +#: ../ui/search-dialog.glade.h:21 ../ui/search-dialog.gtkbuilder.h:22 msgid "Custom Range Selector Combo" msgstr "Combo de Selector de Extensão personalizada" -#: ../ui/search-dialog.glade.h:23 -#: ../ui/search-dialog.gtkbuilder.h:25 +#: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25 msgid "Use a single module for the search" msgstr "Usar um único módulo para a pesquisa" -#: ../ui/search-dialog.glade.h:24 -#: ../ui/search-dialog.gtkbuilder.h:24 +#: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24 msgid "Single module" msgstr "Módulo singular" -#: ../ui/search-dialog.glade.h:25 -#: ../ui/search-dialog.gtkbuilder.h:26 +#: ../ui/search-dialog.glade.h:25 ../ui/search-dialog.gtkbuilder.h:26 msgid "Single module radiobutton" msgstr "Rádio Módulo singular" -#: ../ui/search-dialog.glade.h:26 -#: ../ui/search-dialog.gtkbuilder.h:28 +#: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28 msgid "Use the current module list for the search" msgstr "Usar a lista atual de módulos na pesquisa" -#: ../ui/search-dialog.glade.h:27 -#: ../ui/search-dialog.gtkbuilder.h:27 +#: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27 msgid "Module list" msgstr "Lista de Módulos" -#: ../ui/search-dialog.glade.h:28 -#: ../ui/search-dialog.gtkbuilder.h:29 +#: ../ui/search-dialog.glade.h:28 ../ui/search-dialog.gtkbuilder.h:29 msgid "Module list radiobutton" msgstr "Rádio Lista de Módulos" -#: ../ui/search-dialog.glade.h:29 -#: ../ui/search-dialog.gtkbuilder.h:31 +#: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31 msgid "Use a custom module list for the search" msgstr "Usar uma lista personalizada de módulos para a pesquisa" -#: ../ui/search-dialog.glade.h:30 -#: ../ui/search-dialog.gtkbuilder.h:30 +#: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30 msgid "Custom module list" msgstr "Lista de módulos personalizada" -#: ../ui/search-dialog.glade.h:31 -#: ../ui/search-dialog.gtkbuilder.h:32 +#: ../ui/search-dialog.glade.h:31 ../ui/search-dialog.gtkbuilder.h:32 msgid "Custom module list radiobutton" msgstr "Rádio Lista de módulos personalizada" @@ -4665,13 +4389,11 @@ msgid "Custom Module List Combo" msgstr "Combo Listas de módulos personalizadas" -#: ../ui/search-dialog.glade.h:33 -#: ../ui/search-dialog.gtkbuilder.h:33 +#: ../ui/search-dialog.glade.h:33 ../ui/search-dialog.gtkbuilder.h:33 msgid "Search Type" msgstr "Tipo de Pesquisa" -#: ../ui/search-dialog.glade.h:34 -#: ../ui/search-dialog.gtkbuilder.h:35 +#: ../ui/search-dialog.glade.h:34 ../ui/search-dialog.gtkbuilder.h:35 msgid "" "Fast, featureful, index-based search\n" "Indexes must have been built beforehand:\n" @@ -4681,340 +4403,272 @@ "Os índices devem ser criados a priori:\n" "Veja as funções de manutenção do Gestor de Módulos" -#: ../ui/search-dialog.glade.h:37 -#: ../ui/search-dialog.gtkbuilder.h:34 +#: ../ui/search-dialog.glade.h:37 ../ui/search-dialog.gtkbuilder.h:34 msgid "Optimized (\"Lucene\")" msgstr "Otimizada (\"Lucene\")" -#: ../ui/search-dialog.glade.h:38 -#: ../ui/search-dialog.gtkbuilder.h:38 +#: ../ui/search-dialog.glade.h:38 ../ui/search-dialog.gtkbuilder.h:38 msgid "Optimized (\"Lucene\") radiobutton" msgstr "Rádio Otimizada (\"Lucene\")" -#: ../ui/search-dialog.glade.h:40 -#: ../ui/search-dialog.gtkbuilder.h:40 +#: ../ui/search-dialog.glade.h:40 ../ui/search-dialog.gtkbuilder.h:40 msgid "Multi word radiobutton" msgstr "Rádio Palavra múltipla" -#: ../ui/search-dialog.glade.h:42 -#: ../ui/search-dialog.gtkbuilder.h:42 +#: ../ui/search-dialog.glade.h:42 ../ui/search-dialog.gtkbuilder.h:42 msgid "Regular expression radiobutton" msgstr "Rádio Expressão Regular" -#: ../ui/search-dialog.glade.h:44 -#: ../ui/search-dialog.gtkbuilder.h:44 +#: ../ui/search-dialog.glade.h:44 ../ui/search-dialog.gtkbuilder.h:44 msgid "Exact phrase radiobutton" msgstr "Botão de Rádio Frase exata" -#: ../ui/search-dialog.glade.h:45 -#: ../ui/search-dialog.gtkbuilder.h:46 +#: ../ui/search-dialog.glade.h:45 ../ui/search-dialog.gtkbuilder.h:46 msgid "Make selections on the Attribute Search tab" msgstr "Fazer selecções na Pesquisa de Atributos" -#: ../ui/search-dialog.glade.h:46 -#: ../ui/search-dialog.gtkbuilder.h:45 +#: ../ui/search-dialog.glade.h:46 ../ui/search-dialog.gtkbuilder.h:45 msgid "Attributes" msgstr "Atributos" -#: ../ui/search-dialog.glade.h:47 -#: ../ui/search-dialog.gtkbuilder.h:47 +#: ../ui/search-dialog.glade.h:47 ../ui/search-dialog.gtkbuilder.h:47 msgid "Attributes radiobutton" msgstr "Botão de rádio de Atributos" -#: ../ui/search-dialog.glade.h:48 -#: ../ui/search-dialog.gtkbuilder.h:48 +#: ../ui/search-dialog.glade.h:48 ../ui/search-dialog.gtkbuilder.h:48 msgid "Options" msgstr "Opções" -#: ../ui/search-dialog.glade.h:50 -#: ../ui/search-dialog.gtkbuilder.h:50 +#: ../ui/search-dialog.glade.h:50 ../ui/search-dialog.gtkbuilder.h:50 msgid "Match case checkbox" msgstr "Visto Combinar capitalização" -#: ../ui/search-dialog.glade.h:51 -#: ../ui/search-dialog.gtkbuilder.h:51 +#: ../ui/search-dialog.glade.h:51 ../ui/search-dialog.gtkbuilder.h:51 msgid "Search Criteria" msgstr "Critério de Pesquisa" -#: ../ui/search-dialog.glade.h:52 -#: ../ui/search-dialog.gtkbuilder.h:52 +#: ../ui/search-dialog.glade.h:52 ../ui/search-dialog.gtkbuilder.h:52 msgid "Show in main window" msgstr "Mostrar na janela principal" -#: ../ui/search-dialog.glade.h:53 -#: ../ui/search-dialog.gtkbuilder.h:53 +#: ../ui/search-dialog.glade.h:53 ../ui/search-dialog.gtkbuilder.h:53 msgid "Save search results as bookmarks" msgstr "Guardar resultados da pesquisa como marcas" -#: ../ui/search-dialog.glade.h:54 -#: ../ui/search-dialog.gtkbuilder.h:54 +#: ../ui/search-dialog.glade.h:54 ../ui/search-dialog.gtkbuilder.h:54 msgid "Export current search results" msgstr "Exportar os resultados da pesquisa atual" -#: ../ui/search-dialog.glade.h:55 -#: ../ui/search-dialog.gtkbuilder.h:55 +#: ../ui/search-dialog.glade.h:55 ../ui/search-dialog.gtkbuilder.h:55 msgid "Export" msgstr "Exportar" -#: ../ui/search-dialog.glade.h:56 -#: ../ui/search-dialog.gtkbuilder.h:56 +#: ../ui/search-dialog.glade.h:56 ../ui/search-dialog.gtkbuilder.h:56 msgid "Clear lists for new search" msgstr "Limpar listas para nova busca" -#: ../ui/search-dialog.glade.h:57 -#: ../ui/search-dialog.gtkbuilder.h:57 +#: ../ui/search-dialog.glade.h:57 ../ui/search-dialog.gtkbuilder.h:57 msgid "Found" msgstr "Encontrado" -#: ../ui/search-dialog.glade.h:58 -#: ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Janela de Sumário de Resultados" -#: ../ui/search-dialog.glade.h:59 -#: ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabela de Sumário de Resultados" -#: ../ui/search-dialog.glade.h:60 -#: ../ui/search-dialog.gtkbuilder.h:60 +#: ../ui/search-dialog.glade.h:60 ../ui/search-dialog.gtkbuilder.h:60 msgid "Search Results" msgstr "Resultados de Pesquisa" -#: ../ui/search-dialog.glade.h:61 -#: ../ui/search-dialog.gtkbuilder.h:61 +#: ../ui/search-dialog.glade.h:61 ../ui/search-dialog.gtkbuilder.h:61 msgid "Preview" msgstr "Pré-visualizar" -#: ../ui/search-dialog.glade.h:62 -#: ../ui/search-dialog.gtkbuilder.h:62 +#: ../ui/search-dialog.glade.h:62 ../ui/search-dialog.gtkbuilder.h:62 msgid "Results" msgstr "Resultados" -#: ../ui/search-dialog.glade.h:63 -#: ../ui/search-dialog.gtkbuilder.h:63 +#: ../ui/search-dialog.glade.h:63 ../ui/search-dialog.gtkbuilder.h:63 msgid "Create new custom range" msgstr "Criar nova extensão personalizada" -#: ../ui/search-dialog.glade.h:64 -#: ../ui/search-dialog.gtkbuilder.h:64 +#: ../ui/search-dialog.glade.h:64 ../ui/search-dialog.gtkbuilder.h:64 msgid "New Range Button" msgstr "Botão de Nova Extensão" -#: ../ui/search-dialog.glade.h:65 -#: ../ui/search-dialog.gtkbuilder.h:65 +#: ../ui/search-dialog.glade.h:65 ../ui/search-dialog.gtkbuilder.h:65 msgid "Save custom range" msgstr "Guardar extensão personalizada" -#: ../ui/search-dialog.glade.h:66 -#: ../ui/search-dialog.gtkbuilder.h:66 +#: ../ui/search-dialog.glade.h:66 ../ui/search-dialog.gtkbuilder.h:66 msgid "Save Range Button" msgstr "Botão de Guardar Extensão" -#: ../ui/search-dialog.glade.h:67 -#: ../ui/search-dialog.gtkbuilder.h:67 +#: ../ui/search-dialog.glade.h:67 ../ui/search-dialog.gtkbuilder.h:67 msgid "Delete selected range" msgstr "Apagar extensão selecionada" -#: ../ui/search-dialog.glade.h:68 -#: ../ui/search-dialog.gtkbuilder.h:68 +#: ../ui/search-dialog.glade.h:68 ../ui/search-dialog.gtkbuilder.h:68 msgid "Delete Range Button" msgstr "Botão Apagar Extensão" -#: ../ui/search-dialog.glade.h:69 -#: ../ui/search-dialog.gtkbuilder.h:69 +#: ../ui/search-dialog.glade.h:69 ../ui/search-dialog.gtkbuilder.h:69 msgid "Ranges" msgstr "Extensões" -#: ../ui/search-dialog.glade.h:70 -#: ../ui/search-dialog.gtkbuilder.h:70 +#: ../ui/search-dialog.glade.h:70 ../ui/search-dialog.gtkbuilder.h:70 msgid "Range Name" msgstr "Nome de Extensão" -#: ../ui/search-dialog.glade.h:71 -#: ../ui/search-dialog.gtkbuilder.h:71 +#: ../ui/search-dialog.glade.h:71 ../ui/search-dialog.gtkbuilder.h:71 msgid "Range Name Entry" msgstr "Entrada de Nome de Extensão" -#: ../ui/search-dialog.glade.h:72 -#: ../ui/search-dialog.gtkbuilder.h:72 +#: ../ui/search-dialog.glade.h:72 ../ui/search-dialog.gtkbuilder.h:72 msgid "Range Definition" msgstr "Definição de Extensão" -#: ../ui/search-dialog.glade.h:73 -#: ../ui/search-dialog.gtkbuilder.h:73 +#: ../ui/search-dialog.glade.h:73 ../ui/search-dialog.gtkbuilder.h:73 msgid "Range Definition Entry" msgstr "Entrada de Definição de Extensão" -#: ../ui/search-dialog.glade.h:74 -#: ../ui/search-dialog.gtkbuilder.h:74 +#: ../ui/search-dialog.glade.h:74 ../ui/search-dialog.gtkbuilder.h:74 msgid "e.g. Matt-John;Rev4" msgstr "ex. Mt-Jo;Ap4" -#: ../ui/search-dialog.glade.h:75 -#: ../ui/search-dialog.gtkbuilder.h:75 +#: ../ui/search-dialog.glade.h:75 ../ui/search-dialog.gtkbuilder.h:75 msgid "Custom Range Preview" msgstr "Pré-visualização da extensão personalizada" -#: ../ui/search-dialog.glade.h:76 -#: ../ui/search-dialog.gtkbuilder.h:76 +#: ../ui/search-dialog.glade.h:76 ../ui/search-dialog.gtkbuilder.h:76 msgid "Custom Verse Ranges" msgstr "Extensões de Versículos personalizadas" -#: ../ui/search-dialog.glade.h:77 -#: ../ui/search-dialog.gtkbuilder.h:77 +#: ../ui/search-dialog.glade.h:77 ../ui/search-dialog.gtkbuilder.h:77 msgid "Create a new module list" msgstr "Criar uma nova lista de módulos" -#: ../ui/search-dialog.glade.h:78 -#: ../ui/search-dialog.gtkbuilder.h:78 +#: ../ui/search-dialog.glade.h:78 ../ui/search-dialog.gtkbuilder.h:78 msgid "New Custom Module List Button" msgstr "Botão Listas de Módulos personalizadas" -#: ../ui/search-dialog.glade.h:79 -#: ../ui/search-dialog.gtkbuilder.h:79 +#: ../ui/search-dialog.glade.h:79 ../ui/search-dialog.gtkbuilder.h:79 msgid "Save the module list" msgstr "Guardar a lista de módulos" -#: ../ui/search-dialog.glade.h:80 -#: ../ui/search-dialog.gtkbuilder.h:80 +#: ../ui/search-dialog.glade.h:80 ../ui/search-dialog.gtkbuilder.h:80 msgid "Save Custom Module List Button" msgstr "Botão Guardar Listas de Módulos personalizadas" -#: ../ui/search-dialog.glade.h:81 -#: ../ui/search-dialog.gtkbuilder.h:81 +#: ../ui/search-dialog.glade.h:81 ../ui/search-dialog.gtkbuilder.h:81 msgid "Delete the selected list" msgstr "Apagar a lista selecionada" -#: ../ui/search-dialog.glade.h:82 -#: ../ui/search-dialog.gtkbuilder.h:82 +#: ../ui/search-dialog.glade.h:82 ../ui/search-dialog.gtkbuilder.h:82 msgid "Clear Custom Module List Button" msgstr "Botão para Limpar Listas de Módulos personalizadas" -#: ../ui/search-dialog.glade.h:83 -#: ../ui/search-dialog.gtkbuilder.h:83 +#: ../ui/search-dialog.glade.h:83 ../ui/search-dialog.gtkbuilder.h:83 msgid "Module Lists" msgstr "Lista de Módulos" -#: ../ui/search-dialog.glade.h:84 -#: ../ui/search-dialog.gtkbuilder.h:84 +#: ../ui/search-dialog.glade.h:84 ../ui/search-dialog.gtkbuilder.h:84 msgid "List Name" msgstr "Nome da Lista" -#: ../ui/search-dialog.glade.h:85 -#: ../ui/search-dialog.gtkbuilder.h:85 +#: ../ui/search-dialog.glade.h:85 ../ui/search-dialog.gtkbuilder.h:85 msgid "Custom Module List Name Entry" msgstr "Entrada Listas de módulos personalizadas" -#: ../ui/search-dialog.glade.h:90 -#: ../ui/search-dialog.gtkbuilder.h:90 +#: ../ui/search-dialog.glade.h:90 ../ui/search-dialog.gtkbuilder.h:90 msgid "Open a dialog to select modules to add to the list" msgstr "Abrir um diálogo para selecionar módulos a adicionar à lista" -#: ../ui/search-dialog.glade.h:93 -#: ../ui/search-dialog.gtkbuilder.h:93 +#: ../ui/search-dialog.glade.h:93 ../ui/search-dialog.gtkbuilder.h:93 msgid "Custom Module Lists" msgstr "Listas de Módulos personalizadas" -#: ../ui/search-dialog.glade.h:94 -#: ../ui/search-dialog.gtkbuilder.h:94 +#: ../ui/search-dialog.glade.h:94 ../ui/search-dialog.gtkbuilder.h:94 msgid "Attribute" msgstr "Atributo" -#: ../ui/search-dialog.glade.h:95 -#: ../ui/search-dialog.gtkbuilder.h:96 +#: ../ui/search-dialog.glade.h:95 ../ui/search-dialog.gtkbuilder.h:96 msgid "Search for Strongs Numbers like G4442 or H1121" msgstr "Pesquisar Números de Strong como G4442 ou H1121" -#: ../ui/search-dialog.glade.h:96 -#: ../ui/search-dialog.gtkbuilder.h:95 +#: ../ui/search-dialog.glade.h:96 ../ui/search-dialog.gtkbuilder.h:95 msgid "Strongs Numbers" msgstr "Números de Strong" -#: ../ui/search-dialog.glade.h:97 -#: ../ui/search-dialog.gtkbuilder.h:97 +#: ../ui/search-dialog.glade.h:97 ../ui/search-dialog.gtkbuilder.h:97 msgid "Strongs Numbers radiobutton" msgstr "Rádio Números de Strong" -#: ../ui/search-dialog.glade.h:98 -#: ../ui/search-dialog.gtkbuilder.h:99 +#: ../ui/search-dialog.glade.h:98 ../ui/search-dialog.gtkbuilder.h:99 msgid "Search for Morphological tags" msgstr "Pesquisar etiquetas morfológicas" -#: ../ui/search-dialog.glade.h:100 -#: ../ui/search-dialog.gtkbuilder.h:100 +#: ../ui/search-dialog.glade.h:100 ../ui/search-dialog.gtkbuilder.h:100 msgid "Morphological Tags radiobutton" msgstr "Rádio Etiquetas morfológicas" -#: ../ui/search-dialog.glade.h:101 -#: ../ui/search-dialog.gtkbuilder.h:102 +#: ../ui/search-dialog.glade.h:101 ../ui/search-dialog.gtkbuilder.h:102 msgid "Search in footnotes" msgstr "Pesquisar em notas de rodapé" -#: ../ui/search-dialog.glade.h:103 -#: ../ui/search-dialog.gtkbuilder.h:103 +#: ../ui/search-dialog.glade.h:103 ../ui/search-dialog.gtkbuilder.h:103 msgid "Footnotes radiobutton" msgstr "Rádio Notas de rodapé" -#: ../ui/search-dialog.glade.h:104 -#: ../ui/search-dialog.gtkbuilder.h:104 +#: ../ui/search-dialog.glade.h:104 ../ui/search-dialog.gtkbuilder.h:104 msgid "Results Display Options" msgstr "Opções para mostrar resultados" -#: ../ui/search-dialog.glade.h:105 -#: ../ui/search-dialog.gtkbuilder.h:106 +#: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106 msgid "In modules that have Strong's Numbers" msgstr "Em módulos com números de Strong" -#: ../ui/search-dialog.glade.h:106 -#: ../ui/search-dialog.gtkbuilder.h:105 +#: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105 msgid "Show Strong's Numbers" msgstr "Mostrar Números Strong" -#: ../ui/search-dialog.glade.h:107 -#: ../ui/search-dialog.gtkbuilder.h:107 +#: ../ui/search-dialog.glade.h:107 ../ui/search-dialog.gtkbuilder.h:107 msgid "Show Strong's Numbers checkbox" msgstr "Visto Mostrar Números Strong" -#: ../ui/search-dialog.glade.h:108 -#: ../ui/search-dialog.gtkbuilder.h:109 +#: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109 msgid "In modules that have Morphological Tags" msgstr "Em módulos com etiquetas morfológicas" -#: ../ui/search-dialog.glade.h:109 -#: ../ui/search-dialog.gtkbuilder.h:108 +#: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108 msgid "Show Morphological Tags" msgstr "Mostrar Etiquetas Morfológicas" -#: ../ui/search-dialog.glade.h:110 -#: ../ui/search-dialog.gtkbuilder.h:110 +#: ../ui/search-dialog.glade.h:110 ../ui/search-dialog.gtkbuilder.h:110 msgid "Show Morphological Tags checkbox" msgstr "Visto Mostrar Etiquetas Morfológicas" -#: ../ui/search-dialog.glade.h:111 -#: ../ui/search-dialog.gtkbuilder.h:112 +#: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112 msgid "In modules that have Footnotes" msgstr "Em módulos com Notas de Rodapé" -#: ../ui/search-dialog.glade.h:112 -#: ../ui/search-dialog.gtkbuilder.h:111 +#: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111 msgid "Show Footnotes" msgstr "Mostrar Notas de Rodapé" -#: ../ui/search-dialog.glade.h:113 -#: ../ui/search-dialog.gtkbuilder.h:113 +#: ../ui/search-dialog.glade.h:113 ../ui/search-dialog.gtkbuilder.h:113 msgid "Show Footnotes checkbox" msgstr "Visto Mostrar Notas de Rodapé" -#: ../ui/search-dialog.glade.h:114 -#: ../ui/search-dialog.gtkbuilder.h:114 +#: ../ui/search-dialog.glade.h:114 ../ui/search-dialog.gtkbuilder.h:114 msgid "Attribute Search" msgstr "Pesquisa de Atributos" -#: ../ui/search-dialog.glade.h:115 -#: ../ui/search-dialog.gtkbuilder.h:115 -#: ../ui/selector-prefs.glade.h:1 -#: ../ui/selector-prefs.gtkbuilder.h:1 +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 msgid "Module Selection" msgstr "Selecção de Módulo" @@ -5054,13 +4708,11 @@ msgid "gtk-ok" msgstr "OK" -#: ../ui/xi-menus.glade.h:2 -#: ../ui/xi-menus.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:2 ../ui/xi-menus.gtkbuilder.h:2 msgid "Open Study_pad" msgstr "Abrir Study_Pad" -#: ../ui/xi-menus.glade.h:3 -#: ../ui/xi-menus.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:3 ../ui/xi-menus.gtkbuilder.h:3 msgid "_Open Session" msgstr "_Abrir Sessão" @@ -5068,8 +4720,7 @@ msgid "Open a saved tab settings collection" msgstr "Abrir uma colecção guardada de definições de abas" -#: ../ui/xi-menus.glade.h:5 -#: ../ui/xi-menus.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:5 ../ui/xi-menus.gtkbuilder.h:4 msgid "_Save Session" msgstr "Guardar _Sessão" @@ -5077,8 +4728,7 @@ msgid "Save this collection of tab settings" msgstr "Guardar esta colecção de definições de abas" -#: ../ui/xi-menus.glade.h:7 -#: ../ui/xi-menus.gtkbuilder.h:5 +#: ../ui/xi-menus.glade.h:7 ../ui/xi-menus.gtkbuilder.h:5 msgid "_New Prayerlist/Journal" msgstr "_Nova Lista de Oração/Diário" @@ -5086,8 +4736,7 @@ msgid "Create a new journal or prayerlist from a template" msgstr "Criar uma nova lista de oração a partir de modelo" -#: ../ui/xi-menus.glade.h:10 -#: ../ui/xi-menus.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:10 ../ui/xi-menus.gtkbuilder.h:7 msgid "_Search" msgstr "_Pesquisar" @@ -5095,8 +4744,7 @@ msgid "Bring the simple sidebar search forward" msgstr "Trazer à frente a barra de pesquisa simples" -#: ../ui/xi-menus.glade.h:12 -#: ../ui/xi-menus.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:12 ../ui/xi-menus.gtkbuilder.h:8 msgid "_Advanced Search" msgstr "Pesquisa _Avançada" @@ -5104,8 +4752,7 @@ msgid "Open the advanced search dialog, to run complex queries" msgstr "Abrir o diálogo de pesquisa avançada, para correr queries complexas" -#: ../ui/xi-menus.glade.h:14 -#: ../ui/xi-menus.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:14 ../ui/xi-menus.gtkbuilder.h:9 msgid "_Preferences" msgstr "_Preferências" @@ -5113,42 +4760,40 @@ msgid "Use module manager to install and remove Sword modules" msgstr "Utilizar o gestor de módulos para instalar e remover módulos Sword" -#: ../ui/xi-menus.glade.h:16 -#: ../ui/xi-menus.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:16 ../ui/xi-menus.gtkbuilder.h:10 msgid "_Module Manager" msgstr "Gestor de _Módulos" -#: ../ui/xi-menus.glade.h:18 -#: ../ui/xi-menus.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Ver" + +#: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Pré-visualizar _Devocional Diário" #: ../ui/xi-menus.glade.h:19 msgid "Show today's entry from your selected daily devotional in the previewer" -msgstr "Mostrar entrada de hoje do devocional diário escolhido no pré-visualizador" +msgstr "" +"Mostrar entrada de hoje do devocional diário escolhido no pré-visualizador" -#: ../ui/xi-menus.glade.h:20 -#: ../ui/xi-menus.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:20 ../ui/xi-menus.gtkbuilder.h:13 msgid "_Bible" msgstr "_Bíblia" -#: ../ui/xi-menus.glade.h:21 -#: ../ui/xi-menus.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:21 ../ui/xi-menus.gtkbuilder.h:14 msgid "_Preview" msgstr "_Pré-visualizar" -#: ../ui/xi-menus.glade.h:22 -#: ../ui/xi-menus.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:22 ../ui/xi-menus.gtkbuilder.h:15 msgid "_Commentary/Book" msgstr "_Comentário/Livro" -#: ../ui/xi-menus.glade.h:23 -#: ../ui/xi-menus.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:23 ../ui/xi-menus.gtkbuilder.h:16 msgid "Dictionar_y" msgstr "Dicionár_io" -#: ../ui/xi-menus.glade.h:24 -#: ../ui/xi-menus.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:24 ../ui/xi-menus.gtkbuilder.h:17 msgid "L_ink Tabs" msgstr "L_igar Abas" @@ -5156,17 +4801,17 @@ msgid "Make all tabs' Bibles navigate together" msgstr "Forçar navegação conjunta de todas as Bíblias das abas" -#: ../ui/xi-menus.glade.h:26 -#: ../ui/xi-menus.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:26 ../ui/xi-menus.gtkbuilder.h:18 msgid "_Read Aloud" msgstr "Le_r em voz alta" #: ../ui/xi-menus.glade.h:27 msgid "Turn on text-to-speech reading of Bible verses as they are selected" -msgstr "Ativar leitura de texto-para-voz de versículos bíblicos quando são selecionados" +msgstr "" +"Ativar leitura de texto-para-voz de versículos bíblicos quando são " +"selecionados" -#: ../ui/xi-menus.glade.h:28 -#: ../ui/xi-menus.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19 msgid "Show Verse _Numbers" msgstr "Mostrar _Números de Versículos" @@ -5174,8 +4819,7 @@ msgid "Display verse numbers in the text" msgstr "Mostrar números de versículo no texto" -#: ../ui/xi-menus.glade.h:30 -#: ../ui/xi-menus.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:30 ../ui/xi-menus.gtkbuilder.h:20 msgid "_Highlight Current Verse" msgstr "_Assinalar Versículo Corrente" @@ -5183,8 +4827,7 @@ msgid "Apply a high-contrast highlight to the current verse" msgstr "Assinalar o versículo corrente com alto contraste" -#: ../ui/xi-menus.glade.h:32 -#: ../ui/xi-menus.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:32 ../ui/xi-menus.gtkbuilder.h:21 msgid "_Attach/Detach Sidebar" msgstr "_Anexar/Desanexar Barra Lateral" @@ -5192,8 +4835,7 @@ msgid "Operate the sidebar as a separate window" msgstr "Usar a barra lateral como janela separada" -#: ../ui/xi-menus.glade.h:34 -#: ../ui/xi-menus.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:34 ../ui/xi-menus.gtkbuilder.h:22 msgid "_Show/Hide Attached Sidebar" msgstr "Mo_strar/Ocultar Barra Lateral Anexada" @@ -5201,8 +4843,7 @@ msgid "Remove the sidebar entirely from view" msgstr "Remover a barra lateral de vista" -#: ../ui/xi-menus.glade.h:36 -#: ../ui/xi-menus.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:36 ../ui/xi-menus.gtkbuilder.h:23 msgid "Show Parallel View in a _Tab" msgstr "Mostrar Vista Paralela numa _Aba" @@ -5210,17 +4851,17 @@ msgid "Provide the full-chapter parallel Bible window as another tab" msgstr "Fornecer a janela de capítulo completo da Bíblia paralela noutra aba" -#: ../ui/xi-menus.glade.h:38 -#: ../ui/xi-menus.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:38 ../ui/xi-menus.gtkbuilder.h:24 msgid "Show Previe_wer in the Sidebar" msgstr "Mostrar Pre_visualizador na Barra Lateral" #: ../ui/xi-menus.glade.h:39 msgid "Select Previewer position between sidebar or beneath Bible" -msgstr "Selecionar posição do pré-visualizador entre barra lateral ou por baixo da Bíblia" +msgstr "" +"Selecionar posição do pré-visualizador entre barra lateral ou por baixo da " +"Bíblia" -#: ../ui/xi-menus.glade.h:41 -#: ../ui/xi-menus.gtkbuilder.h:26 +#: ../ui/xi-menus.glade.h:41 ../ui/xi-menus.gtkbuilder.h:26 msgid "_Contents" msgstr "_Conteúdo" @@ -5228,8 +4869,7 @@ msgid "Open the help viewer on the Xiphos manual" msgstr "Abrir a ajuda do manual Xiphos" -#: ../ui/xi-menus.glade.h:43 -#: ../ui/xi-menus.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:43 ../ui/xi-menus.gtkbuilder.h:27 msgid "_Mailing List" msgstr "Lista de _mail" @@ -5237,8 +4877,7 @@ msgid "Open a browser on the users' mailing list webpage" msgstr "Abrir um browser na página web da lista de utilizadores" -#: ../ui/xi-menus.glade.h:45 -#: ../ui/xi-menus.gtkbuilder.h:28 +#: ../ui/xi-menus.glade.h:45 ../ui/xi-menus.gtkbuilder.h:28 msgid "_Live Chat" msgstr "Chat ao _vivo" @@ -5246,8 +4885,7 @@ msgid "Open a browser on an interface to live IRC chat" msgstr "Abrir um browser numa interface com chat IRC ao vivo" -#: ../ui/xi-menus.glade.h:47 -#: ../ui/xi-menus.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:47 ../ui/xi-menus.gtkbuilder.h:29 msgid "_Report Bug" msgstr "_Relatar erro" @@ -5255,8 +4893,7 @@ msgid "Open a browser on our bug tracker" msgstr "Abrir um browser no nosso bug tracker" -#: ../ui/xi-menus.glade.h:49 -#: ../ui/xi-menus.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:49 ../ui/xi-menus.gtkbuilder.h:30 msgid "About _Translation" msgstr "Sobre a _tradução" @@ -5264,8 +4901,7 @@ msgid "Learn about translating the Xiphos interface to other languages" msgstr "Saiba como traduzir a interface de Xiphos para outras línguas" -#: ../ui/xi-menus.glade.h:51 -#: ../ui/xi-menus.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:51 ../ui/xi-menus.gtkbuilder.h:31 msgid "_About The SWORD Project" msgstr "_Sobre o Projeto SWORD" @@ -5273,8 +4909,7 @@ msgid "Learn about The Sword Project, of which Xiphos is one application" msgstr "Aprender sobre o Projeto Sword, do qual Xiphos é uma aplicação" -#: ../ui/xi-menus.glade.h:53 -#: ../ui/xi-menus.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:53 ../ui/xi-menus.gtkbuilder.h:32 msgid "About _Xiphos" msgstr "Sobre _Xiphos" @@ -5282,33 +4917,27 @@ msgid "Learn about Xiphos" msgstr "Sobre Xiphos" -#: ../ui/xi-menus.glade.h:57 -#: ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Anotar Versículo" -#: ../ui/xi-menus.glade.h:60 -#: ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Abrir Módulo" -#: ../ui/xi-menus.glade.h:62 -#: ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Nota" -#: ../ui/xi-menus.glade.h:63 -#: ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Abrir no editor" -#: ../ui/xi-menus.glade.h:65 -#: ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Versículo por linha" -#: ../ui/xi-menus.glade.h:73 -#: ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Marcadores de Nota de Rodapé/Referência Cruzada" @@ -5316,237 +4945,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Mostrar marcadores não-anónimos, ex. \"*n23\"" -#: ../ui/xi-menus.glade.h:79 -#: ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variantes" -#: ../ui/xi-menus.glade.h:85 -#: ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Conteúdo da Imagem" -#: ../ui/xi-menus.glade.h:86 -#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respeitar fontes" -#: ../ui/xi-menus.glade.h:87 -#: ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Comentário por capítulo" -#: ../ui/xi-menus.glade.h:88 -#: ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Espaço Duplo" -#: ../ui/xi-menus.glade.h:89 -#: ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Selecção de Procura" -#: ../ui/xi-menus.glade.h:90 -#: ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Usar Dicionário corrente" -#: ../ui/xi-menus.glade.h:91 -#: ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Explorar em BibleMap.org" -#: ../ui/xi-menus.glade.h:92 -#: ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Desbloquear este Módulo" -#: ../ui/xi-menus.glade.h:93 -#: ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Mostrar Cabeçalho de Livro" -#: ../ui/xi-menus.glade.h:94 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Mostrar Caebeçalho de Capítulo" -#: ../ui/xi-menus.glade.h:95 -#: ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Renomear Comentário Pessoal" -#: ../ui/xi-menus.glade.h:96 -#: ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Descarregar Comentário Pessoal" -#: ../ui/xi-menus.glade.h:97 -#: ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Ler Selecção em voz alta" -#: ../ui/xi-menus.glade.h:98 -#: ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Guardar estes resultados como uma única marca" -#: ../ui/xi-menus.glade.h:99 -#: ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Guardar lista como uma única marca" -#: ../ui/xi-menus.glade.h:100 -#: ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Guardar estes resultados como uma série de marcas na sua pasta" -#: ../ui/xi-menus.glade.h:101 -#: ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Guardar lista como uma série de marcas" -#: ../ui/xi-menus.glade.h:102 -#: ../ui/xi-menus-popup.gtkbuilder.h:91 -msgid "Provide a dialog in which to paste a line of verse references, to fill the verse list." -msgstr "Fornecer um diálogo no qual cola uma linha de referências de versículos, para preencher a lista de versículos." +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 +msgid "" +"Provide a dialog in which to paste a line of verse references, to fill the " +"verse list." +msgstr "" +"Fornecer um diálogo no qual cola uma linha de referências de versículos, " +"para preencher a lista de versículos." -#: ../ui/xi-menus.glade.h:103 -#: ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Preencher lista de versículos" -#: ../ui/xi-menus.glade.h:104 -#: ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." -msgstr "Enviar o conteúdo completo da lista de versículos para a lista de histórico." +msgstr "" +"Enviar o conteúdo completo da lista de versículos para a lista de histórico." -#: ../ui/xi-menus.glade.h:105 -#: ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "Carregar histórico da lista de versículos" -#: ../ui/xi-menus.glade.h:106 -#: ../ui/xi-menus-popup.gtkbuilder.h:95 -msgid "Send this verse list via BibleSync to others, if you are in Personal or Speaker mode." -msgstr "Enviar esta lista de versículos via BibleSync para outros, em modo Pessoal ou Orador." +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 +msgid "" +"Send this verse list via BibleSync to others, if you are in Personal or " +"Speaker mode." +msgstr "" +"Enviar esta lista de versículos via BibleSync para outros, em modo Pessoal " +"ou Orador." -#: ../ui/xi-menus.glade.h:107 -#: ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Enviar lista por BibleSync" -#: ../ui/xi-menus.glade.h:108 -#: ../ui/xi-menus-popup.gtkbuilder.h:96 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exportar Lista" -#: ../ui/xi-menus.glade.h:109 -#: ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Abrir esta marca numa nova aba" -#: ../ui/xi-menus.glade.h:110 -#: ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Abrir numa nova aba" -#: ../ui/xi-menus.glade.h:111 -#: ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Abrir esta marca num diálogo" -#: ../ui/xi-menus.glade.h:112 -#: ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Abrir num diálogo" -#: ../ui/xi-menus.glade.h:113 -#: ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Adicionar nova pasta à pasta selecionada" -#: ../ui/xi-menus.glade.h:115 -#: ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Inserir nova marca aqui" -#: ../ui/xi-menus.glade.h:116 -#: ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Inserir Marca" -#: ../ui/xi-menus.glade.h:117 -#: ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Editar item de marca" -#: ../ui/xi-menus.glade.h:118 -#: ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Editar Item" -#: ../ui/xi-menus.glade.h:119 -#: ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Apagar item" -#: ../ui/xi-menus.glade.h:121 -#: ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Expandir todos os grupos de Marcas" -#: ../ui/xi-menus.glade.h:122 -#: ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Expandir Tudo" -#: ../ui/xi-menus.glade.h:123 -#: ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Colapsar todos os grupos de Marcas" -#: ../ui/xi-menus.glade.h:124 -#: ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Colapsar Tudo" -#: ../ui/xi-menus.glade.h:125 -#: ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Permitir mover itens de uma pasta para outra" -#: ../ui/xi-menus.glade.h:126 -#: ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Permitir Reordenação" -#: ../ui/xi-menus.glade.h:127 -#: ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Carregar outro ficheiro de marcas (Bibletime por omissão)" -#: ../ui/xi-menus.glade.h:128 -#: ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importar Marcas" -#: ../ui/xi-menus.glade.h:129 -#: ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Remover pasta e guardá-la" -#: ../ui/xi-menus.glade.h:130 -#: ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Exportar Pasta" -#: ../ui/xi-menus.glade.h:131 -#: ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Abrir módulo selecionado numa nova aba" -#: ../ui/xi-menus.glade.h:132 -#: ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5554,97 +5146,79 @@ "Abrir módulo selecionado numa\n" "\tjanela ['diálogo'] separada " -#: ../ui/xi-menus.glade.h:134 -#: ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Abrir numa janela separada" -#: ../ui/xi-menus.glade.h:135 -#: ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Criar uma nova lista de oração simples" -#: ../ui/xi-menus.glade.h:136 -#: ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Simples" -#: ../ui/xi-menus.glade.h:137 -#: ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Criar uma nova lista de oração por assunto" -#: ../ui/xi-menus.glade.h:138 -#: ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Assunto" -#: ../ui/xi-menus.glade.h:139 -#: ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Criar um novo registo mensal" -#: ../ui/xi-menus.glade.h:140 -#: ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Mensal" -#: ../ui/xi-menus.glade.h:141 -#: ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Criar um novo diário" -#: ../ui/xi-menus.glade.h:142 -#: ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Diário" -#: ../ui/xi-menus.glade.h:143 -#: ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Criar um novo tópico alinhado" -#: ../ui/xi-menus.glade.h:144 -#: ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Alinhado" -#: ../ui/xi-menus.glade.h:145 -#: ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Abrir módulo em editor ou janela de visualização simples" -#: ../ui/xi-menus.glade.h:146 -#: ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Abrir numa janela separada" -#: ../ui/xi-menus.glade.h:147 -#: ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Adicionar um sub-item" -#: ../ui/xi-menus.glade.h:148 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Adicionar Sub-Item" -#: ../ui/xi-menus.glade.h:149 -#: ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Adicionar um item" -#: ../ui/xi-menus.glade.h:150 -#: ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Adicionar Item" -#: ../ui/xi-menus.glade.h:151 -#: ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Remover este item" -#: ../ui/xi-menus.glade.h:153 -#: ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Editar este item" @@ -5656,6 +5230,105 @@ msgid "Study the Bible" msgstr "Estudar a Bíblia" +#~ msgid "network setup errors." +#~ msgstr "erros de preparação de rede." + +#~ msgid " client socket" +#~ msgstr "socket de cliente" + +#~ msgid " server socket" +#~ msgstr "socket de servidor" + +#~ msgid "bad magic" +#~ msgstr "má 'magia'" + +#~ msgid "bad protocol version" +#~ msgstr "má versão de protocolo" + +#~ msgid "bad msg type" +#~ msgstr "mau tipo de mensagem" + +#~ msgid "bad packet count" +#~ msgstr "mau número de pacotes" + +#~ msgid "bad packet index" +#~ msgstr "mau índice de pacote" + +#~ msgid "bad body format" +#~ msgstr "mau formato de corpo" + +#~ msgid "missing required header " +#~ msgstr "cabeçalho necessário em falta" + +#~ msgid "Spoof stopped: " +#~ msgstr "Forjamento parado:" + +#~ msgid "Ignoring echo." +#~ msgstr "Ignorando echo." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domínio não é 'BIBLE-VERSE':" + +#~ msgid "Invalid group: " +#~ msgstr "Grupo inválido:" + +#~ msgid " present at " +#~ msgstr "presente em" + +#~ msgid " using " +#~ msgstr "usando" + +#~ msgid "[no dump ready]" +#~ msgstr "[sem descarga pronta]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Transmissão falhou.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Incapaz de multicast; BibleSync está agora desativado. Se a sua ligação " +#~ "de rede mudou enquanto este programa estava ativo, pode ser suficiente " +#~ "reativá-la." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + #~ msgid "UUID spoofed: wrong ipaddr." #~ msgstr "UUID forjado: ippaddr errado." diff -Nru xiphos-4.0.0+dfsg1/po/ro.po xiphos-4.0.4+dfsg1/po/ro.po --- xiphos-4.0.0+dfsg1/po/ro.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/ro.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Romanian Version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-29 21:56+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Xiphos \n" @@ -21,296 +21,263 @@ "X-Poedit-Language: Romanian\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Configuratia nu s-a gasit" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Esti sigur ca vrei sa stergi nota pentru" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Deschide" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Document fara titlu" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Salveaza schimbarile la document" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "inainte de inchidere?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Daca nu salvezi, schimbarile vor fi pierdute permanent." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Fisier" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Caiet de Studiu" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Editor de Note" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Lista de Rugaciune / Editor Jurnal" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Despre Modului Sword" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Intregul modul" +msgid "Module name: " +msgstr "Manager Module" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Optiuni" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s a esuat" +msgid "Type: " +msgstr "Scop" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Devotional Zilnic" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Harti" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Configuratia nu s-a gasit" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Imagini" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Pagina %d din %d" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Deschide" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Salveaza ca" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblie" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Document fara titlu" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Comentariu" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Esti sigur ca vrei sa stergi nota pentru" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Dictionar" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Rezultat HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Sursa HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Sursa Simpla" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Carti Generale" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "Ti_parire..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Redenumire Comentariu" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Pre_vizualizare tiparire" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "JurnalZilnic" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Renunta" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Necunoscut" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Deschide" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Salveaza" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Lista Module" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Salveaza _Ca..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Ranguri" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nou" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Deschide document nou" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Sursa Instalare" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Sterge" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Module Fereastra Principala" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Sterge nota curenta" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Formatare" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Fisier" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Titluri" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Rezultat HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_Sursa HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Sursa Simpla" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Vizualizare" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Note de subsol" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Salvare" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Trimiteri" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Inserare Link" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Numere Strong's" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Salveaza schimbarile la document" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Etichete Morfologice" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "inainte de inchidere?" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Leme" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Daca nu salvezi, schimbarile vor fi pierdute permanent." +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Cuvintele lui Hristos in Rosu" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Fisier" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Accente Grecesti" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Caiet de Studiu" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Puncte de Vocale Ebraice" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Editor de Note" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Cantilatie Ebraica" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Lista de Rugaciune / Editor Jurnal" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Deschide " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Pregatire pentru tiparire" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Tiparirea nu este suportate pe aceasta imprimanta" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Transliteratie" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Imprimanta %s nu suporta tiparirea PostScript." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Tiparire" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Asteapta tiparirea" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "O eroare a avut loc in timpul tiparirii" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Segmentare Morfema" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Nu s-a putut tiparii documentu tau: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Despre Modului Sword" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Atribut" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Modului nu are informatii descriptive." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Optiuni" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -322,18 +289,20 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Proiectul SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Iti place sa folosesti Xiphos pentru studiul Bibliei? Ai dori sa vezi " "afisarea lui in limba ta nativa? Ai putea traduce Xipho! \n" @@ -342,24 +311,24 @@ "in alte limbi. Daca poti sa traduci pentru noi, vezi link-ul de mai jos, " "contacteaza-ne si implica-te cu eforturile noastre." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Despre Traducerea Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Vezi TRANSLATION-HOWTO din sursa Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Dezvoltarea Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright 2000-2009 Echipa de Developeri Xiphos" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright 2000-2015 Echipa de Developeri Xiphos" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -372,234 +341,234 @@ "Proiectul SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Insemnare" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Introdu Nume Folder" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Nume Folder" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Folder: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Editeaza obiectul de insemnare" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Editare" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Nume folder: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Nume insemnare: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Verset: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Scoate folderul selectat" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(si tot continutul sau)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Scoate semnul de carte selectat" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Adauga" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Eticheta: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Rezultate cautare: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Insemne" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "pentru:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Introdu Cheia Cipher: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Inchide fara salvare" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Inchide _fara Salvare" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Lista Verset" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Te rog sa verifici drepturile de autor inainte de exportare!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Cauta" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Introdu Cuvantul sau Fraza" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Cauta invers" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Gaseste Urmatorul" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Setare Font Modul" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Schimba fontul pentru" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Fontul curent: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Foloseste fontul implicit pentru acest modul" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos e pe cale sa se inchida datorita unei erori \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Te rog sa raportezi aceasta eroare echipei Xiphos cu:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos e pe cale sa se inchida datorita unei erori \"STRDUP\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "In modulele care ah Numere Strong's" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Software de Studiu Biblic" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Deschide un tab nou" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Vedere Standard" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Vedere Comentariu" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Vedere Carte" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Bun venit la Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -619,33 +588,33 @@ "Prin urmare, redenumirea comentariului personal\n" "nu este disponibila in mediul Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Redenumire Comentariu" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Alege Nume Comentariu" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nume Nou" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Nume: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Numele de modul trebuie sa contina doar [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos cunoaste deja un modul cu acest nume." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -654,7 +623,7 @@ "S-a esuat in crearea noii configuratii:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -662,7 +631,7 @@ "Eroare in cladirea configuratiei:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -752,20 +721,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Elimini aceste module?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Pregatire pentru eliminare" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Eliminare" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Elimina" @@ -785,23 +754,23 @@ msgid "Install" msgstr "Instaleaza" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arhivezi aceste module?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Pregatire pentru arhivare" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arhivare" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arhiveaza" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -809,55 +778,59 @@ "Cladeste indexul de cautare rapida pentru\n" "aceste module (poate dura minute/modul)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Pregatire pentru indexare" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexare" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Index" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Sterge indexul de cautare pentru aceste module?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Pregatire pentru stergere index" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Stergere index" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Stergere" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Modului nu are informatii descriptive." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Nume Modul" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "O bifare inseamna ca acest modul este deja instalat" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Apasa pe casuta pentru a lucra la acest modul" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Apasa casuta pentru a selecta acest modul pentru instalare/actualizare" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Instalat" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -866,7 +839,7 @@ "pentru acest modul pentru cautare rapida (vezi panoul de Intretinere pentru " "aceasta functie)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -874,13 +847,13 @@ "Iconita de lacat inseamna ca acest modul este encriptate, si necesita ca tu " "sa cumperi o cheie de deblocare de la proprietareul acestuia" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Despre" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -888,19 +861,19 @@ "Iconita de reimprospatare inseamna ca modulul Instalat este mai vechi decat " "modului Disponibil mai nou: Ar trebui sa actualizezi modului" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Disponibil" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Marime" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Descriere" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -909,33 +882,33 @@ "`mkdir %s' a esuat:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arhivat in: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Jurnalele si listele de rugaciune nu pot fi indexate." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s a esuat" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Terminat" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Necunoscut" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -944,7 +917,7 @@ "Repozitoriu:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -952,54 +925,44 @@ "Categorizat dupa\n" "Tip Modul" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Texte Biblice" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Comentarii" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Dictionare" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Devotionale Zilnice" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Carti Generale" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Harti" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Imagini" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1007,95 +970,95 @@ "Categorizat dupa\n" "Disponibilitate" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Actualizari" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Dezinstalat" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Lista/Jurnal de Rugaciune" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Reimprospatare din sursa indepartata" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Sursa indepartata nu s-a gasit" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Configurare" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tip" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Legenda" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Sursa" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Director" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "User" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Parola" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Surse Module" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Adauga/Elimina" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Alege" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Module" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Instalare/Actualizare" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Intretinere" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Te rog Reimprospateaza" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Lista ta de module nu este actualizata!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1103,7 +1066,7 @@ "Ai dezinstalat ultima Biblie folosita. \n" "Xiphos are nevoie de cel putin una." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1111,211 +1074,222 @@ "Inca nu sunt Biblii instalate. \n" "Xiphos nu poate continua fara nici una." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Sursele standard indepartate au fost incarcate." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Nu s-au putut incarca sursele standard de la CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Elimina sursa selectata" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Introdu o sursa indepartata" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Legenda:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tip" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Gazda:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Director:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "User (optional)" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Parola (optional):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "O sursa cu acel nume deja exista." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Sterge o sursa indepartata" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Intregul modul" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Mergi in afara, la sectiunea ce contine aceasta" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Mergi la obiectul anterior" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Mergi la obiectul urmator" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Mergi in interior, la prima sub-sectiune" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Detaseaza/Ataseaza" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Optiuni Modul" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Vedere Paralela" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Citeste Selectiunea Tare" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personal" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Selecteaza --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Limba va avea efect dupa restartare." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Preferinte" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "General" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Optiuni" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Biblie" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Fonturi" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Culoare" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Taburi si Panouri" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Special" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Curata Lista?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Esti sigur ca vrei sa cureti lista de module?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Elimina Modul?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Esti sigur ca vrei sa elimini modulul selectat?" @@ -1334,20 +1308,20 @@ msgid "found in " msgstr "gasit i " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Ultima lista de module nu poate fi stearsa" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Sterge lista?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Esti sigur ca vrei sa stergi:" @@ -1367,7 +1341,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1412,7 +1386,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1430,15 +1404,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1446,108 +1420,98 @@ "Aceasta e o cautare inclusiva (\"AND\"):\n" "Gaseste potriviri prin aratarea tuturor cuvintelor." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Cautare _Avansata" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Cauta Modul" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblie" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Comentariu" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Tip Cautare" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Multi cuvant" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Expresie regulata" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Fraza exacta" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Optiuni Cautare" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Potrivire litere" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Proportie Cautare" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Nici o proportie" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Foloseste limite" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Ultima cautare" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Limite" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Mai jos" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Mai sus" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Deschide in editor" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Preferinte" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Cauta" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Bara laterala" @@ -1555,73 +1519,73 @@ msgid "Powered by the SWORD Project" msgstr "Powered by the SWORD Project" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Obiect de Lista/Jurnal de Rugaciune" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nume nou" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Elimina obiectul selectat" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Ianuarie" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februarie" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Martie" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Aprilie" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mai" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Iunie" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Iulie" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Septembrie" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Octombrie" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Noiembrie" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Decembrie" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1631,7 +1595,98 @@ "(Sau probabil imaginea e de alt tip decat bmp/gif/jpg/png.)\n" "Xiphos nu poate redimensiona imaginile pentru a se potrivi in fereastra." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Intregul modul" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Apasa pe casuta pentru a lucra la acest modul" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Disponibil" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Mantuire" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1640,248 +1695,270 @@ "Eticheta de adnotare personnala encodata impropriu:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Capitol" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nu intelege mai mult de un argument." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Initializez Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Cladesc Interfata" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Incepe Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Incarcare Setari" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Afisare Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Revizuitor" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Nota de subsol" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Trimitere" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologie" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Inapoi la " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Numere Strong's" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Note de subsol" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Etichete Morfologice" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Puncte de Vocale Ebraice" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Cantilatie Ebraica" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Accente Grecesti" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Trimiteri" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Leme" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Titluri" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentare Morfema" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Cuvintele lui Hristos in Rosu" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Transliteratie" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Variante Textuale" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Citirea Primara" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Citirea Secundara" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Toate Citirile" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Transliteratie" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "vezi contextul" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Crestere" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Pentru Crestere
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Mantuire" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Pentru Mantuire
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Sanatate" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Pentru Sanatate
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Diverse" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Diverse
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punct x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punct y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punct z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Topic Minor 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subtopic 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Topic Minor 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subtopic 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Topic Minor 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subtopic 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Topic Minor 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subtopic 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Nume pentru lista noua de rugaciune sau jurnal" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos a gasit deja lista aceea de rugaciune." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1890,19 +1967,19 @@ "Xiphos nu poate crea calea modulului:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "O lista de rugaciune de baza. \\par\\par Modul cread de Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ListaDeRugaciuneDeBaza" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "ListaMeaDeRugaciune" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1910,103 +1987,103 @@ "Oameni:
Bob
Sam
Sue

Biserica:
scaune
partasie
Biblii pentru misionari


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "O lista de rugaciune bazata pe un subiect. \\par\\par Modul creat de Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubiectListaRugaciune" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Crestere Spirituala" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "O lista de rugaciune lunara. \\par\\par Modul cread de Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "ListaDeRugaciuneLunara" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Un jurnal zilnic. \\par\\par Modul cread de Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "JurnalZilnic" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Un topic schitat (ex. predica). \\par\\par Modul cread de Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "TopicSchitat" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Topic Major A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Topic Major A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Topic Major B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Topic Major B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Topic Major C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Topic Major C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Notarile Userului" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Rezultat cautare %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Sterge Rang?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Esti sigur ca vrei sa stergi acest rang?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Cauta: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2017,16 +2094,16 @@ "Nu este un asemenea modul instalat.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Te rog sa ajustezi lista de module." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Nu exista un index de cautare rapida pentru %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2034,7 +2111,7 @@ "\n" "Cautarea in acest modul este acum 'multi cuvant'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2042,51 +2119,45 @@ "\n" "Vezi Managerul de Modul, panoul Intretinere." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Cautare terminata" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "potriviri" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME nu este setat!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos nu poate crea .xiphos:\n" -"%s\n" -"\n" -"Xiphos nu poate continua." +"Xiphos nu poate crea calea modulului:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nu se poate crea " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2102,11 +2173,11 @@ "Xiphos nu poate continua,\n" "si se va inchide acum." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Instalarea de modul de Biblie s-a incheiat." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2116,11 +2187,11 @@ msgid "verse" msgstr "verset" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "capitol" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2128,7 +2199,7 @@ "Fisierul Xiphos pentru abreviatii\n" "de limba lipseste." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2136,7 +2207,7 @@ "Fisierul de abreviatie de limba\n" "din Xiphos nu poate fi deschis." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2144,7 +2215,7 @@ "Xiphos nu poate aloca spatiu\n" "pentru abreviatiile de limba." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2153,19 +2224,19 @@ "fisierul abreviat de limbaj." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "Nici o potrivire de limba pentru" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Numele de carti si meniurile nu pot fi translatate" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2173,7 +2244,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2181,11 +2252,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Devotionalul zilnic a fost solicitat dar nu este nici unu instalat." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2199,89 +2270,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Curata Istoric" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Lista Verset" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL negasit:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nu a putut executa %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Eroare vizualizator:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Arata %s in fereastra principala" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Documentul nu s-a creat cu succes. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Ce trebuie sa fac pentru a fi mantuit?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Fapte 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romani 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Ce este Evanghelia?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Cor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Documentul nu s-a analizat cu succes. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "document gol \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "tip gresit, nodul radacina != InsemneSword\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "tip gresit, nod radacina != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2290,7 +2366,7 @@ "\n" msgstr "Capitol" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2299,101 +2375,101 @@ "\n" msgstr "Capitol" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Vechiul Testament" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Noul Testament" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Apoc" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Mostra de Lista Module" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "tip gresit, nod radacina != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2407,13 +2483,13 @@ msgstr "Dialog de Insemnari" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Creaza un folder nou" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Folder Nou" @@ -2422,7 +2498,7 @@ msgstr "Nou ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Anulare Insemnare" @@ -2435,22 +2511,22 @@ msgstr "Eticheteaza Intrare" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Verset:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Intrare Verset" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Intrare Modul" @@ -2458,6 +2534,10 @@ msgid "Bookmark Folder Treeview" msgstr "Folder de Insemne in forma de arbore" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Inserare Link" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2513,6 +2593,12 @@ msgid "_Delete Personal Comment" msgstr "_Sterge Comentariu Personal" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Fisier" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Salveaza nota curenta" @@ -2521,6 +2607,14 @@ msgid "_Save (Personal Comment)" msgstr "_Salveaza (Comentariu Personal)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Pre_vizualizare tiparire" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "Ti_parire..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "I_esire" @@ -2529,6 +2623,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Salvare" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Tipareste acest document" @@ -2566,7 +2665,7 @@ msgstr "Document Nou" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copiaza/Exporta Pasaj" @@ -2603,7 +2702,7 @@ msgstr "Exporta toata cartea" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Carte" @@ -2718,8 +2817,8 @@ msgid "Open about dialog" msgstr "Deschide intr-un dialog" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2762,13 +2861,17 @@ msgid "Delete selection" msgstr "Sterge rangul selectat" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Sterge" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Elimina obiectul selectat" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Sterge Obiect" @@ -2943,6 +3046,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nou" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3077,122 +3184,86 @@ msgid "_Edit" msgstr "_Editare" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Ajutor" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Sterge lista?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Lista Verset" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Marcare/Nemarcare Verset" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Marcare" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Nemarcare" @@ -3265,88 +3336,96 @@ msgstr "Sterge indexul de cautare pentru aceste module?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Continua" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Manager Module" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "ATENTIE: Daca traiesti intr-o tara persecutata foloseste cu atentie." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Adauga si Elimina Surse" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Surse locale curente" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Surse Indepartate Curente" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Sterge o sursa indepartata" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Sursa Instalare" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Local" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Indepartat" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Destinatie Instalare" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Zona personala, doar pentru folosul tau:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Dir Home" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Zona de sistem, pentru toti userii:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword dir sistem" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3354,10 +3433,14 @@ "Atentie: Daca traiesti intr-o tara persecutate si nu vrei sa risti " "detectarea NU ar trebui sa folosest caracteristica de instalare indepartata! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Folderul Instalare Local" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Lista derulativa cu istoric" @@ -3366,11 +3449,11 @@ msgid "Choose book to display" msgstr "Alege cartea de afisat" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Buton Selector Carte" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Apocalipsa lui Ioan" @@ -3379,11 +3462,11 @@ msgid "Choose chapter to display" msgstr "Alege cartea de afisat" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Buton Schimbare Capitol" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3539,11 +3622,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Module" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3615,12 +3699,12 @@ msgid "BSP privacy button" msgstr "Buton Radio Verset" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Mantuire" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3652,11 +3736,12 @@ msgid "BSP nav verse list radio button" msgstr "Buton radio lista module" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Nume Lista" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3699,7 +3784,12 @@ msgid "BSP listen none radio button" msgstr "Buton Radio Text Simplu" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Special" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3891,193 +3981,192 @@ msgstr "Activeaza casuta de verificare Liste de Rugaciune" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Numar Verset" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "Arata _Numerele Versetelor" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Marime numar verset" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Casuta de verificare Verset Per Linie" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Descriere" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Arata _Numerele Versetelor" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Marime numar verset" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Directorul implicit combo Caiet de Studiu" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Selecteaza Un Director" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Directorul implicit combo Caiet de Studiu" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Diverse Generale" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Module Fereastra Principala" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Text Biblic" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Schimba Combo Text Biblic" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Schimba Combo Comentariu" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Dictionar" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Schimba Combo Dictionar" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Schimba Combo Carte" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Module" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Curata toate modulele din lista" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Curata Modulele din Butonul Lista" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Elimina modulul selectat din lista" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Sterge Modulul Selectat din Butonul Lista" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Deschide un dialog pentru a selecta modulele de adaugat la lista" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Adauga Module" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Buton de Dialog Deschidere Selectie" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Paralela Module" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Module cu Scop Special" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Devotional Zilnic" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Combo Devotional Zilnic" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Lexicon Ebraic" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Combo Lexicon Ebraic" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Lexicon Grec" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Combo Lexicon Grec" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Dictionar Implicit" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Schimba Combo Dictionar Implicit" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Note Personale" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Schimba Combo Note Personale" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Diverse despre Module" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Selectie Module" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4108,6 +4197,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Cautare Avansata" @@ -4316,11 +4409,11 @@ msgid "Found" msgstr "Gasit" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Fereastra Sumar de Rezultate" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabelul Sumar de Rezultate" @@ -4512,6 +4605,11 @@ msgid "Attribute Search" msgstr "Atribut Cautare" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Selectie Module" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4607,6 +4705,10 @@ msgid "_Module Manager" msgstr "_Manager de Modul" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Vizualizare" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Previzualizare _Devotional Zilnic" @@ -4754,27 +4856,27 @@ msgid "Learn about Xiphos" msgstr "Despre _Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Adnotare Verset" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Deschide Modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Nota" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Deschide in editor" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Verset Per _Linie" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4782,191 +4884,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Variante" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Continut Imagine" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respecta Fetele de Font" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Comentariu pe Capitol" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Text cu D_ublu-Spatiu" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Cauta Selectia" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Foloseste Dictionarul Curent" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Rasfoieste in BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Deschide Acest Modul" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Afiseaza Titlu Carte" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Afiseaza Titlu Capitol" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Redenumeste Com.Pers." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Goleste Com.Pers." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Citeste Selectiunea Tare" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Salveaza aceste rezultate ca o insemnare singura" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Salveza lista ca o insemnare singura" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" "Salveaza aceste rezultate ca o serie de insemnari in propriul lor folder" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Salveaza lista ca o serie de insemnari" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Lista Verset" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Lista derulativa cu istoric" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exporta Lista" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Deschide aceasta insemnare intr-un tab nou" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Deschide in tab-ul curent" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Deschide acest insemn intr-un dialog" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Deschide intr-un dialog" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Adauga folder nou la folderul selectat" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Insereaza o insemnare aici" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Insereaza Insemn" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Editeaza obiectul de insemnare" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Editare obiect" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Sterge obiect" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Extinde toate grupele de Insemne" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Extinde Toate" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Strange toate grupele de Insemne" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Strange toate" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Permite ca obiectele sa fie mutate de la un folder la altu" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Permite Reordonarea" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Incarca Insemnele din Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Insereaza Insemn" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Elimina folder si salveaza-l" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Exporta Folder" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Deschide modulul selectate intr-un tab nou" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -4974,80 +5085,80 @@ "Deschide modulul selectat intr-o\n" "\tfereastra ['dialog'] separata" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Deschide intr-o fereastra separata" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Creaza o simpla lista noua de rugaciune" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Simplu" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Creaza o lista noua de rugaciune pe subiecte" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Subiect" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Creaza un jurnal lunar nou" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Lunar" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Creaza un jurnal zilnic nou" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Zilnic" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Creaza un topic subliniat nou" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Subliniat" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Deschide intr-o fereastra separata" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Adauga un sub-obiect" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Adauga Sub-Obiect" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Adauga un obiect" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Adauga obiect" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Elimina acest obiect" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Editeaza acest obiect" @@ -5059,6 +5170,91 @@ msgid "Study the Bible" msgstr "Studiaza Biblia" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Intregul modul" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s a esuat" + +#~ msgid "Page %d of %d" +#~ msgstr "Pagina %d din %d" + +#~ msgid "Save As" +#~ msgstr "Salveaza ca" + +#~ msgid "HTML Output" +#~ msgstr "Rezultat HTML" + +#~ msgid "HTML Source" +#~ msgstr "Sursa HTML" + +#~ msgid "Plain Source" +#~ msgstr "Sursa Simpla" + +#~ msgid "_Quit" +#~ msgstr "_Renunta" + +#~ msgid "_Open" +#~ msgstr "_Deschide" + +#~ msgid "_Save" +#~ msgstr "_Salveaza" + +#~ msgid "Save _As..." +#~ msgstr "Salveaza _Ca..." + +#~ msgid "Open new document" +#~ msgstr "Deschide document nou" + +#~ msgid "Delete current note" +#~ msgstr "Sterge nota curenta" + +#~ msgid "HTML _Output" +#~ msgstr "_Rezultat HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_Sursa HTML" + +#~ msgid "_Plain Source" +#~ msgstr "_Sursa Simpla" + +#~ msgid "Unlock " +#~ msgstr "Deschide " + +#~ msgid "Preparing to print" +#~ msgstr "Pregatire pentru tiparire" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Tiparirea nu este suportate pe aceasta imprimanta" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Imprimanta %s nu suporta tiparirea PostScript." + +#~ msgid "Printing" +#~ msgstr "Tiparire" + +#~ msgid "Waiting to print" +#~ msgstr "Asteapta tiparirea" + +#~ msgid "An error occurred while printing" +#~ msgstr "O eroare a avut loc in timpul tiparirii" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Nu s-a putut tiparii documentu tau: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos nu poate crea .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos nu poate continua." + #~ msgid "Tabs" #~ msgstr "Tab-uri" diff -Nru xiphos-4.0.0+dfsg1/po/ru.po xiphos-4.0.4+dfsg1/po/ru.po --- xiphos-4.0.0+dfsg1/po/ru.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/ru.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-29 22:00+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Russian \n" @@ -20,296 +20,263 @@ "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Конфигурация не найдена" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Вы уверены что хотите удалить заметку для" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Открыть" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Безымянный документ" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Сохранить изменения в документе" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "перед закрытием?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Если вы не сохраните, изменения будут потеряны." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Файл" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Редактор Заметок" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Молитвенный Список/Редактор Журнала" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "О Модуле Sword" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Весь модуль" +msgid "Module name: " +msgstr "Менеджер Модулей" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Опции" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s провалилось" +msgid "Type: " +msgstr "Диапазон" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Стих Дня" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Карты" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Конфигурация не найдена" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Изображения" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Страница %d из %d" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Открыть" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Сохранить Как" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Библия" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Безымянный документ" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Комментарий" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Вы уверены что хотите удалить заметку для" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Словарь" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "Результат в HTML" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "Исходный текст в HTML" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Простой исходный текст" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Книги" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Печать..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Переименовать Комментарий" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "П_редпросмотр Печати" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Дневной журнал" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Выход" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Неизвестно" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Открыть" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Сохранить" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Список Модулей" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Сохранить _Как..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Диапазоны" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Новый" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Открыть новый документ" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Источник Установки" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Удалить" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Окно Модуля" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Удалить текущую заметку" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Формат" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Файл" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Заглавия" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "_Результат в HTML" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_Исходный текст в HTML" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Простой исходный текст" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Вид" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Сноски" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Сохранить" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Параллельные места" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Вставить Связь" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Номера Стронга" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Сохранить изменения в документе" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Морфологические тэги" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "перед закрытием?" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Леммы" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Если вы не сохраните, изменения будут потеряны." +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Слова Христа Красным" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Файл" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Греческие Ударения" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Пункты Гласных Иврита" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Редактор Заметок" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Повествование как в Иврите" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Молитвенный Список/Редактор Журнала" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Разблокировать " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Подготовка к печати" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Печать не поддерживается данным принтером" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Транслитерация" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Принтер %s не поддерживает PostScript." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Печать" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Ожидание печати" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Во время печати произошел сбой" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Сегментация по Морфемам" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Не удалось распечатать документ: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "О Модуле Sword" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Свойство" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Данный модуль не содержит информации о себе." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Опции" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -321,18 +288,20 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Проект SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Перевод программы на русский язык подготовил Константин Маслюк, если вам " "кажется, что-то переведено не так, пишите на kalemas@mail.ru.\n" @@ -340,24 +309,24 @@ "Также мы всегда рады переводам Xiphos на другие языки. Если ты можешь " "сделать перевод, пожалуйста, свяжись с нами по ссылке ниже." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "О Переводе Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Смотри TRANSLATION-HOWTO в исходных файлах Xiphos" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Разработка Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Копирайт 2000-2009 The Xiphos Development Team" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Копирайт 2000-2015 The Xiphos Development Team" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -370,235 +339,235 @@ "SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Закладка" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Введите Название Папки" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Имя Папки" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Папка: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Редактировать пункт закладки" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Редактирование" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Имя Папки: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Имя Закладки: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Стих: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Модуль: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Удалить выбранную папку" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(и все содержимое)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Удалить выбранную закладку?" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Добавить" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Метка: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Результат поиска: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Закладки" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "для:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Введите Шифровой Ключ: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Закрыть без Сохранения" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Закрыть _без Сохранения" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Список Стихов" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Пожалуйста, проверьте копирайт перед экспортом!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Найти" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Введите Слово или Фразу" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Поиск назад" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Найти Следующий" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Выбрать Шрифт Модуля" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Изменить шрифт для" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Модуль" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Текущий шрифт: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Использовать для этого модуля шрифт по-умолчанию" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos сейчас завершит работу из-заошибки \"STRDUP\"." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Пожалуйста сообщите об этой ошибке команде Xiphos с:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos завершит работу из-зи ошибки \"STRING\"." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "В модулях, имеющих Номера Стронга" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Программа для изучения Библии" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Открыть новую вкладку" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Стандартный Вид" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Вид Комментария" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Вид Книги" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Добро пожаловать в Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -618,33 +587,33 @@ "Следовательно, переименовывание личных комментариев\n" "не доступно в окружении Windows." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Переименовать Комментарий" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Выберите Имя Комментария" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Новое Имя" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Имя: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Имена модулей могут состоять только из символов [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos уже известен модуль с таким именем." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -653,7 +622,7 @@ "Не удалось создать новую конфигурацию:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -661,7 +630,7 @@ "Ошибка создания конфигурации:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -751,20 +720,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Удалить эти модули?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Подготовка к удалению" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Удаление" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Удалить" @@ -784,23 +753,23 @@ msgid "Install" msgstr "Установить" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Архивировать эти модули?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Подготовка к архивированию" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Архивация" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Архивировать" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -808,55 +777,59 @@ "Создать базу индексов для быстрого поиска для этих \n" "модулей (может занять несколько минут/модуль):" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Подготовка к индексации" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Индексация" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Индексировать" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Удалить базы индексов для быстрого поиска для этих модулей?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Подготовкка к удаленю индексов" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Удаление индексации" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Удаление" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Данный модуль не содержит информации о себе." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Имя Модуля" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Отметка означает, что модуль уже установлен" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Нажми на отметку, чтобы работать с данным модулем" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Нажми на отметку, чтобы установить/обновить этот модуль" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Установленное" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -864,7 +837,7 @@ "Эта иконка означает, что для данного модуля база индексов ('lucene') уже " "создана. База индексов необходима для быстрого оптимизированного поиска." -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -872,13 +845,13 @@ "Блокирующая иконка означает что этот модуль зашифрован, необходимо заказать " "ключ у владельца" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "О модуле..." -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -886,19 +859,19 @@ "Иконка обновления означает что установленный модуль старее чем доступный: " "необходимо обновить модуль" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Доступно" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Размер" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Описание" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -907,33 +880,33 @@ "`не удалось mkdir %s':\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " архивация за : \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Журналы и списки молитв не могут быть проиндексированы" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s провалилось" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Закончено" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Неизвестно" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -942,7 +915,7 @@ "Репозиторий:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -950,54 +923,44 @@ "Категоризованно по\n" "Типу Модуля" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Библейские Тексты" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Комментарии" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Словари" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Стих Дня" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Книги" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Карты" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Изображения" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1005,95 +968,95 @@ "Категоризованно по\n" "Доступности" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Обновления" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Удаленные" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Молитвенные Списки" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Обновление из удаленного источника" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Удаленный источник не найден" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Настроить" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Тип" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Заголовок" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Источник" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Каталог" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Пользователь" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Пароль" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Источники Модулей" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Добавить/Удалить" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Установки" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Модули" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Установить/Обновить" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Обслуживание" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Пожалуйста Обновите" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Ваш список модулей не обновлен!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1101,7 +1064,7 @@ "Вы удалили вашу последнюю Библию.\n" "Xiphos нужна хотябы одна." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1109,213 +1072,224 @@ "По-прежнему ни одной Библии не установлено.\n" "Без нее Xiphos не может работать." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Стандартные источники были загруженны." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" "Не могу загрузить стандартные источники\n" "с сайта CrossWire." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Удалить выбранный источник" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Настройка Удаленного Источника:" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Заголовок:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Тип:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Хост:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Каталог:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Пользователь (опционально):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Пароль (опционально):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Источник с таким именем уже существует." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Удалить удаленный источник" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Весь модуль" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Перейти наружу, к выделению, состоящему из данного" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Перейти к предыдущему пункту" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Перейти к следующему пункту" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Перейти внутрь, к подвыделению" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Параллель" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Разъединить/Соединить" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Опции Модуля" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Параллельный Вид" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Прочесть Выделение" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Личное" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Выбрать --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Параметры языка вступят в силу после перезапуска." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Настройки" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Общие" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Опции" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Библия" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Шрифты" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Цвет" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Вкладки и Панели" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Специальные" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Очистить Список?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Вы уверены что хотите очистить список модулей?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Удалить Модуль?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Вы уверены, что хотите удалить выбранный модуль?" @@ -1334,20 +1308,20 @@ msgid "found in " msgstr "найдено в " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Последний список модулей не может быть удален" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Удалить Список?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Вы уверены что хотите удалить:" @@ -1367,7 +1341,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1412,7 +1386,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1430,15 +1404,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1446,108 +1420,98 @@ "Это включающий (\"AND\") поиск:\n" "Находит совпадения по всем словам." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "П_родвинутый Поиск" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Поиск по Модулю" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Библия" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Комментарий" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Тип Поиска" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Свободная форма" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Регулярное выражение" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Точная фраза" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Опции Поиска" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Соответствие регистру" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Диапазон Поиска" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Нет Диапазона" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Задать Диапазон" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Последний поиск" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Границы" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Нижняя" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Верхняя" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Открыть в редакторе" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Настройки" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Поиск" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Боковая Панель" @@ -1555,73 +1519,73 @@ msgid "Powered by the SWORD Project" msgstr "Основано на Проекте SWORD" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Пункт Молитвенного Списка" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Новое имя" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Удалить выбранный пункт" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Январь" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Февраль" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Март" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Апрель" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Май" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Июнь" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Июль" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Август" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Сентябрь" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Октябрь" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Ноябрь" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Декабрь" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1632,7 +1596,98 @@ "(или, возможно, изображение не bmp/gif/jpg/png.)\n" "Xiphos не может изменить размер чтобы подогнать окно." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Весь модуль" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Нажми на отметку, чтобы работать с данным модулем" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Доступно" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Спасение" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1641,248 +1696,270 @@ "Непавильно кодированная метка личного примечания:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Глава" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos не понимает более одного аргумента." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Запуск Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Создание Интерфейса" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Запускается Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Загрузка Настроек" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Интерфейс Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Предпросмотр" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Сноска" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Параллельные Места" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Стронги" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Морфология" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Назад к " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Номера Стронга" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Сноски" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Морфологические тэги" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Пункты Гласных Иврита" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Повествование как в Иврите" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Греческие Ударения" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Параллельные места" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Леммы" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Заглавия" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Сегментация по Морфемам" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Слова Христа Красным" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Транслитерация" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Текстовые Варианты" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Основное Чтение" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Побочное Чтение" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Все Чтения" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Транслитерация" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "видовой контекст" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Рост" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Для Роста
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Спасение" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Для спасения
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Здоровье" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Для Здоровья
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Разное" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Разное
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Пункт x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Пункт y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Пункт z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Тема 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Подтема 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Тема 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Подтема 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Тема 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Подтема 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Тема 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Подтема 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Имя нового молитвенного списка или журнала" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Этот молитвенный список готов." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1891,19 +1968,19 @@ "Xiphos не может создать путь модуля:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Базовый молитвенный список. \\par\\par Модуль создан Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "BasicPrayerList" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MyPrayerList" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1911,103 +1988,103 @@ "Люди:
Вова
Саша
Света

Церковь:
сиденье
товарищество
Библии для миссионеров


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Молитвенный список, основанный на темах. \\par\\par Модуль создан Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubjectPrayerList" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Вова
Саша
Света
Ваня
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Духовный Рост" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Миша
Степан
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Света
Ваня
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Месячный молитвенный список. \\par\\par Модуль создан Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonthlyPrayerList" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Дневной журнал. \\par\\par Модуль создан Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Дневной журнал" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Выделеная тема (например, проповедь). \\par\\par Модуль создан Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OutlinedTopic" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Главная Тема А" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Главная Тема А
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Главная Тема Б" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Главная Тема Б
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Главная Тема В" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Главная Тема В
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Пользователькое Примечание" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Результаты поиска %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Удалить диапазон?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Вы уверены, что хотите удалить этот диапазон?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Поиск: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2018,16 +2095,16 @@ "Такого модуля не установлено.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Пожалуйста подгоните список модулей." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Нет базы индексов для модуля %s.%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2035,7 +2112,7 @@ "\n" "Поиск в режиме `Свободная форма'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2043,51 +2120,45 @@ "\n" "Посмотри Мэнеджер Модулей, пункт Обслуживание." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Поиск закончен" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "совпадает" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME не настроена!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos не может создать .xiphos:\n" -"%s\n" -"\n" -"Xiphos не может продолжить." +"Xiphos не может создать путь модуля:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "не может быть создано " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2104,11 +2175,11 @@ "хотя бы, одного модуля Библии,\n" "и заканчивает работу." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Установка модуля Библии выполнена." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2118,11 +2189,11 @@ msgid "verse" msgstr "стих" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "глава" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2130,7 +2201,7 @@ "Файл Xiphos'а для языковых\n" "аббревиатур потерян." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2138,7 +2209,7 @@ "Файл языковых аббревиатур Xiphos'а\n" "не может быть открыт." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2146,7 +2217,7 @@ "Xiphos не может выделить место\n" "для языковых аббревиатур." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2155,19 +2226,19 @@ "файл языковых аббревиатур." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "Не найдено подходящей локали для" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Названия книг и меню могут быть не переведены" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2175,7 +2246,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2183,11 +2254,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Не установлено ни одного модуля необходимого типа." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2201,89 +2272,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Очистить Историю" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Список Стихов" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL не найден:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos не может выполнить %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Ошибка Просмоторщика:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Показать %s в главном окне" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Документ не создан. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Что Я должен делать, чтобы спастись?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Деяния 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Еф 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Римлянам 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Что такое Проповедь Евангелия?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Кор 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Документ не обработан. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "пустой документ \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "не правильный тип, корневой объект != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "неверный тип, root node != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2292,7 +2368,7 @@ "\n" msgstr "Глава" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2301,101 +2377,101 @@ "\n" msgstr "Глава" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Ветхий Завет" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Быт - Мал" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Новый Завет" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Мф - Откр" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Простой Список Модулей" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "неверный тип, root node != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2409,13 +2485,13 @@ msgstr "Диалог Закладок" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Создать новую закладку" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Новая Папка" @@ -2424,7 +2500,7 @@ msgstr "Новый ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Отменить Закладку" @@ -2437,22 +2513,22 @@ msgstr "Отметить Вхождение" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Стих:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Вхождение Стиха" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Модуль:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Вхождение Модуля" @@ -2460,6 +2536,10 @@ msgid "Bookmark Folder Treeview" msgstr "Bookmark Folder Treeview" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Вставить Связь" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2515,6 +2595,12 @@ msgid "_Delete Personal Comment" msgstr "_Удалить Личный Комментарий" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Файл" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Сохранить текущую запись" @@ -2523,6 +2609,14 @@ msgid "_Save (Personal Comment)" msgstr "_Сохранить (Личный Комментарий)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "П_редпросмотр Печати" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Печать..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Выход" @@ -2531,6 +2625,11 @@ msgid "For_mat" msgstr "Для _мат" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Сохранить" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Печатать документ" @@ -2568,7 +2667,7 @@ msgstr "Новый Документ" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Копирование/Экспорт Отрывка" @@ -2605,7 +2704,7 @@ msgstr "Экспортировать книгу целиком" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Книга" @@ -2720,8 +2819,8 @@ msgid "Open about dialog" msgstr "Открыть в диалоге" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2764,13 +2863,17 @@ msgid "Delete selection" msgstr "Удалить выбранный диапазон" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Удалить" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Удалить выбранный пункт" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Удалить Пункт" @@ -2945,6 +3048,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Новый" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3079,122 +3186,86 @@ msgid "_Edit" msgstr "_Инструменты" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Помощь" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Удалить Список?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Список Стихов" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Отметка Стиха" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Отметить" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Снять Отметку" @@ -3273,90 +3344,98 @@ msgstr "Удалить базы индексов для быстрого поиска для этих модулей?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Продолжить" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Менеджер Модулей" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Используйте с осторожностью в странах\n" "преследующих за Слово Божие." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Добавить или Удалить Источники" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Текущий локальный источник:" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Текущий удаленный источник:" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Удалить удаленный источник" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Источник Установки" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Локально" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Удаленно" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Папка Установки" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Личная зона, только для вашего использования:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Домашняя папка" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Системная зона, для всех пользователей:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Системная папка Sword" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3365,10 +3444,14 @@ "не хотите рисковать то, вы НЕ должны использовать возможность удаленной " "установки модулей! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Локальная Папку Установки" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Выпадающий список истории" @@ -3377,11 +3460,11 @@ msgid "Choose book to display" msgstr "Выберите Книгу" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Кнопка Выбора Книги" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Откровение Иоанна Богослова" @@ -3390,11 +3473,11 @@ msgid "Choose chapter to display" msgstr "Выберите Книгу" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Переключить Кнопку Главы" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3550,11 +3633,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Модули" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3626,12 +3710,12 @@ msgid "BSP privacy button" msgstr "Кнопка Выбора Стиха" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Спасение" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3663,11 +3747,12 @@ msgid "BSP nav verse list radio button" msgstr "Переключатель Списка Модулей" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Имя Списка" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3710,7 +3795,12 @@ msgid "BSP listen none radio button" msgstr "Кнопка Выбора Простого Текста" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Специальные" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3902,194 +3992,193 @@ msgstr "Флажок Включения Молитвенных Списков" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Номер Стиха" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "Показать _Номера Стихов" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Размер номеров стиха" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Флажок Использования Стих на Строку" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Описание" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Показать _Номера Стихов" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Размер номеров стиха" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Комбо директории StudyPad по-умолчанию" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Выбрать Директорию" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Комбо директории StudyPad по-умолчанию" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Общее Разное" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Окно Модуля" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Библейский Текст" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Изменить Комбо Библейского Текста" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Изменить Комбо Комментария" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Словарь" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Изменить Комбо Словаря" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Изменить Комбо Книги" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Модули" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Очистить все модули из списка" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Кнопка Очистки Модулей из Списка" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Удалить выбранный модуль из списка" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Кнопка Удаления Выбранного Модуля из Списка" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "Открыть диалог выбора модулей, чтобы добавить из в список" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Добавить Модули" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Кнопка Открытия Диалога Выбора" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Модули Параллельное" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Модули Специального Назначения" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Стих Дня" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Комбо Стих Дня" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Еврейский Лексикон" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Комбо Еврейского Лексикона" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Греческий Лексикон" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Комбо Греческого Лексикона" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Словарь По-умолчанию" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Изменить Комбо Словаря По-умолчанию" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Личные Заметки" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Изменить Комбо Личных Комментариев" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Модули Разное" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Выбор Модуля" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4120,6 +4209,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Продвинутый Поиск" @@ -4328,11 +4421,11 @@ msgid "Found" msgstr "Найдено" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Окно Сводки Результатов" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Таблица Сводки Результатов" @@ -4524,6 +4617,11 @@ msgid "Attribute Search" msgstr "Поиск Свойств" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Выбор Модуля" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4619,6 +4717,10 @@ msgid "_Module Manager" msgstr "_Менеджер Модулей" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Вид" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Предварительноый просмотр Daily Devotion" @@ -4767,28 +4869,28 @@ msgid "Learn about Xiphos" msgstr "_О Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Комментировать Стих" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Открыть Модуль" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Заметка" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Открыть в редакторе" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "Стихов на С_троку" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4796,191 +4898,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Варианты" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Содержимое Изображения" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Сохранять Начертания Шрифтов" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Комментарии по Главам" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" msgstr "Двойной интервал для текста" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Рассмотреть Выбор" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Использовать Текущий Словарь" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Просмотреть в BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Разблокировать Этот Модуль" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Показывать Вступление к Книгам" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Показывать Вступление к Главам" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Переименовать Личные Комментарии" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Слить Личный Комментарий" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Прочесть Выделение" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Сохранить эти результаты как одну закладку" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Сохранить лист как одну закладку" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Сохранить эти результаты как серию закладок в их собственной папке" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Сохранить лист как серию закладок" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Список Стихов" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Выпадающий список истории" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Список экспорта" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Открыть эту закладку в новой вкладке" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Открыть в новой вкладке" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Открыть эту закладку в новом диалоге" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Открыть в диалоге" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Добавить новую папку" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Вставить новую закладку" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Вставить Закладку" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Редактировать пункт закладки" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Редактировать" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Удалить пункт" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Развернуть все группы Закладок" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Развернуть Все" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Свернуть все группы Закладок" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Свернуть Все" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Можно перемещать пункты из одной папки в другую" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Позволять Изменение Порядка" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Загрузить Закладки из Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Вставить Закладку" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Удалить папку и сохранить ее" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Папка для экспорта" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Открыть выбранный модуль в новой вкладке" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -4988,80 +5099,80 @@ "Открыть выбранный модуль в\n" "\tотдельном ['dialog'] окне" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Открыть в отдельном окне" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Создать простой молитвенный список" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Простой" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Создать новый предметный молитвенный список" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Предмет" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Создать новый месячный журнал" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Ежемесячно" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Создать новый дневной журнал" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Ежедневно" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Создать новую тему" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Тематический" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Открыть в отдельном окне" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Добавить подпункт" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Добавить Подпункт" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Добавить пункт" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Добавьте материал" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Удалить этот пункт" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Изменить этот пункт" @@ -5073,6 +5184,91 @@ msgid "Study the Bible" msgstr "Изучать Библию" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Весь модуль" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s провалилось" + +#~ msgid "Page %d of %d" +#~ msgstr "Страница %d из %d" + +#~ msgid "Save As" +#~ msgstr "Сохранить Как" + +#~ msgid "HTML Output" +#~ msgstr "Результат в HTML" + +#~ msgid "HTML Source" +#~ msgstr "Исходный текст в HTML" + +#~ msgid "Plain Source" +#~ msgstr "Простой исходный текст" + +#~ msgid "_Quit" +#~ msgstr "_Выход" + +#~ msgid "_Open" +#~ msgstr "_Открыть" + +#~ msgid "_Save" +#~ msgstr "_Сохранить" + +#~ msgid "Save _As..." +#~ msgstr "Сохранить _Как..." + +#~ msgid "Open new document" +#~ msgstr "Открыть новый документ" + +#~ msgid "Delete current note" +#~ msgstr "Удалить текущую заметку" + +#~ msgid "HTML _Output" +#~ msgstr "_Результат в HTML" + +#~ msgid "_HTML Source" +#~ msgstr "_Исходный текст в HTML" + +#~ msgid "_Plain Source" +#~ msgstr "_Простой исходный текст" + +#~ msgid "Unlock " +#~ msgstr "Разблокировать " + +#~ msgid "Preparing to print" +#~ msgstr "Подготовка к печати" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Печать не поддерживается данным принтером" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Принтер %s не поддерживает PostScript." + +#~ msgid "Printing" +#~ msgstr "Печать" + +#~ msgid "Waiting to print" +#~ msgstr "Ожидание печати" + +#~ msgid "An error occurred while printing" +#~ msgstr "Во время печати произошел сбой" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Не удалось распечатать документ: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos не может создать .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos не может продолжить." + #~ msgid "Tabs" #~ msgstr "Вкладки" diff -Nru xiphos-4.0.0+dfsg1/po/sk.po xiphos-4.0.4+dfsg1/po/sk.po --- xiphos-4.0.0+dfsg1/po/sk.po 2014-12-23 21:53:36.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/sk.po 2015-06-16 17:44:26.000000000 +0000 @@ -1,17 +1,16 @@ # translation of sk.po to Slovak # Slovak translation for Xiphos -# Copyright (C) 2001 Zdenko Podobný +# Copyright (C) 2001-2015 Zdenko Podobný # # Zdenko Podobný , 2001. -# Zdenko Podobny , 2009, 2014. +# Zdenko Podobny , 2009, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: xiphos-3.1.sk.po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-22 17:41+0100\n" -"PO-Revision-Date: 2014-12-23 01:17+0100\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" +"PO-Revision-Date: 2015-01-31 23:13+0100\n" "Last-Translator: Zdenko Podobny \n" -"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,92 +19,6 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/biblesync/biblesync.cc:130 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:176 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:371 -msgid "bad magic" -msgstr "" - -#: ../src/biblesync/biblesync.cc:375 -msgid "bad protocol version" -msgstr "" - -#: ../src/biblesync/biblesync.cc:381 -msgid "bad msg type" -msgstr "" - -#: ../src/biblesync/biblesync.cc:385 -msgid "bad packet count" -msgstr "" - -#: ../src/biblesync/biblesync.cc:389 -msgid "bad packet index" -msgstr "" - -#: ../src/biblesync/biblesync.cc:433 -msgid "bad body format" -msgstr "" - -#: ../src/biblesync/biblesync.cc:447 -msgid "missing required header " -msgstr "" - -#: ../src/biblesync/biblesync.cc:474 -msgid "Spoof stopped: " -msgstr "" - -#: ../src/biblesync/biblesync.cc:505 -msgid "Ignoring echo." -msgstr "" - -#: ../src/biblesync/biblesync.cc:534 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" - -#: ../src/biblesync/biblesync.cc:542 -msgid "Invalid group: " -msgstr "Neplatná skupina" - -#: ../src/biblesync/biblesync.cc:572 -msgid " present at " -msgstr "" - -#: ../src/biblesync/biblesync.cc:574 -msgid " using " -msgstr "" - -#: ../src/biblesync/biblesync.cc:692 -msgid "[no dump ready]" -msgstr "[výpis nie je pripravený]" - -#: ../src/biblesync/biblesync.cc:700 -msgid "select < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:711 -msgid "recvfrom < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:801 -msgid "Transmit failed.\n" -msgstr "Prenos zlyhal.\n" - -#: ../src/biblesync/biblesync.cc:802 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" - #: ../src/backend/sword_main.cc:792 msgid "" "Xiphos failure: \"can't happen\", display_mod: null\n" @@ -113,7 +26,7 @@ "What were you doing when this occurred?" msgstr "" -#: ../src/backend/sword_main.cc:1155 +#: ../src/backend/sword_main.cc:1149 msgid "Configuration not found" msgstr "Konfigurácia nebola nájdená" @@ -121,53 +34,228 @@ msgid "Are you sure you want to delete the note for" msgstr "Ste si istý, že chcete zmazať poznámku pre" -#: ../src/editor/webkit_editor.c:593 ../ui/editor_studypad.xml.h:9 +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 #: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 msgid "Open" msgstr "Otvoriť" -#: ../src/editor/webkit_editor.c:685 +#: ../src/editor/webkit_editor.c:688 msgid "Untitled document" msgstr "Nepomenovaný dokument" -#: ../src/editor/webkit_editor.c:1227 ../src/editor/webkit_editor.c:1270 +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 msgid "Save the changes to document" msgstr "Uložiť zmeny v dokumente" -#: ../src/editor/webkit_editor.c:1228 ../src/editor/webkit_editor.c:1271 +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 msgid "before closing?" msgstr "pred zatvorením?" -#: ../src/editor/webkit_editor.c:1235 ../src/editor/webkit_editor.c:1278 +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 msgid "If you don't save, changes will be permanently lost." msgstr "Ak ich neuložíte, zmeny sa natrvalo stratia." -#: ../src/editor/webkit_editor.c:1269 ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 msgid "File" msgstr "Súbor" -#: ../src/editor/webkit_editor.c:1319 +#: ../src/editor/webkit_editor.c:1255 msgid "StudyPad" msgstr "Poznámkový blok" -#: ../src/editor/webkit_editor.c:1334 +#: ../src/editor/webkit_editor.c:1270 msgid "Note Editor" msgstr "Editor poznámok" -#: ../src/editor/webkit_editor.c:1349 +#: ../src/editor/webkit_editor.c:1287 msgid "Prayer List/Journal Editor" msgstr "Modlitebný zoznam/Editor zápisník" -#: ../src/gnome2/about_modules.c:148 +#: ../src/gnome2/about_modules.c:138 msgid "About Sword Module" msgstr "O Sword module" -#: ../src/gnome2/about_modules.c:358 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "K modulu nie sú dostupné informácie." +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "Zatvoriť" + +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " +msgstr "Názov modulu: " + +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " +msgstr "Verzia: " + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "Nebola nájdená pečiatka verzie" + +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Záber" + +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Denné zamyslenie" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Mapy" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Obrázky" + +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Glosáre" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblia" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Komentár" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Slovník" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Všeobecné knihy" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Premenovať komentár" + +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Dennik" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Neznáme" + +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "Skratka modulu " + +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "Jazyk: " + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "Nie je určené" + +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "Veľkosť inštalácie: " + +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "Sprievodný modul(y):
" + +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "Vlastnosti:" + +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "* Nadpisy" + +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "* Poznámky pod čiarou" + +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "* Krížové referencie" + +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "* Strongové čísla" + +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "* Morfologické značky" + +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "* Lemy" + +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "* Kristove slová červenou farbou" + +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "* Grécke akcenty" + +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "* Body hebrejských samohlások" + +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "* Hebrejské vokalizácia" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "* Varianty čítania" + +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "* Formy prepisu" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "* Vymenovania" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "* Glosáre" + +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "* Segmentácia morfém" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "* Vlastnosti neboli nájdené" + +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "Licencia distribúcie:" + +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "Propagačné " + +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -179,18 +267,20 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "The SWORD Project" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Páči sa vám štúdium Biblie pomocou programu Xiphos? Chceli by ste ho mať vo " "vlastnom jazyku? Môžete ho preložiť!\n" @@ -199,23 +289,23 @@ "schopný prekladať, pozrite si odkaz uvedený nižšie, ako sa pripojiť k našim " "snahám." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "O preklade Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Pozrite si TRANSLATION-HOWTO v zdrojovom kóde Xiphosu" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos vývoj" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Copyright © 2000-2014 Xiphos vývojový Tím" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Copyright © 2000-2015 Xiphos vývojový Tím" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -228,167 +318,167 @@ "The SWORD Project." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:370 -#: ../src/gnome2/bookmarks_menu.c:670 ../src/gnome2/bookmarks_menu.c:769 -#: ../src/gnome2/bookmarks_treeview.c:135 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Záložka" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:771 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Vložiť názov priečinku" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:773 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Názov priečinku" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:774 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Priečinok: " -#: ../src/gnome2/bookmarks_menu.c:208 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Uveďte súbor so záložkami" -#: ../src/gnome2/bookmarks_menu.c:356 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Upraviť" -#: ../src/gnome2/bookmarks_menu.c:373 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Názov priečinku: " -#: ../src/gnome2/bookmarks_menu.c:376 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Názov záložky: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:678 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Verš: " -#: ../src/gnome2/bookmarks_menu.c:380 ../src/gnome2/bookmarks_menu.c:679 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:502 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Odstrániť označený priečinok" -#: ../src/gnome2/bookmarks_menu.c:504 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(a všetko, čo obsahuje)?" -#: ../src/gnome2/bookmarks_menu.c:507 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Odstrániť označenú záložku" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Pridať" -#: ../src/gnome2/bookmarks_menu.c:677 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Menovka: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Výsledky hľadania: %s" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:867 ../src/gnome2/sidebar.c:1508 -#: ../src/gnome2/sidebar.c:1541 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Záložky" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" -msgstr "" +msgstr "Šifrovací kľúč k modulu %s" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "pre:" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Vložte kľúč: " -#: ../src/gnome2/dialog.c:291 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Zavrieť bez uloženia" -#: ../src/gnome2/dialog.c:736 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:872 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Zavrieť _bez uloženia" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1557 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Zoznam veršov" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" -msgstr "" +msgstr "ZoznamVeršov" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" -msgstr "" +msgstr "VýsledkyHľadania" -#: ../src/gnome2/export_dialog.c:324 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Pre exportovaní si prosím preverte autorské práva" -#: ../src/gnome2/find_dialog.c:188 ../src/gnome2/find_dialog.c:367 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Nájsť" -#: ../src/gnome2/find_dialog.c:207 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Vložiť slovo alebo frázu" -#: ../src/gnome2/find_dialog.c:222 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Hľadať smerom odzadu" -#: ../src/gnome2/find_dialog.c:283 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Nájsť ďalší" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Nastaviť písmo pre modul" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Zmeniť písmo pre" -#: ../src/gnome2/font_dialog.c:342 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Aktuálne písmo: " -#: ../src/gnome2/font_dialog.c:378 ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" @@ -397,63 +487,63 @@ msgid "Use the default font for this module" msgstr "Použiť štandardné písmo pre tento modul" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:594 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Modul nemá podporu pre %s." -#: ../src/gnome2/main_window.c:664 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Bez okien." -#: ../src/gnome2/main_window.c:720 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Aktuálna navigácia odoslaná." -#: ../src/gnome2/main_window.c:724 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Nekomunikuje." -#: ../src/gnome2/main_window.c:908 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - aplikácia pre štúdium Biblie" -#: ../src/gnome2/main_window.c:971 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../src/gnome2/main_window.c:1051 ../src/gnome2/sidebar.c:621 -#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Štandardné zobrazenie" -#: ../src/gnome2/main_window.c:1112 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Zobrazenie komentára" -#: ../src/gnome2/main_window.c:1128 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Zobrazenie knihy" -#: ../src/gnome2/main_window.c:1155 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Vitajte v Xiphose" -#: ../src/gnome2/menu_popup.c:1247 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -473,33 +563,33 @@ " Preto v prostredí Windows nie je dostupné\n" "premenovanie osobného komentára." -#: ../src/gnome2/menu_popup.c:1266 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Premenovať komentár" -#: ../src/gnome2/menu_popup.c:1269 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Vyberte názov pre komentár" -#: ../src/gnome2/menu_popup.c:1271 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nový názov" -#: ../src/gnome2/menu_popup.c:1272 ../src/gnome2/treekey-editor.c:141 -#: ../src/gnome2/treekey-editor.c:204 ../src/gnome2/treekey-editor.c:300 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Názov: " -#: ../src/gnome2/menu_popup.c:1282 ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Názvy modulov môžu obsahovať iba znaky [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1289 ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos už poznám modul s takým názvom." -#: ../src/gnome2/menu_popup.c:1330 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -508,7 +598,7 @@ "Neporadilo sa vytvoriť novú konfiguráciu:\n" "%s" -#: ../src/gnome2/menu_popup.c:1339 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -516,9 +606,9 @@ "Chyba vytvorenia konfigurácie:\n" "\n" -#: ../src/gnome2/menu_popup.c:1939 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." -msgstr "" +msgstr "V table nie je modul." #. ***************************************************************************** #. * defines @@ -583,20 +673,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Odstrániť tieto moduly?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Príprava na odstránenie" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Mazanie" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:152 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Odstrániť" @@ -616,23 +706,23 @@ msgid "Install" msgstr "Inštalovať" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Archivovať tieto moduly?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Príprava na archiváciu" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Archivovanie" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Archivovať" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -640,57 +730,61 @@ "Vytvoriť indexy pre rýchle hľadanie pre tieto\n" "moduly (môže to trvať aj niekoľko minút pre jeden modul)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Príprava na indexovanie" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexovanie" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indexovať" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Odstrániť indexy pre rýchle hľadanie pre tieto moduly?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Príprava na zmazanie indexu" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Zmazanie indexu" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Zmazať" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "K modulu nie sú dostupné informácie." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Názov modulu" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Fajka znamená, že modul už bol nainštalovaný" -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Pre prácu na tomto module kliknite na rámček" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" "Kliknite na rámček, ak chcete označiť tento modul na inštalovanie/" "aktualizovanie" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Nainštalovaný" -#: ../src/gnome2/mod_mgr.c:628 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -698,7 +792,7 @@ "Ikona indexu znamená, že ste vytvorili optimalizovaný ('lucene') index pre " "tento modul pre rýchle hľadanie (Pozrite si časť Údržba)" -#: ../src/gnome2/mod_mgr.c:646 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -706,13 +800,13 @@ "Ikona zo zámkom znamená, že tento modul je zašifrovaný, a vyžaduje si, aby " "ste si kúpili kľúč na odomknutie od vlastníka obsahu." -#: ../src/gnome2/mod_mgr.c:663 ../src/main/biblesync_glue.cc:629 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 #: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Informácie" -#: ../src/gnome2/mod_mgr.c:689 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -720,19 +814,19 @@ "Ikona aktualizácie znamená, že nainštalovaný modul je starší ako je aktuálna " "dostupná verzia. Modul by ste mali zaktualizovať." -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Dostupné" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Veľkosť" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Popis" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -741,33 +835,33 @@ "`mkdir %s' zlyhalo:\n" "%s." -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" -msgstr "" +msgstr " archivované v: \n" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Zápisníky a modlitebné zoznamy nie je možné indexovať." -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s zlyhalo" -#: ../src/gnome2/mod_mgr.c:1000 ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Dokončené" -#: ../src/gnome2/mod_mgr.c:1168 ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Neznáme" -#: ../src/gnome2/mod_mgr.c:1496 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -776,7 +870,7 @@ "Úložisko:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -784,54 +878,44 @@ "Kategorizované podľa\n" "typu modulu" -#: ../src/gnome2/mod_mgr.c:1513 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Biblické texty" -#: ../src/gnome2/mod_mgr.c:1517 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Komentáre" -#: ../src/gnome2/mod_mgr.c:1521 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Slovníky" -#: ../src/gnome2/mod_mgr.c:1525 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Glosáre" -#: ../src/gnome2/mod_mgr.c:1529 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Denné zamyslenia" -#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Všeobecné knihy" -#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "Mapy" - -#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "Obrázky" - -#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kultické/Neortodoxné" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -839,57 +923,57 @@ "Kategorizované podľa\n" "dostupnosti" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Aktualizácie" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Nenainštalované" -#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/sidebar.c:637 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Modlitebný zoznam/Zápisník" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Obnovovanie vzdialeného zdroja" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Vzdialený zdroj nebol nájdený" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurácia" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Typ" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Titulok" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Zdroj" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Priečinok" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Používateľ" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Heslo" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" @@ -901,12 +985,12 @@ msgid "Add/Remove" msgstr "Pridať/Odstrániť" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Vybrať" -#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2067 -#: ../src/gnome2/sidebar.c:1526 ../src/gnome2/sidebar.c:1565 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduly" @@ -914,19 +998,20 @@ msgid "Install/Update" msgstr "Inštalovať/Aktualizovať" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Údržba" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Prosím obnoviť" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Váš zoznam modulov nie je aktuálny!" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -934,7 +1019,7 @@ "Odinštalovali ste svoju poslednú Bibliu.\n" "Xiphos vyžaduje aspoň jednu" -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -942,206 +1027,218 @@ "Žiadna Biblia nie je nainštalovaná.\n" "Xiphos nemôže kvôli tomu pokračovať." -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Štandardné vzdialené zdroje boli načítané." -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Nie je možné načítať štandardné zdroje z CrossWire." -#: ../src/gnome2/mod_mgr.c:2787 ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Odstrániť označený zdroj" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Vložiť vzdialený zdroj" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Titulok:" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Typ:" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Hostiteľ:" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Priečinok:" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Používateľ (voliteľné):" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Heslo (voliteľné):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Zdroj s týmto názvom už existuje." -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Odstrániť vzdialený zdroj" -#: ../src/gnome2/mod_mgr.c:3554 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[bez modulu]" -#: ../src/gnome2/navbar_book.c:371 ../src/gnome2/navbar_book_dialog.c:312 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Ísť von na sekciu, ktorá obsahuje túto položku" -#: ../src/gnome2/navbar_book.c:393 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Ísť na predchádzajúcu položku" -#: ../src/gnome2/navbar_book.c:414 ../src/gnome2/navbar_book_dialog.c:352 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Ísť na nasledujúcu položku" -#: ../src/gnome2/navbar_book.c:436 ../src/gnome2/navbar_book_dialog.c:372 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Ísť dovnútra na prvú podsekciu" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:855 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2074 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralelné" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Pripojiť/Odobrať" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Nastavenia modulov" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:620 -#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:250 -#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Paralelné zobrazenie" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "Prístupové heslo k BibleSync relácií" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Fráza:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Výber modulu zlyhal.\n" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" -msgstr "" +msgstr "Nepovolené" -#: ../src/gnome2/preferences_dialog.c:1021 ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Osobné" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Rečník" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Obecenstvo" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1927 -#: ../src/gnome2/preferences_dialog.c:2404 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Výber --" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Locale bude aplikované po reštarte." -#: ../src/gnome2/preferences_dialog.c:1962 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Nastavenia" -#: ../src/gnome2/preferences_dialog.c:2047 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Všeobecné" -#: ../src/gnome2/preferences_dialog.c:2050 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Možnosti" -#: ../src/gnome2/preferences_dialog.c:2053 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2057 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Písma" -#: ../src/gnome2/preferences_dialog.c:2060 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Farby" -#: ../src/gnome2/preferences_dialog.c:2063 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Veľkosti a tvary" -#: ../src/gnome2/preferences_dialog.c:2077 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Špeciálne" -#: ../src/gnome2/preferences_dialog.c:2786 ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Vyčistiť zoznam?" -#: ../src/gnome2/preferences_dialog.c:2787 ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Ste si istý, že chcete vyčistiť zoznam modulov?" -#: ../src/gnome2/preferences_dialog.c:2838 ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Odstrániť modul?" -#: ../src/gnome2/preferences_dialog.c:2839 ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Ste si istý, že chcete odstrániť zvolený modul?" @@ -1160,20 +1257,20 @@ msgid "found in " msgstr "nájdené v " -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Nový zoznam %s" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Posledný zoznam modulov nemôže byť zmazaný" -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Zmazať zoznam?" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Ste si istý, že chcete zmazať:" @@ -1193,7 +1290,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1238,7 +1335,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1256,15 +1353,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1247 ../src/gnome2/sidebar.c:996 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1272,105 +1369,95 @@ "Toto je inkluzívne (\"AND\") hľadanie:\n" "Nájde výskyty zobrazujúce všetky slová." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Otvoriť pokročilé vyhľadávanie" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Hľadať v module" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "Biblia" - -#: ../src/gnome2/search_sidebar.c:259 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Komentár" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Typ hľadania" -#: ../src/gnome2/search_sidebar.c:287 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Viac slov" -#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulárny výraz" -#: ../src/gnome2/search_sidebar.c:306 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Presná fráza" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Možnosti vyhľadávania" -#: ../src/gnome2/search_sidebar.c:333 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Veľkosť písmen" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Záber hľadania" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Bez rozsahu" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Použiť ohraničenie" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Posledné hľadanie" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Ohraničenie" -#: ../src/gnome2/search_sidebar.c:410 ../src/gnome2/search_sidebar.c:443 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Dolné" -#: ../src/gnome2/search_sidebar.c:422 ../src/gnome2/search_sidebar.c:450 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Horné" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Otvoriť modul v editore?" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:950 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Vložiť odkazy veršov" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:936 msgid "List:" -msgstr "" +msgstr "Zoznam:" -#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1549 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Hľadať" -#: ../src/gnome2/sidebar_dialog.c:164 ../src/gnome2/sidebar_dialog.c:173 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Postranný panel" @@ -1378,73 +1465,73 @@ msgid "Powered by the SWORD Project" msgstr "Využíva The SWORD Project." -#: ../src/gnome2/tabbed_browser.c:359 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:139 ../src/gnome2/treekey-editor.c:202 -#: ../src/gnome2/treekey-editor.c:298 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Modlitebný zoznam/Položka zápisníka" -#: ../src/gnome2/treekey-editor.c:140 ../src/gnome2/treekey-editor.c:203 -#: ../src/gnome2/treekey-editor.c:299 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nový názov" -#: ../src/gnome2/treekey-editor.c:260 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Odstrániť označenú položku" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Január" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Február" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marec" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Apríl" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Máj" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Jún" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Júl" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "August" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Október" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1452,94 +1539,103 @@ "Nie je možné zistiť veľkosť obrázka.\n" "Xiphos nevie zmeniť jeho veľkosť tak, aby sa obrázok zmestil do okna." -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" msgstr "" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" msgstr "" +"Oznámenia o prítomnosti:\n" +"\n" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" msgstr "" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "Neznámy modul" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." msgstr "" -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " -msgstr "" +msgstr "CHYBA: neznámy indikátor BibleSync: " -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" -msgstr "" +msgstr "Ďalšie indikátory sú:" -#: ../src/main/biblesync_glue.cc:579 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "Zaškrtnite voľbu ak chcete počúvať tohoto rečníka" -#: ../src/main/biblesync_glue.cc:592 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "Dostupný rečníci" -#: ../src/main/biblesync_glue.cc:601 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "" -#: ../src/main/biblesync_glue.cc:611 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" -msgstr "" +msgstr "Posledná navigácia bola priama alebo nepriama" -#: ../src/main/biblesync_glue.cc:620 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "Posledná navigácia" -#: ../src/main/biblesync_glue.cc:639 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" -msgstr "" +msgstr "UUID" -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "IP adresa: " -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " msgstr "" +"\n" +"Aplikácia: " -#: ../src/main/biblesync_glue.cc:663 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " msgstr "" +"\n" +"Zariadenie: " -#: ../src/main/biblesync_glue.cc:664 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " msgstr "" +"\n" +"UUID: " -#: ../src/main/display.cc:88 +#: ../src/main/display.cc:89 msgid "" "

This module has no content at this point.
" msgstr "" +"

Tento module nemá obsah v tomto bode.
" -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1548,261 +1644,268 @@ "Nesprávne kódovaná značka osobného komentára:\n" "'%s'" -#: ../src/main/display.cc:1110 ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapitola" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos nerozozná viac ako jeden argument." -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Inicializujem HTML" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Vytváram rozhranie" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Spúšťam Sword" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Načítavam nastavenia" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Zobrazujem Xiphos" -#: ../src/main/module_dialogs.cc:188 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Náhľad" -#: ../src/main/module_dialogs.cc:243 ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Poznámka pod čiarou" -#: ../src/main/module_dialogs.cc:249 ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Krížová referencia" -#: ../src/main/module_dialogs.cc:255 ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongové čísla" -#: ../src/main/module_dialogs.cc:261 ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 ../src/main/module_dialogs.cc:386 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfológia" -#: ../src/main/module_dialogs.cc:1012 ../src/main/url.cc:529 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Späť k " #: ../src/main/parallel_view.cc:61 msgid "Unknown parallel module: " -msgstr "" +msgstr "Neznámy paralelný modul: " #: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongové čísla" -#: ../src/main/parallel_view.cc:410 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Poznámky pod čiarou" -#: ../src/main/parallel_view.cc:420 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologické značky" -#: ../src/main/parallel_view.cc:430 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Body hebrejských samohlások" -#: ../src/main/parallel_view.cc:440 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrejské vokalizácia" -#: ../src/main/parallel_view.cc:450 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Grécke akcenty" -#: ../src/main/parallel_view.cc:460 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Krížové referencie" -#: ../src/main/parallel_view.cc:470 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemy" -#: ../src/main/parallel_view.cc:480 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Nadpisy" -#: ../src/main/parallel_view.cc:490 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Segmentácia morfém" -#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Kristove slová červenou farbou" -#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Prepis" -#: ../src/main/parallel_view.cc:524 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Textové varianty" -#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Prvoradé čítanie" -#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Pomocné čítanie" -#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Všetky čítania" -#: ../src/main/parallel_view.cc:560 ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 msgid "Transliterated Forms" msgstr "Formy prepisu" -#: ../src/main/parallel_view.cc:570 ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 msgid "Enumerations" -msgstr "" +msgstr "Vymenovania" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "Glosáre" #: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "zobraziť kontext" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Rast" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Pre rast
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Spasenie" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Pre spasenie
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Zdravie" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Pre zdravie
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Rôzne" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Rôzne
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Bod x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Bod y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Bod z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Vedľajšia téma 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Podtéma 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Vedľajšia téma 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Podtéma 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Vedľajšia téma 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Podtéma 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Vedľajšia téma 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Podtéma 4
" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Názov pre nový modlitebný zoznam alebo zápisník" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos už nášiel taký modlitebný zoznam." -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1811,128 +1914,127 @@ "Xiphos nemôže vytvoriť cestu pre moduly:\n" "%s" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" "Základný modlitebný zoznam. \\par\\par Modul vytvorený aplikáciou Xiphos." -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "ZakladnyModlitebnyZoznam" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MojModlitebnyZoznam" -#: ../src/main/prayerlists.cc:335 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -"Ľudia:
Robo
Samo
Zuzka

Zbor:
lavice
spoločenstvo
Biblie pre misionárov


" +"Ľudia:
Robo
Samo
Zuzka

Zbor:
lavice
spoločenstvo
Biblie pre misionárov


" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Modlitebný zoznam založený na predmetoch. \\par \\par Modul vytvorený v " "aplikácií Xiphos." -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "PredmetModlitieb" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Robo
Samo
Zuzka
Ján
" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Duchovný rast" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mišo
Števo
" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Zuzka
Ján
" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" "Mesačný modlitebný zoznam. \\par\\par Modul vytvorený v aplikácií Xiphos." -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MesacnyModlitebnyZoznam" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Denník. \\par\\par Modul vytvorený aplikáciou Xiphos." -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Dennik" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -"Osnova témy (napr. kázeň). \\par\\par Moduly vytvorený aplikáciou " -"Xiphos." +"Osnova témy (napr. kázeň). \\par\\par Moduly vytvorený aplikáciou Xiphos." -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OsnovaTémy" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Hlavná téma A" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Hlavná téma A
" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Hlavná téma B" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Hlavná téma B
" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Hlavná téma C" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Hlavná téma C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Používateľov komentár" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Výsledky hľadania %s: %s" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Odstrániť rozsah?" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Ste si istý, že chcete zmazať tento rozsah?" -#: ../src/main/search_dialog.cc:645 ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Prehľadávať: " -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1943,16 +2045,16 @@ "Taký modul nie je nainštalovaný.\n" "%s" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Upravte prosím zoznam modulov." -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Neexistuje index rýchleho hľadania pre %s.%s%s" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -1960,7 +2062,7 @@ "\n" "Hľadanie v module je teraz 'viacslovné'." -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -1968,19 +2070,19 @@ "\n" "Pozrite Správcu modulov, časť Údržba." -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Hľadanie skončilo" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "výsledky" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." -msgstr "" +msgstr "Nie je dostupný modul s komentármi." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME nie je nastavené!" @@ -1989,12 +2091,12 @@ msgid "Xiphos can not create directory " msgstr "Xiphos nemôže vytvoriť priečinok " -#: ../src/main/settings.c:135 ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "nemôžem vytvoriť " -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2004,7 +2106,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2020,25 +2122,25 @@ "Xiphos nemôže pokračovať,\n" "a preto sa ukončí." -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Inštalácia Biblie bola dokončená." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" msgstr "" -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "verš" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "kapitola" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2046,7 +2148,7 @@ "Chýba súbor jazykových\n" "skratiek pre Xiphos." -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2054,7 +2156,7 @@ "Nie je možné otvoriť Xiphos\n" "súbor so skratkami jazykov." -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2062,7 +2164,7 @@ "Xiphos nemôže alokovať miesto\n" "Pre jazykové skratky." -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2071,7 +2173,7 @@ "súbor s jazykovými skratkami." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2080,11 +2182,11 @@ "Nebolo nájdete vhodné locale pre `%s'.\n" "%s" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1052 ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2092,19 +2194,23 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1056 ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" "The first will open in the main window\n" "and others in separate windows." msgstr "" +"\n" +"\n" +"Prvý bude otvorený v hlavnom okne\n" +"a ostatné v samostatných oknách." -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Požaduje sa Denné zamyslenie, ale žiadne nebolo nainštalované." -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2118,93 +2224,93 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Zmazať históriu" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "História ➛ Zoznam veršov" -#: ../src/main/url.cc:103 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL nebola nájdená:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos nemôže spustiť %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Chyba prehliadača:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Zobraziť %s v hlavnom okne" -#: ../src/main/xml.c:86 ../src/main/xml.c:478 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokument nebol úspešne vytvorený. \n" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Čo musím robiť, aby som bol spasený?" -#: ../src/main/xml.c:98 ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Skutky 16:31" -#: ../src/main/xml.c:103 ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:108 ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Rimanom 1:16" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Čo je evanjelium?" -#: ../src/main/xml.c:114 ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:270 ../src/main/xml.c:416 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokument nebol úspešne spracovaný. \n" -#: ../src/main/xml.c:276 ../src/main/xml.c:422 ../src/main/xml.c:444 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "prázdny dokument \n" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "zlý typ, koreňový uzol != SwordBookmarks\n" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "zlý typ, koreňový uzol != Copy_Export\n" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Kapitola %d

" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Kapitola %d

" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2217,7 +2323,7 @@ "Kapitola %d\n" "\n" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2230,12 +2336,12 @@ "Kapitola %d\n" "\n" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Kapitola %d

" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2244,82 +2350,82 @@ "%s: %s Kapitola %d\n" "\n" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:529 ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Starý Zákon" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nový Zákon" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Zjv" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Ukážka zoznamu modulov" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "zlý typ, koreňový uzol != %s\n" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2328,9 +2434,9 @@ "Uloženie nastavení zlyhalo! stat %d, veľkosť %d\n" "%s" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." -msgstr "" +msgstr "Pokus o vrátenie sa k poslednej uloženej verzií." #: ../ui/bookmarks.glade.h:1 ../ui/bookmarks.gtkbuilder.h:1 msgid "Add Bookmark" @@ -2342,13 +2448,13 @@ msgstr "Dialog záložiek" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Vytvoriť nový priečinok" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nový priečinok" @@ -2357,7 +2463,7 @@ msgstr "Nový..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Zrušiť záložku" @@ -2370,22 +2476,22 @@ msgstr "Položka Označenie" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Verš:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Položka verš" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Položka modul" @@ -2522,7 +2628,7 @@ msgstr "Nový dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopírovať/Exportovať pasáž" @@ -2559,7 +2665,7 @@ msgstr "Export celú knihu" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Kniha" @@ -2667,8 +2773,8 @@ msgid "Open about dialog" msgstr "Otvorí dialóg o programe" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Hrubým" @@ -2682,7 +2788,7 @@ #: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 msgid "Copy selection to clipboard" -msgstr "" +msgstr "Skopírovať výber do schránky" #: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 msgid "Cut" @@ -2694,15 +2800,15 @@ #: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 msgid "Decrease indent" -msgstr "" +msgstr "Znížiť odsadenie" #: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 msgid "Decrease" -msgstr "" +msgstr "Znížiť" #: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 msgid "Decrease paragraph indent" -msgstr "" +msgstr "Znížiť odsadenie odseku." #: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 msgid "Delete selection" @@ -2710,14 +2816,14 @@ #: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 msgid "Delete" -msgstr "" +msgstr "Zmazať" #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 msgid "Remove selection" msgstr "Odstrániť označené" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Zmazať položku" @@ -2739,15 +2845,15 @@ #: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 msgid "Increase indent" -msgstr "" +msgstr "Zvýšiť odsadenie" #: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 msgid "Increase" -msgstr "" +msgstr "Zvýšiť" #: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 msgid "Increase paragraph indent" -msgstr "" +msgstr "Zvýšiť odsadenie odseku" #: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 msgid "Insert emoticon" @@ -2755,11 +2861,11 @@ #: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 msgid "Emoticon" -msgstr "" +msgstr "Emoticon" #: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 msgid "Insert an emoticon" -msgstr "" +msgstr "Vložiť emoticon" #: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 msgid "Insert image" @@ -2771,7 +2877,7 @@ #: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 msgid "Insert image at cursor" -msgstr "" +msgstr "Vložiť obrázok v pozícií kurzora" #: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 msgid "Insert link" @@ -2803,11 +2909,11 @@ #: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 msgid "Rule" -msgstr "" +msgstr "Čiara" #: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 msgid "Insert horizontal rule" -msgstr "" +msgstr "Vložiť vodorovnú čiaru" #: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 msgid "Xiphos Link" @@ -2823,59 +2929,59 @@ #: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 msgid "Insert table" -msgstr "" +msgstr "Vložiť tabuľku" #: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 msgid "Table" -msgstr "" +msgstr "Tabuľka" #: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 msgid "Insert a table" -msgstr "" +msgstr "Vložiť tabuľku" #: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 msgid "Italic" -msgstr "" +msgstr "Kurzíva" #: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 msgid "Change selection to italic font" -msgstr "" +msgstr "Pre označené použiť kurzívu" #: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 msgid "Center" -msgstr "" +msgstr "Centrovať" #: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 msgid "Center justify paragraph" -msgstr "" +msgstr "Vycentrovať odsek" #: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 msgid "Full" -msgstr "" +msgstr "Plné" #: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 msgid "full justify" -msgstr "" +msgstr "plné zarovnanie" #: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 msgid "Left" -msgstr "" +msgstr "Vľavo" #: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 msgid "Left justify paragraph" -msgstr "" +msgstr "Vľavo zarovnaný odsek" #: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 msgid "Right" -msgstr "" +msgstr "Vpravo" #: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 msgid "Right justify paragraph" -msgstr "" +msgstr "Vpravo zarovnaný odsek" #: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 msgid "New" -msgstr "" +msgstr "Nový" #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" @@ -2887,11 +2993,11 @@ #: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 msgid "Paste" -msgstr "" +msgstr "Vložiť" #: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 msgid "Paste clipboard at cursor." -msgstr "" +msgstr "Vložiť obsah schránky na pozíciu kurzora." #: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 msgid "Print Document" @@ -2927,19 +3033,19 @@ #: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 msgid "Redo" -msgstr "" +msgstr "Znovu" #: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 msgid "Redo last undo" -msgstr "" +msgstr "Obnoviť poslednú vrátenú operáciu" #: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 msgid "Find and replace" -msgstr "" +msgstr "Hľadať a nahradiť" #: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 msgid "Replace" -msgstr "" +msgstr "Nahradiť" #: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 msgid "Search and replace" @@ -2959,15 +3065,15 @@ #: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 msgid "Strikethrough" -msgstr "" +msgstr "Prečiarknuť" #: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 msgid "Strikethrough selection" -msgstr "" +msgstr "Prečiarknuť výber" #: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 msgid "Underline" -msgstr "" +msgstr "Podčiarknuť" #: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 msgid "Underline selection" @@ -2975,11 +3081,11 @@ #: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 msgid "Undo" -msgstr "" +msgstr "Späť" #: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 msgid "Undo last change" -msgstr "" +msgstr "Vrátiť späť poslednú zmenu" #: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 msgid "Editor" @@ -2995,124 +3101,83 @@ msgstr "_Upraviť" #: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Zobrazenie" - -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Pomocník" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Základný text" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" -msgstr "" +msgstr "Nadpis 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" -msgstr "" +msgstr "Nadpis 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" -msgstr "" +msgstr "Nadpis 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" -msgstr "" +msgstr "Nadpis 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" -msgstr "" +msgstr "Nadpis 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" -msgstr "" +msgstr "Nadpis 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adressa " -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Odrážkový zoznam" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" -msgstr "" +msgstr "Zoznam s rímskymi číslami" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Číslovaný zoznam" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" -msgstr "" +msgstr "Abecedný zoznam" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Nastaví farbu písma pre označený text." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Poznamenať/Zrušiť poznámku" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Poznamenať" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Zrušiť poznámku" @@ -3182,88 +3247,96 @@ msgstr "Odstráni indexy pre rýchle hľadanie pre označené moduly." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Pokračovať" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Správca modulov" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "VAROVANIE: Ak žije v krajine, kde je prenasledovanie, buďte opatrní." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Pridať a odstrániť zdroje" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Aktuálne lokálne zdroje" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Aktuálne vzdialené zdroje" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Odstráni vzdialený inštalačný zdroj." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Inštalačný zdroj" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokálne" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Vzdialené" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Inštalačný cieľ" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Osobná oblasť, iba pre vaše použitie:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Domovský priečinok" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Systémová oblasť, pre všetkých používateľov:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword systémový priečinok" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3271,10 +3344,14 @@ "Varovanie: Ak žije v krajine, kde je prenasledovanie, a nechcete " "riskovať odhalenie, tak by ste nemali použiť možnosť vzdialenej inštalácie! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokálny inštalačný priečinok" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Vysúvací zoznam s históriou" @@ -3283,23 +3360,23 @@ msgid "Choose book to display" msgstr "Vybrať knihu na zobrazenie" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Tlačidlo výberu knihy" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" -msgstr "Zjavenia Jána" +msgstr "Zjavenia Jána" #: ../ui/navbar_versekey.glade.h:5 msgid "Choose chapter to display" msgstr "Vyberte knihu na zobrazenie" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Tlačidlo zmeniť kapitolu" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3449,11 +3526,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "Režim:" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3463,7 +3540,7 @@ #: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." -msgstr "" +msgstr "Nepovoliť BibleSync." #: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 msgid "BSP off radio button" @@ -3519,11 +3596,11 @@ msgid "BSP privacy button" msgstr "" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "Navigovať:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3551,13 +3628,13 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "Počúvať:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." -msgstr "" +msgstr "Xiphos bude počúvať rečníkov podľa tejto voľby." #: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" @@ -3565,7 +3642,7 @@ #: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." -msgstr "" +msgstr "Vyberte rečníka pre nasledovanie." #: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 msgid "BSP listen some radio button" @@ -3589,17 +3666,17 @@ #: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." -msgstr "" +msgstr "Žiadny rečník nebude nasledovný." #: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 msgid "BSP listen none radio button" msgstr "" -#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "Špeciálne:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3632,7 +3709,7 @@ #: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 msgid "Debug" -msgstr "" +msgstr "Ladiť" #: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." @@ -3780,177 +3857,181 @@ msgstr "Voľba pre povolenie Modlitebných zoznamov" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Číslo verša" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Posun čísla verša niekoľkým smermi" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Zobraziť čísla veršov hrubým textom" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Zaškrtávacie pole Čísla veršov hrubým" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Zátvorky" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Zobraziť čísla veršov v zátvorkách" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Zaškrtávacie pole Čísla veršov v zátvorkách" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Horný index" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Zobraziť čísla veršov ako horný index" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Zaškrtávacie pole Čísla veršov ako horný index" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Štandardný priečinok pre poznámkový blok" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Vybrať priečinok" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Roletové menu Štandardný priečinok pre poznámkový blok" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Rôzne všeobecné" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Okno hlavných modulov" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblické texty" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Roletové menu Zmeniť Biblický text" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Roletové menu Zmeniť komentár" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Slovník" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Roletové menu Zmeniť slovník" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Roletové menu Zmeniť knihu" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduly" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Vyčistiť všetky moduly zo zoznamu" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Tlačidlo Vyčistiť moduly zo zoznamu" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Odstrániť označený modul zo zoznamu" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Tlačidlo Vymazať zvolený modul zo zoznamu" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Otvorí dialóg pre výber modulov" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Pridať moduly" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Tlačidlo Otvoriť dialóg výberu" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Paralelné moduly" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Moduly so špeciálnymi cieľmi" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Denné zamyslenie" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Roletové menu Denné zamyslenie" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebrejský lexikón" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Roletové menu Hebrejský Lexikón" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Grécky lexikón" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Roletové menu Grécky Lexikón" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Štandardný slovník" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Roletové menu Zmeniť štandardný slovník" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Osobné poznámky" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Roletové menu Osobné poznámky" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Rôzne moduly" @@ -3982,6 +4063,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Pokročilé hľadanie" @@ -4190,11 +4275,11 @@ msgid "Found" msgstr "Nájdené" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Okno Sumárne výsledky" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabuľka Sumárne výsledky" @@ -4417,7 +4502,7 @@ #: ../ui/xi-export-bookmarks.glade.h:6 msgid "Include Bible text" -msgstr "" +msgstr "Vrátane textu Biblie" #: ../ui/xi-export-bookmarks.glade.h:7 msgid "gtk-cancel" @@ -4483,6 +4568,10 @@ msgid "_Module Manager" msgstr "Správca _modulov" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Zobrazenie" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Náhľad na _denné zamyslenie" @@ -4627,27 +4716,27 @@ msgid "Learn about Xiphos" msgstr "Ďalšie informácie o Xiphose" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Anotovať verš" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Otvoriť modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Poznámka" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Otvoriť v editore" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Verše na samostatných riadkoch" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4655,79 +4744,79 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianty" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Obsah obrázka" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Rešpektovať písma" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Komentár podľa kapitoly" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Dv_ojitá medzera" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Hľadať výber" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Použiť štandardný slovník" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Prezerať v BibleMap.org" -#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Odomknúť tento modul" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Zobraziť nadpis knihy" -#: ../ui/xi-menus.glade.h:94 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Zobraziť nadpis kapitoly" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Premenovať Osobné komentáre" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Exportovať osobné komentáre" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Prečítať nahlas označené" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Uložiť tieto výsledky ako jednu záložku" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Uložiť zoznam ako jednu záložku" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Uložiť tieto výsledky ako sériu záložiek v ich vlastnom priečinku" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Uložiť zoznam ako sériu záložiek" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." @@ -4735,195 +4824,195 @@ "Poskytuje dialóg, kde môžete vložiť riadok odkazy veršov pre naplnenie " "zoznamu veršov." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Zaplniť zoznam veršov" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "Vopred načítať históriu zo zoznamu veršov" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:95 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:96 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Otvoriť túto záložku v novej karte" -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Otvoriť v novej karte" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Otvoriť túto záložku v dialógu" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Otvoriť v dialógu" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Pridať nový priečinok do vybraného priečinku" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Sem vložiť novú záložku" -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Vložiť záložku" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Upraviť položku záložky" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Upraviť položku" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Zmazať položku" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Rozbaliť všetky skupiny záložiek" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Všetko rozbaliť" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Zbaliť všetky skupiny záložiek" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Zbaliť všetko" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Povoliť presun položiek z jedného priečinku do druhého" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Povoliť preusporiadanie" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Načítať iný súbor záložiek (štandardne: z Bibletime)" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importovať záložky" -#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Odstrániť priečinok a uložiť ho" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Otvorí označený modul v novej karte" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Otvoriť v samostatnom okne" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Vytvoriť nový jednoduchý modlitebný zoznam" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Jednoduchý zoznam" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Vytvoriť nový predmet modlitebného zoznamu" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Predmet" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Vytvorí nový mesačný zápisník" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Mesačný denník" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Vytvorí nový denník" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Denník" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Vytvorí novú osnovu témy" -#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Osnova" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Otvoriť v samostatnom okne" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" -msgstr "" +msgstr "Pridať pod-položku" -#: ../ui/xi-menus.glade.h:148 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" -msgstr "" +msgstr "Pridať pod-položku" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Pridať položku" -#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Pridať položku" -#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Odstrániť túto položku" -#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Upraviť túto položku" @@ -4935,6 +5024,15 @@ msgid "Study the Bible" msgstr "Študovať Bibliu" +#~ msgid "Invalid group: " +#~ msgstr "Neplatná skupina" + +#~ msgid "[no dump ready]" +#~ msgstr "[výpis nie je pripravený]" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Prenos zlyhal.\n" + #~ msgid "Page %d of %d" #~ msgstr "Strana %d z %d" diff -Nru xiphos-4.0.0+dfsg1/po/sl.po xiphos-4.0.4+dfsg1/po/sl.po --- xiphos-4.0.0+dfsg1/po/sl.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/sl.po 2015-06-16 17:44:26.000000000 +0000 @@ -1,317 +1,288 @@ # prevod xiphos.po (en_GB) v sl_SI # Copyright (C) 2010 -# Ta datoteka je ditrubiurana pod isto licenco kot Xiphos paket. +# Ta datoteka je distribuirana pod isto licenco kot Xiphos paket. # -# Marjan Šavli , 2010. +# Marjan Šavli , ver 1, 2010, 2015. msgid "" msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" -"PO-Revision-Date: 2010-03-26 08:39+0000\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" +"PO-Revision-Date: 2015-06-04 12:39+0000\n" "Last-Translator: Marjan Šavli \n" -"Language-Team: Slovenščina (Slovene) \n" -"Language: \n" +"Language-Team: Slovenščina (Slovene) \n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"sourceforge.net>\n" "X-Launchpad-Export-Date: 2010-03-27 05:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: SLOVENIA\n" "X-Language: sl_SI\n" "X-Poedit-Language: Slovene\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"Xiphos napaka: \"can't happen\", display_mod: null\n" +"Prosim prijavite. sword_main.cc:set_treekey\n" +"Kaj ste počeli, ko se je to zgodilo?" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Nastavitev ni najdena" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Ali ste prepričani da želite izbrisati zaznamek za" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Odpri" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "Neimenovan dokument" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Spremembe shrani v dokument" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "pred zaprtjem?" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "Če ne shranite, bodo narejene spremembe za vedno izgubljene." -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Datoteka" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Študijski zaznamki" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Urejevalnik opomb" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Molitveni seznam/Urejevalnik dnevnika" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Vizitka Sword modula" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" +msgstr "Zapri" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " -msgstr "" +#: ../src/gnome2/about_modules.c:411 +#, fuzzy +msgid "Module name: " +msgstr "Upravljalec modulov" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:415 #, fuzzy -msgid "[no dump ready]" -msgstr "Celoten modul" +msgid "Version: " +msgstr "Verzija:" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "Ni najti podatka o verziji" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Tip:" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:423 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s spodletelo" +msgid "Daily Devotion" +msgstr "Dnevne posvetitve" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Zemljevidi" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Slike" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Ne najdem nastavitev" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "Besednjak" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "Kult" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Stran %d od %d" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Biblija" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Odpri" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Komentar" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Shrani kot" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Slovar" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "Neimenovan dokument" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Splošna knjiga" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Ali ste prepričani da želite izbrisati zaznamek za" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Oseben komentar" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML izvoz" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML koda" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Navadna koda" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DnevniDnevnik" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "Na_tisni..." +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Neznana vrsta" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Predo_gled tiskanja" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Seznam modulov" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Izhod" - -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Odpri" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Shrani" - -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Shr_ani kot..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Jezik:" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Nov" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "Ni navedeno" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Odpri nov dokument" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Nameščena velikost:" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Izbriši" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Spremljevalni modul/-i" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Izbriši trenutni zaznamek" - -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Datoteka" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Lastnosti:" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML izv_oz" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML koda" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Navadna koda" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "P_ogled" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "* Poglavja" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Shrani" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "* Zaznamki" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Vstavi povezavo" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "* Sklici" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Shrani spremembe dokumenta" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "* Strong-ove številke" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "pred zaprtjem?" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "* Oblikoslovne oznake" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "Če ne shranite bodo narejene spremembe za vedno izgubljene." +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "* Leme (besede s podobnim pomenom)" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Datoteka" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "* Kristusove besede obarvane z rdečo" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Študijski zaznamki" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "* Grški naglasi" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Opomba uredniku" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "* Hebrejski poudarjeni samoglasniki" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Molitveni seznam/Urejevalnik dnevnika" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "* Hebrejske oznake za petje besedila" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Odkleni " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "Priprava na tiskanje" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Na tem tiskalniku tiskanje ni podprto" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "* Bralne različice" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Tiskalnik %s ne podpira PostScript načina tiskanja." +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "* Prepis v druge oblike" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Tiskanje" - -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "Čakanje na tiskanje" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Med tiskanjem je prišlo do napake" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "* Naštevanja" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Vašega dokumenta ni bilo mogoče natisniti: %s" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "* Besednjak" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Vizitka Sword modula" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "* Delitev morfemov" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Modul nima informacij o vizitki." +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "* Ni najti lastnosti" + +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Licenca za razširjanje:" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Podpira:" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -327,48 +298,50 @@ "projekta SWORD omogoča preprosto uporabo in proučevanje Bibličnih besedil, " "komentarjev, leksikonov, slovarjev in drugih knjig. S pomočjo tega ogrodja " "je bilo zgrajenih veliko vmesnikov. Nameščen seznam knjig se lahko deli med " -"vsemi vmesniki ki uporabljajo to ogrodje.\n" +"vsemi vmesniki, ki uporabljajo to ogrodje.\n" "\n" "Knjige je mogoče naložiti iz projekta SWORD." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Projekt SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -"Ali za proučevanje Biblije radi uporabljate Xiphos? Bi radi videli da njegov " -"vmesnik uporablja vaš materin jezik? Vi lahko prevedete Xiphos! \n" +"Ali za proučevanje Biblije radi uporabljate Xiphos? Bi radi videli, da " +"njegov vmesnik uporablja vaš materin jezik? Vi lahko prevedete Xiphos! \n" "\n" -"Vedno veseli pričakujemo prispevke prevodov Xiphosa v druge jezike. Če nam " +"Vedno veselo pričakujemo prispevke prevodov Xiphosa v druge jezike. Če nam " "ga lahko prevedete, prosimo obiščite spodnjo povezavo, navežite stik z nami " "in se priključite našemu trudu." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Vizitka prevoda Xiphos" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" -msgstr "V Xiphos izvorni kodi si poglejte kako narediti prevod" +msgstr "V izvorni kodi Xiphos-a poglejte navodila za prevod" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos razvoj" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Avtorske pravice 2000-2010 Xiphos razvojna skupina" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Avtorske pravice © 2000-2015 Xiphos razvojna skupina" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -377,239 +350,241 @@ msgstr "" "\n" "Podprt s projektom SWORD.\n" -"Radi bi se zahvalili Troyu Griffittsu in vsem ostalim ki so nam dali projekt " -"SWORD." +"Radi bi se zahvalili Troyu Griffittsu in vsem ostalim, ki so nam dali " +"projekt SWORD." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Zaznamek" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Vnesi ime mape" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Ime Mape" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mapa: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" -msgstr "Uredi zaznamek" +msgstr "Določi datoteko zaznamkov" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Uredi" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Ime mape: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Ime zaznamka: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vrstica: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Odstrani označeno mapo" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(in vso njeno vsebino)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Odstrani označeni zaznamek" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Dodaj" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Oznaka: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Rezultat iskanja: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" +"Odpiranje zaznamka z mnogimi sklici v\n" +"ločeni tabulatorji niso podprti." -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Zaznamki" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" -msgstr "" +msgstr "Kodni ključ za modul %s" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "za:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Vnesi kodni ključ: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Zapri brez shranjevanja" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Zapri _brez shranjevanja" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Seznam vrstic" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "SeznamVerzov" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "RezultatiIskanja" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" -msgstr "Prosim da pred izvažanjem preverite avtorske pravice!" +msgstr "Prosim, da pred izvažanjem preverite avtorske pravice!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Najdi" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Vnesi besedo ali besedno zvezo" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Iskanje nazaj" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Najdi naslednjega" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Nastavi pisavo modula" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Spremeni pisavo za" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Trenutna pisava: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Za ta modul uporabi privzeto pisavo" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." -msgstr "HROŠČ! Xiphos je tik pred tem da se zruši zaradi \"STRDUP\" napake." +msgstr "HROŠČ! Xiphos je tik pred tem, da se zruši zaradi \"STRDUP\" napake." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" -msgstr "Prosimo sporočite to napako Xiphos osebju z:" +msgstr "Prosimo, sporočite to napako Xiphos osebju z:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "HROŠČ! Xiphos je tik pred tem da se zruši zaradi \"STRING\" napake." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." -msgstr "V modulih ki imajo krepke številke" +msgstr "Modul nima podpore za %s." -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." -msgstr "Xiphos:" +msgstr "Xiphos: Nobenih oken." -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." -msgstr "" +msgstr "BibleSync: Trenutna navigacija poslana." -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." -msgstr "" +msgstr "BibleSync: Ne govori." -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Program za proučevanje Biblije" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Odpri nov zavihek" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Običajen pogled" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Pogled komentarjev" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Pogled knjig" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Dobrodošli v program Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -629,33 +604,33 @@ "Zato osebno preimenovanje komentarjev\n" "v okolju Oken ni omogočeno." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Preimenuj komentar" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Izberi ime komentarja" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Novo ime" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Ime: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." -msgstr "Imena Modulov smejo vsebovati samo znake iz nabora [A-Za-z0-9_]." +msgstr "Imena Modulov smejo vsebovati samo znake [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos že pozna modul s tem imenom." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -664,7 +639,7 @@ "Ustvarjenje nove nastavitve je spodletelo:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -672,9 +647,9 @@ "Napaka pri izgradnji nastavitev:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." -msgstr "" +msgstr "V tem oknu ni nobenega modula." #. ***************************************************************************** #. * defines @@ -704,15 +679,15 @@ "Live Chat, or (if no one is responsive in chat) send mail to our users' " "mailing list.\n" msgstr "" -"Dobrodošli v upravljalcu modulov.\n" +"Pregled Upravljalca modulov.\n" "\n" "To je Xiphosov mehanizem za pridobivanje novih in \n" -"osveženih vsebin. Videti je da na tem mestu niste bili še nikoli doslej. " -"Prosimo vas da si vzamete trenutek in si ga ogledate.\n" +"osveženih vsebin. Videti je, da na tem mestu doslej še niste bili. Prosimo " +"vas, da si vzamete trenutek in si ga ogledate.\n" "(To obvestilno okno boste videli samo enkrat.)\n" "\n" "Moduli prihajajo iz različnih skladišč. Viri modulov: Dodaj/" -"Odstrani vam pokažejo katera skladišča so trenutno znana.\n" +"Odstrani vam bodo pokazali katera skladišča so trenutno znana.\n" "\n" "Viri modulov: Izberi je za odločitev od kje naj bi moduli prišli, " "torej iz katerega skladišča naj jih Xiphos pridobi, kot tudi kje v vašem " @@ -724,7 +699,7 @@ "\n" "Moduli: Vzdrževanje je za arhiviranje in ustvarjanje kazala.\n" "\n" -"Za podrobnosti pri upravljanju z moduli si poglejte si peto poglavje našega " +"Za podrobnosti pri upravljanju z moduli si poglejte peto poglavje našega " "priročnika, ali prosite za pomoč preko pogovora v živo, ali (če se nihče ne " "odzove) pošljite e-sporočilo na naš uporabniški poštni seznam.\n" @@ -762,21 +737,51 @@ "Both this step-by-step instruction dialog and the general introduction " "dialog may be closed at any time." msgstr "" +"Dobrodošli v Xiphosu.\n" +"\n" +"Ni nameščenih Bibilij. Da se program požene, Xiphos potrebuje najmanj en " +"Biblijski modul.\n" +"\n" +"Z vašim dovoljenjem, bo Xiphos odprl Upravljalca modulov, tako da boste " +"lahko namestili eno ali več Biblij iz lokalnega vira (CDROM, USB disk) ali " +"preko omrežja družbe CrossWire Bible Society.\n" +"\n" +"Za lokalno namestitev:\n" +"- V Viri modulov: Dodaj/Odstrani, dodaj novo loklano mapo kjer se " +"lahko najdejo moduli.\n" +" (To je kjer obstajata mapi mods.d in modules.)\n" +"- V Viri modulov: Izberi, kliknite \"Lokalen\" gumb, in iz padajočega " +"seznama izberite vašo mapo.\n" +"\n" +"Za mrežno namestitec iz CrossWire:\n" +"- V Viri modulov: Izberi, kliknite \"Oddaljen\" gumb in iz padajočega " +"seznama izberite CrossWire.\n" +"- Kliknite na gumb \"Osveži\", ki se pojavi na dnu okna.\n" +"\n" +"V vsakem primeru:\n" +"- V Moduli: Namesti/Osveži, izberite Biblije, ki jih želite.\n" +"- Kliknite \"Namesti\".\n" +"- Ko ste zaključili, zaprite Upravljalec modulov.\n" +"\n" +"Opozorilo: Če živite v državi, kjer kristjane preganjajo, to " +"uporabite s previdnostjo.\n" +"\n" +"Naj Xiphos odpre Upravljalec modulov, tako da boste lahko namestili Biblijo?" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Odstranim te module?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Priprava na odstranitev" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Odstranitev" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Odstrani" @@ -796,23 +801,23 @@ msgid "Install" msgstr "Namesti" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arhiviram te module?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Priprava na arhiviranje" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arhiviranje" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arhiv" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -821,97 +826,101 @@ "s hitrim iskanjem (lahko zahteva nekaj\n" "minut na modul)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Priprava na izgradnjo kazala" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Poteka izgradnja kazala" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Kazalo" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Ali za te module izbrišem kazalo s hitrim iskanjem?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Priprava na izbris kazal" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Brisanje kazal" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Brisanje" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Modul nima informacij o vizitki." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Ime modula" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" -msgstr "Kljukica pomeni da je ta modul že nameščen" +msgstr "Kljukica pomeni, da je ta modul že nameščen" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" -msgstr "Za delo s tem modulom kliknite na okvir" +msgstr "Za delo s tem modulom kliknite v kvadratek" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" -msgstr "Kliknite okvir da izberete ta modul za namestitev/posodobitev" +msgstr "Za izbiro tega modula za namestitev/posodobitev, kliknite v kvadratek" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Nameščeno" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -"Ikona kazala pomeni da ste zgradili optimizirano ('sijajno') kazalo za hitro " -"iskanje po modulu (za to funkcijo poglejte Vzdrževanje)" +"Ikona kazala pomeni, da ste zgradili optimizirano ('sijajno') kazalo za " +"hitro iskanje po modulu (za to funkcijo poglejte Vzdrževanje)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -"Ikona zaklenjene ključavnice pomeni da je ta modul kriptiran in zahteva " +"Ikona zaklenjene ključavnice pomeni, da je ta modul kriptiran in zahteva " "nakup šifrirnega ključa od lastnika vsebine" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Vizitka" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -"Osvežitvena ikona pomeni da je nameščen modul starejši od novega modula ki " -"je na voljo: Predlagamo osvežitev tega modula" +"Osvežitvena ikona pomeni, da je nameščen modul starejši od novega modula, ki " +"je na voljo: Predlagana je osvežitev tega modula" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Na voljo" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Velikost" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Opis" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -920,33 +929,33 @@ "`mkdir %s' je spodletel:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " arhiviran v: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Dnevnikom in molitvenim seznamom ne moremo zgraditi kazala." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s spodletelo" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Končano" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Neznan" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -955,7 +964,7 @@ "Skladišče:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -963,54 +972,44 @@ "Kategorizirano po\n" "tipu modula" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Biblična besedila" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Komentarji" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Slovarji" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" -msgstr "" +msgstr "Besednjaki" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Dnevne posvetitve" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Splošne knjige" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Zemljevidi" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Slike" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" -msgstr "" +msgstr "Kultne/Neobičajne" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -1018,95 +1017,95 @@ "Kategorizirano po\n" "razpoložljivosti" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Popravki" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Odstranjeno" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Molitveni seznam/Dnevnik" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Osveževanje iz oddaljenega vira" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Oddaljenega vira ni najti" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Nastavitev" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Tip" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Naslov" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Izvor" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Imenik" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Uporabnik" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Geslo" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Viri modulov" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Dodaj/Odstrani" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Izberi" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduli" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Namesti/Osveži" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Vzdrževanje" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Prosimo osvežite" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Vaš seznam modulov ni osvežen!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1114,7 +1113,7 @@ "Odstranili ste vašo zadnjo Biblijo.\n" "Xiphos zahteva najmanj eno." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1122,213 +1121,229 @@ "Še vedno ni nameščene nobene Biblije.\n" "Xiphos ne more nadaljevati brez najmanj ene." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" +"%s zastarele %s.\n" +"Ali želite, da sa pobriše %s?\n" +"Pazite: Tega se ne da razveljaviti." + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "Zastarelih modulov ni najti." + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Običajni oddaljeni viri so bili naloženi." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." -msgstr "Ni bilo mogoče naložiti običajnih virov iz CrossWire." +msgstr "Iz CrossWire ni bilo mogoče naložiti običajnih virov." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Odstrani izbran vir" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Vnesi oddaljen vir" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Naslov:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Tip:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Gostitelj:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Mapa:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Uporabnik (opcijsko):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Geslo (opcijsko):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "Vir s tem imenom že obstaja." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Izbriši oddaljeni vir" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" -msgstr "Celoten modul" +msgstr "[noben modul]" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" -msgstr "Pojdi nazaj na poglavje ki to vsebuje" +msgstr "Pojdi nazaj na poglavje, ki to vsebuje" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Pojdi k prejšnji" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Pojdi k naslednji" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" -msgstr "Pojdi noter k prvemu podpoglavju" +msgstr "Pojdi noter, k prvemu podpoglavju" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" -msgstr "Uskladi pomikanje tega okna z glavnim oknom" +msgstr "Pomik tega okna uskladi z glavnim oknom" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Vzporedno" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Odlepi/Prilepi" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Opcije modulov" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Vzporedni pogled" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" -msgstr "" +msgstr "BibleSync geslo za sejo" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" -msgstr "" +msgstr "Geslo:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" +"Način izbire je spodletel.\n" +"Nastavi \"Odprava napak\" in poskusi ponovno, da vidiš zakaj." -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" -msgstr "Izbrano preberi na glas" +msgstr "Način izbire spodletel.\n" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." -msgstr "" +msgstr "BibleSync: %s (geslo \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" -msgstr "" +msgstr "Onemogočeno" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Osebno" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" -msgstr "" +msgstr "Govornik" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" -msgstr "" +msgstr "Občinstvo" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Izberi --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Sprememba jezika bo imela učinek po ponovnem zagonu programa." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Možnosti" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Splošno" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Opcije" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" -msgstr "Biblija" +msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Pisave" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Barva" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" -msgstr "Zavihki in okvirčki" +msgstr "Velikosti in oblike" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Posebni" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Počistim seznam?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" -msgstr "Ali ste prepričani da želite počistiti seznam modulov?" +msgstr "Ali ste prepričani, da želite počistiti seznam modulov?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Odstranim modul?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" -msgstr "Ali ste prepričani da želite pobrisati označeni modul?" +msgstr "Ali ste prepričani, da želite odstraniti označen modul?" #: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:52 #: ../src/main/search_sidebar.cc:51 @@ -1345,22 +1360,22 @@ msgid "found in " msgstr "najden v " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" -msgstr "" +msgstr "Nov seznam %s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Zadnji seznam modulov naj ne bi bil izbrisan" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Izbrišem seznam?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" -msgstr "Ali ste prepričani da želite izbrisati:" +msgstr "Ali ste prepričani, da želite izbrisati:" #. ***************************************************************************** #. * Name @@ -1378,7 +1393,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1406,6 +1421,33 @@ "\n" "For complete details, search the web for \"lucene search syntax\"." msgstr "" +"Pregled sintaks za optimalna \"lucene\" iskanja\n" +"Išči vrstice, ki vsebujejo...\n" +"\n" +"ljubiti Bog\n" +"\t \"ljubiti\" or \"Bog\"\n" +"\tTo je isto kot iskanje: ljubiti ALI Bog\n" +"\"ljubiti Bog\"\n" +"\tFraza \"ljubiti Bog\"\n" +"ljub*\n" +"\tBeseda, ki se prične z \"ljub\"\n" +"\t(ljubiti OR ljubljen OR ljubezen OR itd...)\n" +"ljubiti AND Bog\n" +"\tBeseda \"ljubiti\" in beseda \"Bog\"\n" +"\t&& se lahko uporabi namesto AND\n" +"+ljubiti Bog\n" +"\tVrstice, ki morajo vsebovati \"ljubiti\" in lahko vsebujejo " +"\"Bog\"\n" +"ljubiti NOT Bog\n" +"\t\"ljubiti\" toda ne \"Bog\"\n" +"(ljubiti Bog) AND Jezus\n" +"\t\"ljubiti\" ali \"Bog\" in \"Jezus\"\n" +"lemma:G2316\n" +"\tIskanje za Strong-ovo grško (\"G\") besedo za število 2316.\n" +"\tPrav tako izberite Strongov prikaz na zavihku Iskanje po lastnostih.\n" +"\n" +"Za podrobnejšo razlago na internetu iščite za \"lucene search syntax\"." #. ***************************************************************************** #. * Name @@ -1423,7 +1465,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1440,125 +1482,129 @@ "* Morphological tags are identified literally, e.g. N-ASF for \"noun, " "accusative singular feminine\" -- see the Robinson module for details." msgstr "" +"Iskanja osnovana na lastnostih\n" +"Iskanja vsebine, ki je napisna izven glavnega besedila. Lastnosti so " +"zaznamki, Strong-ova števila in morfološki znaki.\n" +"\n" +"Zavedajte se, da je večina takšnih iskanj lahko opravljena hitreje s pomočjo " +"optimiziranih \"lucene\" iskanj z uporabo ključnih besed.\n" +"\n" +"Za uporabo Iskanj po lastnostih, morate izbrati primeren gumb na zavihku " +"Iskanje po lastnostih.\n" +"* Po besedilu opomb se išče podobno kot po običajnem besedilu.\n" +"* Strong-ove besede so navedene s predčrko H ali G (Hebrejščina ali Grščina) " +"in številčno besedo, npr. G2316, če iščete \"θεός\" (\"Bog\").\n" +"* Morfološke oznake so identificirane dobesedno, npr. N-ASF for \"noun, " +"accusative singular feminine\" -- za podrobnosti glej Robinson-ov modul." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" -msgstr "" +msgstr "Modul ni niti Biblija, niti komentar" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." -msgstr "" +msgstr "BibleSync ni aktiven za oddajo." -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" "To je vključujoče (\"AND\") iskanje:\n" -"Najde zadetke ki prikazujejo vse besede." +"Najde zadetke, ki prikazujejo vse besede." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" -msgstr "N_apredno iskanje" +msgstr "_Odpri napredno iskanje" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." -msgstr "" +msgstr "Odpri okno z ločenim naprednim iskanjem." -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Iskalni modul" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Biblija" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Komentar" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Iskalni tip" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" -msgstr "Mnogobeseden" +msgstr "Mnogo beseden" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Nadomestni vzorci" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Natančen izraz" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Opcije iskanja" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Razlikovanje velikih in malih črk" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Iskalno področje" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Brez področja" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Uporabi meje" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Zadnje iskanje" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Meje" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Nižji" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Višji" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" -msgstr "Odpri v urejevalniku" +msgstr "Modul odprem v urejevalniku?" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." -msgstr "" +msgstr "Če ne, bo prikazan samo za branje." -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" -msgstr "Možnosti" +msgstr "Prilepi sklice vrstic" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" -msgstr "" +msgstr "Seznam:" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Iskanje" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Stranska vrstica" @@ -1566,84 +1612,188 @@ msgid "Powered by the SWORD Project" msgstr "Podkrepljeno s SWORD projektom" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." -msgstr "" +msgstr "Ne morem kreirati zavihkov." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Molitveni seznam/Dnevnik" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Novo ime" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Odstrani označeno" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januar" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februar" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Marec" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Maj" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Junij" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Julij" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Avgust" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Oktober" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" "Ni mogoče določiti velikost slikovne datoteke.\n" -"Ali je nameščen ImageMagickov 'identify'?\n" -"(Ali je mogoče slika tipa ki je drug kot bmp/gif/jpg/png.)\n" "Xiphos slikam ne more spremeniti velikosti da bi se prilegale oknu." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" +"Neprimeren paket\n" +"\n" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" +"Navzočnost obvestila:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" +"Navigacijski paket:\n" +"\n" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Neznan modul" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" +".\n" +"Posredna navigacija z uporabo seznama vrstic." + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "NAPAKA: neznan BibleSync kazalnik: " + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "Drugi kazalniki so:" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "Za poslušanje tega govornika obklukajte izbiro" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Govorniki na voljo" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "D/I" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "Zadnja navigacija je bila direktna sli posredna" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Zadnja navigacija" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "UUID" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "IP številka: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" +"\n" +"Program: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" +"\n" +"Naprava: " + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" +"\n" +"UUID: " + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" +"

Ta modul na tej točki nima nobene vsebine.
" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1652,259 +1802,281 @@ "Nepravilno kodirana osebna beležka:\n" "'%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Poglavje" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." -msgstr "Xiphos ne razume več kot enega argumenta." +msgstr "Xiphos ne razume več kakor samo en argument." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" -msgstr "Zaganjam Gecko" +msgstr "Zaganjam HTML" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Gradim vmesnik" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Zaganjam Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Nalagam nastavitve" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Prikazujem Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Pregledovalnik" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Zaznamek" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" -msgstr "Kazalka" +msgstr "Sklic" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" -msgstr "Močni" +msgstr "Strong" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Oblikoslovje" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " -msgstr "Nazaj " +msgstr "Nazaj na " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "Neznan vzporeden modul: " + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" -msgstr "Močne številke" +msgstr "Strong-ove številke" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Zaznamki" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Oblikoslovni dodatki" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebrejski poudarjeni samoglasniki" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebrejske oznake za petje besedila" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Grški naglasi" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Napotitve drugam" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lema (sklop vseh oblik neke besede, ki imajo enak pomen)" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Naslovi" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Delitev morfemov" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Kristusove besede obarvane z rdečo" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Prepis v drugo abecedo" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Besedilne različice" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Osnovno branje" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" -msgstr "Drugo branje" +msgstr "Dodatno branje" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Vsa branja" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Prepis obrazcev v drugo abecedo" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "Naštevanja" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "Razlage" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "poglej zvezo" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Rast" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 #, fuzzy msgid "For Growth
" -msgstr "Za rast
" +msgstr "Za rast
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" -msgstr "Odrešitev" +msgstr "Rešitev duš" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 #, fuzzy msgid "For Salvation
" -msgstr "Za odrešitev
" +msgstr "Za rešitev duš
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Zdravje" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 #, fuzzy msgid "For Health
" -msgstr "Za Zdravje
" +msgstr "Za Zdravje
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Mešano" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 #, fuzzy msgid "Miscellaneous
" -msgstr "Mešano
" +msgstr "Mešano
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Določi x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 #, fuzzy msgid "(x)
" -msgstr "(x)
" +msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Določi y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 #, fuzzy msgid "(y)
" -msgstr "(y)
" +msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Določi z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 #, fuzzy msgid "(z)
" -msgstr "(z)
" +msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Podpoglavje 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 #, fuzzy msgid "Subtopic 1
" -msgstr "Podpoglavje 1
" +msgstr "Podpoglavje 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Podpoglavje 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 #, fuzzy msgid "Subtopic 2
" -msgstr "Podpoglavje 2
" +msgstr "Podpoglavje 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Podpoglavje 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 #, fuzzy msgid "Subtopic 3
" -msgstr "Podpoglavje 3
" +msgstr "Podpoglavje 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Podpoglavje 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 #, fuzzy msgid "Subtopic 4
" -msgstr "Podpoglavje 4
" +msgstr "Podpoglavje 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Ime molitvenega seznama ali dnevnika" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos je že našel ta molitveni seznam." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1913,130 +2085,130 @@ "Xiphos ne more ustvariti modulove poti:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Osnoven molitveni seznam. \\par\\par Modul je ustvaril Xiphos." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "OsnovniMolitveniSeznam" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MojMolitveniSeznam" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 #, fuzzy msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -"Ljudje:
Bob
Sam
Sue

Cerkev:
sedež
družba
Biblija za misijonarje


" +"Ljudje:
Bob
Sam
Sue

Cerkev:
sedež
družba
Biblija za misijonarje


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -"Molitveni seznam temelječ po področjih. \\par\\par Modul je ustvaril Xiphos." +"Molitveni seznam temelječ na področjih. \\par\\par Modul je ustvaril Xiphos." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "MolitveniSeznamPoPodročjih" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 #, fuzzy msgid "Bob
Sam
Sue
John
" -msgstr "Bob
Sam
Sue
John
" +msgstr "Bob
Sam
Sue
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Duhovna rast" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 #, fuzzy msgid "Mike
Steve
" -msgstr "Mike
Steve
" +msgstr "Mike
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 #, fuzzy msgid "Sue
John
" -msgstr "Sue
John
" +msgstr "Sue
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "Mesečni molitveni seznam. \\par\\par Modul je ustvaril Xiphos." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MesečniMolitveniSeznam" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Dnevni dnevnik. \\par\\par Module je ustvaril Xiphos." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DnevniDnevnik" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Skica teme (npr. pridiga). \\par\\par Modul je ustvaril Xiphos." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "SkicaTeme" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Glavna tema A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 #, fuzzy msgid "Major Topic A
" -msgstr "Glavna tema A
" +msgstr "Glavna tema A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Glavna tema B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 #, fuzzy msgid "Major Topic B
" -msgstr "Glavna tema B
" +msgstr "Glavna tema B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Glavna tema C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 #, fuzzy msgid "Major Topic C
" -msgstr "Glavna tema C
" +msgstr "Glavna tema C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Uporabniške beležke" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Rezultat iskanja %s: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Pobrišem območje?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Ali ste prepričani da želite pobrisati to območje?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Iskanje: " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2047,16 +2219,16 @@ "Takšnega modula ni nameščenega.\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Prosim prilagodite seznam modulov." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" -msgstr "Ne obstaja kazalo hitrega iskanja za %s.%s%s" +msgstr "Kazalo hitrega iskanja za %s.%s%s ne obstaja" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2064,49 +2236,41 @@ "\n" "Iskanje na tem modulu je sedaj 'večbesedno'." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" "\n" -"Poglejte Upravljalca z modulom, zavihek Vzdrževanje." +"Poglejte Upravljalca z modulom, Moduli, Vzdrževanje." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Iskanje je končano" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "zadetki" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." -msgstr "" +msgstr "Modula s komentarjen ni." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME ni nastavljen!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "" -"Xiphos ne more ustvariti .xiphos:\n" -"%s\n" -"\n" -"Xiphos ne more nadaljevati." +#, fuzzy, c-format +msgid "Xiphos can not create directory " +msgstr "Xiphos ne more ustvariti mape " -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "ne more ustvariti " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2114,12 +2278,12 @@ "Prazna datoteka z nastavitvami -- poskus obnovitve varnostne kopije.\n" "Nekaj podatkov bo mogoče izgubljenih." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" "Prazna datoteka z nastavitvami -- ni varnostne kopije?!? Izguba podatkov!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2130,31 +2294,33 @@ "and will now exit." msgstr "" "Ni nameščenih Bibilij.\n" -"Očitno ste zavrnili da bi kako namestili.\n" +"Očitno ste zavrnili, da bi kako namestili.\n" "\n" -"Brez nobenega Biblijskega modula za prikaz,\n" +"Brez niti enega Biblijskega modula za prikaz,\n" "Xiphos ne more pričeti,\n" "in se bo sedaj končal." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Namestitev Biblijskega modula je končana." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" msgstr "" +"Napaka modula: Neuporabno xref kodiranje.\n" +"Prosim, to napako sporočite z modulom in vrstico" #: ../src/main/sidebar.cc:411 msgid "verse" msgstr "vrstica" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "poglavje" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2162,7 +2328,7 @@ "Manjka Xiphos-ova datoteka\n" "za jezikovne kratice." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2170,7 +2336,7 @@ "Xiphosova datoteka za jezikovne kratice\n" "se ne da odpreti." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2178,7 +2344,7 @@ "Xiphos ne more dodeliti prostora\n" "za jezikovne kratice." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2187,39 +2353,48 @@ "datoteke za jezikovne kratice." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" -msgstr "Ni najti ujemajočega se prizorišča za" +msgstr "" +"Ni najti ujemajočega se jezika za `%s'.\n" +"%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "Imena knjig in menujev ne morejo biti prevedena" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" "%s.\n" "Would you like to open these as well?%s" msgstr "" +"Module %s ima spremljevalne module:\n" +"%s.\n" +"Želite, da tudi te odprem?%s" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" "The first will open in the main window\n" "and others in separate windows." msgstr "" +"\n" +"\n" +"Najprej se bo odprlo glavno okno,\n" +"ostala pa v ločenih oknih." -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." -msgstr "Dnevne posvetitve so bile zahtevane, toda nobenih ni nameščenih." +msgstr "Dnevne posvetitve so bile zahtevane, toda nobene ni nameščene." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2232,195 +2407,220 @@ "\n" "Please enter the key in the dialog." msgstr "" +"Zaklenjen modul.\n" +"\n" +"Odpirate modul, ki zahteva ključ.\n" +"\n" +"Modul je zaklenjen, kar pomeni, da je vsebino kriptiral njen izdajatelj in " +"da morate vnesti pravi ključ, da vsebina lahko postala uporabna. Ta ključ " +"naj bi pridobili na spletni strani , ki je potrdila vaš nakup ali pa vam je " +"bil po nakupu poslan na vaš elektronski naslov.\n" +"\n" +"Prosim, da v okno vnesete ključ." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" -msgstr "Pobriše zgodovino" +msgstr "Pobriši zgodovino" + +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Zgodovina ➛ Seznam vrstic" -#: ../src/main/url.cc:103 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL ni najden:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos ne more izvršiti %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Napaka pregledovalnika:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Prikaži %s v glavnem oknu" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokument ni bil uspešno kreiran. \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Kaj moram storiti da bi bil odrešen?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apd 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Pismo Rimljanom 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Kaj je evangelij?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokument ni uspešno razčlenjen. \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "prazen dokument \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "napačen tip, root vozel != SwordZaznamki\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" -msgstr "napačen tip, root vozel != %s\n" +msgstr "napačen tip, root vozel != Copy_Export\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" -msgstr "" +msgstr "%s
%s
Poglavje %d

" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" -msgstr "" +msgstr "
Poglavje %d

" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" "\n" "Chapter %d\n" "\n" -msgstr "Poglavje" +msgstr "" +"%s\n" +"\n" +"Poglavje %d\n" +"\n" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" "\n" "Chapter %d\n" "\n" -msgstr "Poglavje" +msgstr "" +"\n" +"\n" +"Poglavje %d\n" +"\n" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" -msgstr "" +msgstr "%s%s: %s Poglavje %d

" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" +"%s: %s Poglavje %d\n" +"\n" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" -msgstr "" +msgstr "  [%d]" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" -msgstr "" +msgstr " [%d]" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" -msgstr "" +msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " -msgstr "" +msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" -msgstr "" +msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" -msgstr "" +msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" -msgstr "" +msgstr " %s%s" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" -msgstr "" +msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" -msgstr "" +msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" -msgstr "" +msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Stara Zaveza" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "1Mz - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nova Zaveza" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mt - Raz" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Primer seznama modulov" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "napačen tip, root vozel != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2429,7 +2629,7 @@ "Shranitev nastavitev je spodletela! stat %d, velikost %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Poskus obnovitve v prvotno stanje." @@ -2443,13 +2643,13 @@ msgstr "Pogovorno okno zaznamkov" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Ustvari novo mapo" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Nova mapa" @@ -2458,7 +2658,7 @@ msgstr "Nov ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Prekliči zaznamek" @@ -2471,22 +2671,22 @@ msgstr "Seznam vnosov" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vrstica:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Vnos vrstice" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Vnos modula" @@ -2494,6 +2694,10 @@ msgid "Bookmark Folder Treeview" msgstr "Drevesna struktura map z zaznamki" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Vstavi povezavo" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2502,20 +2706,20 @@ #: ../ui/editor_link_dialog.xml.h:4 #, fuzzy msgid "Link Text" -msgstr "Preprosto besedilo" +msgstr "Poveži besedilo" #: ../ui/editor_link_dialog.xml.h:5 msgid "Link directly" -msgstr "" +msgstr "Poveži direktno" #: ../ui/editor_link_dialog.xml.h:6 msgid "Link via verse list" -msgstr "" +msgstr "Poveži preko seznama vrstic" #: ../ui/editor_link_dialog.xml.h:7 #, fuzzy msgid "Test Link" -msgstr "Vstavi povezavo" +msgstr "Preveri povezavo" #: ../ui/editor_note.xml.h:1 ../ui/editor_studypad.xml.h:1 msgid "Exit the program" @@ -2531,7 +2735,7 @@ #: ../ui/editor_note.xml.h:4 msgid "Preview the note to be printed" -msgstr "Predogled beležke ki naj bi se natisnila" +msgstr "Predogled beležke, ki naj bi se natisnila" #: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:5 msgid "HTML Format switch" @@ -2547,7 +2751,13 @@ #: ../ui/editor_note.xml.h:8 msgid "_Delete Personal Comment" -msgstr "Iz_briši osebni komentar" +msgstr "_Izbriši osebni komentar" + +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Datoteka" #: ../ui/editor_note.xml.h:10 msgid "Save the current note" @@ -2557,6 +2767,14 @@ msgid "_Save (Personal Comment)" msgstr "_Shrani (osebni komentar)" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Predo_gled tiskanja" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "Na_tisni..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "_Konec" @@ -2565,17 +2783,22 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Shrani" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Natisni ta dokument" #: ../ui/editor_studypad.xml.h:4 msgid "Preview the document to be printed" -msgstr "Predogled dokumenta ki naj bi se natisnil" +msgstr "Predogled dokumenta, ki naj bi se natisnil" #: ../ui/editor_studypad.xml.h:8 msgid "Open a file in Studypad" -msgstr "Odpri datoteko v študijski beležnici" +msgstr "Datoteko odpri v študijski beležnici" #: ../ui/editor_studypad.xml.h:10 msgid "Save the current file" @@ -2583,15 +2806,15 @@ #: ../ui/editor_studypad.xml.h:12 msgid "Save the current file as" -msgstr "Shrani trenutno datoteko kot" +msgstr "Trenutno datoteko shrani kot" #: ../ui/editor_studypad.xml.h:13 msgid "Save AS" -msgstr "Shrani kot" +msgstr "Shrani KOT" #: ../ui/editor_studypad.xml.h:14 msgid "Add this file to your bookmarks" -msgstr "To datoteko dodaj k svojim zaznamkom" +msgstr "To datoteko dodaj k tvojim zaznamkom" #: ../ui/editor_studypad.xml.h:16 msgid "Create a new document" @@ -2602,7 +2825,7 @@ msgstr "Nov dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Odlomek kopiraj/izvozi" @@ -2639,13 +2862,13 @@ msgstr "Izvozi celotno knjigo" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Knjiga" #: ../ui/export-dialog.glade.h:12 ../ui/export-dialog.gtkbuilder.h:12 msgid "Book Radio Button" -msgstr "Bližnjica do knjige" +msgstr "Izbira knjige" #: ../ui/export-dialog.glade.h:13 ../ui/export-dialog.gtkbuilder.h:14 msgid "Export complete chapter" @@ -2653,7 +2876,7 @@ #: ../ui/export-dialog.glade.h:15 ../ui/export-dialog.gtkbuilder.h:15 msgid "Chapter Radio Button" -msgstr "Bližnjica do poglavja" +msgstr "Izbira poglavja" #: ../ui/export-dialog.glade.h:16 ../ui/export-dialog.gtkbuilder.h:17 msgid "Export single verse" @@ -2661,7 +2884,7 @@ #: ../ui/export-dialog.glade.h:18 ../ui/export-dialog.gtkbuilder.h:18 msgid "Verse Radio Button" -msgstr "Bližnjica za vrstico" +msgstr "Izbira vrstice" #: ../ui/export-dialog.glade.h:19 ../ui/export-dialog.gtkbuilder.h:19 msgid "Verse range" @@ -2677,7 +2900,7 @@ #: ../ui/export-dialog.glade.h:22 ../ui/export-dialog.gtkbuilder.h:22 msgid "Plain Text Radio Button" -msgstr "Bližnjica do preprostega besedila" +msgstr "Izbira preprostega besedila" #: ../ui/export-dialog.glade.h:23 ../ui/export-dialog.gtkbuilder.h:23 msgid "HTML" @@ -2685,84 +2908,86 @@ #: ../ui/export-dialog.glade.h:24 ../ui/export-dialog.gtkbuilder.h:24 msgid "HTML Radio Button" -msgstr "HTML bližnjica" +msgstr "HTML izbira" #: ../ui/export-dialog.glade.h:25 msgid "" "Indicates whether verse numbers should appear inline in the text for more " "than 1 verse." msgstr "" +"Nakazuja katera vrstica naj se prikaže znotraj besedila za več kakor eno " +"vrstico." #: ../ui/export-dialog.glade.h:26 ../ui/export-dialog.gtkbuilder.h:25 #, fuzzy msgid "_Verse numbers in text" -msgstr "Velikost številke vrstice" +msgstr "Številke _vrstic v besedilu" #: ../ui/export-dialog.glade.h:27 ../ui/export-dialog.gtkbuilder.h:27 #, fuzzy msgid "Verse Number button" -msgstr "Številka vrstice" +msgstr "Izbira vrstice" #: ../ui/export-dialog.glade.h:28 ../ui/export-dialog.gtkbuilder.h:29 msgid "Indicates whether reference is placed first or last." -msgstr "" +msgstr "Nakazuje kateri sklic je postavljen kot prvi ali kot zadnji." #: ../ui/export-dialog.glade.h:29 ../ui/export-dialog.gtkbuilder.h:28 #, fuzzy msgid "Reference last" -msgstr "Vnos virov" +msgstr "Zadnji sklic" #: ../ui/export-dialog.glade.h:30 ../ui/export-dialog.gtkbuilder.h:30 #, fuzzy msgid "Reference last button" -msgstr "Vnos virov" +msgstr "Izbira sklica" #: ../ui/export-dialog.glade.h:31 ../ui/export-dialog.gtkbuilder.h:32 msgid "Indicates whether or not version name is included in reference." -msgstr "" +msgstr "Nakazuja ali naj bo ime verzije vsebovano v sklicu." #: ../ui/export-dialog.glade.h:32 #, fuzzy msgid "Include Version" -msgstr "Sword verzija" +msgstr "Vsebuje verzijo" #: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33 #, fuzzy msgid "Version button" -msgstr "Bližnjica za vrstico" +msgstr "Izbira vrstice" #: ../ui/export-dialog.glade.h:34 msgid "Save Export As" -msgstr "Shrani izvoženo kot" +msgstr "Izvoženo shrani kot" #: ../ui/export-dialog.gtkbuilder.h:26 msgid "Indicates whether verse numbers should appear inline in the text." -msgstr "" +msgstr "Nakazuje ali naj se v besedilu prikažejo številke vrstic." #: ../ui/export-dialog.gtkbuilder.h:31 #, fuzzy msgid "Include version" -msgstr "Sword verzija" +msgstr "Vsebuje verzijo" #: ../ui/gtk2_webedit.ui.h:1 ../ui/gtk_webedit.ui.h:1 #, fuzzy msgid "About Studypad" -msgstr "Odpri študijsko _beležko" +msgstr "Vizitka študijske beležke" #: ../ui/gtk2_webedit.ui.h:3 ../ui/gtk_webedit.ui.h:3 #, fuzzy msgid "Open about dialog" -msgstr "Odpri v pogovornem oknu" +msgstr "Odpri okno vizitke" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" -msgstr "" +msgstr "Krepko" #: ../ui/gtk2_webedit.ui.h:5 ../ui/gtk_webedit.ui.h:5 #, fuzzy msgid "Make selection bold" -msgstr "Izbrano preberi na glas" +msgstr "Izbrano poudari" #: ../ui/gtk2_webedit.ui.h:6 ../ui/gtk_webedit.ui.h:6 msgid "Copy" @@ -2770,33 +2995,37 @@ #: ../ui/gtk2_webedit.ui.h:7 ../ui/gtk_webedit.ui.h:7 msgid "Copy selection to clipboard" -msgstr "" +msgstr "Izbiro kopiraj na odložišče" #: ../ui/gtk2_webedit.ui.h:8 ../ui/gtk_webedit.ui.h:8 msgid "Cut" -msgstr "" +msgstr "Izreži" #: ../ui/gtk2_webedit.ui.h:9 ../ui/gtk_webedit.ui.h:9 #, fuzzy msgid "Cut selection" -msgstr "Izbira modula" +msgstr "Izreži izbiro" #: ../ui/gtk2_webedit.ui.h:10 ../ui/gtk_webedit.ui.h:10 msgid "Decrease indent" -msgstr "" +msgstr "Zmanjšaj zamik" #: ../ui/gtk2_webedit.ui.h:11 ../ui/gtk_webedit.ui.h:11 msgid "Decrease" -msgstr "" +msgstr "Zmanjšaj" #: ../ui/gtk2_webedit.ui.h:12 ../ui/gtk_webedit.ui.h:12 msgid "Decrease paragraph indent" -msgstr "" +msgstr "Zmanjšaj zamik odstavka" #: ../ui/gtk2_webedit.ui.h:13 ../ui/gtk_webedit.ui.h:13 #, fuzzy msgid "Delete selection" -msgstr "Izbris označenega območja" +msgstr "Izbris označenega" + +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Izbriši" #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy @@ -2804,69 +3033,68 @@ msgstr "Odstrani označeno" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" -msgstr "Izbriši Stvar" +msgstr "Izbriši Predmet" #: ../ui/gtk2_webedit.ui.h:17 ../ui/gtk_webedit.ui.h:17 -#, fuzzy msgid "Delete current item" -msgstr "Izbriši trenutni zaznamek" +msgstr "Izbriši trenuten predmet" #: ../ui/gtk2_webedit.ui.h:19 ../ui/gtk_webedit.ui.h:19 #, fuzzy msgid "Search current document" -msgstr "Preišči celoten modul" +msgstr "Išči po trenutnem dokumentu" #: ../ui/gtk2_webedit.ui.h:20 ../ui/gtk_webedit.ui.h:20 #, fuzzy msgid "Font" -msgstr "Pisave" +msgstr "Pisava" #: ../ui/gtk2_webedit.ui.h:21 ../ui/gtk_webedit.ui.h:21 #, fuzzy msgid "Change font" -msgstr "Spremeni pisavo za" +msgstr "Spremeni pisavo" #: ../ui/gtk2_webedit.ui.h:22 ../ui/gtk_webedit.ui.h:22 msgid "Increase indent" -msgstr "" +msgstr "Povečaj zamik" #: ../ui/gtk2_webedit.ui.h:23 ../ui/gtk_webedit.ui.h:23 msgid "Increase" -msgstr "" +msgstr "Povečaj" #: ../ui/gtk2_webedit.ui.h:24 ../ui/gtk_webedit.ui.h:24 msgid "Increase paragraph indent" -msgstr "" +msgstr "Povečaj zamik odstavka" #: ../ui/gtk2_webedit.ui.h:25 ../ui/gtk_webedit.ui.h:25 #, fuzzy msgid "Insert emoticon" -msgstr "Vstavi povezavo" +msgstr "Vstavi smejkota" #: ../ui/gtk2_webedit.ui.h:26 ../ui/gtk_webedit.ui.h:26 msgid "Emoticon" -msgstr "" +msgstr "Smrjko" #: ../ui/gtk2_webedit.ui.h:27 ../ui/gtk_webedit.ui.h:27 #, fuzzy msgid "Insert an emoticon" -msgstr "Vstavi povezavo" +msgstr "Vstavi smejkota" #: ../ui/gtk2_webedit.ui.h:28 ../ui/gtk_webedit.ui.h:28 #, fuzzy msgid "Insert image" -msgstr "Vstavi povezavo" +msgstr "Vstavi sliko" #: ../ui/gtk2_webedit.ui.h:29 ../ui/gtk_webedit.ui.h:29 #, fuzzy msgid "Image" -msgstr "Slike" +msgstr "Slika" #: ../ui/gtk2_webedit.ui.h:30 ../ui/gtk_webedit.ui.h:30 msgid "Insert image at cursor" -msgstr "" +msgstr "Sliko vstavi pri kurzorju" #: ../ui/gtk2_webedit.ui.h:31 ../ui/gtk_webedit.ui.h:31 #, fuzzy @@ -2876,7 +3104,7 @@ #: ../ui/gtk2_webedit.ui.h:32 ../ui/gtk_webedit.ui.h:32 #, fuzzy msgid "Link" -msgstr "Povezave" +msgstr "Povezava" #: ../ui/gtk2_webedit.ui.h:33 ../ui/gtk_webedit.ui.h:33 #, fuzzy @@ -2886,7 +3114,7 @@ #: ../ui/gtk2_webedit.ui.h:34 ../ui/gtk_webedit.ui.h:34 #, fuzzy msgid "Insert Outline" -msgstr "Vstavi povezavo" +msgstr "Vstavi skico" #: ../ui/gtk2_webedit.ui.h:35 ../ui/gtk_webedit.ui.h:35 #, fuzzy @@ -2896,116 +3124,119 @@ #: ../ui/gtk2_webedit.ui.h:36 ../ui/gtk_webedit.ui.h:36 #, fuzzy msgid "Insert outline" -msgstr "Vstavi povezavo" +msgstr "Vstavi skico" #: ../ui/gtk2_webedit.ui.h:37 ../ui/gtk_webedit.ui.h:37 #, fuzzy msgid "Insert rule" -msgstr "Vstavi povezavo" +msgstr "Vstavi pravilo" #: ../ui/gtk2_webedit.ui.h:38 ../ui/gtk_webedit.ui.h:38 msgid "Rule" -msgstr "" +msgstr "Pravilo" #: ../ui/gtk2_webedit.ui.h:39 ../ui/gtk_webedit.ui.h:39 msgid "Insert horizontal rule" -msgstr "" +msgstr "Vstavi vodoravno pravilo" #: ../ui/gtk2_webedit.ui.h:40 ../ui/gtk_webedit.ui.h:40 #, fuzzy msgid "Xiphos Link" -msgstr "Xiphos:" +msgstr "Xiphos povezava" #: ../ui/gtk2_webedit.ui.h:41 ../ui/gtk_webedit.ui.h:41 -#, fuzzy msgid "Xiphos" -msgstr "Xiphos:" +msgstr "Xiphos" #: ../ui/gtk2_webedit.ui.h:42 ../ui/gtk_webedit.ui.h:42 #, fuzzy msgid "Insert a link to a sword module" -msgstr "Namestim te module?" +msgstr "Vstavi povezavo do sword modula" #: ../ui/gtk2_webedit.ui.h:43 ../ui/gtk_webedit.ui.h:43 #, fuzzy msgid "Insert table" -msgstr "Vstavi povezavo" +msgstr "Vstavi tabelo" #: ../ui/gtk2_webedit.ui.h:44 ../ui/gtk_webedit.ui.h:44 msgid "Table" -msgstr "" +msgstr "Tabela" #: ../ui/gtk2_webedit.ui.h:45 ../ui/gtk_webedit.ui.h:45 msgid "Insert a table" -msgstr "" +msgstr "Vstavi tabelo" #: ../ui/gtk2_webedit.ui.h:46 ../ui/gtk_webedit.ui.h:46 msgid "Italic" -msgstr "" +msgstr "Ležeče" #: ../ui/gtk2_webedit.ui.h:47 ../ui/gtk_webedit.ui.h:47 msgid "Change selection to italic font" -msgstr "" +msgstr "Izbrano spremeni v poševno pisavo" #: ../ui/gtk2_webedit.ui.h:48 ../ui/gtk_webedit.ui.h:48 msgid "Center" -msgstr "" +msgstr "Na sredino" #: ../ui/gtk2_webedit.ui.h:49 ../ui/gtk_webedit.ui.h:49 msgid "Center justify paragraph" -msgstr "" +msgstr "Odstavek porazdeli sredinsko" #: ../ui/gtk2_webedit.ui.h:50 ../ui/gtk_webedit.ui.h:50 msgid "Full" -msgstr "" +msgstr "Poln" #: ../ui/gtk2_webedit.ui.h:51 ../ui/gtk_webedit.ui.h:51 msgid "full justify" -msgstr "" +msgstr "polno obojestransko" #: ../ui/gtk2_webedit.ui.h:52 ../ui/gtk_webedit.ui.h:52 msgid "Left" -msgstr "" +msgstr "Levo" #: ../ui/gtk2_webedit.ui.h:53 ../ui/gtk_webedit.ui.h:53 msgid "Left justify paragraph" -msgstr "" +msgstr "Odstavek porazdeli levo" #: ../ui/gtk2_webedit.ui.h:54 ../ui/gtk_webedit.ui.h:54 msgid "Right" -msgstr "" +msgstr "Desno" #: ../ui/gtk2_webedit.ui.h:55 ../ui/gtk_webedit.ui.h:55 msgid "Right justify paragraph" -msgstr "" +msgstr "Odstavek porazdeli desno" + +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Nov" #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" -msgstr "Ustvari novo mapo" +msgstr "Ustvari novo datoteko" #: ../ui/gtk2_webedit.ui.h:59 ../ui/gtk_webedit.ui.h:59 #, fuzzy msgid "Open file" -msgstr "Odpri modul" +msgstr "Odpri datoteko" #: ../ui/gtk2_webedit.ui.h:60 ../ui/gtk_webedit.ui.h:60 msgid "Paste" -msgstr "" +msgstr "Prilepi" #: ../ui/gtk2_webedit.ui.h:61 ../ui/gtk_webedit.ui.h:61 msgid "Paste clipboard at cursor." -msgstr "" +msgstr "Odložišče prilepi pri kurzorju." #: ../ui/gtk2_webedit.ui.h:62 ../ui/gtk_webedit.ui.h:62 #, fuzzy msgid "Print Document" -msgstr "Natisni ta dokument" +msgstr "Natisni dokument" #: ../ui/gtk2_webedit.ui.h:63 ../ui/gtk_webedit.ui.h:63 #, fuzzy msgid "Print" -msgstr "Tiskanje" +msgstr "Natisni" #: ../ui/gtk2_webedit.ui.h:64 ../ui/gtk_webedit.ui.h:64 #, fuzzy @@ -3015,53 +3246,53 @@ #: ../ui/gtk2_webedit.ui.h:65 ../ui/gtk_webedit.ui.h:65 #, fuzzy msgid "Print Preview" -msgstr "Predo_gled tiskanja" +msgstr "Predogled tiskanja" #: ../ui/gtk2_webedit.ui.h:66 ../ui/gtk_webedit.ui.h:66 #, fuzzy msgid "Preview" -msgstr "_Predogled" +msgstr "Predogled" #: ../ui/gtk2_webedit.ui.h:67 ../ui/gtk_webedit.ui.h:67 #, fuzzy msgid "Print preview of current document" -msgstr "Natisni ta dokument" +msgstr "Predogled tega dokumenta" #: ../ui/gtk2_webedit.ui.h:68 ../ui/gtk_webedit.ui.h:68 #, fuzzy msgid "Quit" -msgstr "_Izhod" +msgstr "Izhod" #: ../ui/gtk2_webedit.ui.h:69 ../ui/gtk_webedit.ui.h:69 #, fuzzy msgid "Shut down editor" -msgstr "Odpri v urejevalniku" +msgstr "Zapri urejevalnik" #: ../ui/gtk2_webedit.ui.h:70 ../ui/gtk_webedit.ui.h:70 msgid "Redo" -msgstr "" +msgstr "Ponovi" #: ../ui/gtk2_webedit.ui.h:71 ../ui/gtk_webedit.ui.h:71 msgid "Redo last undo" -msgstr "" +msgstr "Ponovi zadnjo razveljavitev" #: ../ui/gtk2_webedit.ui.h:72 ../ui/gtk_webedit.ui.h:72 msgid "Find and replace" -msgstr "" +msgstr "Najdi in zamenjaj" #: ../ui/gtk2_webedit.ui.h:73 ../ui/gtk_webedit.ui.h:73 msgid "Replace" -msgstr "" +msgstr "Zamenjaj" #: ../ui/gtk2_webedit.ui.h:74 ../ui/gtk_webedit.ui.h:74 #, fuzzy msgid "Search and replace" -msgstr "Iskalni kriterij" +msgstr "Išči in zamenjaj" #: ../ui/gtk2_webedit.ui.h:76 ../ui/gtk_webedit.ui.h:76 #, fuzzy msgid "Save changes to file" -msgstr "Shrani spremembe dokumenta" +msgstr "Spremembe shrani v datoteko" #: ../ui/gtk2_webedit.ui.h:77 ../ui/gtk_webedit.ui.h:77 #, fuzzy @@ -3071,164 +3302,128 @@ #: ../ui/gtk2_webedit.ui.h:78 ../ui/gtk_webedit.ui.h:78 #, fuzzy msgid "Save file as ..." -msgstr "Shr_ani kot..." +msgstr "Datoteko shrani kot..." #: ../ui/gtk2_webedit.ui.h:79 ../ui/gtk_webedit.ui.h:79 msgid "Strikethrough" -msgstr "" +msgstr "Prečrtaj" #: ../ui/gtk2_webedit.ui.h:80 ../ui/gtk_webedit.ui.h:80 msgid "Strikethrough selection" -msgstr "" +msgstr "Izbrano prečrtaj" #: ../ui/gtk2_webedit.ui.h:81 ../ui/gtk_webedit.ui.h:81 msgid "Underline" -msgstr "" +msgstr "Podčrtaj" #: ../ui/gtk2_webedit.ui.h:82 ../ui/gtk_webedit.ui.h:82 #, fuzzy msgid "Underline selection" -msgstr "Izbira modula" +msgstr "Izbiro podčrtaj" #: ../ui/gtk2_webedit.ui.h:83 ../ui/gtk_webedit.ui.h:83 msgid "Undo" -msgstr "" +msgstr "Razveljavi" #: ../ui/gtk2_webedit.ui.h:84 ../ui/gtk_webedit.ui.h:84 msgid "Undo last change" -msgstr "" +msgstr "Razveljavi zadnjo spremembo" #: ../ui/gtk2_webedit.ui.h:85 ../ui/gtk_webedit.ui.h:85 #, fuzzy msgid "Editor" -msgstr "Uredi" +msgstr "Urejevalnik" #: ../ui/gtk2_webedit.ui.h:87 ../ui/gtk_webedit.ui.h:87 #, fuzzy msgid "Recent files" -msgstr "Shrani trenutno datoteko kot" +msgstr "Zadnje datoteke" #: ../ui/gtk2_webedit.ui.h:88 ../ui/gtk_webedit.ui.h:88 #: ../ui/xi-menus.glade.h:9 ../ui/xi-menus.gtkbuilder.h:6 msgid "_Edit" msgstr "Ur_edi" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Pomoč" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" -msgstr "" +msgstr "Običajno" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" -msgstr "" +msgstr "Naslov 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" -msgstr "" +msgstr "Naslov 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" -msgstr "" +msgstr "Naslov 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" -msgstr "" +msgstr "Naslov 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" -msgstr "" +msgstr "Naslov 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" -msgstr "" +msgstr "Naslov 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" -msgstr "" +msgstr "Naslov" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" -msgstr "" +msgstr "Predurejeno" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" -msgstr "Izbrišem seznam?" +msgstr "Izbirni seznam" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" -msgstr "" +msgstr "Roman številčni seznam" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" -msgstr "Seznam vrstic" +msgstr "Oštevilčen seznam" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" -msgstr "" +msgstr "Abecedni seznam" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" +msgstr "Prečrtaj" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." -msgstr "" +msgstr "Nastavi pisavo in barvo označenega besedila." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" +msgstr "Izbrano besedilo poudari z nastavitvijo barve izadja." #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Zaznamuj/Odzaznamuj vrstico" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Zaznamuj" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Odzaznamuj" @@ -3239,184 +3434,204 @@ #: ../ui/module-manager.glade.h:2 ../ui/module-manager.gtkbuilder.h:2 #, fuzzy msgid "_View Intro" -msgstr "P_ogled" +msgstr "Pogled u_voda" #: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3 msgid "Open a brief introductory explanation of how the Module Manager works." -msgstr "" +msgstr "Odpri kratko uvodno pojasnilo o tem kako deluje Upravljalec modulov." #: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4 #, fuzzy msgid "_Load Standard" -msgstr "Naloži standard" +msgstr "Na_loži standard" #: ../ui/module-manager.glade.h:5 ../ui/module-manager.gtkbuilder.h:5 msgid "" "Load and synchronize the standard set of known repositories, as maintained " "at crosswire.org, with your current remote sources." msgstr "" +"Naloži in sinhroniziraj običajno nastavitev znanih skladišč, kakor so " +"vzdrževana pri crosswire.org, z vašimi trenutnimi oddaljenimi viri." #: ../ui/module-manager.glade.h:6 ../ui/module-manager.gtkbuilder.h:6 msgid "" "Refresh Xiphos' knowledge of what modules are available at the selected " "remote repository" msgstr "" +"Osveži Xiphos-ovo poznavanje modulov, ki so na voljo na izbranem oddaljenem " +"skladišču" #: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8 #, fuzzy msgid "_Install" -msgstr "Namesti" +msgstr "Namest_i" #: ../ui/module-manager.glade.h:8 ../ui/module-manager.gtkbuilder.h:7 #, fuzzy msgid "Install or update the selected modules" -msgstr "Namestim te module?" +msgstr "Izbrane module namestim ali osvežim?" #: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9 #, fuzzy msgid "Remove the selected modules from your system" -msgstr "Označeni modul odstrani iz seznama" +msgstr "Izbrane module odstrani iz vaše naprave" #: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10 #, fuzzy msgid "_Archive" -msgstr "Arhiv" +msgstr "_Arhiv" #: ../ui/module-manager.glade.h:11 ../ui/module-manager.gtkbuilder.h:11 #, fuzzy msgid "Create a zip archive of the selected modules." -msgstr "Ali ste prepričani da želite pobrisati označeni modul?" +msgstr "Ali ste prepričani, da želite pobrisati označene module?" #: ../ui/module-manager.glade.h:12 ../ui/module-manager.gtkbuilder.h:12 #, fuzzy msgid "_Index" -msgstr "Kazalo" +msgstr "_Kazalo" #: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13 msgid "" "Build an index of the selected modules, for optimized (\"lucene\") searching." -msgstr "" +msgstr "Zgradi kazalo izbranih modulov za optimizirano (\"lucene\") iskanje." #: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14 #, fuzzy msgid "_Delete Index" -msgstr "Pobriši kazalo" +msgstr "_Pobriši kazalo" #: ../ui/module-manager.glade.h:15 ../ui/module-manager.gtkbuilder.h:15 #, fuzzy msgid "Delete the fast-search index of the selected modules." -msgstr "Ali za te module izbrišem kazalo s hitrim iskanjem?" +msgstr "Ali za izbrane module izbrišem kazalo s hitrim iskanjem?" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "Preišči _zastarele" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "Preišči za zastarelimi moduli in ponudi njihov izbris." + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Nadaljuj" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Upravljalec modulov" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "OPOZORILO: Če živite v državi kjer je preganjanje, modul uporabljajte " "pazljivo." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Dodaj in odstrani vire" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Trenutni lokalni viri" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" +"Lokalno mapo dodaj kot namestitveni vir, tipično je to CDROM ali USB disk. " +"Takšna mapa vsebuje podmapi \"mods.d\" in \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." -msgstr "" +msgstr "Eno izmed lokalnih map odstrani kot namestitveni vir." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Trenutni oddaljeni viri" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" +"Dodaj posebne oddaljene namestitvene vire. Poznati morate njihovo ime " +"(hostname) in mapo v kateri je skladišče." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." -msgstr "Izbriši oddaljeni vir" +msgstr "Izbriši oddaljeni namestitveni vir" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Namesti izvorno kodo" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokalen" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Oddaljen" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" -msgstr "Namesti cilj" +msgstr "Namestitveni cilj" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Osebno področje, samo za vašo uporabo:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" -msgstr "Domači direktorij" +msgstr "Domača mapa" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Sistemsko področje, za vse uporabnike:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" -msgstr "Swordov sistemski direktorij" +msgstr "Swordova sistemska mapa" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -"Opozorilo: Če živite v državi kjer je preganjanje in ne želite " +"Opozorilo: Če živite v državi, kjer je preganjanje in ne želite " "tvegati da vas opazijo, naj v bodoče NE bi uporabljali možnosti oddaljene " "namestitve! " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokalna namestitvena mapa" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "_Prekliči" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" -msgstr "Padajoči seznam zgodovine" +msgstr "Spustni menu seznama zgodovine" #: ../ui/navbar_versekey.glade.h:2 msgid "Choose book to display" msgstr "Izberite knjigo za prikaz" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Gumb za izbiro knjige" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Janezovo Razodetje" @@ -3425,30 +3640,30 @@ msgid "Choose chapter to display" msgstr "Izberite knjigo za prikaz" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Gumb za poglavja" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" #: ../ui/navbar_versekey.glade.h:8 #, fuzzy msgid "Choose Verse to display" -msgstr "Izberite knjigo za prikaz" +msgstr "Izberite vrstico za prikaz" #: ../ui/navbar_versekey.glade.h:9 ../ui/navbar_versekey.gtkbuilder.h:6 msgid "Toggle Verse Button" -msgstr "Gumb za vrstice" +msgstr "Gumb za vrstico" #: ../ui/navbar_versekey.glade.h:10 ../ui/navbar_versekey.gtkbuilder.h:7 msgid "Enter a Verse reference in Book 1:1 format and press Return" -msgstr "" +msgstr "Vnesite sklic na vrstico v obliki Knjiga 1:1 in pritisnite Enter" #: ../ui/navbar_versekey.glade.h:11 ../ui/navbar_versekey.gtkbuilder.h:8 msgid "Reference Entry" -msgstr "Vnos virov" +msgstr "Vnos sklica" #: ../ui/prefs.glade.h:2 ../ui/prefs.gtkbuilder.h:10 msgid "Cover" @@ -3463,9 +3678,8 @@ msgstr "Ozadje" #: ../ui/prefs.glade.h:5 ../ui/prefs.gtkbuilder.h:13 -#, fuzzy msgid " " -msgstr ": " +msgstr " " #: ../ui/prefs.glade.h:6 ../ui/prefs.gtkbuilder.h:14 msgid "Foreground" @@ -3473,7 +3687,7 @@ #: ../ui/prefs.glade.h:7 ../ui/prefs.gtkbuilder.h:15 msgid "Current Verse" -msgstr "Trenutni verz" +msgstr "Trenutna vrstica" #: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16 msgid "Verse Number" @@ -3494,16 +3708,16 @@ #: ../ui/prefs.glade.h:12 ../ui/prefs.gtkbuilder.h:20 #, fuzzy msgid "Invert color pairs" -msgstr "Vstavi zaznamek" +msgstr "Preobrni barvne pare" #: ../ui/prefs.glade.h:13 ../ui/prefs.gtkbuilder.h:21 msgid "Normal Text" -msgstr "" +msgstr "Običajno besedilo" #: ../ui/prefs.glade.h:14 ../ui/prefs.gtkbuilder.h:22 #, fuzzy msgid "Highlight" -msgstr "Poudari ozadje" +msgstr "Poudari" #: ../ui/prefs.glade.h:15 ../ui/prefs.gtkbuilder.h:23 msgid "Font Colors" @@ -3515,11 +3729,11 @@ #: ../ui/prefs.glade.h:17 ../ui/prefs.gtkbuilder.h:25 msgid "All displayed font sizes are relative to this choice" -msgstr "" +msgstr "Vse prikazane velikosti pisav so relativne k tej izbiri" #: ../ui/prefs.glade.h:18 ../ui/prefs.gtkbuilder.h:26 msgid "Base font size" -msgstr "Temeljna velikost pisave" +msgstr "Osnovna velikost pisave" #: ../ui/prefs.glade.h:19 msgid "" @@ -3543,7 +3757,7 @@ #: ../ui/prefs.glade.h:27 ../ui/prefs.gtkbuilder.h:27 msgid "Commonly -1, to make verse numbers less obtrusive" -msgstr "" +msgstr "Pogosto -1, da naredi številke vrstic manj vsiljive" #: ../ui/prefs.glade.h:28 ../ui/prefs.gtkbuilder.h:28 msgid "Verse number size" @@ -3554,15 +3768,17 @@ "Name and size choice for any module in a given language; still overridden by " "a specific choice on a particular module" msgstr "" +"Ime in velikost izbire za katereikoli modul v danem jeziku; še vedno " +"neupoštevno z določeno izbiro na posameznem modulu" #: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30 msgid "Font preferences, per language" -msgstr "" +msgstr "Nastavitve pisave za jezik" #: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31 #, fuzzy msgid "Language Font Combo" -msgstr "Spremeni okno s knjigo" +msgstr "Izbira pisave za jezik" #: ../ui/prefs.glade.h:32 ../ui/prefs.gtkbuilder.h:32 msgid "Font Misc" @@ -3571,7 +3787,7 @@ #: ../ui/prefs.glade.h:33 ../ui/prefs.gtkbuilder.h:33 #, fuzzy msgid "BibleSync" -msgstr "Območje" +msgstr "BibleSync" #: ../ui/prefs.glade.h:34 ../ui/prefs.gtkbuilder.h:34 msgid "" @@ -3584,216 +3800,238 @@ "audience's Bible programs to follow along; Audience, to receive the " "speaker's navigation." msgstr "" +"Xiphos je prvi program za preučevanje Biblije, ki omogoča uporabo BibleSync, " +"sinhronizacijskega protokola za Biblijske programe. Če delate z več " +"Biblijskimi programi ali če delate v skupini ali če imate šolske dejavnosti " +"s uporabo deljenega učenja, je lahko BibleSync za vas zelo uporabno orodje. " +"BibleSync deluje v enem od treh načinov: - Osebni, da sinhronizira več " +"vaših lastnih Biblij, ali v delovni skupini; - Govornik, da poganja lekcijo " +"z Bibličnimi programi občinstva, da sledijo; - Občinstvo, da sprejema " +"govornikovo usmerjanje. " -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Način:" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." -msgstr "" +msgstr "Izberi način v katerem naj BibleSync deluje." #: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37 msgid "_Off" -msgstr "" +msgstr "_Izklopljen" #: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38 msgid "Disable BibleSync." -msgstr "" +msgstr "Onemogoči BibleSync." #: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39 #, fuzzy msgid "BSP off radio button" -msgstr "Bližnjica do knjige" +msgstr "Izbira za izklop BSP" #: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40 msgid "_Speaker" -msgstr "" +msgstr "_Govornik" #: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41 msgid "Enable BibleSync as the speaker." -msgstr "" +msgstr "Omogoči BibleSync kot govornik" #: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42 #, fuzzy msgid "BSP speaker radio button" -msgstr "Točna fraza okvirček" +msgstr "Izbira za BSP govornika" #: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43 msgid "_Audience" -msgstr "" +msgstr "_Občinstvo" #: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44 msgid "Enable BibleSync as a member of the audience." -msgstr "" +msgstr "Omogoči BibleSync kot član občinstca." #: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45 #, fuzzy msgid "BSP audience radio button" -msgstr "Bližnjica do preprostega besedila" +msgstr "Izbira za BSP občinstvo" #: ../ui/prefs.glade.h:46 ../ui/prefs.gtkbuilder.h:46 #, fuzzy msgid "_Personal" -msgstr "Osebno" +msgstr "_Oseben" #: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47 msgid "Enable BibleSync for personal or team use." -msgstr "" +msgstr "Omogoči BibleSync za osebno ali skupinsko uporabo." #: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48 #, fuzzy msgid "BSP personal radio button" -msgstr "Nadomestni vzorci okvirček" +msgstr "Izbira za oseben BSP" #: ../ui/prefs.glade.h:49 ../ui/prefs.gtkbuilder.h:49 msgid "Private" -msgstr "" +msgstr "Osebno" #: ../ui/prefs.glade.h:50 ../ui/prefs.gtkbuilder.h:50 msgid "" "When in Personal mode, only programs running on this machine will hear your " "navigation." msgstr "" +"Kadar je v Osebnem načinu, bodo vaše usmerjanje slišali samo programi, ki so " +"na tej napravi." #: ../ui/prefs.glade.h:51 ../ui/prefs.gtkbuilder.h:51 #, fuzzy msgid "BSP privacy button" -msgstr "Bližnjica za vrstico" +msgstr "Izbira za BSP zasebnost" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" -msgstr "Odrešitev" +msgid "Navigate:" +msgstr "Usmeriti:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." -msgstr "" +msgstr "Izberite kako sprejeti vstopajočo usmerjevalno sinhronizacijo." #: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54 #, fuzzy msgid "_Direct" -msgstr "Imenik" +msgstr "_Neposredno" #: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55 msgid "BibleSync navigation will send Xiphos directly to the verse indicated." msgstr "" +"BibleSync usmerjanje bo Xiphos usmerilo neposredno na označeno vrstico." #: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56 #, fuzzy msgid "BSP nav direct radio button" -msgstr "Posamezen modul okvirček" +msgstr "Izbira za neposredno BSP navigacijo" #: ../ui/prefs.glade.h:57 ../ui/prefs.gtkbuilder.h:57 #, fuzzy msgid "_Verse list" -msgstr "Seznam vrstic" +msgstr "_Seznam vrstic" #: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58 msgid "BibleSync navigation will use Xiphos' sidebar verse list." -msgstr "" +msgstr "BibleSync navigacija bo uporabljala Xiphos-ev stranski seznam vrstic." #: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59 #, fuzzy msgid "BSP nav verse list radio button" -msgstr "Seznam modula okvirček" +msgstr "Izbira za navigacijski BSP seznam vrstic" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Prisluhni:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." -msgstr "" +msgstr "Xiphos bo poslušal govornike glede na izbiro tukaj." #: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62 msgid "Selective" -msgstr "" +msgstr "Izbiren" #: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63 msgid "Choose the Speakers to be followed." -msgstr "" +msgstr "Izberite govornike, ki naj sledijo." #: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64 #, fuzzy msgid "BSP listen some radio button" -msgstr "Bližnjica do preprostega besedila" +msgstr "Izbira poslušaj nekatere BSP" #: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65 msgid "All" -msgstr "" +msgstr "Vsi" #: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66 msgid "All Speakers will be followed." -msgstr "" +msgstr "Sledili bodo vsi govorniki." #: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67 #, fuzzy msgid "BSP listen all radio button" -msgstr "Nadomestni vzorci okvirček" +msgstr "Izbira poslušaj vse BSP" #: ../ui/prefs.glade.h:68 ../ui/prefs.gtkbuilder.h:68 msgid "None" -msgstr "" +msgstr "Noben" #: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69 msgid "No Speakers will be followed." -msgstr "" +msgstr "Noben govornik ne bo sledil." #: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70 #, fuzzy msgid "BSP listen none radio button" -msgstr "Bližnjica do preprostega besedila" +msgstr "Izbira poslušaj noben BSP" + +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Poseben:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " "chatty. Also, decide whether to allow group parameter as Xiphos' tab number." msgstr "" +"Dodatne sledi so lahko predstavljene med BibleSync delovanjem z omogočitvijo " +"prisotnosti, neujemanja, and odpravo napak. Pazite z omogočanjem le-teh, ker " +"so lahko zelo zgovorne. Prav tako se odločite ali boste dovolili skupinske " +"nastavitve kot Xiphos-ovo število zavihkov." #: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 #, fuzzy msgid "Presence" -msgstr "Možnosti" +msgstr "Prisotnost" #: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74 msgid "Presence announcements will be shown in dialogs." -msgstr "" +msgstr "Obvestilo o prisotnost bo prikazano v dialogih " #: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75 #, fuzzy msgid "BSP presence button" -msgstr "Bližnjica za vrstico" +msgstr "Izbira za pristnost BSP" #: ../ui/prefs.glade.h:76 ../ui/prefs.gtkbuilder.h:76 #, fuzzy msgid "Mismatch" -msgstr "zadetki" +msgstr "Neujemanja" #: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77 msgid "Mismatches from your session will be shown in dialogs." -msgstr "" +msgstr "Neujemanja pred vašo sejo bodo prikazana v dialogih." #: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78 msgid "BSP mismatch button" -msgstr "" +msgstr "Izbira za neujemanja BSP" #: ../ui/prefs.glade.h:79 ../ui/prefs.gtkbuilder.h:79 msgid "Debug" -msgstr "" +msgstr "Odprava napak" #: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80 msgid "Packet tracing." -msgstr "" +msgstr "Sledenje paketa." #: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81 msgid "BSP event debug button" -msgstr "" +msgstr "Izbira za odprave napak BSP" #: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82 msgid "_Group as tab" -msgstr "" +msgstr "_Skupina kot zavihek" #: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83 msgid "" @@ -3801,11 +4039,14 @@ "Disabling this may be necessary if some Speakers' use of group number is not " "appropriate as a tab number." msgstr "" +"Pojasnjuje številko skupinskega protokola kot Xiphos-ovo številko zavihka. " +"Onemogočitev tega je lahko potrebna, če nekateri govorniki menijo, da " +"uporaba skupinske številke ni primerna kot številka tabulatorja." #: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84 #, fuzzy msgid "BSP event group-as-tab button" -msgstr "Posamezen modul okvirček" +msgstr "Izbira za primer BSP, ko je skupina kot zavihek" #: ../ui/prefs.glade.h:86 ../ui/prefs.gtkbuilder.h:86 msgid "General" @@ -3816,6 +4057,8 @@ "Select a particular language for interface display, other than your usual " "setting" msgstr "" +"Izbira določenega jezika za prikaz vmesnika, ki je različna od običajne " +"nastavitve" #: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88 msgid "Special Locale (requires restart)" @@ -3823,7 +4066,7 @@ #: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89 msgid "Special Locale Combo" -msgstr "Posebna lokalizacija okvirček" +msgstr "Izbira posebna lokalizacije" #: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90 msgid "Show splash screen at start up" @@ -3838,6 +4081,8 @@ "If you have set a preferred daily devotion module, its entry for today will " "be shown at startup." msgstr "" +"Če ste določili izbrano dnevno posvetitev, bo njegova današnja vsebina " +"prikazana ob zagonu." #: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93 msgid "Use default Dictionary" @@ -3848,10 +4093,12 @@ "Make double-click of a word always use default dictionary instead of " "dictionary currently displayed" msgstr "" +"Z dvojnim klikom na besedo vedno uporabi privzet slovar namesto slovarja, ki " +"je trenutno prikazan" #: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95 msgid "Use default Dictionary Checkbox" -msgstr "Uporabi privzeti slovar okvirček" +msgstr "Izbira uporabe privzetega slovanja" #: ../ui/prefs.glade.h:96 ../ui/prefs.gtkbuilder.h:96 msgid "Scroll to Previous/Next Chapter" @@ -3865,22 +4112,20 @@ #: ../ui/prefs.glade.h:98 ../ui/prefs.gtkbuilder.h:98 msgid "Scroll to Previous/Next Chapter Checkbox" -msgstr "Pomakni se k prejšnjemu/naslednjemu poglavju okvirček" +msgstr "Pomakni se k prejšnjemu/naslednjemu poglavju" #: ../ui/prefs.glade.h:99 ../ui/prefs.gtkbuilder.h:99 msgid "Resize images" -msgstr "Spremeni velikost slikam" +msgstr "Slikam spremeni velikost" #: ../ui/prefs.glade.h:100 ../ui/prefs.gtkbuilder.h:100 #, fuzzy msgid "Automatically resize image content to fit the pane" -msgstr "" -"Avtomatično prilagodi velikost komentarja, knjige in vsebino slovarjeve " -"slike da ustreza podoknu" +msgstr "Velikost slike avtomatično prilagodi, da ustreza podoknu" #: ../ui/prefs.glade.h:101 ../ui/prefs.gtkbuilder.h:101 msgid "Resize images checkbox" -msgstr "Spremeni velikost slikam okvirček" +msgstr "Izbira slikam spremeni velikost" #: ../ui/prefs.glade.h:102 ../ui/prefs.gtkbuilder.h:102 msgid "Highlight current verse" @@ -3889,40 +4134,41 @@ #: ../ui/prefs.glade.h:103 ../ui/prefs.gtkbuilder.h:103 #, fuzzy msgid "Apply high-contrast highlight to current verse - see color pickers" -msgstr "Uporabi zelo kontrastno označevanje trenutne vrstice" +msgstr "" +"Uporabi zelo kontrastno označevanje trenutne vrstice - glej barvne možnosti" #: ../ui/prefs.glade.h:104 ../ui/prefs.gtkbuilder.h:104 msgid "Highlight current verse check box" -msgstr "Poudari trenutno vrstico okvirček" +msgstr "Izbira poudari trenutno vrstico" #: ../ui/prefs.glade.h:105 ../ui/prefs.gtkbuilder.h:105 #, fuzzy msgid "Highlight user annotations" -msgstr "Uporabniške beležke" +msgstr "Poudari uporabniške beležke" #: ../ui/prefs.glade.h:106 ../ui/prefs.gtkbuilder.h:106 #, fuzzy msgid "Use inverted highlight on user-annotated verses" -msgstr "Uporabi zelo kontrastno označevanje trenutne vrstice" +msgstr "Na uporabniško-komentiranih vrsticah uporabi preobrnjen poudarek" #: ../ui/prefs.glade.h:107 ../ui/prefs.gtkbuilder.h:107 #, fuzzy msgid "Highlight user annotations check box" -msgstr "Poudari trenutno vrstico okvirček" +msgstr "Izbira poudari uporabniško beležko" #: ../ui/prefs.glade.h:108 ../ui/prefs.gtkbuilder.h:108 #, fuzzy msgid "Cross-references in verse list" -msgstr "Napotitve drugam" +msgstr "Napotitve drugam na seznamu vrstic" #: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109 msgid "Use the verse list for Bible cross-references instead of the previewer" -msgstr "" +msgstr "Za Biblijske napotitve drugam namesto predogleda uporabi seznam vrstic" #: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110 #, fuzzy msgid "Xrefs in verse list check box" -msgstr "Spremeni velikost slikam okvirček" +msgstr "Izbira Xrefs v seznamu vrstic" #: ../ui/prefs.glade.h:111 ../ui/prefs.gtkbuilder.h:111 msgid "Enable Prayer Lists" @@ -3930,230 +4176,233 @@ #: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112 msgid "Make journals/prayer lists available" -msgstr "" +msgstr "Omogoči Dnevnike/molitvene sezname" #: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113 msgid "Enable Prayer Lists Checkbox" -msgstr "Omogoči okvirčke molitvenih seznamov" +msgstr "Omogoči izbiro molitvenih seznamov" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "Omogoči statusno vrstico" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "Omogoči/onemogoči statusno vrstico" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Številka vrstice" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" -msgstr "" +msgstr "Odmik številke vrstice na več načinov" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" -msgstr "Prikaži oštevilče_nje vrstic" +msgstr "Številke vrstic prikaži s krepkim besedilom" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" -msgstr "Velikost številke vrstice" +msgstr "Izbira krepke (poudarjene) številke vrstice" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" -msgstr "" +msgstr "Oklepaji" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" -msgstr "" +msgstr "Številko vrstice prikaži z [obdajajočimi oklepaji]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" -msgstr "Uporabi eno vrsto za eno vrstico okvirček" +msgstr "Izbira oklepaja za številko vrstice" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" -msgstr "Opis" +msgstr "Nadpisano" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" -msgstr "Prikaži oštevilče_nje vrstic" +msgstr "Številko vrstice prikaži kot nadpisano" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" -msgstr "Velikost številke vrstice" +msgstr "Izbira nadpisa številke vrstice" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" -msgstr "Privzeti imenik študijske beležnice" +msgstr "Privzeta mapa študijske beležnice" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" -msgstr "Izberi imenik" +msgstr "Izberi mapo" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" -msgstr "Privzeti imenik študijske beležnice" +msgstr "Privzeta mapa študijske beležnice" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Splošne podrobnosti" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Glavno okno modulov" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Biblično besedilo" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" -msgstr "Spremeni okno Bibličnega besedila" +msgstr "Izbira spremembe Bibličnega besedila" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" -msgstr "Spremeni okno s komentarjem" - -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Slovar" +msgstr "Izbira spremembe okna s komentarjem" -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" -msgstr "Spremeni okno slovarja" +msgstr "Izbira spremembe slovarja" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" -msgstr "Spremeni okno s knjigo" +msgstr "Izbira spremembe knjige" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduli" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" -msgstr "Pobriši vse module iz seznama" +msgstr "Iz seznama pobriši vse module" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" -msgstr "Gumb za brisanje modulov iz seznama" +msgstr "Izbira brisanja modulov iz seznama" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Označeni modul odstrani iz seznama" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" -msgstr "Gumb za izbris označenega modula iz seznama" +msgstr "Izbira za izbris označenega modula iz seznama" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" -msgstr "Odpre okno za izbiro modulov katere doda na seznam" +msgstr "Odpre okno za izbiro modulov" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Dodaj module" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Gumb za odprtje okna za izbiro" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Moduli vzporedno" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Moduli s posebnim namenom" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Dnevne posvetitve" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Okno z dnevnimi posvetitvami" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebrejski leksikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" -msgstr "Okno Hebrejskega leksikona" +msgstr "Izbira Hebrejskega leksikona" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Grški leksikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" -msgstr "Okno Grškega leksikona" +msgstr "Izbira Grškega leksikona" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" -msgstr "Prizveti slovar" +msgstr "Prizvet slovar" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" -msgstr "Spremeni okno privzetega slovarja" +msgstr "Izbira spremembe privzetega slovarja" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Osebne beležke" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Spremeni okno osebnih beležk" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" -msgstr "Moduli Podrobnosti" - -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Izbira modula" +msgstr "Podrobnosti Modulov" #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" -msgstr "" +msgstr "-2" #: ../ui/prefs.gtkbuilder.h:2 #, fuzzy msgid "-1" -msgstr "1" +msgstr "-1" #: ../ui/prefs.gtkbuilder.h:4 #, fuzzy msgid "+1" -msgstr "1" +msgstr "+1" #: ../ui/prefs.gtkbuilder.h:5 msgid "+2" -msgstr "" +msgstr "+2" #: ../ui/prefs.gtkbuilder.h:6 msgid "+3" -msgstr "" +msgstr "+3" #: ../ui/prefs.gtkbuilder.h:7 msgid "+4" -msgstr "" +msgstr "+4" #: ../ui/prefs.gtkbuilder.h:8 msgid "+5" -msgstr "" +msgstr "+5" + +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "Omogoči/onemogoči statustno vrstico" #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" @@ -4161,22 +4410,22 @@ #: ../ui/search-dialog.glade.h:2 ../ui/search-dialog.gtkbuilder.h:2 msgid "_Lucene Search Syntax" -msgstr "" +msgstr "Pravila _Lucene iskanja" #: ../ui/search-dialog.glade.h:3 ../ui/search-dialog.gtkbuilder.h:3 msgid "" "Open a brief explanation of the syntax used for optimized \"lucene\" " "searches." -msgstr "" +msgstr "Odpre kratko razlago sintakse za optimalna \"lucene\" iskanja." #: ../ui/search-dialog.glade.h:4 ../ui/search-dialog.gtkbuilder.h:4 #, fuzzy msgid "_Attribute Search" -msgstr "Iskanje po lastnostih" +msgstr "_Iskanje po lastnostih" #: ../ui/search-dialog.glade.h:5 ../ui/search-dialog.gtkbuilder.h:5 msgid "Open a brief explanation of attribute-based searches." -msgstr "" +msgstr "Odpre kratko razlago iskanja osnovanega na lastnostih" #: ../ui/search-dialog.glade.h:6 ../ui/search-dialog.gtkbuilder.h:7 msgid "for " @@ -4212,11 +4461,11 @@ #: ../ui/search-dialog.glade.h:14 ../ui/search-dialog.gtkbuilder.h:15 msgid "Entire module radiobutton" -msgstr "Celoten modul okvirček" +msgstr "Izbira celotnega modula" #: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17 msgid "Use the results of the last search as the scope of the search" -msgstr "Za območje iskanja uporabi rezultat zadnjega iskanja" +msgstr "Za območje iskanja uporabi rezultate zadnjega iskanja" #: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16 msgid "Current results" @@ -4224,35 +4473,35 @@ #: ../ui/search-dialog.glade.h:17 ../ui/search-dialog.gtkbuilder.h:18 msgid "Current results radiobutton" -msgstr "Trenutni rezultati gumbek" +msgstr "Izbira trenutni rezultatov" #: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20 msgid "Use a custom range for the scope of the search" -msgstr "Za področje iskanja uporabi običajno območje" +msgstr "Za področje iskanja uporabi posebno območje" #: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19 msgid "Custom verse range" -msgstr "Običajno območje vrstic" +msgstr "Posebno območje vrstic" #: ../ui/search-dialog.glade.h:20 ../ui/search-dialog.gtkbuilder.h:21 msgid "Custom verse range radiobutton" -msgstr "Običajno območje vrstic okvirček" +msgstr "Izbira posebnega območja vrstic" #: ../ui/search-dialog.glade.h:21 ../ui/search-dialog.gtkbuilder.h:22 msgid "Custom Range Selector Combo" -msgstr "Okno za izbiro običajnega območja" +msgstr "Izbira posebnga območja" #: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25 msgid "Use a single module for the search" -msgstr "Za iskanje uporabi običajen modul" +msgstr "Za iskanje uporabi samo en modul" #: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24 msgid "Single module" -msgstr "Posamezen modul" +msgstr "Samo en modul" #: ../ui/search-dialog.glade.h:25 ../ui/search-dialog.gtkbuilder.h:26 msgid "Single module radiobutton" -msgstr "Posamezen modul okvirček" +msgstr "Izbira samo enega modula" #: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28 msgid "Use the current module list for the search" @@ -4260,31 +4509,31 @@ #: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27 msgid "Module list" -msgstr "Seznam modula" +msgstr "Seznam modulov" #: ../ui/search-dialog.glade.h:28 ../ui/search-dialog.gtkbuilder.h:29 msgid "Module list radiobutton" -msgstr "Seznam modula okvirček" +msgstr "Izbira seznama modulov" #: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31 msgid "Use a custom module list for the search" -msgstr "Za iskanje uporabi običajen seznam modula" +msgstr "Za iskanje uporabi poseben seznam modulov" #: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30 msgid "Custom module list" -msgstr "Običajen seznam modula" +msgstr "Poseben seznam modulov" #: ../ui/search-dialog.glade.h:31 ../ui/search-dialog.gtkbuilder.h:32 msgid "Custom module list radiobutton" -msgstr "Običajen seznam modula okvirček" +msgstr "Seznam posebnega seznama modulov" #: ../ui/search-dialog.glade.h:32 msgid "Custom Module List Combo" -msgstr "Običajen seznam modula okno" +msgstr "Izbira posebnega seznama modulov" #: ../ui/search-dialog.glade.h:33 ../ui/search-dialog.gtkbuilder.h:33 msgid "Search Type" -msgstr "Iskalni tip" +msgstr "Tip iskanja" #: ../ui/search-dialog.glade.h:34 ../ui/search-dialog.gtkbuilder.h:35 msgid "" @@ -4302,23 +4551,23 @@ #: ../ui/search-dialog.glade.h:38 ../ui/search-dialog.gtkbuilder.h:38 msgid "Optimized (\"Lucene\") radiobutton" -msgstr "Optimiziran (\"Lucene\") okvirček" +msgstr "Izbira optimizirano (\"Lucene\") iskanje" #: ../ui/search-dialog.glade.h:40 ../ui/search-dialog.gtkbuilder.h:40 msgid "Multi word radiobutton" -msgstr "Mnogobeseden okvirček" +msgstr "Izbira mnogobesednosti" #: ../ui/search-dialog.glade.h:42 ../ui/search-dialog.gtkbuilder.h:42 msgid "Regular expression radiobutton" -msgstr "Nadomestni vzorci okvirček" +msgstr "Izbira nadomestnih vzorcev" #: ../ui/search-dialog.glade.h:44 ../ui/search-dialog.gtkbuilder.h:44 msgid "Exact phrase radiobutton" -msgstr "Točna fraza okvirček" +msgstr "Izbira točne fraze" #: ../ui/search-dialog.glade.h:45 ../ui/search-dialog.gtkbuilder.h:46 msgid "Make selections on the Attribute Search tab" -msgstr "Naredi izbire na zavihku podrobnega iskanja" +msgstr "Izbire naredi na zavihku iskanja po lastnostih" #: ../ui/search-dialog.glade.h:46 ../ui/search-dialog.gtkbuilder.h:45 msgid "Attributes" @@ -4326,7 +4575,7 @@ #: ../ui/search-dialog.glade.h:47 ../ui/search-dialog.gtkbuilder.h:47 msgid "Attributes radiobutton" -msgstr "Lastnosti gumbek" +msgstr "Izbira lastnosti" #: ../ui/search-dialog.glade.h:48 ../ui/search-dialog.gtkbuilder.h:48 msgid "Options" @@ -4334,7 +4583,7 @@ #: ../ui/search-dialog.glade.h:50 ../ui/search-dialog.gtkbuilder.h:50 msgid "Match case checkbox" -msgstr "Razlikovanje velikih in malih črk okvirček" +msgstr "Izbira razlikovanja velikih in malih črk" #: ../ui/search-dialog.glade.h:51 ../ui/search-dialog.gtkbuilder.h:51 msgid "Search Criteria" @@ -4362,13 +4611,13 @@ #: ../ui/search-dialog.glade.h:57 ../ui/search-dialog.gtkbuilder.h:57 msgid "Found" -msgstr "Našel" +msgstr "Najedno" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Okno končnih povzetkov" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Tabela končnih povzetkov" @@ -4434,11 +4683,11 @@ #: ../ui/search-dialog.glade.h:75 ../ui/search-dialog.gtkbuilder.h:75 msgid "Custom Range Preview" -msgstr "Predogled običajnega območja" +msgstr "Predogled posebnega območja" #: ../ui/search-dialog.glade.h:76 ../ui/search-dialog.gtkbuilder.h:76 msgid "Custom Verse Ranges" -msgstr "Običajno območje vrstic" +msgstr "Posebna območja vrstic" #: ../ui/search-dialog.glade.h:77 ../ui/search-dialog.gtkbuilder.h:77 msgid "Create a new module list" @@ -4446,15 +4695,15 @@ #: ../ui/search-dialog.glade.h:78 ../ui/search-dialog.gtkbuilder.h:78 msgid "New Custom Module List Button" -msgstr "Gumb za nov običajni seznam modula" +msgstr "Gumb za nov poseben seznam modulov" #: ../ui/search-dialog.glade.h:79 ../ui/search-dialog.gtkbuilder.h:79 msgid "Save the module list" -msgstr "Shrani seznam modula" +msgstr "Shrani seznam modulov" #: ../ui/search-dialog.glade.h:80 ../ui/search-dialog.gtkbuilder.h:80 msgid "Save Custom Module List Button" -msgstr "Gumb za shranitev običajnega seznama modula" +msgstr "Gumb za shranitev običajnega seznama modulov" #: ../ui/search-dialog.glade.h:81 ../ui/search-dialog.gtkbuilder.h:81 msgid "Delete the selected list" @@ -4466,7 +4715,7 @@ #: ../ui/search-dialog.glade.h:83 ../ui/search-dialog.gtkbuilder.h:83 msgid "Module Lists" -msgstr "Seznam modulov" +msgstr "Seznami modulov" #: ../ui/search-dialog.glade.h:84 ../ui/search-dialog.gtkbuilder.h:84 msgid "List Name" @@ -4474,7 +4723,7 @@ #: ../ui/search-dialog.glade.h:85 ../ui/search-dialog.gtkbuilder.h:85 msgid "Custom Module List Name Entry" -msgstr "Običajen seznam modula vpis imen" +msgstr "Poseben seznam modulov vpisa imen" #: ../ui/search-dialog.glade.h:90 ../ui/search-dialog.gtkbuilder.h:90 msgid "Open a dialog to select modules to add to the list" @@ -4482,7 +4731,7 @@ #: ../ui/search-dialog.glade.h:93 ../ui/search-dialog.gtkbuilder.h:93 msgid "Custom Module Lists" -msgstr "Običajni seznami modulov" +msgstr "Posebni seznami modulov" #: ../ui/search-dialog.glade.h:94 ../ui/search-dialog.gtkbuilder.h:94 msgid "Attribute" @@ -4490,15 +4739,15 @@ #: ../ui/search-dialog.glade.h:95 ../ui/search-dialog.gtkbuilder.h:96 msgid "Search for Strongs Numbers like G4442 or H1121" -msgstr "Išči za močnimi številkami kot so G4442 ali H1121" +msgstr "Išči za Strong-ovimi številkami kot so G4442 ali H1121" #: ../ui/search-dialog.glade.h:96 ../ui/search-dialog.gtkbuilder.h:95 msgid "Strongs Numbers" -msgstr "Močne številke" +msgstr "Strong-ove številke" #: ../ui/search-dialog.glade.h:97 ../ui/search-dialog.gtkbuilder.h:97 msgid "Strongs Numbers radiobutton" -msgstr "Močne številke okvirček" +msgstr "Izbira Strong-ovih številk" #: ../ui/search-dialog.glade.h:98 ../ui/search-dialog.gtkbuilder.h:99 msgid "Search for Morphological tags" @@ -4506,7 +4755,7 @@ #: ../ui/search-dialog.glade.h:100 ../ui/search-dialog.gtkbuilder.h:100 msgid "Morphological Tags radiobutton" -msgstr "Oblikoslovni dodatki okvirček" +msgstr "Izbira oblikoslovnih dodatkov" #: ../ui/search-dialog.glade.h:101 ../ui/search-dialog.gtkbuilder.h:102 msgid "Search in footnotes" @@ -4514,7 +4763,7 @@ #: ../ui/search-dialog.glade.h:103 ../ui/search-dialog.gtkbuilder.h:103 msgid "Footnotes radiobutton" -msgstr "Zaznamki okenček" +msgstr "Izbira opomb" #: ../ui/search-dialog.glade.h:104 ../ui/search-dialog.gtkbuilder.h:104 msgid "Results Display Options" @@ -4522,19 +4771,19 @@ #: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106 msgid "In modules that have Strong's Numbers" -msgstr "V modulih ki imajo krepke številke" +msgstr "V modulih, ki imajo Strong-ove številke" #: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105 msgid "Show Strong's Numbers" -msgstr "Pokaži močne številke" +msgstr "Pokaži Strong-ove številke" #: ../ui/search-dialog.glade.h:107 ../ui/search-dialog.gtkbuilder.h:107 msgid "Show Strong's Numbers checkbox" -msgstr "Pokaži močne številke okvirček" +msgstr "Izbira prikaza Strong-ovih številk" #: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109 msgid "In modules that have Morphological Tags" -msgstr "V modulih ki imajo oblikoslovne dodatke" +msgstr "V modulih, ki imajo oblikoslovne dodatke" #: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108 msgid "Show Morphological Tags" @@ -4542,11 +4791,11 @@ #: ../ui/search-dialog.glade.h:110 ../ui/search-dialog.gtkbuilder.h:110 msgid "Show Morphological Tags checkbox" -msgstr "Pokaži oblikoslovne dodatke okvirček" +msgstr "Izbira prikaza oblikoslovnih dodatkov" #: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112 msgid "In modules that have Footnotes" -msgstr "V modulih ki imajo opombe" +msgstr "V modulih, ki imajo opombe" #: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111 msgid "Show Footnotes" @@ -4554,16 +4803,21 @@ #: ../ui/search-dialog.glade.h:113 ../ui/search-dialog.gtkbuilder.h:113 msgid "Show Footnotes checkbox" -msgstr "Pokaži opombe okvirček" +msgstr "Izbira prikaza opomb" #: ../ui/search-dialog.glade.h:114 ../ui/search-dialog.gtkbuilder.h:114 msgid "Attribute Search" msgstr "Iskanje po lastnostih" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Izbira modula" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" -msgstr "Iskalni tip" +msgstr "iskalni modul" #: ../ui/xi-export-bookmarks.glade.h:1 msgid "Export Bookmark Folder" @@ -4587,7 +4841,7 @@ #: ../ui/xi-export-bookmarks.glade.h:6 msgid "Include Bible text" -msgstr "Vsebuje besedilo Biblije" +msgstr "Vsebuje Biblično besedilo" #: ../ui/xi-export-bookmarks.glade.h:7 msgid "gtk-cancel" @@ -4607,7 +4861,7 @@ #: ../ui/xi-menus.glade.h:4 msgid "Open a saved tab settings collection" -msgstr "" +msgstr "Odpri nastavtive zbirke shranjenih zavihkov" #: ../ui/xi-menus.glade.h:5 ../ui/xi-menus.gtkbuilder.h:4 msgid "_Save Session" @@ -4615,25 +4869,25 @@ #: ../ui/xi-menus.glade.h:6 msgid "Save this collection of tab settings" -msgstr "" +msgstr "Shrani zbirko nastavitev zavihkov" #: ../ui/xi-menus.glade.h:7 ../ui/xi-menus.gtkbuilder.h:5 #, fuzzy msgid "_New Prayerlist/Journal" -msgstr "Molitveni seznam/Dnevnik" +msgstr "_Nov Molitveni seznam/Dnevnik" #: ../ui/xi-menus.glade.h:8 #, fuzzy msgid "Create a new journal or prayerlist from a template" -msgstr "Ustvari nov preprost molitveni seznam" +msgstr "Ustvari nov preprost molitveni seznam iz predloge" #: ../ui/xi-menus.glade.h:10 ../ui/xi-menus.gtkbuilder.h:7 msgid "_Search" -msgstr "I_skanje" +msgstr "_Iskanje" #: ../ui/xi-menus.glade.h:11 msgid "Bring the simple sidebar search forward" -msgstr "" +msgstr "Preprosto stransko vrstico za iskanje privedi naprej" #: ../ui/xi-menus.glade.h:12 ../ui/xi-menus.gtkbuilder.h:8 msgid "_Advanced Search" @@ -4641,7 +4895,7 @@ #: ../ui/xi-menus.glade.h:13 msgid "Open the advanced search dialog, to run complex queries" -msgstr "" +msgstr "Odpri dialog za napredno iskanje za poganjanje zapletenih poizvedb" #: ../ui/xi-menus.glade.h:14 ../ui/xi-menus.gtkbuilder.h:9 msgid "_Preferences" @@ -4656,6 +4910,10 @@ msgid "_Module Manager" msgstr "Upravljalec _modulov" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "P_ogled" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Predogled _Dnevnih posvetitev" @@ -4663,6 +4921,7 @@ #: ../ui/xi-menus.glade.h:19 msgid "Show today's entry from your selected daily devotional in the previewer" msgstr "" +"Prikaži današnje vnose vaših izbranih dnevnih posvetitev v pregledovalniku" #: ../ui/xi-menus.glade.h:20 ../ui/xi-menus.gtkbuilder.h:13 msgid "_Bible" @@ -4686,7 +4945,7 @@ #: ../ui/xi-menus.glade.h:25 msgid "Make all tabs' Bibles navigate together" -msgstr "" +msgstr "Naj se vsi Biblični zavihki hkrati premikajo" #: ../ui/xi-menus.glade.h:26 ../ui/xi-menus.gtkbuilder.h:18 msgid "_Read Aloud" @@ -4694,7 +4953,7 @@ #: ../ui/xi-menus.glade.h:27 msgid "Turn on text-to-speech reading of Bible verses as they are selected" -msgstr "" +msgstr "Vklopi možnost glasnega branja Bibličnih besedil, kot so izbrani" #: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19 msgid "Show Verse _Numbers" @@ -4702,7 +4961,7 @@ #: ../ui/xi-menus.glade.h:29 msgid "Display verse numbers in the text" -msgstr "" +msgstr "V besedilu prikaži številke vrstic" #: ../ui/xi-menus.glade.h:30 ../ui/xi-menus.gtkbuilder.h:20 msgid "_Highlight Current Verse" @@ -4720,7 +4979,7 @@ #: ../ui/xi-menus.glade.h:33 #, fuzzy msgid "Operate the sidebar as a separate window" -msgstr "Odpri v ločenem oknu" +msgstr "Stransko vrstico odpri v ločenem oknu" #: ../ui/xi-menus.glade.h:34 ../ui/xi-menus.gtkbuilder.h:22 msgid "_Show/Hide Attached Sidebar" @@ -4729,7 +4988,7 @@ #: ../ui/xi-menus.glade.h:35 #, fuzzy msgid "Remove the sidebar entirely from view" -msgstr "Odstrani označeno mapo" +msgstr "Popolnoma odstrani stransko vrstico iz pogleda" #: ../ui/xi-menus.glade.h:36 ../ui/xi-menus.gtkbuilder.h:23 msgid "Show Parallel View in a _Tab" @@ -4737,7 +4996,7 @@ #: ../ui/xi-menus.glade.h:37 msgid "Provide the full-chapter parallel Bible window as another tab" -msgstr "" +msgstr "Zagotovo celotno poglavje okna paralelne Biblije kot še en zavihek" #: ../ui/xi-menus.glade.h:38 ../ui/xi-menus.gtkbuilder.h:24 msgid "Show Previe_wer in the Sidebar" @@ -4745,7 +5004,7 @@ #: ../ui/xi-menus.glade.h:39 msgid "Select Previewer position between sidebar or beneath Bible" -msgstr "" +msgstr "Izberi položaj predledovalnika med stransko vrstico ali pod Biblijo" #: ../ui/xi-menus.glade.h:41 ../ui/xi-menus.gtkbuilder.h:26 msgid "_Contents" @@ -4753,7 +5012,7 @@ #: ../ui/xi-menus.glade.h:42 msgid "Open the help viewer on the Xiphos manual" -msgstr "" +msgstr "Odpri prikazovalnik pomoči Xiphos-ovega priročnika" #: ../ui/xi-menus.glade.h:43 ../ui/xi-menus.gtkbuilder.h:27 msgid "_Mailing List" @@ -4761,7 +5020,7 @@ #: ../ui/xi-menus.glade.h:44 msgid "Open a browser on the users' mailing list webpage" -msgstr "" +msgstr "Brskalnik odpri na spletni strani uporabniških diskusijskih skupin" #: ../ui/xi-menus.glade.h:45 ../ui/xi-menus.gtkbuilder.h:28 msgid "_Live Chat" @@ -4769,15 +5028,15 @@ #: ../ui/xi-menus.glade.h:46 msgid "Open a browser on an interface to live IRC chat" -msgstr "" +msgstr "Brskalnik odpri na strani vmesnika za IRC pogovor v živo" #: ../ui/xi-menus.glade.h:47 ../ui/xi-menus.gtkbuilder.h:29 msgid "_Report Bug" -msgstr "Spo_roči hrošča" +msgstr "Spo_roči napako v programu" #: ../ui/xi-menus.glade.h:48 msgid "Open a browser on our bug tracker" -msgstr "" +msgstr "Brskalnik odpri na naš strani za sporočanje napak v programu" #: ../ui/xi-menus.glade.h:49 ../ui/xi-menus.gtkbuilder.h:30 msgid "About _Translation" @@ -4785,7 +5044,7 @@ #: ../ui/xi-menus.glade.h:50 msgid "Learn about translating the Xiphos interface to other languages" -msgstr "" +msgstr "Pouči se o prevajanju Xiphos-ovega vmesnika v druge jezike" #: ../ui/xi-menus.glade.h:51 ../ui/xi-menus.gtkbuilder.h:31 msgid "_About The SWORD Project" @@ -4793,7 +5052,7 @@ #: ../ui/xi-menus.glade.h:52 msgid "Learn about The Sword Project, of which Xiphos is one application" -msgstr "" +msgstr "Pouči se o Projektu Sword, katerega ena izmed aplikacij je tudi Xiphos" #: ../ui/xi-menus.glade.h:53 ../ui/xi-menus.gtkbuilder.h:32 msgid "About _Xiphos" @@ -4804,220 +5063,233 @@ msgid "Learn about Xiphos" msgstr "Vizitka _Xiphosa" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Komentar vrstice" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Odpri modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Beležka" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Odpri v urejevalniku" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "En _Verz v eni vrstici" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" -msgstr "" +msgstr "Oznake za Opombe/Napotitve drugam" #: ../ui/xi-menus.glade.h:74 msgid "Show non-anonymous markers e.g. \"*n23\"" -msgstr "" +msgstr "Prikaži neanonimne oznake npr. \"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Različice" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Vsebina slike" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" -msgstr "Spoštuj videz pisave" +msgstr "Spoštuj obliko pisave" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Komentarji po poglavju" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" -msgstr "Besedilo z Dv_ojnim presledkom med črkami" +msgstr "Besedilo z dvojnim presledkom med črkami" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Poglej izbiro" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Uporabi trenutni slovar" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Krmari v BibleMap.org" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Odkleni ta modul" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Prikaži naslov knjige" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Prikaži naslov poglavja" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Preimenuj osebne komentarje" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Znebi se osebnih komentarjev" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Izbrano preberi na glas" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Rezultate shrani kot en zaznamek" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" -msgstr "Shrani seznam kot en zaznamek" +msgstr "Shrani seznam kot en sam zaznamek" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Rezultate shrani kor zaporedje zaznamkov v njihovi lastni mapi" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Shrani seznam kot zaporedje zaznamkov" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" +"Zagotovi dialog v katerega se prilepi vrstico z napotitvami drugam, da se " +"napolni seznam vrstic." -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" -msgstr "Seznam vrstic" +msgstr "Poseliti seznam vrstic" + +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "Celoten seznam vrstic porine direktno v seznam zgodovine." + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Iz seznama vrstic ponovno naloži zgodovino" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" +"Ta seznam vrstic pošlji ostalim preko BibleSync, če si v osebnem ali " +"govorniškem načinu." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" -msgstr "" +msgstr "Seznam pošlji preko BibleSync" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Izvozi seznam" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Ta zaznamek odpri v novem zavihku" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Odpri v novem zavihku" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Ta zaznamek odpri v pogovornem oknu" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Odpri v pogovornem oknu" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "K označeni mapi dodaj novo mapo" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Tukaj vstavi nov zaznamek" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Vstavi zaznamek" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Uredi zaznamek" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "Ur_edi stvar" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" -msgstr "Izbriši stvar" +msgstr "Izbriši predmet" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Razširi vse skupine zaznamkov" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Razširi vse" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Zapri vse skupine zaznamkov" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Zapri vse" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" -msgstr "Dovoli stvarem da se premaknejo iz ene mape v drugo" +msgstr "Dovoli stvarem, da se premaknejo iz ene mape v drugo" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Dovoli spreminjanje vrstnega reda" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" -msgstr "Naloži zaznamke iz bibličnih časov" +msgstr "Naloži drugo datoteko z zaznamki (privzeto: iz BibleTime)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" -msgstr "Vstavi zaznamek" +msgstr "Uvozi zaznamke" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Odstrani mapo in jo shrani" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Izvozi mapo" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Izbrani modul odpri v novem zavihku" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5025,80 +5297,80 @@ "Izbrani modul odpri v\n" "\tločenem ['pogovornem'] oknu" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Odpri v ločenem oknu" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Ustvari nov preprost molitveni seznam" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" -msgstr "Preprosto" +msgstr "Preprost" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Ustvari novo temo molitvenega seznama" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Tema" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Ustari nov mesečni dnevnik" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Mesečno" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Ustvari nov dnevni dnevnik" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Dnevno" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Ustvari nov obris teme" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Skica" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" -msgstr "" +msgstr "Modul odpri v urejevalniku ali preprostem pogovornem oknu" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Odpri v ločenem oknu" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Dodaj podstvar" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" -msgstr "Dodaj Podstvar" +msgstr "Dodaj Podstvari" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Dodaj stvar" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" -msgstr "Dodaj stvar" +msgstr "Dodaj stvari" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Odstrani to stvar" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Uredi to stvar" @@ -5110,6 +5382,91 @@ msgid "Study the Bible" msgstr "Proučevanje Biblije" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "[nobeno odlagališče ni pripravljeno]" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "Prenos ni uspel.\n" + +#~ msgid "Page %d of %d" +#~ msgstr "Stran %d od %d" + +#~ msgid "Save As" +#~ msgstr "Shrani kot" + +#~ msgid "HTML Output" +#~ msgstr "HTML izvoz" + +#~ msgid "HTML Source" +#~ msgstr "HTML koda" + +#~ msgid "Plain Source" +#~ msgstr "Navadna koda" + +#~ msgid "_Quit" +#~ msgstr "_Izhod" + +#~ msgid "_Open" +#~ msgstr "_Odpri" + +#~ msgid "_Save" +#~ msgstr "_Shrani" + +#~ msgid "Save _As..." +#~ msgstr "Shr_ani kot..." + +#~ msgid "Open new document" +#~ msgstr "Odpri nov dokument" + +#~ msgid "Delete current note" +#~ msgstr "Izbriši trenutni zaznamek" + +#~ msgid "HTML _Output" +#~ msgstr "HTML izv_oz" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML koda" + +#~ msgid "_Plain Source" +#~ msgstr "_Navadna koda" + +#~ msgid "Unlock " +#~ msgstr "Odkleni " + +#~ msgid "Preparing to print" +#~ msgstr "Priprava na tiskanje" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Na tem tiskalniku tiskanje ni podprto" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Tiskalnik %s ne podpira PostScript načina tiskanja." + +#~ msgid "Printing" +#~ msgstr "Tiskanje" + +#~ msgid "Waiting to print" +#~ msgstr "Čakanje na tiskanje" + +#~ msgid "An error occurred while printing" +#~ msgstr "Med tiskanjem je prišlo do napake" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Vašega dokumenta ni bilo mogoče natisniti: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos ne more ustvariti .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos ne more nadaljevati." + #~ msgid "Tabs" #~ msgstr "Tabulatorji" @@ -5117,7 +5474,7 @@ #~ msgstr "Uporabi krmarjenje z zavihki" #~ msgid "Use tabbed browsing Checkbox" -#~ msgstr "Uporabi krmarjenje z zavihki okvirček" +#~ msgstr "Izbira uporabe krmarjenja z zavihki" #~ msgid "Show" #~ msgstr "Pokaži" @@ -5126,22 +5483,22 @@ #~ msgstr "Biblična besedila" #~ msgid "Bible Texts Checkbox" -#~ msgstr "Vklop bibličnega besedila" +#~ msgstr "Izbira bibličnega besedila" #~ msgid "Previewer Checkbox" -#~ msgstr "Okvirček za predogled" +#~ msgstr "Izbira predogleda" #~ msgid "Commentaries Checkbox" -#~ msgstr "Okvirček za komentarje" +#~ msgstr "Izbira komentarjev" #~ msgid "Dictionary/Lexicon" #~ msgstr "Slovar/Leksikon" #~ msgid "Dictionary/Lexicon Checkbox" -#~ msgstr "Slovar/Leksikon okvirček" +#~ msgstr "Izbira slovarja/leksikona" #~ msgid "Parallel View in a tab" -#~ msgstr "Vzporeden pogled v zavihkih" +#~ msgstr "Vzporeden pogled v zavihku" #~ msgid "Tabs and Panes" #~ msgstr "Zavihki in okvirčki" @@ -5162,9 +5519,9 @@ #~ "program to handle these references?" #~ msgstr "" #~ "URL reference \"sword://\" (podobno kot spletne\n" -#~ "strani) lahko uporabljajo programi da pogledajo\n" +#~ "strani) lahko uporabljajo programi, da pogledajo\n" #~ "biblijske reference. Vaš sistem trenutno nima\n" -#~ "nobenega programa ki bi bil nastavljen za\n" +#~ "nobenega programa, ki bi bil nastavljen za\n" #~ "upravljanje s temi referencami.\n" #~ "\n" #~ "Ali želite da se Xiphos nastavi kot program\n" @@ -5257,7 +5614,7 @@ #~ "Trenutno ni nameščenih modulov z Biblijami. Da bi pričeli, morate Xiphosu " #~ "namestiti najmanj eno Biblijo.\n" #~ "\n" -#~ "Z vašim dovoljenjem, se bo Xiphos obrnil na Upravljalca z moduli tako da " +#~ "Z vašim dovoljenjem, se bo Xiphos obrnil na Upravljalca z moduli, tako da " #~ "jih boste lahko namestili iz spletne strani Crosswire:\n" #~ " 1. Konfigurirajte oddaljeno namestitev.\n" #~ " 2. Povežite se.\n" @@ -5268,7 +5625,7 @@ #~ "Opozorilo: Če živite v državi kjer je preganjanje, Upravljalca modulov " #~ "uporabljajte pazljivo.\n" #~ "\n" -#~ "Sme torej Xiphos poklicati Upravljalca modulov tako da boste lahko " +#~ "Sme torej Xiphos poklicati Upravljalca modulov, tako da boste lahko " #~ "namestili Biblijo?" #~ msgid "Parallel View" @@ -5278,37 +5635,37 @@ #~ msgstr "Vzporedno 1" #~ msgid "Parallel 1 Combo" -#~ msgstr "Vzporedno 1 okno" +#~ msgstr "Izbira vzporedno 1" #~ msgid "Parallel 2" #~ msgstr "Vzporedno 2" #~ msgid "Parallel 2 Combo" -#~ msgstr "Vzporedno 2 okno" +#~ msgstr "Izbira vzporedno 2" #~ msgid "Parallel 3" #~ msgstr "Vzporedno 3" #~ msgid "Parallel 3 Combo" -#~ msgstr "Vzporedno 3 Okno" +#~ msgstr "Izbira vzporedno 3" #~ msgid "Parallel 4" #~ msgstr "Vzporedno 4" #~ msgid "Parallel 4 Combo" -#~ msgstr "Vzporedno 4 Okno" +#~ msgstr "Izbira vzporedno 4" #~ msgid "Parallel 5" #~ msgstr "Vzporedno 5" #~ msgid "Parallel 5 Combo" -#~ msgstr "Vzporedno 5 okno" +#~ msgstr "Izbira vzporedno 5" #~ msgid "Use Verse Per Line" #~ msgstr "Uporabi eno vrsto za eno vrstico" #~ msgid "Import Bibletime Bookmarks" -#~ msgstr "Uvozi zaznamke iz bibličnih časov" +#~ msgstr "Uvozi zaznamke iz Bibletime" #~ msgid "Restore Folder" #~ msgstr "Obnovi mapo" @@ -5329,7 +5686,7 @@ #~ "SWORD dovoljuje lahkotno uporabo in proučevanje Bibličnih besedil, " #~ "komentarjev, leksikonov, slovarjev in drugih knjig. Mnogo vmesnikov je " #~ "bilo zgrajenih z uporabo tega ogrodja. Nameščen nabor knjig se lahko deli " -#~ "med vsemi vmesniki ki uporabljajo to ogrodje." +#~ "med vsemi vmesniki, ki uporabljajo to ogrodje." #~ msgid "About the SWORD Project" #~ msgstr "Vizitka projekta SWORD" @@ -5344,7 +5701,4 @@ #~ msgstr "Sinhronizira to okno iz glavnega okna" #~ msgid "Open the file in Studypad" -#~ msgstr "Odpri datoteko v študijski beležnici" - -#~ msgid "_Daily Devotion" -#~ msgstr "_Dnevne posvetitve" +#~ msgstr "Datoteko odpri v študijski beležnici" diff -Nru xiphos-4.0.0+dfsg1/po/sv.po xiphos-4.0.4+dfsg1/po/sv.po --- xiphos-4.0.0+dfsg1/po/sv.po 2014-12-23 21:31:27.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/sv.po 2015-06-16 17:44:26.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-21 21:51+0000\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-23 20:47+0100\n" "Last-Translator: Matthew Talbert \n" "Language-Team: Xiphos Dev Team Module name: " +msgstr "Modulhanterare" + +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Alternativ" + +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" +msgstr "" + +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Sökomfång" + +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Dagliga andakter" + +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Kartor" + +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Bilder" + +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Ordlistor" + +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" + +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Bibel" + +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Kommentar" + +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Uppslagsverk" + +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Allmäna böcker" + +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Byt namn på kommentar" + +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "Daglig journal" + +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Okänd" + +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Modullistor" + +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "sökomfång" + +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" + +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Installationskälla" + +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Huvudfönstermoduler" + +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Format" + +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Överskrifter" + +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Fotnoter" + +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Korsreferens" + +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Strongs nummer" + +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfologiska symboler" + +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemman" + +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Kristi ord i rött" + +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Grekiska dialekter" + +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Hebreiska vokal-punkter (nikkud)" + +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Hebreisk kantillation" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" + +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Translittererade former" + +#: ../src/gnome2/about_modules.c:583 +#, fuzzy +msgid "* Enumerations" +msgstr "Uppräkningar" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" + +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morfem segmentering" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" + +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Attribut" + +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Alternativ" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -188,18 +297,20 @@ "\n" "Böcker kan laddas ner från the SWORD Project." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "The SWORD Project" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "Gillar du att använda Xiphos för att studera bibeln? Skulle du vilja se " "menyerna i ett annat språk? Du kan översätta Xiphos!\n" @@ -208,23 +319,23 @@ "språk. Om du är villig och har förmågan att översätta åt oss, vänligen följ " "länken nedan, kontakta oss, och involvera dig i arbetet." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Om Xiphos-översättning" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Se TRANSLATION-HOWTO i Xiphos-källkoden" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos-utveckling" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Upphovsrätt © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Upphovsrätt © 2000-2015 Xiphos Development Team" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -237,79 +348,79 @@ "som har gett oss The SWORD Project." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:370 -#: ../src/gnome2/bookmarks_menu.c:670 ../src/gnome2/bookmarks_menu.c:769 -#: ../src/gnome2/bookmarks_treeview.c:135 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Bokmärk" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:771 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Ange mappnamn" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:773 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Mappnamn" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:774 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Mapp: " -#: ../src/gnome2/bookmarks_menu.c:208 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Ange bokmärkesfil" -#: ../src/gnome2/bookmarks_menu.c:356 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Redigera" -#: ../src/gnome2/bookmarks_menu.c:373 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Namn på mapp: " -#: ../src/gnome2/bookmarks_menu.c:376 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Namn på bokmärke: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:678 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Vers: " -#: ../src/gnome2/bookmarks_menu.c:380 ../src/gnome2/bookmarks_menu.c:679 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modul: " -#: ../src/gnome2/bookmarks_menu.c:502 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Ta bort vald mapp" -#: ../src/gnome2/bookmarks_menu.c:504 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(och allt av dess innehåll)?" -#: ../src/gnome2/bookmarks_menu.c:507 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Ta bort valt bokmärke" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Lägg till" -#: ../src/gnome2/bookmarks_menu.c:677 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etikett: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Sökresultat: %s" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." @@ -317,89 +428,89 @@ "Multi-referensbokmärken kan inte öppnas\n" "i separata flikar." -#: ../src/gnome2/bookmarks_treeview.c:867 ../src/gnome2/sidebar.c:1508 -#: ../src/gnome2/sidebar.c:1541 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Bokmärken" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "Krypteringsnyckel för modul %s" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "för:" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Ange krypteringsnyckel: " -#: ../src/gnome2/dialog.c:291 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Stäng utan att spara" -#: ../src/gnome2/dialog.c:736 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:872 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1557 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Verslista" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "Verslista" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Sökresultat" -#: ../src/gnome2/export_dialog.c:324 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "Vänligen kontrollera upphovsrätt innan du exporterar!" -#: ../src/gnome2/find_dialog.c:188 ../src/gnome2/find_dialog.c:367 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Hitta" -#: ../src/gnome2/find_dialog.c:207 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Fyll i ett ord eller en fras" -#: ../src/gnome2/find_dialog.c:222 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Sök baklänges" -#: ../src/gnome2/find_dialog.c:283 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Hitta nästa" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Välj typsnitt för modul" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Ändra typsnitt för" -#: ../src/gnome2/font_dialog.c:342 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modul" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Nuvarande typsnitt: " -#: ../src/gnome2/font_dialog.c:378 ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" @@ -408,66 +519,66 @@ msgid "Use the default font for this module" msgstr "Använd standardtypsnittet för denna modul" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" "BUG! Xiphos är på väg att krascha på grund av ett \"STRDUP\"-fel " "(strängduplicering)." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "Vänligen rapportera felet till Xiphos-teamet med:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" "BUG! Xiphos är på väg att krascha på grund av ett \"STRING\"-fel (strängfel)." -#: ../src/gnome2/main_window.c:594 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "Modulen har inget stöd för %s." -#: ../src/gnome2/main_window.c:664 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "Xiphos: Inga fönster." -#: ../src/gnome2/main_window.c:720 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "BibleSync: Nuvarande navigering skickad." -#: ../src/gnome2/main_window.c:724 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "BibleSync: Talar ej." -#: ../src/gnome2/main_window.c:908 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - Bibelstudieprogram" -#: ../src/gnome2/main_window.c:971 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Öppna en ny flik" -#: ../src/gnome2/main_window.c:1051 ../src/gnome2/sidebar.c:621 -#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standardvy" -#: ../src/gnome2/main_window.c:1112 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Kommentar-vy" -#: ../src/gnome2/main_window.c:1128 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Bok-vy" -#: ../src/gnome2/main_window.c:1155 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Välkommen till Xiphos" -#: ../src/gnome2/menu_popup.c:1247 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -486,33 +597,33 @@ "Det går därför inte att byta namn på\n" "kommentarer i Windows-miljö." -#: ../src/gnome2/menu_popup.c:1266 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Byt namn på kommentar" -#: ../src/gnome2/menu_popup.c:1269 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Namnge kommentar" -#: ../src/gnome2/menu_popup.c:1271 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Nytt namn" -#: ../src/gnome2/menu_popup.c:1272 ../src/gnome2/treekey-editor.c:141 -#: ../src/gnome2/treekey-editor.c:204 ../src/gnome2/treekey-editor.c:300 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Namn: " -#: ../src/gnome2/menu_popup.c:1282 ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modulnamn kan endast innehålla [A-Za-z0-9_]." -#: ../src/gnome2/menu_popup.c:1289 ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos känner redan till en modul med det namnet." -#: ../src/gnome2/menu_popup.c:1330 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -521,7 +632,7 @@ "Misslyckades med att skapa ny konfiguration:\n" "%s" -#: ../src/gnome2/menu_popup.c:1339 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -529,7 +640,7 @@ "Konfigurationsbyggfel:\n" "\n" -#: ../src/gnome2/menu_popup.c:1939 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "Ingen modul i denna vy." @@ -650,20 +761,20 @@ "Både denna steg-för-steg-instruktion och den generella instruktionen kan " "stängas när du vill." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Ta bort dessa moduler?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "Förbereder för borttagning" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Tar bort" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:152 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Ta bort" @@ -683,23 +794,23 @@ msgid "Install" msgstr "Installera" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arkivera dessa moduler?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "Förbereder för arkivering" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arkiverar" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arkivera" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -707,55 +818,59 @@ "Indexera dessa moduler för snabbsökning?\n" "(kan ta några minuter per modul)" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "Förbereder för indexering" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Indexerar" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indexera" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Ta bort snabbsökningsindex från dessa moduler?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "Förbereder för borttagning av index" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "Tar bort index" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Radering" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Denna modul har inget om-avsnitt." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modulnamn" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Moduler som har en bock är redan installerade" -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "Klicka i rutan för att arbeta med denna modul" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "Klicka i rutan för att installera/uppdatera denna modul" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Installerad" -#: ../src/gnome2/mod_mgr.c:628 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -764,7 +879,7 @@ "denna modul, som gör att det går fortare att söka i den (see Underhålls-" "panelen för denna funktion)" -#: ../src/gnome2/mod_mgr.c:646 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -772,13 +887,13 @@ "Låssymbolen betyder att den här modulen är krypterad, och att du behöver " "köpa en upplåsningsnyckel från ägaren av innehållet för att kunna öppna den" -#: ../src/gnome2/mod_mgr.c:663 ../src/main/biblesync_glue.cc:629 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 #: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Om" -#: ../src/gnome2/mod_mgr.c:689 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -786,19 +901,19 @@ "Uppdateringssymbolen betyder att den installerade modulen är äldre än den " "nyaste tillgängliga versionen av den: Du bör uppdatera modulen" -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Tillgänglig" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Storlek" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Beskrivning" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -807,33 +922,33 @@ "`mkdir %s' misslyckades:\n" "%s." -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "arkiverad i:\n" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Journaler och bönelistor kan inte indexeras." -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: ../src/gnome2/mod_mgr.c:1000 ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Färdigt" -#: ../src/gnome2/mod_mgr.c:1168 ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Okänd" -#: ../src/gnome2/mod_mgr.c:1496 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -842,7 +957,7 @@ "Repository (källa):\n" "%s" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" @@ -850,54 +965,44 @@ "Kategoriserat via\n" "modultyp" -#: ../src/gnome2/mod_mgr.c:1513 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Biblar" -#: ../src/gnome2/mod_mgr.c:1517 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Kommentarer" -#: ../src/gnome2/mod_mgr.c:1521 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Uppslagsverk" -#: ../src/gnome2/mod_mgr.c:1525 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Ordlistor" -#: ../src/gnome2/mod_mgr.c:1529 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Dagliga andakter" -#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Allmäna böcker" -#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "Kartor" - -#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "Bilder" - -#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kult/Oortodoxt" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" @@ -905,57 +1010,57 @@ "Kategoriserat efter\n" "tillgänglighet" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Uppdateringar" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Avinstallerade" -#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/sidebar.c:637 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Bönelista/Journal" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Uppdaterar nätverkskälla" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Nätverkskällan hittades inte" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Konfigurera" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Typ" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Rubrik" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Källa" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Mapp" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Användare" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Lösenord" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" @@ -967,12 +1072,12 @@ msgid "Add/Remove" msgstr "Lägg till/Ta bort" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Välj" -#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2066 -#: ../src/gnome2/sidebar.c:1526 ../src/gnome2/sidebar.c:1565 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Moduler" @@ -980,19 +1085,20 @@ msgid "Install/Update" msgstr "Installera/Uppdatera" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Underhåll" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Vänligen uppdatera" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Din modullista är inte uppdaterad!" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1000,7 +1106,7 @@ "Du har avinstallerat samtliga biblar.\n" "Xiphos behöver minst en bibel." -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1008,111 +1114,123 @@ "Det finns fortfarande inga installerade biblar.\n" "Xiphos kan inte fortsätta utan en bibel." -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standardnätverkskällor har öppnats." -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "Kunde inte öppna standardnärtverkskällor från CrossWire." -#: ../src/gnome2/mod_mgr.c:2787 ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Ta bort vald källa" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Ange en nätverkskälla" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Rubrik:" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Typ:" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Klient:" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Mapp:" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Användare (valfritt):" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Lösenord (valfritt):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "En källa med det här namnet finns redan." -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Ta bort nätverkskälla" -#: ../src/gnome2/mod_mgr.c:3554 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "[ingen modul]" -#: ../src/gnome2/navbar_book.c:371 ../src/gnome2/navbar_book_dialog.c:312 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "Stega utåt, till sektionen som innehåller denna" -#: ../src/gnome2/navbar_book.c:393 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "Gå till föregående objekt" -#: ../src/gnome2/navbar_book.c:414 ../src/gnome2/navbar_book_dialog.c:352 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Gå till nästa objekt" -#: ../src/gnome2/navbar_book.c:436 ../src/gnome2/navbar_book_dialog.c:372 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Stega inåt, till första subsektionen" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:855 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "Synkronisera fönstrets scroller mot huvudfönstret" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2073 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Parallella" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Koppla loss/Fäst" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Modulinställningar" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:620 -#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:250 -#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Parallell vy" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "Passerfras för BibleSync-sessionen" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "Fras:" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." @@ -1120,96 +1238,96 @@ "Val av läge misslyckades.\n" "Slå på \"Debug\" och försök igen för att se varför." -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "Kunde inte byta läge.\n" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "BibleSync: %s (passerfras \"%s\")." -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "Inaktiverad" -#: ../src/gnome2/preferences_dialog.c:1021 ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Personlig" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "Talare" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "Åhörare" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1926 -#: ../src/gnome2/preferences_dialog.c:2403 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- Välj --" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Systemspråket kommer uppdateras efter nästa omstart." -#: ../src/gnome2/preferences_dialog.c:1961 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Inställningar" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Allmänt" -#: ../src/gnome2/preferences_dialog.c:2049 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Alternativ" -#: ../src/gnome2/preferences_dialog.c:2052 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "BibleSync" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Typsnitt" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Färg" -#: ../src/gnome2/preferences_dialog.c:2062 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Storlekar och typsnitt" -#: ../src/gnome2/preferences_dialog.c:2076 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Specialmoduler" -#: ../src/gnome2/preferences_dialog.c:2785 ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Rensa lista?" -#: ../src/gnome2/preferences_dialog.c:2786 ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Är du säker på att du vill rensa modullistan?" -#: ../src/gnome2/preferences_dialog.c:2837 ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Ta bort modul?" -#: ../src/gnome2/preferences_dialog.c:2838 ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Är du säker på att du vill ta bort vald modul?" @@ -1228,20 +1346,20 @@ msgid "found in " msgstr "hittades i " -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Ny lista %s" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Den sista modullistan kan inte tas bort" -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Ta bort lista?" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Är du säker på att du vill ta bort:" @@ -1261,7 +1379,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1332,7 +1450,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1365,15 +1483,15 @@ "* Morfologiska taggar tolkas bokstavligt, t ex N-ASF (\"substantiv, " "ackusativ singular femininum\") -- see Ronbinson-modulen för detaljer." -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "Modulen är ingen bibel eller kommentar" -#: ../src/gnome2/search_dialog.c:1247 ../src/gnome2/sidebar.c:996 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "BibleSync-transmission är inte aktiverad." -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1381,105 +1499,95 @@ "Det här är en inklusiv sökning (\"logisk OCH\"):\n" "Träffar som innehåller samtliga sökord visas." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "_Avancerad sökning" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "Öppna fönstret för avancerad sökning" -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Sök i modul" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "Bibel" - -#: ../src/gnome2/search_sidebar.c:259 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Kommentar" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Söktyp" -#: ../src/gnome2/search_sidebar.c:287 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Flerordssökning" -#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Regulära uttryck" -#: ../src/gnome2/search_sidebar.c:306 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Specifik fras" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Sökalternativ" -#: ../src/gnome2/search_sidebar.c:333 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Matcha shiftläge" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Sökomfång" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Inga avgränsningar" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Använd avgränsningar" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Föregående sökning" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Avgränsningar" -#: ../src/gnome2/search_sidebar.c:410 ../src/gnome2/search_sidebar.c:443 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Nedre" -#: ../src/gnome2/search_sidebar.c:422 ../src/gnome2/search_sidebar.c:450 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Övre" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "Öppna modulen i redigerare?" -#: ../src/gnome2/sidebar.c:843 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "Om nej, så öppnas den endast för visning." -#: ../src/gnome2/sidebar.c:950 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "Klistra in versreferens" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "Lista:" -#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1549 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Sök" -#: ../src/gnome2/sidebar_dialog.c:164 ../src/gnome2/sidebar_dialog.c:173 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sidomeny" @@ -1487,73 +1595,73 @@ msgid "Powered by the SWORD Project" msgstr "Byggt på SWORD Project" -#: ../src/gnome2/tabbed_browser.c:359 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "Kan ej skapa flik-katalog." -#: ../src/gnome2/treekey-editor.c:139 ../src/gnome2/treekey-editor.c:202 -#: ../src/gnome2/treekey-editor.c:298 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Bönelista/Journalnotering" -#: ../src/gnome2/treekey-editor.c:140 ../src/gnome2/treekey-editor.c:203 -#: ../src/gnome2/treekey-editor.c:299 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Nytt namn" -#: ../src/gnome2/treekey-editor.c:260 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Ta bort markerat objekt" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Januari" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Februari" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Mars" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "April" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Maj" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Juni" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Juli" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Augusti" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "September" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Oktober" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "November" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "December" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1562,7 +1670,7 @@ "Xiphos kan därför inte skala om bilder\n" "för att få plats i fönstret." -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" @@ -1570,7 +1678,7 @@ "Felmatchat paket\n" "\n" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" @@ -1578,7 +1686,7 @@ "Närvaroanmälan:\n" "\n" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" @@ -1586,11 +1694,11 @@ "Navigeringspaket:\n" "\n" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "Okänd modul" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." @@ -1598,43 +1706,43 @@ ".\n" "Navingerade indirekt via verslistan." -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " msgstr "FEL: Okänd BibleSync-indikator:" -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" msgstr "Andra indikatorer är:" -#: ../src/main/biblesync_glue.cc:579 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "Klicka i rutan för att lyssna på denna talare" -#: ../src/main/biblesync_glue.cc:592 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "Tillgängliga talare" -#: ../src/main/biblesync_glue.cc:601 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "" -#: ../src/main/biblesync_glue.cc:611 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" msgstr "Senaste navigering var direkt eller indirekt" -#: ../src/main/biblesync_glue.cc:620 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "Senaste navigering" -#: ../src/main/biblesync_glue.cc:639 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" msgstr "UUID" -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "IP-adress:" -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " @@ -1642,7 +1750,7 @@ "\n" "Program:" -#: ../src/main/biblesync_glue.cc:663 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " @@ -1650,7 +1758,7 @@ "\n" "Enhet:" -#: ../src/main/biblesync_glue.cc:664 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " @@ -1658,13 +1766,13 @@ "\n" "UUID: " -#: ../src/main/display.cc:88 +#: ../src/main/display.cc:89 msgid "" "

This module has no content at this point.
" msgstr "" "

Denna modul har just nu inget innehåll.
" -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1673,63 +1781,63 @@ "Felaktigt kodad egen noteringsetikett:\n" "'%s'" -#: ../src/main/display.cc:1110 ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Kapitel" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos förstår inte mer än ett argument." -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "Initierar HTML" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Bygger gränssnitt" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Startar Sword" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Laddar inställningar" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Visar Xiphos" -#: ../src/main/module_dialogs.cc:188 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Förhandsgranskare" -#: ../src/main/module_dialogs.cc:243 ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Fotnot" -#: ../src/main/module_dialogs.cc:249 ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Korsreferens" -#: ../src/main/module_dialogs.cc:255 ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strong's" -#: ../src/main/module_dialogs.cc:261 ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 ../src/main/module_dialogs.cc:386 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfologi" -#: ../src/main/module_dialogs.cc:1012 ../src/main/url.cc:529 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Tillbaka till " @@ -1738,196 +1846,204 @@ msgstr "Okänd parallellmodul:" #: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Strongs nummer" -#: ../src/main/parallel_view.cc:410 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Fotnoter" -#: ../src/main/parallel_view.cc:420 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfologiska symboler" -#: ../src/main/parallel_view.cc:430 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Hebreiska vokal-punkter (nikkud)" -#: ../src/main/parallel_view.cc:440 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Hebreisk kantillation" -#: ../src/main/parallel_view.cc:450 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Grekiska dialekter" -#: ../src/main/parallel_view.cc:460 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Korsreferens" -#: ../src/main/parallel_view.cc:470 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemman" -#: ../src/main/parallel_view.cc:480 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Överskrifter" -#: ../src/main/parallel_view.cc:490 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfem segmentering" -#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Kristi ord i rött" -#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Translitteration" -#: ../src/main/parallel_view.cc:524 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Variationer av grundtexten" -#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Primär tolkning" -#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Sekundär tolkning" -#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Alla tolkningar" -#: ../src/main/parallel_view.cc:560 ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 msgid "Transliterated Forms" msgstr "Translittererade former" -#: ../src/main/parallel_view.cc:570 ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 msgid "Enumerations" msgstr "Uppräkningar" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Ordlistor" + #: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "visa sammanhang" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Tillväxt" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "För tillväxt
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Frälsning" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "För frälsning
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Hälsa" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "För hälsa
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Övrigt" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Övrigt
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Punkt x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(x)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Punkt y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Punkt z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Underrubrik 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Underrubrik 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Underrubrik 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Underrubrik 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Underrubrik 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Underrubrik 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Underrubrik 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Underrubrik 4
" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "Namn på ny bönelista/journal" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos hittar redan detta i bönelistan." -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1936,19 +2052,19 @@ "Xiphos kan inte skapa modulsökväg:\n" "%s" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "En enkel bönelista. \\par\\par Modul skapad av Xiphos." -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "Enkel bönelista" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "Min bönelista" -#: ../src/main/prayerlists.cc:335 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1956,102 +2072,102 @@ "Personer:
Anna
Johannes
Lars

Kyrkan:
Kyrkbänkar
Gemenskap
Biblar åt missionärer


" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "En ämnebaserad bönelista. \\par\\par Modul skapad av Xiphos." -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "Ämnesbönelista" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Robert
Samuel
Birgitta
Stefan
" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Andlig tillväxt" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Adam
Dennis
" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Birgitta
Stefan
" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "En månatlig bönelista. \\par\\par Modul skapad av Xiphos." -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "Månagtlig bönelista" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "En daglig journal. \\par\\par Modul skapad av Xiphos." -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "Daglig journal" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "An outlined topic (t.ex. predikan). \\par\\par Modul skapad av Xiphos." -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "Ämne" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Rubrik A" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Rubrik A
" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Rubrik B" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Rubrik B
" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Rubrik C" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Rubrik C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Egen kommentar" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Sökresultat %s: %s" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Ta bort spännvid?" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Är du säker på att du vill ta bort detta sökomfång?" -#: ../src/main/search_dialog.cc:645 ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Sök: " -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2062,16 +2178,16 @@ "Ingen sådan modul är installerad.\n" "%s" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "Vänligen justera modullistan." -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Ingen snabbsökningsindex för %s.%s%s" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2079,7 +2195,7 @@ "\n" "Sökning i denna modul är nu av slaget 'multiord'." -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2087,19 +2203,19 @@ "\n" "Se Modulhanteraren, underhållspanelen." -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Sökning slutförd" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "matchar" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "Det finns ingen modul med kommentarer." -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "Miljövariabeln $HOME är inte satt!" @@ -2108,12 +2224,12 @@ msgid "Xiphos can not create directory " msgstr "Xiphos kan inte skapa katalog" -#: ../src/main/settings.c:135 ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "kan inte skapa" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2125,7 +2241,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Tom inställningsfil -- Ingen backup?! Information har gått förlorad!" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2141,11 +2257,11 @@ "kan Xiphos inte fortsätta\n" "och kommer nu att avslutas." -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "Installation av bibelmodul slutförd." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2153,15 +2269,15 @@ "Modulfel: Oanvändbar xref-kodning.\n" "Vänligen rapportera detta, med modul och vers." -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "vers" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "kapitel" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2169,7 +2285,7 @@ "Xiphos fil för\n" "språkförkortningar saknas" -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2177,7 +2293,7 @@ "Xiphos språkförkortningsfil\n" "kan inte öppnas." -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." @@ -2185,7 +2301,7 @@ "Xiphos kan inte allokera utrymme\n" "för språkförkortningar." -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2194,7 +2310,7 @@ "språkförkortningsfilen." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" @@ -2203,11 +2319,11 @@ "Kunde inte hitta något systemspråk som matchar `%s'.\n" "%s" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Boknamn och menyer kan vara oöversatta." -#: ../src/main/sword.cc:1052 ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2218,7 +2334,7 @@ "%s.\n" "Vill du öppna dessa också?%s" -#: ../src/main/sword.cc:1056 ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2230,11 +2346,11 @@ "Den första kommer att öppnas i huvudfönstret\n" "coh de andra i separata fönster." -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Dagliga andakter efterfrågades men inga är installerade." -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2258,93 +2374,93 @@ "\n" "Vänligen fyll i krypteringsnyckeln i rutan." -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Rensa historik" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "Historik ➛Verslista" -#: ../src/main/url.cc:103 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL hittades inte:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos kunde inte köra %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Visningsfel:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Visa %s i huvudfönstret" -#: ../src/main/xml.c:86 ../src/main/xml.c:478 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Dokumentet kunde inte skapas korrekt.\n" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Vad behöver jag göra för att bli frälst?" -#: ../src/main/xml.c:98 ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Apg 16:31" -#: ../src/main/xml.c:103 ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Ef 2:8,9" -#: ../src/main/xml.c:108 ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romarbrevet 1:16" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Vad är evangeliet?" -#: ../src/main/xml.c:114 ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:270 ../src/main/xml.c:416 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Dokumentet kunde inte läsas korrekt.\n" -#: ../src/main/xml.c:276 ../src/main/xml.c:422 ../src/main/xml.c:444 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "tomt dokument \n" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "fel typ, rotnod != SwordBookmarks\n" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "fel typ, rotnod != Copy_Export\n" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "%s
%s
Kapitel %d

" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "
Kapitel %d

" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2357,7 +2473,7 @@ "Kapitel %d\n" "\n" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2370,12 +2486,12 @@ "Kapitel %d\n" "\n" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "%s%s: %s Kapitel %d

" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" @@ -2384,82 +2500,82 @@ "%s: %s Kapitel %d\n" "\n" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "  [%d]" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr " [%d]" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "%s%s (%s %d:%d%s)" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "%s(%s %d:%d%s)%s " -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "%s (%s %d:%d%s)" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "(%s %d:%d%s) %s" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr " %s%s" -#: ../src/main/xml.c:529 ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "%s(%s %d:%d-%d%s)" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "(%s %d:%d-%d%s)
" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "(%s %d:%d-%d%s)\n" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Gamla Testamentet" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Mos - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Nya Testamentet" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Upp" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Exempellista av moduler" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "fel typ, rotnod != %s\n" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2468,7 +2584,7 @@ "Misslyckades att spara inställningar! Status %d, storlek %d\n" "%s" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "Försöker återgå till föregående sparläge." @@ -2482,13 +2598,13 @@ msgstr "Bokmärk" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Skapa ny mapp" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Ny mapp" @@ -2497,7 +2613,7 @@ msgstr "Ny ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Avbryt bokmärkning" @@ -2510,22 +2626,22 @@ msgstr "Etikettens innehåll" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Vers:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Versens innehåll" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modul:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Modulens innehåll" @@ -2662,7 +2778,7 @@ msgstr "Nytt dokument" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Kopiera/Exportera stycke" @@ -2699,7 +2815,7 @@ msgstr "Exporterare hela boken" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Bok" @@ -2806,8 +2922,8 @@ msgid "Open about dialog" msgstr "Öppna \"om\"-fönster" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Fetstil" @@ -2856,7 +2972,7 @@ msgstr "Ta bort valda" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Ta bort objekt" @@ -3134,124 +3250,84 @@ msgstr "_Redigera" #: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Visa" - -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Hjälp" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "toolbutton1" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "toolbutton10" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "toolbutton3" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "toolbutton2" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "toolbutton4" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "toolbutton6" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "toolbutton7" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "Brödtext" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Rubrik 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Rubrik 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Rubrik 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Rubrik 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Rubrik 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Rubrik 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Adress" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "Förformatterad" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Punktlista" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "Numrerad lista (romersk)" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Numrerad lista" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Alfabetisk lista" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "toolbutton11" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Genomstruken" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "Ändra den markerade textens färg." -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "Understryk markerad text med annan bakgrundsfärg." -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "toolbutton9" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "Markera/Avmarkera vers" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Markera" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Avmarkera" @@ -3325,33 +3401,41 @@ msgstr "Ta bort snabbsöknings-index från dom valda modulerna." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Fortsätt" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modulhanterare" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" "VARNING: Om du lever i ett land där förföljelse förekommer så använd " "detta med försiktighet." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Lägg till och ta bort källor" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Nuvarande lokala källor" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3360,16 +3444,16 @@ "eller ett USB-minne. En sådan katalog måste innehålla underkatalogerna " "\"mods.d\" och \"modules\"." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" "Ta bort en av dina lokala kataloger från listan av installationskällor." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Nuvarande nätverkskällor" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3377,43 +3461,43 @@ "Lägg till en specifik fjärrkälla. Du måste ange hostnamnet och katalogen där " "repositoriet finns." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "Ta bort en nätverkskälla." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Installationskälla" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Lokalt" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Nätverkskälla" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Installera till" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "Personlig area, endast för din egen användning:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Hemkatalog" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "Systemarea, för alla användare:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Systemkatalog för Sword" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3422,10 +3506,14 @@ "vill riskera att bli upptäckt så bör du inte använda " "fjärrinstallationsfunktionen. " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Lokal installationskatalog" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Dropdownlista över historik" @@ -3434,11 +3522,11 @@ msgid "Choose book to display" msgstr "Välj bok att visa" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Book Selector Button" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "Uppenbarelseboken" @@ -3446,11 +3534,11 @@ msgid "Choose chapter to display" msgstr "Välj kapitel att visa" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Toggle Chapter Button" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3611,11 +3699,11 @@ "inom en grupp; Talare, för att synkronisera åhörares bibelprogram att följa " "det du visar,Åhörare, för att följa en talares navigering." -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "Läge:" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "Välj vilket läge BibleSync ska köras i." @@ -3683,11 +3771,11 @@ msgid "BSP privacy button" msgstr "BSP privacy button" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "Navigering:" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "Välj hur du vill hantera inkommande navigering." @@ -3716,11 +3804,11 @@ msgid "BSP nav verse list radio button" msgstr "BSP nav verse list radio button" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "Lyssna:" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "Xiphos kommer att lyssna till talare enligt vad som väljs här." @@ -3760,20 +3848,20 @@ msgid "BSP listen none radio button" msgstr "BSP listen none radio button" -#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "Extra utskrifter:" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " "chatty. Also, decide whether to allow group parameter as Xiphos' tab number." msgstr "" "Ytterligare utskrifter kan förekomma i BibleSync-sessioner genom att slå på " -"närvaro, felmatchning och debug. Var medveten om att dessa är väldigt pratiga " -"om du slår på dom. Välj också om du vill använda grupp-paramentern för att " -"välja vilken flik som ska följa navigeringen." +"närvaro, felmatchning och debug. Var medveten om att dessa är väldigt " +"pratiga om du slår på dom. Välj också om du vill använda grupp-paramentern " +"för att välja vilken flik som ska följa navigeringen." #: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73 msgid "Presence" @@ -3956,177 +4044,181 @@ msgstr "Enable Prayer Lists Checkbox" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "Visning av versnumrering" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "Alternativ för hur versnumrering visas" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "Fetmarkera versnummer" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "Verse number bold checkbox" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "Hakparenteser" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "Visa versnummer inom [hakparenteser]" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "Verse number bracket checkbox" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "Upphöjd versnumrering" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "Visa versnumrering som upphöjd text" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "Verse number superscript checkbox" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "Standardsökväg för StudyPad" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Välj en mapp" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "Standardsökvägskombination för StudyPad" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Allmänt övrigt" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Huvudfönstermoduler" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Bibeltext" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Byt kombination av bibeltexter" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Byt kombination av kommentarer" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Uppslagsverk" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Byt kombination av uppslagsverk" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Byt kombination av böcker" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Moduler" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Rensa " -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Clear Modules from List Button" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Ta bort vald modul från listan" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Delete Selected Module From List Button" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "Öppna ett fönster för att välja moduler" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Lägg till moduler" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Open Selection Dialog Button" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Moduler parallell" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Specialmoduler" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Dagliga andakter" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Kombination av dagliga andakter" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Hebreiskt lexikon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "Kombination av hebreiska lexikon" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Grekiskt lexikon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Kombination av grekiska lexikon" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Förvalt uppslagsverk" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Byt förvald kombination av uppslagsverk" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Egna anteckningar" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Ändra kombination av egna noteringar" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Moduler övrigt" @@ -4158,6 +4250,11 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +#, fuzzy +msgid "Enable/disable the Statusbar" +msgstr "Aktivera BibleSync i talar-läge." + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Avancerad sökning" @@ -4367,11 +4464,11 @@ msgid "Found" msgstr "Hittade" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Resultatsummeringsfönster" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Resultatsummeringstabell" @@ -4661,6 +4758,10 @@ msgid "_Module Manager" msgstr "_Modulhanterare" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Visa" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Förhandsgranska _daglig personlig andakt" @@ -4805,27 +4906,27 @@ msgid "Learn about Xiphos" msgstr "Mer om Xiphos" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Kommentera vers" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Öppna modul" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Anteckning" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "Öppna i redigerare" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Vers per rad" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "Fotnot-/Korsreferensmarkör" @@ -4833,98 +4934,98 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "Visa icke-anonyma markörer, t ex \"*n23\"" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Varianter" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Bildinnehåll" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Respektera typsnitt" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Kommentar per kapitel" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "Dubbelt radavstånd" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Uppslag" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Använd nuvarande uppslagsverk" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Surfa på BibleMap.org" -#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Lås upp denna modul" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Visa boköverskrift" -#: ../ui/xi-menus.glade.h:94 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Visa kapitelöverskrift" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Byt namn på egen kommentar" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Dumpa egen kommentar" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Läs sektionen högt" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "Spara resultaten som enskilt bokmärke" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "Spara listan som enskilt bokmärke" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "Spara resultaten som serie av bokmärken i deras egen katalog" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "Spara listan som serie av bokmärken" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" "Visa ett fönster att klistra in versreferenser i, för att fylla verslistan." -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "Populera verslista" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." msgstr "Kopiera hela verslistan direkt till historik-listan." -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "Fyll upp historik från verslista" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:95 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." @@ -4932,99 +5033,99 @@ "Skicka denna vers via BibleSync till andra, om du är i Personlig- eller " "Talar-läge." -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "Skicka lista via BibleSync" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:96 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "Exportera lista" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "Öppna detta bokmärke i en ny flik" -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "Öppna i ny flik" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Öppna detta bokmärke i ett dialogfönster" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Öppna i ett dialogfönster" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Lägg till en ny mapp i vald mapp" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Infoga nytt bokmärke här" -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Infoga bokmärke" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Redigera bokmärkesobjekt" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Redigera objekt" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Ta bort objekt" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Expandera alla bokmärkesgrupper" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Expandera alla" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Kollapsa alla bokmärkesgrupper" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Kollapsa alla" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Tillåt bokmärke att flyttas från en mapp till en annan" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Tillåt flyttning" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Ladda in andra bokmärken (standardval: från BibleTime)" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Importera bokmärken" -#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Ta bort mapp och spara den" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Exportera till mapp" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Öppna vald modul i en ny flik" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -5032,79 +5133,79 @@ "Öppna vald modul i ett\n" "\tseparat ['dialogfönster'] " -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "Öppna i separat fönster" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Skapa en ny enkel bönelista" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Enkel" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "Skapa en ny ämnesbönelista" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Ämne" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "Skapa en ny månatlig journal" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Månatlig" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Skapa en ny daglig journal" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Daglig" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Skapa nytt ämne med innehållsförteckning" -#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Med innehållsförteckning" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "Öppna modul i editor eller visningsfönster" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "Öppna i ett separat fönster" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Lägg till ett underobjekt" -#: ../ui/xi-menus.glade.h:148 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Lägg till underobjekt" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "Lägg till ett objekt" -#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Lägg till objekt" -#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Ta bort detta objekt" -#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Ändra detta objekt" @@ -5116,6 +5217,105 @@ msgid "Study the Bible" msgstr "Studera bibeln" +#~ msgid "network setup errors." +#~ msgstr "anslutningsproblem." + +#~ msgid " client socket" +#~ msgstr " socket på klientsidan" + +#~ msgid " server socket" +#~ msgstr " socket på serversidan" + +#~ msgid "bad magic" +#~ msgstr "felaktigt kontrollvärde" + +#~ msgid "bad protocol version" +#~ msgstr "felaktig protokollversion" + +#~ msgid "bad msg type" +#~ msgstr "felaktig meddelandetyp" + +#~ msgid "bad packet count" +#~ msgstr "felaktigt antal paket" + +#~ msgid "bad packet index" +#~ msgstr "felaktigt paketindex" + +#~ msgid "bad body format" +#~ msgstr "felaktigt format" + +#~ msgid "missing required header " +#~ msgstr "saknar nödvändig header" + +#~ msgid "Spoof stopped: " +#~ msgstr "Förfalskning förhindrad:" + +#~ msgid "Ignoring echo." +#~ msgstr "Ignorerar eko." + +#~ msgid "Domain not 'BIBLE-VERSE': " +#~ msgstr "Domänen är ej 'BIBLE-VERSE':" + +#~ msgid "Invalid group: " +#~ msgstr "Felaktig grupp:" + +#~ msgid " present at " +#~ msgstr " på adress" + +#~ msgid " using " +#~ msgstr " med grupp" + +#~ msgid "[no dump ready]" +#~ msgstr "[ingen dump redo]" + +#~ msgid "select < 0" +#~ msgstr "select < 0" + +#~ msgid "recvfrom < 0" +#~ msgstr "recvfrom < 0" + +#~ msgid "Transmit failed.\n" +#~ msgstr "Transmissionen misslyckades.\n" + +#~ msgid "" +#~ "Unable to multicast; BibleSync is now disabled. If your network " +#~ "connection changed while this program was active, it may be sufficient to " +#~ "re-enable." +#~ msgstr "" +#~ "Multicast misslyckades; Bibelsynk är nu avstängt. Om din " +#~ "nätverksanslutning ändrades medan detta program var aktivt, så kan det " +#~ "hjälpa att försöka igen." + +#~ msgid "toolbutton1" +#~ msgstr "toolbutton1" + +#~ msgid "toolbutton10" +#~ msgstr "toolbutton10" + +#~ msgid "toolbutton3" +#~ msgstr "toolbutton3" + +#~ msgid "toolbutton2" +#~ msgstr "toolbutton2" + +#~ msgid "toolbutton4" +#~ msgstr "toolbutton4" + +#~ msgid "toolbutton6" +#~ msgstr "toolbutton6" + +#~ msgid "toolbutton7" +#~ msgstr "toolbutton7" + +#~ msgid "toolbutton11" +#~ msgstr "toolbutton11" + +#~ msgid "toolbutton12" +#~ msgstr "toolbutton12" + +#~ msgid "toolbutton9" +#~ msgstr "toolbutton9" + #~ msgid "UUID spoofed: wrong ipaddr." #~ msgstr "UUID förfalskat: Felaktig IP-adress." diff -Nru xiphos-4.0.0+dfsg1/po/tr.po xiphos-4.0.4+dfsg1/po/tr.po --- xiphos-4.0.0+dfsg1/po/tr.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/tr.po 2015-06-16 17:54:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 3.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-30 00:47+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Turkish \n" @@ -16,297 +16,266 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" +"Xiphos hatası: bildiriniz null Bu, display_mod \"olmaz. sword_main.cc: " +"oluştu set_treekey Bu ne zaman yapıyordun sen?" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "Yapılandırması bulunamadı" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "Emin misiniz sizin için notu silmek istiyorum" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Açık" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "belge Untitled" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "Değişiklikleri belge kaydet" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "kapatmadan önce?" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "kaydetmek istemiyorsanız, değişiklikler kalıcı olarak kaybolur." -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Dosya" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "StudyPad" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "Editör notu" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "Dua Listesi / Dergi Editörü" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Kılıç Modül Hakkında" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Tüm modül" +msgid "Module name: " +msgstr "Modül Yöneticisi" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "Seçenekleri" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Kapsam" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Günlük adanmışlık" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" -"Xiphos hatası: bildiriniz null Bu, display_mod \"olmaz. sword_main.cc: " -"oluştu set_treekey Bu ne zaman yapıyordun sen?" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "Haritaları" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "Yapılandırması bulunamadı" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "Görüntüler" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Sayfa %d /%d" +#: ../src/gnome2/about_modules.c:429 +#, fuzzy +msgid "Glossary" +msgstr "Sözlükler" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Açık" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "Olarak kaydet" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "İncil" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "belge Untitled" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Yorum" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "Emin misiniz sizin için notu silmek istiyorum" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Sözlük" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML Çıktı" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML Kaynak" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "Düz Kaynak" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Genel Kitaplar" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "_Print ..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Adlandırmak Yorum" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "Baskı Pre_view" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "DailyJournal" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "_Quit" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Bilinmeyen" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "_Open" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "_Save" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "Modül Listeler" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "Kaydetmek _As ..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "Aralıkları" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Yeni" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "Yeni belge" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Yükleme Kaynağı" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "Silmek" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Ana Pencere Modülleri" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "Silmek geçerli not" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Format" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_file" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Başlıkları" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML _Output" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML Kaynak" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "_Plain Kaynak" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_View" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Dipnotlar" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Kaydetmek" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Çapraz referans" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "Bağlantı Ekle" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Güçlü Numaraları" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "Değişiklikleri belge kaydet" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Morfolojik Etiketler" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "kapatmadan önce?" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Lemmas" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "kaydetmek istemiyorsanız, değişiklikler kalıcı olarak kaybolur." +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Kırmızı Mesih'in Kelimeler" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Dosya" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Yunan Vurgular" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "StudyPad" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "İbranice Ünlü Noktaları" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "Editör notu" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "İbranice Cantillation" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "Dua Listesi / Dergi Editörü" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Kilidini açmak" - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "yazdırmak için hazırlanıyor" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "Baskı bu yazıcı desteklenmez" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "Çevirisi" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "Yazıcı%s PostScript yazdırma desteği yok." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "Baskı" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "yazdırmak için bekliyorum" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "Bir hata baskı oluştu" +#: ../src/gnome2/about_modules.c:595 +#, fuzzy +msgid "* Morpheme Segmentation" +msgstr "Morfem Segmentasyon" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "Bu belgenizi yazdırmak mümkün değildi: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Kılıç Modül Hakkında" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "Nitelik" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "Modül bilgi hakkında hiçbir bulunmuyor." +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "Seçenekleri" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -324,18 +293,20 @@ "inşa edilir. dizi kitap yüklü bir çerçeve kullanarak önyüz tüm arasında " "ortak olabilir. Kitap Projesi SWORD dan olabilir indirilebilir." -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD Projesi" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "İncil çalışma Xiphos kullanarak sever misiniz? Eğer anadil kullanarak kendi " "ekran görmek ister misiniz? Eğer Xiphos çevirmek olabilir! Biz dilde diğer " @@ -343,24 +314,24 @@ "çevirmek için aşağıdaki linke bakınız lütfen bize ulaşın ve çabalarımız ile " "yer almak edebiliyoruz." -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "Xiphos Çeviri Hakkında" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "Xiphos Bkz TERCÜME-HOWTO kaynak" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos gelişme" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Telif hakkı 2000-2009 Xiphos Geliştirme Ekibi" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Telif hakkı 2000-2015 Xiphos Geliştirme Ekibi" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -372,233 +343,233 @@ "verilmiş bize Troy millet diğer Griffitts ve tüm." #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Imi" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Klasör Adı girin" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Klasör Adı" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Klasör:" -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "Belirtmek imleri dosyası" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Düzenlemek" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Klasör adı:" -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Işareti adı:" -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Ayet:" -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Modülü:" -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Seçilen klasör kaldırma" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(Ve tüm içeriği)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "seçili yer imini kaldır" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Eklemek" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Etiket:" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "Arama sonucu:%s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Imleri" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "modül için %s Cipher anahtar sözcükler" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "için:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "Enter tuşu:" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "Yakın Tasarruf olmadan" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos:" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "Yakın Tasarruf _without" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Ayet Listesi" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "VerseList" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "Arama sonuçları" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "ihracat öncesi telif kontrol edin!" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Bulmak" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Kelime ya da cümle girin" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Arama geriye" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Sonrakini bul" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Set Modülü Yazı" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "için yazı tipini değiştirme" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Modül" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Geçerli yazı tipi:" -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Bu modül için varsayılan yazı tipi kullanın" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "HATA! Xiphos hakkında bir \"STRDUP\" hatası nedeniyle kaza etmektir." -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "ile Xiphos ekibine Lütfen bu hatayı bildirin:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "HATA! Xiphos hakkında \"STRING\" hatası nedeniyle kaza etmektir." -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "modüllerde o Güçlü Numaraları var" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos:" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - İncil Çalışması Yazılım" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "yeni bir sekme açma" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Standart Profil" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "Yorum Profili" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "Kitap Profili" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "Hoşgeldin Xiphos için" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -614,40 +585,40 @@ "içeriklerin resimler, açık şu bileşenlerin sınırlı Windows 'dosya " "sistemi, dosya isimlerinin değiştirilmesi çünkü izin vermez." -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "Adlandırmak Yorum" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "Seçim Commentary Adı" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "Yeni Adı" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "Adı:" -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "Modül adları yalnızca [A-Za-z0-9_] içermelidir." -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos zaten bu isimde bir modül biliyor." -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "yapılandırma, yeni oluşturmak alınamadı:%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -655,7 +626,7 @@ "Yapılandırma hatası kurmak:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -740,20 +711,20 @@ "zaman. Hem bu adım giriş-adım öğretim iletişim ve genel bir kapatılmaya " "iletişim olabilir." -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "Bu modüllerin kaldırılsın mı?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "kaldırmak için hazırlanıyor" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "Çıkarmadan" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Kaldırmak" @@ -773,78 +744,82 @@ msgid "Install" msgstr "Yüklemek" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "Arşiv bu modülleri?" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "arşiv için hazırlanıyor" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "Arşivleme" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "Arşiv" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" "arama indeksi için bu modüllerin-Build hızlı (modül / dakika sürebilir)?" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "endeks hazırlanıyor" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "Endeksleme" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "Indeks" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "Bu modüller için silme hızlı arama indeksi?" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "dizini silmek için hazırlanıyor" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "indeks silme" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "Silme" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "Modül bilgi hakkında hiçbir bulunmuyor." + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Modül Adı" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "Bir onay işareti bu modül zaten yüklü olduğu anlamına gelir" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "kutusunda bu modül üzerinde çalışmak için tıklayın" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "install / güncelleme için bu modülü seçmek için kutuyu tıklayın" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "Yüklü" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -852,7 +827,7 @@ "Endeks simge (bu işlev için Bakım bölmesinde bakınız) arama hızlı bu modül " "için bir ('Lucene') optimize endeksi inşa demektir" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" @@ -860,13 +835,13 @@ "Kilit simgesi, bu modül şifreli olduğu anlamına gelir ve bir içerik " "sahibinden anahtar kilidini satın gerektirir" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Hakkında" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" @@ -874,19 +849,19 @@ "Yenileme simgesi Yüklü modül yeni Mevcut modül daha büyük olduğu anlamına " "gelir: güncellemeniz gerekir modülü" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "Mevcut" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "Boyut" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "Açıklama" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -895,403 +870,404 @@ "`mkdir %s' başarısız oldu:\n" "%s." -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "arşivlenir:\n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "Dergi ve dua listeleri endeksli olamaz." -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Bitmiş" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Bilinmeyen" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "Depo:%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "Türü Modülü Categorized tarafından" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "İncille Metinler" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Yorumlar" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Sözlükler" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "Sözlükler" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "Günlük devotionals" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Genel Kitaplar" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "Haritaları" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "Görüntüler" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "Kült / Ortodoks Olmayan" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "Durumu ile Categorized" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "Güncellemeleri" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "Kaldırıldı" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "Dua Listesi / Dergi" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "Uzak bir kaynaktan Yenileniyor" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "Uzaktan kaynak bulunamadı" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Yapılandırmak" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Türü" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Başlık" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Kaynak" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Dizin" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "Kullanıcı" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "Şifre" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "Modül Kaynakları" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "Ekle / Kaldır" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "Seçmek" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Modülleri" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "Install / Güncelleme" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "Bakım" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Lütfen yenileyin" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Sizin modül listesi güncel değil!" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "Eğer en az bir şekilde kaldırdınız son İncil de Xiphos. Gerektirir." -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" "olmadan tek devam edebilirsiniz değil Xiphos vardır. yüklü İncil yok hala." -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "Standart uzaktan kaynaklardan yüklenen edilmiştir." -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "CrossWire arası standart kaynakları yüklenemedi." -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Seçilen kaynak Kaldır" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Uzak bir kaynak girin" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Başlık:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Türü:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "Host:" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Dizin:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "Kullanıcı (isteğe bağlı):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "Parola (isteğe bağlı):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "bu isimle bir kaynak zaten var." -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "Silmek uzak bir kaynak" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Tüm modül" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "bu içeren bölümüne, dışa git" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "önceki öğeye gider" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "Bir sonraki öğeye gider" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "Birinci fıkrada için, dahilde git" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "ana penceresi ile senkronize bu pencerenin kaydırma" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Paralel" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Ayırmak / takın" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Modül Seçenekleri" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Paralel Profili" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Yüksek sesle okuyun Seçimi" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Kişisel" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "- Seçiniz -" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "Yerel yeniden başlattıktan sonra yürürlüğe girecek." -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Tercihleri" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Genel" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "Seçenekleri" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "İncil" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Yazı" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Renk" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "Boyutları ve Yüzler" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "Özel" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Net Listesi?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Eğer modül listesini silmek istediğinizden emin misiniz?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "Modül kaldırılsın mı?" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "Seçili modülü kaldırmak istediğinizden emin misiniz?" @@ -1310,20 +1286,20 @@ msgid "found in " msgstr "bulundu" -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "Yeni Liste%s" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "Son modül listesi silinemez" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Listeyi sil?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Eğer silmek istediğinizden emin misiniz:" @@ -1343,7 +1319,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1398,7 +1374,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1426,123 +1402,113 @@ "H * Morfolojik etiketleri tanımlanır kelimenin tam anlamıyla, \"isim hali " "dişil tekil\" için N-ASF gibi - Ayrıntılar için Robinson modülü bakın." -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "Bu arama bir kapsayıcı (\"VE\"): Kelimeleri gösteren bul eşleşir." -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "_Advanced Arama" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 #, fuzzy msgid "Open the separate Advanced Search dialog." msgstr "Karmaşık sorgular çalıştırmak için, gelişmiş arama iletişim aç" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Arama Modülü" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "İncil" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Yorum" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Arama Türü" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Çok kelime" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Düzenli ifade" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Tam cümle" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Arama Seçenekleri" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Maç durumda" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Arama Kapsam" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Hayır kapsamı" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Kullanım sınırları" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Son arama" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Sınır" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Alt" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Üst" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "editörü açın" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Tercihleri" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Arama" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Sidebar" @@ -1550,73 +1516,73 @@ msgid "Powered by the SWORD Project" msgstr "SWORD Proje Powered by" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "sekmeler dir oluşturulamıyor." -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "Dua Listesi / Dergi Öğe" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "Yeni isim" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "Seçili öğeyi kaldır" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "Ocak" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "Şubat" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "Mart" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "Nisan" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "Mayıs" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "Haziran" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "Temmuz" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "Ağustos" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "Eylül" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "Ekim" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "Kasım" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "Aralık" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." @@ -1624,274 +1590,388 @@ "Bir resim dosyası boyutunu tespit edilemedi. Xiphos penceresine sığacak " "şekilde yapabilirsiniz resimlerinizin boyutunu değil." -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Tüm modül" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "kutusunda bu modül üzerinde çalışmak için tıklayın" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "Mevcut" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "Kurtuluş" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "Yanlış etiket kodlanmış kişisel açıklama: '%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "Bölüm" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos birden fazla argüman anlamıyor." -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Başlatılması Gecko" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "Bina Arayüzü" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "Kılıç Başlangıç" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "Yükleme Ayarlar" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Gösteren Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "Önizleyicide" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "Dipnot" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "Çapraz Referans" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "Strongs" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "Morfoloji" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "Geri" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Güçlü Numaraları" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Dipnotlar" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Morfolojik Etiketler" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "İbranice Ünlü Noktaları" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "İbranice Cantillation" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Yunan Vurgular" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "Çapraz referans" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Lemmas" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Başlıkları" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "Morfem Segmentasyon" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Kırmızı Mesih'in Kelimeler" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "Çevirisi" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "Metinsel Varyantlar" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "İlk Okuma" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "İkinci Okuma" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Tüm Kaynaklar" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "Çevirisi" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +#, fuzzy +msgid "Glosses" +msgstr "Sözlükler" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "görmek bağlamda" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "Büyüme" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "Büyüme için
" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "Kurtuluş" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "Kurtuluş için
" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "Sağlık" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "Sağlık için
" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Misc" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "Çeşitli
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "Noktası x" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(X)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "Nokta y" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(Y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "Nokta z" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(Z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "Minör Konu 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "Subtopic 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "Küçük Konu 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "Subtopic 2
" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "Küçük Konu 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "Subtopic 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "Küçük Konu 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "Subtopic 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "yeni dua listesi veya dergi için Ad" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos zaten dua listesi bulur." -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "Xiphos yolun modülü oluşturamazsınız:%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Temel dua listesi. \\par \\par Modülü Xiphos tarafından hazırlandı." -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "BasicPrayerList" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "MyPrayerList" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1899,107 +1979,107 @@ "Kişi:
Bob
Sam
Dava

Kilise:
" "pews
arkadaşlık
misyonerler için İncil


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" "Bir konu tabanlı dua listesi. \\par \\par Modülü Xiphos tarafından " "hazırlandı." -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "SubjectPrayerList" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "Bob
Sam
Dava
John
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "Ruhsal Gelişim" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "Mikrofon
Steve
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "Dava
John
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" "Bir aylık namaz liste. \\par \\par Modülü Xiphos tarafından hazırlandı." -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "MonthlyPrayerList" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Bir günlük dergi. \\par \\par Modülü Xiphos tarafından hazırlandı." -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "DailyJournal" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" "Bir özetlenen konu (örneğin vaaz). \\par \\par Modülü Xiphos tarafından " "hazırlandı." -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "OutlinedTopic" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "Önemli konu A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "Önemli konu A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "Önemli Konu B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "Önemli Konu B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "Önemli konu C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "Önemli konu C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "Kullanıcı Annotation" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "Arama sonucu%s:%s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "Silmek Aralığı?" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "Eğer bu aralığı silmek istediğinizden emin misiniz?" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "Arama:" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -2007,18 +2087,19 @@ "%s" msgstr "" "%s:\n" -"Böyle bir modül kurulu var.\b%s" +"Böyle bir modül kurulu var.\n" +"%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "modül listesi ayarlayın." -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "Hiçbir hızlı arama indeksi%s.%s%s için var" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2026,7 +2107,7 @@ "\n" "Bu modül ara 'çok kelime' şimdi." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2034,37 +2115,33 @@ "\n" "Modül Yöneticisi, Bakım bölmesi bakın." -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "Arama bitmiş" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "maçlar" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$ HOME set değil!" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." -msgstr "Xiphos oluşturmak mümkün değil. Xiphos%s Xiphos devam edemiyor." +#, fuzzy, c-format +msgid "Xiphos can not create directory " +msgstr "Xiphos yolun modülü oluşturamazsınız:%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "oluşturamazsınız" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2072,11 +2149,11 @@ "Boş ayarları dosyası - yedek kurtarma girişiminde kaybetti. Bazı olabilir " "bilgi." -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "Boş ayarları dosyası - Hiçbir yedekleme?!? Bilgi kaybettik!" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2089,11 +2166,11 @@ "olmadan herhangi bir anda ve İncil modülleri olabilir Xiphos, görüntülemek " "için değil, devam edin." -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "İncil modülü kurulumu tamamlayın." -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2103,47 +2180,47 @@ msgid "verse" msgstr "ayet" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "bölüm" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "için dil kısaltmalar dosya Xiphos's eksik." -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "Xiphos dil kısaltması dosya açılamaz." -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "Xiphos kısaltmalar dil için yer ayırabilirsiniz değil." -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "Xiphos dosya kısaltma dili okuyamaz." #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "Eşleşen yerelin bulundu için '%s.'%s" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "Kitap isimleri ve menüler tercüme olmayabilir." -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2151,7 +2228,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2159,11 +2236,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "Günlük adanmışlık, ama istendi hiçbiri kurulu vardır." -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2183,89 +2260,94 @@ "Aldığınız tarafından yeniden yapılandırılan ya da e-posta yoluyla gönderilen " "belki, ya da satın alma da doğruladı sayfa web." -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "Geçmişi Temizle" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Ayet Listesi" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL bulunamadı:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Yürütmüyor olabilir Xiphos %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "Görüntüleyici hatası:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "%s ana penceresinde" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "Belge değil başarıyla oluşturuldu.\n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "Ne kayıtlı olmak için ne yapmalıyız?" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "Eylemler 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "Efesliler 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "Romalılar 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "Gospel nedir?" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "1 Kor 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "Belge değil başarıyla çözümlenen.\n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "boş belge\n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "yanlış tipi, kök düğüm! = SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "yanlış tipi, kök düğüm! =%s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2274,7 +2356,7 @@ "\n" msgstr "Bölüm" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2283,101 +2365,101 @@ "\n" msgstr "Bölüm" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "Eski Ahit" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "Gen - Mal" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "Yeni Ahit" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "Mat - Rev" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "Örnek Modül Listesi" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "yanlış tipi, kök düğüm! =%s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "ayarları kaydet başarısız! stat% d, boyutu% d%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "önceki kaydetmek dönmek için çalışılıyor." @@ -2391,13 +2473,13 @@ msgstr "Imi Dialog" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "Yeni klasör oluştur" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Yeni Klasör" @@ -2406,7 +2488,7 @@ msgstr "Yeni ..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "Iptal Bookmark" @@ -2419,22 +2501,22 @@ msgstr "Etiket Giriş" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "Ayet:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "Ayet Giriş" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "Modülü:" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "Modül Giriş" @@ -2442,6 +2524,10 @@ msgid "Bookmark Folder Treeview" msgstr "Imi Klasör Treeview" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "Bağlantı Ekle" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2497,6 +2583,12 @@ msgid "_Delete Personal Comment" msgstr "Kişisel Yorum _Delete" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_file" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "Geçerli notu kaydedin" @@ -2505,6 +2597,14 @@ msgid "_Save (Personal Comment)" msgstr "(Kişisel Yorum) _Save" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "Baskı Pre_view" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "_Print ..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "E_xit" @@ -2513,6 +2613,11 @@ msgid "For_mat" msgstr "For_mat" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Kaydetmek" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "Baskı bu belgenin" @@ -2550,7 +2655,7 @@ msgstr "Yeni Belge" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "Copy / İhracat Passage" @@ -2587,7 +2692,7 @@ msgstr "Ihracat tam kitap" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "Kitap" @@ -2702,8 +2807,8 @@ msgid "Open about dialog" msgstr "Bir iletişim aç" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2746,13 +2851,17 @@ msgid "Delete selection" msgstr "Silmek seçilen aralığı" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "Silmek" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Seçili öğeyi kaldır" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Silmek Öğe" @@ -2927,6 +3036,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Yeni" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3061,123 +3174,87 @@ msgid "_Edit" msgstr "_Edit" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Help" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #, fuzzy msgid "Normal" msgstr "Normal Metin" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "Listeyi sil?" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "Ayet Listesi" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "İşaretle / İş Verse" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "Işaretlemek" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "Işaretini kaldırın" @@ -3250,31 +3327,39 @@ msgstr "Silmek seçilen modüllerin hızlı arama indeksi." #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "Devam" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Kılıç" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "Modül Yöneticisi" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "UYARI: bakım Eğer kullanımda bir zulüm ülkede yaşamak sizi." -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Eklemek ve Kaynaklar Kaldır" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Mevcut yerel kaynaklardan" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." @@ -3283,15 +3368,15 @@ "bir klasör ekleyin. Böyle bir klasöre alt klasörleri ve \"modules\" mods.d " "\"içeriyor." -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "bir yükleme kaynağı olarak yerel klasörlerden birini çıkarın." -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Geçerli Uzaktan Kaynakları" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." @@ -3299,43 +3384,43 @@ "Özel bir uzaktan yükleme kaynak ekleyin. Onun ismi ve klasör onun depo " "yaşıyor bilmeniz gerekir." -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "bir uzaktan yükleme kaynağını çıkarın." -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "Yükleme Kaynağı" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Yerel" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Uzak" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "Yüklemek Hedef" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "yalnızca sizin kullanımınız için alan, Kişisel:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "Ev dir" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "tüm kullanıcılar için, Sistem alanı:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Kılıç dir sys" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " @@ -3343,10 +3428,14 @@ "Uyarı: Eğer ülkede zulüm canlı bir sen özellik yükleme uzak " "kullanırım değil DEĞİL isteyen gerektiğini risk algılama!" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "Yerel Yükleme Klasör" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "Açılır geçmiş listesi" @@ -3355,11 +3444,11 @@ msgid "Choose book to display" msgstr "görüntülemek için kitap seçin" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "Kitap Seçici Düğme" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "John Vahiy" @@ -3368,11 +3457,11 @@ msgid "Choose chapter to display" msgstr "görüntülemek için kitap seçin" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "Geçiş Bölüm Düğme" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3519,11 +3608,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "Modülleri" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3595,12 +3685,12 @@ msgid "BSP privacy button" msgstr "Ayet Radyo Düğmesi" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "Kurtuluş" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3632,11 +3722,12 @@ msgid "BSP nav verse list radio button" msgstr "Modül listesi Radiobuton" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "Liste Adı" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3679,7 +3770,12 @@ msgid "BSP listen none radio button" msgstr "Düz Metin Radyo Düğmesi" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "Özel" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3869,193 +3965,192 @@ msgstr "Etkinleştirmek Namaz Listeler Checkbox" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Ayet sayısı" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "metin görüntüleme ayet numaraları" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "Ayet sayısı boyutu" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "Boyutlandırmak görüntüler onay" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "Açıklama" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "Göstermek Ayet _Numbers" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "Ayet sayısı boyutu" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "StudyPad varsayılan dizin combo" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "Bir Dizin Seçin" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "StudyPad varsayılan dizin combo" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "Genel Çeşitli" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Ana Pencere Modülleri" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "İncille Metin" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "Combo İncil Metin Değişikliği" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "Combo Yorum değiştir" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Sözlük" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "Değiştirmek Combo Sözlük" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "Combo Kitap Değişim" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "Modülleri" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Net listeden tüm modülleri" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "Liste Button sil Modülleri" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Listeden seçilen modülünü çıkarın" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "Liste Button From Delete Selected Modülü" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "modülleri seçmek için bir iletişim aç" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "Eklemek Modülleri" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "Açık Seçim Dialog Button" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "Modülleri Paralel" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "Özel Amaçlı Modüller" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Günlük adanmışlık" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "Günlük Combo adanmışlık" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "İbranice Lexicon" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "İbranice Lexicon Combo" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Yunan Lexicon" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "Lexicon Combo Yunan" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Varsayılan Sözlük" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "Değiştirmek Varsayılan Combo Sözlük" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Kişisel Notlar" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "Kişisel Notlar Combo değiştir" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "Modülleri Misc" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "Modül Seçimi" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4086,6 +4181,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Gelişmiş Arama" @@ -4295,11 +4394,11 @@ msgid "Found" msgstr "Bulundu" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "Sonuç Özet Penceresi" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "Sonuç Özet Tablo" @@ -4491,6 +4590,11 @@ msgid "Attribute Search" msgstr "Öznitelik Arama" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "Modül Seçimi" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4584,6 +4688,10 @@ msgid "_Module Manager" msgstr "_Module Müdürü" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_View" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "Ön _Daily Devotion" @@ -4728,27 +4836,27 @@ msgid "Learn about Xiphos" msgstr "Xiphos hakkında bilgi edinin" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "Açıklama Ayet" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Açık Modülü" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Dikkat" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "editörü açın" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "Ayet Başına Hattı" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4756,267 +4864,276 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Türevleri" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "Görüntü İçerik" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "Saygı Yazı Yüzler" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "Bölüm yorumu" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "DoubleSpace" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Arama Seçimi" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Kullanmak Şu Sözlük" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "Göz BibleMap.org içinde" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Kilidini Bu Modülü" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "Başlığı Ekran Kitap" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "Başlığı Ekran Bölüm" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "Adlandırmak Pers.Comm." -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "Dökümü Pers.Comm." -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "Yüksek sesle okuyun Seçimi" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "tek bir yer imi olarak bu sonuçları kaydet" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "tek bir yer imi olarak listesini kaydedin" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "kendi klasöründe yer imleri bir dizi olarak bu sonuçları kaydet" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "imlerinin bir dizi olarak listesini kaydedin" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Ayet Listesi" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Açılır geçmiş listesi" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "İhracat Listesi" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "yeni bir sekmede bu imi aç" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "yeni sekmede açma" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "bir iletişim içinde bu imi aç" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Bir iletişim aç" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "seçilen klasöre yeni bir klasör ekle" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Buraya ekle yeni yer imi" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Favori Ekle" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "madde imini düzenle" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Edit Öğe" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Silmek öğe" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Genişletmek tüm imleri gruplar" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Tümünü Genişlet" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Tümünü daralt imleri gruplar" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Çöküşü Tüm" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Izin öğeleri başka bir klasörden diğerine taşınacak" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Reordering izin ver" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Yük diğer imleri dosyası (varsayılan: BibleTime itibaren)" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "Ithalat imleri" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "klasöre çıkartın ve kaydedin" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "Ihracat Klasör" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Açık yeni bir sekmede modül seçili" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "Açık pencere] 'Seçilen modülü ayrı bir [' iletişim" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "ayrı bir pencerede aç" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "Yeni bir basit dua listesi oluşturun" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "Basit" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "yeni bir konu dua listesi oluşturun" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "Konu" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "yeni bir aylık dergi oluşturma" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "Aylık" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "Yeni bir günlük dergi oluşturma" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "Günlük" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "Yeni bir özetlenen konu oluşturun" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "Özetlenen" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "ayrı bir pencerede aç" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "Eklemek bir alt kalemi" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "Alt Öğe Ekle" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "öğe ekleme" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "Öğe ekle" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "Bu öğeyi kaldır" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "Bu öğeyi Düzenle" @@ -5028,6 +5145,83 @@ msgid "Study the Bible" msgstr "Çalışma İncil" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Tüm modül" + +#~ msgid "Page %d of %d" +#~ msgstr "Sayfa %d /%d" + +#~ msgid "Save As" +#~ msgstr "Olarak kaydet" + +#~ msgid "HTML Output" +#~ msgstr "HTML Çıktı" + +#~ msgid "HTML Source" +#~ msgstr "HTML Kaynak" + +#~ msgid "Plain Source" +#~ msgstr "Düz Kaynak" + +#~ msgid "_Quit" +#~ msgstr "_Quit" + +#~ msgid "_Open" +#~ msgstr "_Open" + +#~ msgid "_Save" +#~ msgstr "_Save" + +#~ msgid "Save _As..." +#~ msgstr "Kaydetmek _As ..." + +#~ msgid "Open new document" +#~ msgstr "Yeni belge" + +#~ msgid "Delete current note" +#~ msgstr "Silmek geçerli not" + +#~ msgid "HTML _Output" +#~ msgstr "HTML _Output" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML Kaynak" + +#~ msgid "_Plain Source" +#~ msgstr "_Plain Kaynak" + +#~ msgid "Unlock " +#~ msgstr "Kilidini açmak" + +#~ msgid "Preparing to print" +#~ msgstr "yazdırmak için hazırlanıyor" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "Baskı bu yazıcı desteklenmez" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "Yazıcı%s PostScript yazdırma desteği yok." + +#~ msgid "Printing" +#~ msgstr "Baskı" + +#~ msgid "Waiting to print" +#~ msgstr "yazdırmak için bekliyorum" + +#~ msgid "An error occurred while printing" +#~ msgstr "Bir hata baskı oluştu" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "Bu belgenizi yazdırmak mümkün değildi: %s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "Xiphos oluşturmak mümkün değil. Xiphos%s Xiphos devam edemiyor." + #~ msgid "Tabs" #~ msgstr "Sekmeler" diff -Nru xiphos-4.0.0+dfsg1/po/uk.po xiphos-4.0.4+dfsg1/po/uk.po --- xiphos-4.0.0+dfsg1/po/uk.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/uk.po 2015-06-16 17:44:26.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: xiphos-2.1.dev1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2009-12-09 22:28+0000\n" "Last-Translator: Pavlo Bohmat \n" "Language-Team: Ukrainian \n" @@ -20,295 +20,255 @@ "X-Launchpad-Export-Date: 2010-03-21 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" msgstr "" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" msgstr "" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "Відкрити" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" msgstr "" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" msgstr "" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" msgstr "" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." msgstr "" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "Файл" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "Конспект" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "Про модуль Sword'а" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "Цілий модуль" - -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" - -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" -msgstr "" +msgid "Module name: " +msgstr "Назва модуля" -#: ../src/biblesync/biblesync.cc:791 -msgid "Transmit failed.\n" +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" - -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "" - -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "Сторінка %d з %d" - -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "Відкрити" - -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "" +#: ../src/gnome2/about_modules.c:421 +#, fuzzy +msgid "Type: " +msgstr "Пошуковий модуль" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "Щоденні читання" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" msgstr "" -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "Біблія" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "Коментар" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "Словник" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "Загальні книги" -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "" +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "Коментар" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "Новий" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "Невідомий" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "_Файл" - -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "Паралельний перегляд" -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "Модулі головного вікна" -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "_Вигляд" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "Пошуковий модуль" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "Зберегти" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "Заголовки" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "Виноски" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "Перехресні посилання з Св. Письма" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "Номери Стронгу" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "Морфологічні теги" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "Файл" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "Анотації" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "Конспект" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "Виділяти Христові слова червоним" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "Грецькі наголоси" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "Риски голосних івриту" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "Разблокувати " +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "Кантиляції івриту" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "Про модуль Sword'а" - -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -320,37 +280,38 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "Проект SWORD" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" msgstr "" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -359,235 +320,235 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "Закладки" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "Введіть ім'я теки" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "Ім'я теки" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "Тека: " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "Правити пункт закладки" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "Правка" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "Ім'я теки: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "Ім'я закладки: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "Вірш: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "Модуль: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "Видалити виділену теку" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(і весь її вміст)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "Видалити виділену закладку" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "Додати" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "Мітка: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "Закладки" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "для:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "Ввести код ключа: " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "Список віршів" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "Знайти" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "Введіть слово або фразу" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "Зворотній пошук" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "Шукати далі" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "Встановити шрифт модуля" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "Змінити шрифт для" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "Модуль" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "Поточний шрифт: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "Використовувати для цього модуля типовий шрифт" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "У модулі, в якому є номери Стронгу" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos вимкнено" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - програма з вивчення Біблії" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "Стандартний перегляд" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -599,46 +560,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "" -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 #, fuzzy msgid "No module in this pane." msgstr "Знайти в цій нотатці" @@ -706,20 +667,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "Видалити" @@ -739,516 +700,521 @@ msgid "Install" msgstr "Встановити" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "Назва модуля" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "Про модуль" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "Завершено" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "Невідомий" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "Біблійні тексти" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "Коментарі" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "Словники" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "Загальні книги" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "Налаштування" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "Тип" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "Назва" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "Джерело" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "Каталог" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "Модулі" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "Будь-ласка, поновіть" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "Ваш список модулів застарілий" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "Видаліть локальне джерело" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "Введіть віддалене джерело" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "Назва:" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "Тип:" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "Каталог SWORD'у:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "Цілий модуль" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "Паралельний" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "Відокремити/Прикріпити" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "Опції модуля" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "Паралельний перегляд" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "Жирний текст" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "Персональний" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "Параметри" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "Загальне" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "Біблія" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "Шрифти" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "Колір" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "Вкладки та панелі" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "Очистити список?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "Ви впевнені, що бажаєте очистити список модулів?" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1267,20 +1233,20 @@ msgid "found in " msgstr "знайдено в " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, fuzzy, c-format msgid "New List %s" msgstr "Зберегти список" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "Видалити список?" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "Ви впевнені, що бажаєте видалити:" @@ -1300,7 +1266,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1345,7 +1311,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1363,122 +1329,112 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "Розширений пошук" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "Пошуковий модуль" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "Біблія" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "Коментар" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "Тип пошуку" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "Декілька слів" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "Звичайний вислів" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "Точна фраза" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "Опції пошуку" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "Зважати на регістр" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "Контекст пошуку" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "Без контексту" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "Використовувати обмеження" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "Останній пошук" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "Обмеження" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "Нижній" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "Верхній" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "Відкрити вибраний модуль в диалозі" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "Параметри" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "Пошук" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "Бокова панель" @@ -1486,447 +1442,558 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "Цілий модуль" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +msgid "Check the box to listen to this Speaker" +msgstr "" + +#: ../src/main/biblesync_glue.cc:543 +msgid "Available Speakers" +msgstr "" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "IP address: " +msgstr "Адреса" + +#: ../src/main/biblesync_glue.cc:610 +#, fuzzy +msgid "" +"\n" +"Application: " +msgstr "Про цю програму" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "Ініціалізація Xiphos" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "Відображення Xiphos" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "Номери Стронгу" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "Виноски" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "Морфологічні теги" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "Риски голосних івриту" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "Кантиляції івриту" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "Грецькі наголоси" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "Анотації" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "Заголовки" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "Виділяти Христові слова червоним" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "Першечергове читання" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "Другорядне читання" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "Усі читання" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" +msgstr "" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "Різне" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1934,69 +2001,65 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 #, fuzzy msgid "There is no commentary module." msgstr "Кількість модулів коментарів:" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2006,11 +2069,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2020,47 +2083,47 @@ msgid "verse" msgstr "вірш" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "розділ" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2068,7 +2131,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2076,11 +2139,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2094,89 +2157,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "Список віршів" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "Показувати %s в головному вікні" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2185,7 +2253,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2194,101 +2262,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2302,13 +2370,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "Нова тека" @@ -2317,7 +2385,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2330,22 +2398,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2353,6 +2421,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2408,6 +2480,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "_Файл" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2416,6 +2494,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "" + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "" @@ -2424,6 +2510,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "Зберегти" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "" @@ -2461,7 +2552,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2498,7 +2589,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2612,8 +2703,8 @@ msgid "Open about dialog" msgstr "Відкрити у діалозі" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "Жирний" @@ -2656,13 +2747,17 @@ msgid "Delete selection" msgstr "Видалити вибраний діапазон" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "Видалення не вдалося" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "Видалити пункт" @@ -2836,6 +2931,10 @@ msgid "Right justify paragraph" msgstr "Вирівнювати абзаци по правій межі" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "Новий" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -2966,123 +3065,88 @@ msgid "_Edit" msgstr "_Правити" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "_Довідка" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #, fuzzy msgid "Normal" msgstr "Звичайний" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "Заголовок 1" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "Заголовок 2" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "Заголовок 3" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "Заголовок 4" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "Заголовок 5" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "Заголовок 6" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "Адреса" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 #, fuzzy msgid "Preformatted" msgstr "Преформатований" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "Неупорядкований список" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 #, fuzzy msgid "Roman Numeral List" msgstr "Нумерований список" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "Нумерований список" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "Абетковий список" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" -msgstr "" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#, fuzzy +msgid "Strike" +msgstr "Закреслений" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3158,97 +3222,109 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "Додати та видалити джерела" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "Поточні локальні джерела" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "Поточні віддалені джерела" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "Видаліть локальне джерело" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "Локальні" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "Віддалене" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3257,11 +3333,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3269,11 +3345,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3418,11 +3494,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3491,11 +3567,11 @@ msgid "BSP privacy button" msgstr "Список віршів" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3525,11 +3601,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3572,7 +3648,11 @@ msgid "BSP listen none radio button" msgstr "Список віршів" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +msgid "Special:" +msgstr "" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3751,188 +3831,187 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "Вірш: " -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "Використовувати типовий словник" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "Модулі головного вікна" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "Біблійний текст" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "Словник" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "Видалити усі модулі зі списку" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "Видалити вибрані модулі зі списку" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "Поновити чи встановити вибрані модулі" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "Щоденні читання" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "Лексикон івриту" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "Грецький лексикон" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "Словник по замовчуванню" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "Особисті нотатки" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "-2" @@ -3961,6 +4040,10 @@ msgid "+5" msgstr "+5" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "Розширений пошук" @@ -4167,11 +4250,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4363,6 +4446,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4457,6 +4545,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "_Вигляд" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4603,28 +4695,28 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "Відкрити модуль" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "Нотатка" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "Список віршів" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4632,269 +4724,278 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "Варіанти" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "Передевитися вибране" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "Використовувати поточний словник" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "Разблокувати цей модуль" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "Список віршів" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "Очистити список історії" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "Відкрити цю закладку у діалозі" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "Відкрити у діалозі" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "Додати нову теку у вибрану теку" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "Вставити тут нову закладку" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "Вставити закладку" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "Правити пункт закладки" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "_Правити пункт" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "Видалити пункт" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "Розгорнути усі групи закладок" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "Розгорнути все" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "Згорнути усі групи закладок" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "Згорнути все" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "Дозволити перенесення елементів з однієї теки в іншу" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "Дозволити перевпорядкування" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "Завантажити закладки з Bibletime" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "Вставити закладку" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "Видалити теку і зберегти" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "Відкрити вибраний модуль в диалозі" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "Відкрити у діалозі" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4906,6 +5007,16 @@ msgid "Study the Bible" msgstr "Вивчай Біблію" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "Цілий модуль" + +#~ msgid "Page %d of %d" +#~ msgstr "Сторінка %d з %d" + +#~ msgid "Unlock " +#~ msgstr "Разблокувати " + #~ msgid "Use tabbed browsing" #~ msgstr "Використовувати відображення вкладок" @@ -4918,9 +5029,6 @@ #~ msgid "Tabs and Panes" #~ msgstr "Вкладки та панелі" -#~ msgid "Scripture Cross-references" -#~ msgstr "Перехресні посилання з Св. Письма" - #~ msgid "Go to " #~ msgstr "Перейти " @@ -4945,9 +5053,6 @@ #~ msgid "Change parallel 5" #~ msgstr "Змінити паралельний 5" -#~ msgid "Parallel View" -#~ msgstr "Паралельний перегляд" - #~ msgid "Parallel 1" #~ msgstr "Паралельний 1" @@ -5093,9 +5198,6 @@ #~ msgid "C_lear" #~ msgstr "О_чистити" -#~ msgid "Clear history list" -#~ msgstr "Очистити список історії" - #~ msgid "Show the Daily Devotion for today" #~ msgstr "Показати щоденне молитовне читання на сьогодні" @@ -5108,9 +5210,6 @@ #~ msgid "More information about the SWORD Project" #~ msgstr "Більше інформації про проект SWORD" -#~ msgid "About this application" -#~ msgstr "Про цю програму" - #~ msgid "Hi_story" #~ msgstr "І_сторія" diff -Nru xiphos-4.0.0+dfsg1/po/xiphos.pot xiphos-4.0.4+dfsg1/po/xiphos.pot --- xiphos-4.0.0+dfsg1/po/xiphos.pot 2014-12-24 16:36:56.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/xiphos.pot 2015-06-16 17:44:26.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-24 16:33+0000\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,154 +17,236 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/biblesync/biblesync.cc:130 -msgid "network setup errors." +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:176 -msgid " client socket" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" msgstr "" -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" msgstr "" -#: ../src/biblesync/biblesync.cc:371 -msgid "bad magic" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" msgstr "" -#: ../src/biblesync/biblesync.cc:375 -msgid "bad protocol version" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" msgstr "" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad msg type" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" msgstr "" -#: ../src/biblesync/biblesync.cc:385 -msgid "bad packet count" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" msgstr "" -#: ../src/biblesync/biblesync.cc:389 -msgid "bad packet index" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." msgstr "" -#: ../src/biblesync/biblesync.cc:433 -msgid "bad body format" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" msgstr "" -#: ../src/biblesync/biblesync.cc:447 -msgid "missing required header " +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" msgstr "" -#: ../src/biblesync/biblesync.cc:474 -msgid "Spoof stopped: " +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:505 -msgid "Ignoring echo." +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" msgstr "" -#: ../src/biblesync/biblesync.cc:534 -msgid "Domain not 'BIBLE-VERSE': " +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" msgstr "" -#: ../src/biblesync/biblesync.cc:542 -msgid "Invalid group: " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:572 -msgid " present at " +#: ../src/gnome2/about_modules.c:411 +msgid "Module name: " msgstr "" -#: ../src/biblesync/biblesync.cc:574 -msgid " using " +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/biblesync/biblesync.cc:692 -msgid "[no dump ready]" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:700 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:421 +msgid "Type: " msgstr "" -#: ../src/biblesync/biblesync.cc:711 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:423 +msgid "Daily Devotion" msgstr "" -#: ../src/biblesync/biblesync.cc:801 -msgid "Transmit failed.\n" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" msgstr "" -#: ../src/biblesync/biblesync.cc:802 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" msgstr "" -#: ../src/backend/sword_main.cc:792 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/backend/sword_main.cc:1155 -msgid "Configuration not found" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" msgstr "" -#: ../src/editor/webkit_editor.c:316 -msgid "Are you sure you want to delete the note for" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" msgstr "" -#: ../src/editor/webkit_editor.c:598 ../ui/editor_studypad.xml.h:9 -#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 -msgid "Open" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" msgstr "" -#: ../src/editor/webkit_editor.c:825 -msgid "Untitled document" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" msgstr "" -#: ../src/editor/webkit_editor.c:1367 ../src/editor/webkit_editor.c:1410 -msgid "Save the changes to document" +#: ../src/gnome2/about_modules.c:446 +msgid "General Book" msgstr "" -#: ../src/editor/webkit_editor.c:1368 ../src/editor/webkit_editor.c:1411 -msgid "before closing?" +#: ../src/gnome2/about_modules.c:451 +msgid "Personal Commentary" msgstr "" -#: ../src/editor/webkit_editor.c:1375 ../src/editor/webkit_editor.c:1418 -msgid "If you don't save, changes will be permanently lost." +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" msgstr "" -#: ../src/editor/webkit_editor.c:1409 ../ui/xi-menus.glade.h:59 -#: ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" +#: ../src/gnome2/about_modules.c:457 +msgid "Unknown type" msgstr "" -#: ../src/editor/webkit_editor.c:1459 -msgid "StudyPad" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " msgstr "" -#: ../src/editor/webkit_editor.c:1474 -msgid "Note Editor" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " msgstr "" -#: ../src/editor/webkit_editor.c:1489 -msgid "Prayer List/Journal Editor" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" msgstr "" -#: ../src/gnome2/about_modules.c:148 -msgid "About Sword Module" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " msgstr "" -#: ../src/gnome2/about_modules.c:358 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "" + +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "" + +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "" + +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "" + +#: ../src/gnome2/about_modules.c:519 +msgid "* Cross references" +msgstr "" + +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "" + +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "" + +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "" + +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "" + +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "" + +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "" + +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" + +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "" + +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" + +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" + +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" + +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" + +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "" + +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "" + +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -176,37 +258,38 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "" -#: ../src/gnome2/about_xiphos.c:122 -msgid "Copyright © 2000-2014 Xiphos Development Team" +#: ../src/gnome2/about_xiphos.c:129 +msgid "Copyright © 2000-2015 Xiphos Development Team" msgstr "" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -215,167 +298,167 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:374 -#: ../src/gnome2/bookmarks_menu.c:674 ../src/gnome2/bookmarks_menu.c:773 -#: ../src/gnome2/bookmarks_treeview.c:135 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:775 -#: ../src/gnome2/bookmarks_treeview.c:136 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:777 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:778 -#: ../src/gnome2/bookmarks_treeview.c:138 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:360 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:377 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:380 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:383 ../src/gnome2/bookmarks_menu.c:682 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:384 ../src/gnome2/bookmarks_menu.c:683 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:508 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:511 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:675 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:681 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:772 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:867 ../src/gnome2/sidebar.c:1515 -#: ../src/gnome2/sidebar.c:1548 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:65 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:68 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:291 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "" -#: ../src/gnome2/dialog.c:736 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "" -#: ../src/gnome2/dialog.c:872 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1527 ../src/gnome2/sidebar.c:1564 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:324 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "" -#: ../src/gnome2/find_dialog.c:188 ../src/gnome2/find_dialog.c:367 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "" -#: ../src/gnome2/find_dialog.c:207 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "" -#: ../src/gnome2/find_dialog.c:222 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "" -#: ../src/gnome2/find_dialog.c:283 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "" -#: ../src/gnome2/font_dialog.c:338 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "" -#: ../src/gnome2/font_dialog.c:342 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "" -#: ../src/gnome2/font_dialog.c:346 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "" -#: ../src/gnome2/font_dialog.c:378 ../src/gnome2/font_dialog.c:394 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "" @@ -384,63 +467,63 @@ msgid "Use the default font for this module" msgstr "" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "" -#: ../src/gnome2/main_window.c:596 +#: ../src/gnome2/main_window.c:583 #, c-format msgid "Module has no support for %s." msgstr "" -#: ../src/gnome2/main_window.c:666 +#: ../src/gnome2/main_window.c:656 msgid "Xiphos: No windows." msgstr "" -#: ../src/gnome2/main_window.c:722 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:726 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:910 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "" -#: ../src/gnome2/main_window.c:973 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "" -#: ../src/gnome2/main_window.c:1053 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:674 -#: ../src/main/sidebar.cc:1019 ../src/main/sidebar.cc:1020 -#: ../src/main/sidebar.cc:1021 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "" -#: ../src/gnome2/main_window.c:1114 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "" -#: ../src/gnome2/main_window.c:1130 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "" -#: ../src/gnome2/main_window.c:1157 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "" -#: ../src/gnome2/menu_popup.c:1251 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -452,46 +535,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1270 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "" -#: ../src/gnome2/menu_popup.c:1273 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1275 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1276 ../src/gnome2/treekey-editor.c:147 -#: ../src/gnome2/treekey-editor.c:210 ../src/gnome2/treekey-editor.c:306 -#: ../src/main/prayerlists.cc:236 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "" -#: ../src/gnome2/menu_popup.c:1286 ../src/main/prayerlists.cc:250 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "" -#: ../src/gnome2/menu_popup.c:1293 ../src/main/prayerlists.cc:257 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1334 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "" -#: ../src/gnome2/menu_popup.c:1343 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1943 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -558,20 +641,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:152 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "" @@ -591,262 +674,256 @@ msgid "Install" msgstr "" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "" -#: ../src/gnome2/mod_mgr.c:543 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "" -#: ../src/gnome2/mod_mgr.c:570 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:598 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "" -#: ../src/gnome2/mod_mgr.c:599 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "" -#: ../src/gnome2/mod_mgr.c:618 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "" -#: ../src/gnome2/mod_mgr.c:628 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "" -#: ../src/gnome2/mod_mgr.c:646 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "" -#: ../src/gnome2/mod_mgr.c:663 ../src/main/biblesync_glue.cc:629 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 #: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 -#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "" -#: ../src/gnome2/mod_mgr.c:689 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "" -#: ../src/gnome2/mod_mgr.c:701 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "" -#: ../src/gnome2/mod_mgr.c:710 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "" -#: ../src/gnome2/mod_mgr.c:719 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "" -#: ../src/gnome2/mod_mgr.c:868 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" "%s." msgstr "" -#: ../src/gnome2/mod_mgr.c:900 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr "" -#: ../src/gnome2/mod_mgr.c:971 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "" -#: ../src/gnome2/mod_mgr.c:997 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "" -#: ../src/gnome2/mod_mgr.c:1000 ../src/gnome2/mod_mgr.c:1778 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "" -#: ../src/gnome2/mod_mgr.c:1168 ../src/gnome2/mod_mgr.c:1170 -#: ../src/gnome2/mod_mgr.c:1272 ../src/gnome2/mod_mgr.c:1307 -#: ../src/gnome2/mod_mgr.c:1309 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:853 -#: ../src/main/sidebar.cc:925 ../src/main/sidebar.cc:927 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "" -#: ../src/gnome2/mod_mgr.c:1496 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" "%s" msgstr "" -#: ../src/gnome2/mod_mgr.c:1508 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1513 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "" -#: ../src/gnome2/mod_mgr.c:1517 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:686 ../src/main/sidebar.cc:1028 -#: ../src/main/sidebar.cc:1030 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1521 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1037 ../src/main/sidebar.cc:1039 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1525 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1046 ../src/main/sidebar.cc:1048 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1529 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1055 ../src/main/sidebar.cc:1057 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "" -#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:696 ../src/main/sidebar.cc:1064 -#: ../src/main/sidebar.cc:1066 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "" -#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1073 ../src/main/sidebar.cc:1075 -msgid "Maps" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1082 ../src/main/sidebar.cc:1084 -msgid "Images" -msgstr "" - -#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1091 ../src/main/sidebar.cc:1093 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1553 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "" -#: ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "" -#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:234 -#: ../src/main/sidebar.cc:1101 ../src/main/sidebar.cc:1103 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1762 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1772 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "" -#: ../src/gnome2/mod_mgr.c:1842 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "" -#: ../src/gnome2/mod_mgr.c:1873 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1880 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "" -#: ../src/gnome2/mod_mgr.c:1888 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "" -#: ../src/gnome2/mod_mgr.c:1896 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "" -#: ../src/gnome2/mod_mgr.c:1904 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "" -#: ../src/gnome2/mod_mgr.c:1912 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "" -#: ../src/gnome2/mod_mgr.c:1920 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "" @@ -858,12 +935,12 @@ msgid "Add/Remove" msgstr "" -#: ../src/gnome2/mod_mgr.c:1942 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "" -#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2067 -#: ../src/gnome2/sidebar.c:1533 ../src/gnome2/sidebar.c:1572 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "" @@ -871,230 +948,243 @@ msgid "Install/Update" msgstr "" -#: ../src/gnome2/mod_mgr.c:1950 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "" -#: ../src/gnome2/mod_mgr.c:2186 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "" -#: ../src/gnome2/mod_mgr.c:2187 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "" -#: ../src/gnome2/mod_mgr.c:2513 +#. Zero Bibles is just not workable in Xiphos. +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2520 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." msgstr "" -#: ../src/gnome2/mod_mgr.c:2613 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "" -#: ../src/gnome2/mod_mgr.c:2619 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "" -#: ../src/gnome2/mod_mgr.c:2787 ../src/gnome2/mod_mgr.c:3050 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2854 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:2863 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2864 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2865 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2866 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "" -#: ../src/gnome2/mod_mgr.c:2867 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "" -#: ../src/gnome2/mod_mgr.c:2868 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2895 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "" -#: ../src/gnome2/mod_mgr.c:3047 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3554 +#: ../src/gnome2/mod_mgr.c:3636 msgid "[no module]" msgstr "" -#: ../src/gnome2/navbar_book.c:371 ../src/gnome2/navbar_book_dialog.c:312 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:393 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "" -#: ../src/gnome2/navbar_book.c:414 ../src/gnome2/navbar_book_dialog.c:352 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "" -#: ../src/gnome2/navbar_book.c:436 ../src/gnome2/navbar_book_dialog.c:372 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:893 -#: ../src/gnome2/navbar_versekey_editor.c:935 -#: ../src/gnome2/navbar_versekey_parallel.c:855 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2074 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:252 -#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:1011 -#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1013 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:870 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:872 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:950 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1011 +#: ../src/gnome2/preferences_dialog.c:988 msgid "Mode selection failed.\n" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1017 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1019 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 ../src/main/xml.c:95 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1023 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1024 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1595 -#: ../src/gnome2/preferences_dialog.c:1632 -#: ../src/gnome2/preferences_dialog.c:1668 -#: ../src/gnome2/preferences_dialog.c:1702 -#: ../src/gnome2/preferences_dialog.c:1736 -#: ../src/gnome2/preferences_dialog.c:1770 -#: ../src/gnome2/preferences_dialog.c:1804 -#: ../src/gnome2/preferences_dialog.c:1839 -#: ../src/gnome2/preferences_dialog.c:1875 -#: ../src/gnome2/preferences_dialog.c:1927 -#: ../src/gnome2/preferences_dialog.c:2404 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1889 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1962 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2047 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2050 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2057 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2060 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2063 +#: ../src/gnome2/preferences_dialog.c:2019 msgid "Sizes and Faces" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2077 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2786 ../src/gnome2/search_dialog.c:522 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2787 ../src/gnome2/search_dialog.c:523 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2838 ../src/main/search_dialog.cc:690 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2839 ../src/main/search_dialog.cc:691 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1113,20 +1203,20 @@ msgid "found in " msgstr "" -#: ../src/gnome2/search_dialog.c:481 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:709 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:727 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:728 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1146,7 +1236,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:859 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1191,7 +1281,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:922 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1209,119 +1299,109 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1224 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1247 ../src/gnome2/sidebar.c:1003 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:211 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:220 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:236 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:250 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:259 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:273 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:287 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "" -#: ../src/gnome2/search_sidebar.c:306 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:320 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "" -#: ../src/gnome2/search_sidebar.c:333 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "" -#: ../src/gnome2/search_sidebar.c:348 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:361 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:371 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:380 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:395 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:410 ../src/gnome2/search_sidebar.c:443 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:422 ../src/gnome2/search_sidebar.c:450 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:957 +#: ../src/gnome2/sidebar.c:934 msgid "Paste verse references" msgstr "" -#: ../src/gnome2/sidebar.c:959 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1521 ../src/gnome2/sidebar.c:1556 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "" -#: ../src/gnome2/sidebar_dialog.c:164 ../src/gnome2/sidebar_dialog.c:173 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "" @@ -1329,229 +1409,229 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:361 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:145 ../src/gnome2/treekey-editor.c:208 -#: ../src/gnome2/treekey-editor.c:304 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:146 ../src/gnome2/treekey-editor.c:209 -#: ../src/gnome2/treekey-editor.c:305 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:266 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/biblesync_glue.cc:107 +#: ../src/main/biblesync_glue.cc:104 msgid "" "Mismatched packet\n" "\n" msgstr "" -#: ../src/main/biblesync_glue.cc:126 +#: ../src/main/biblesync_glue.cc:118 msgid "" "Presence announcement:\n" "\n" msgstr "" -#: ../src/main/biblesync_glue.cc:137 +#: ../src/main/biblesync_glue.cc:128 msgid "" "Navigation packet:\n" "\n" msgstr "" -#: ../src/main/biblesync_glue.cc:191 +#: ../src/main/biblesync_glue.cc:179 msgid "Unknown module " msgstr "" -#: ../src/main/biblesync_glue.cc:192 +#: ../src/main/biblesync_glue.cc:179 msgid "" ".\n" "Navigated indirectly using verse list." msgstr "" -#: ../src/main/biblesync_glue.cc:281 +#: ../src/main/biblesync_glue.cc:255 msgid "ERROR: unknown BibleSync indicator: " msgstr "" -#: ../src/main/biblesync_glue.cc:284 +#: ../src/main/biblesync_glue.cc:255 msgid "Other indications are:" msgstr "" -#: ../src/main/biblesync_glue.cc:579 +#: ../src/main/biblesync_glue.cc:530 msgid "Check the box to listen to this Speaker" msgstr "" -#: ../src/main/biblesync_glue.cc:592 +#: ../src/main/biblesync_glue.cc:543 msgid "Available Speakers" msgstr "" -#: ../src/main/biblesync_glue.cc:601 +#: ../src/main/biblesync_glue.cc:552 msgid "D/I" msgstr "" -#: ../src/main/biblesync_glue.cc:611 +#: ../src/main/biblesync_glue.cc:562 msgid "Last navigation was Direct or Indirect" msgstr "" -#: ../src/main/biblesync_glue.cc:620 +#: ../src/main/biblesync_glue.cc:571 msgid "Last Navigation" msgstr "" -#: ../src/main/biblesync_glue.cc:639 +#: ../src/main/biblesync_glue.cc:590 msgid "UUID" msgstr "" -#: ../src/main/biblesync_glue.cc:661 +#: ../src/main/biblesync_glue.cc:610 msgid "IP address: " msgstr "" -#: ../src/main/biblesync_glue.cc:662 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Application: " msgstr "" -#: ../src/main/biblesync_glue.cc:663 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "Device: " msgstr "" -#: ../src/main/biblesync_glue.cc:664 +#: ../src/main/biblesync_glue.cc:610 msgid "" "\n" "UUID: " msgstr "" -#: ../src/main/display.cc:88 +#: ../src/main/display.cc:89 msgid "" "

This module has no content at this point.
" msgstr "" -#: ../src/main/display.cc:247 +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1110 ../src/main/display.cc:1151 -#: ../src/main/display.cc:1236 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:132 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:246 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:251 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:254 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:257 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:260 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:188 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:243 ../src/main/module_dialogs.cc:354 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:249 ../src/main/module_dialogs.cc:359 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:255 ../src/main/module_dialogs.cc:269 -#: ../src/main/module_dialogs.cc:364 ../src/main/module_dialogs.cc:376 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:261 ../src/main/module_dialogs.cc:280 -#: ../src/main/module_dialogs.cc:369 ../src/main/module_dialogs.cc:386 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1012 ../src/main/url.cc:534 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" @@ -1560,316 +1640,323 @@ msgstr "" #: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:410 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "" -#: ../src/main/parallel_view.cc:420 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:430 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:440 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:450 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:460 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:470 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:480 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:490 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:524 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "" -#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "" -#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "" -#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:560 ../ui/xi-menus.glade.h:83 -#: ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 msgid "Transliterated Forms" msgstr "" -#: ../src/main/parallel_view.cc:570 ../ui/xi-menus.glade.h:84 -#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 msgid "Enumerations" msgstr "" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + #: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:380 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:235 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:266 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:279 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:319 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:320 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:334 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:335 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:361 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:362 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:377 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:378 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:379 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:381 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:407 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:408 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:459 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:460 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:524 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:525 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:539 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:542 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:543 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:545 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:546 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:424 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:645 ../src/main/search_dialog.cc:1073 -#: ../src/main/search_dialog.cc:1076 ../src/main/search_dialog.cc:1098 -#: ../src/main/search_dialog.cc:1101 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1443 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1877,40 +1964,40 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1445 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1461 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1463 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1464 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1527 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" @@ -1919,12 +2006,12 @@ msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:135 ../src/main/settings.c:144 -#: ../src/main/settings.c:153 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -1934,7 +2021,7 @@ msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:219 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -1944,61 +2031,61 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:225 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" msgstr "" -#: ../src/main/sidebar.cc:422 +#: ../src/main/sidebar.cc:411 msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:483 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:582 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:589 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:602 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:609 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:691 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:693 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1052 ../src/main/sword.cc:1223 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2006,7 +2093,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1056 ../src/main/sword.cc:1227 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2014,11 +2101,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1348 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1599 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2032,93 +2119,93 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:298 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/tab_history.c:304 +#: ../src/main/tab_history.c:308 msgid "History ➛ Verse List" msgstr "" -#: ../src/main/url.cc:108 +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:198 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:206 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:279 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:86 ../src/main/xml.c:478 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:96 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:98 ../src/main/xml.c:99 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:103 ../src/main/xml.c:104 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:108 ../src/main/xml.c:109 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:112 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:114 ../src/main/xml.c:115 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:270 ../src/main/xml.c:416 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:276 ../src/main/xml.c:422 ../src/main/xml.c:444 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1375 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:282 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:428 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:499 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2127,7 +2214,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:500 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2136,101 +2223,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:506 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:507 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:512 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:513 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:521 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:522 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:529 ../src/main/xml.c:531 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:532 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1336 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1338 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2244,13 +2331,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "" @@ -2259,7 +2346,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2272,22 +2359,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2424,7 +2511,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2461,7 +2548,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2567,8 +2654,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2617,7 +2704,7 @@ msgstr "" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2895,124 +2982,83 @@ msgstr "" #: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 -#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3082,96 +3128,108 @@ msgstr "" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 msgid "Remove a remote install source." msgstr "" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3180,11 +3238,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3192,11 +3250,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3338,11 +3396,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3408,11 +3466,11 @@ msgid "BSP privacy button" msgstr "" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3440,11 +3498,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3484,11 +3542,11 @@ msgid "BSP listen none radio button" msgstr "" -#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:71 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 msgid "Special:" msgstr "" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3665,177 +3723,181 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 msgid "Verse number" msgstr "" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 msgid "Superscript" msgstr "" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" @@ -3867,6 +3929,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "" @@ -4072,11 +4138,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4365,6 +4431,10 @@ msgid "_Module Manager" msgstr "" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4509,27 +4579,27 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 msgid "Verse Per Line" msgstr "" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4537,273 +4607,273 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:94 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 msgid "Populate verse list" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:93 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 msgid "Push the entire verse list contents directly into the history list." msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 msgid "Preload history from verse list" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:95 +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:94 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:96 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 msgid "Import Bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:148 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" diff -Nru xiphos-4.0.0+dfsg1/po/zh_CN.po xiphos-4.0.4+dfsg1/po/zh_CN.po --- xiphos-4.0.0+dfsg1/po/zh_CN.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/zh_CN.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-09-29 22:04+0100\n" "Last-Translator: Peter von Kaehne \n" "Language-Team: Chinese (Simplified) \n" @@ -18,296 +18,262 @@ "X-Launchpad-Export-Date: 2010-04-19 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "配置未找到" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "你是否要删除相关笔记" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" -msgstr "" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" +msgstr "打开" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "无标题文档" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "保存修改内容" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "在关闭之前" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "如果您不保存，变更将永久丢失。" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "文件" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "研修笔记" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "笔记编辑器" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "祈祷名单/笔记编辑器" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "关于 Sword 模块" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr "整个模块" +msgid "Module name: " +msgstr "模块管理器" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" -msgstr "" +#: ../src/gnome2/about_modules.c:415 +#, fuzzy +msgid "Version: " +msgstr "选项" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s 失败" +msgid "Type: " +msgstr "范围" -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "每日灵修" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "地图" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "配置未找到" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "图片" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "第 %d 页，共 %d 页" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" +msgstr "" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" -msgstr "打开" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "另存为" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "圣经" -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "无标题文档" +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "注释" -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "你是否要删除相关笔记" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "字典" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML 输出" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML 源" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "原始代码" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "普通书卷" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "打印(_P)..." +#: ../src/gnome2/about_modules.c:451 +#, fuzzy +msgid "Personal Commentary" +msgstr "重命名注释" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "打印预览(_v)" +#: ../src/gnome2/about_modules.c:454 +#, fuzzy +msgid "Journal" +msgstr "日记" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "退出(_Q)" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "未知" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "打开(_O)" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "保存(_S)" +#: ../src/gnome2/about_modules.c:466 +#, fuzzy +msgid "Module abbreviation: " +msgstr "模块列表" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "另存为(_A)..." +#: ../src/gnome2/about_modules.c:471 +#, fuzzy +msgid "Language: " +msgstr "范围" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "新建" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "打开新文档" +#: ../src/gnome2/about_modules.c:483 +#, fuzzy +msgid "Installed size: " +msgstr "安装数据源" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "删除" +#: ../src/gnome2/about_modules.c:491 +#, fuzzy +msgid "Companion module(s):
" +msgstr "主要窗口模块" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "删除当前笔记" +#: ../src/gnome2/about_modules.c:501 +#, fuzzy +msgid "Features:" +msgstr "格式" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "文件(_F)" +#: ../src/gnome2/about_modules.c:505 +#, fuzzy +msgid "* Headings" +msgstr "标题" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML 输出(_O)" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "HTML 源代码(_H)" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "纯源代码(_P)" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "查看 (_V)" +#: ../src/gnome2/about_modules.c:513 +#, fuzzy +msgid "* Footnotes" +msgstr "脚注注释" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "保存" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "交叉引用" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "插入链接" +#: ../src/gnome2/about_modules.c:526 +#, fuzzy +msgid "* Strong's numbers" +msgstr "突出数字" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "保存修改内容" +#: ../src/gnome2/about_modules.c:534 +#, fuzzy +msgid "* Morphological tags" +msgstr "形态标签 单选按钮" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "在关闭之前" +#: ../src/gnome2/about_modules.c:540 +#, fuzzy +msgid "* Lemmas" +msgstr "引理" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "如果您不保存，变更将永久丢失。" +#: ../src/gnome2/about_modules.c:548 +#, fuzzy +msgid "* Words of Christ in red" +msgstr "基督的话语用红字显示" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "文件" +#: ../src/gnome2/about_modules.c:553 +#, fuzzy +msgid "* Greek accents" +msgstr "希腊口音" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "研修笔记" +#: ../src/gnome2/about_modules.c:559 +#, fuzzy +msgid "* Hebrew Vowel Points" +msgstr "希伯来文元音点" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "笔记编辑器" +#: ../src/gnome2/about_modules.c:565 +#, fuzzy +msgid "* Hebrew Cantillation" +msgstr "希伯来吟唱" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "祈祷名单/笔记编辑器" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "解锁 " - -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "正在准备打印" - -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "此打印机上目前尚不支持打印" +#: ../src/gnome2/about_modules.c:578 +#, fuzzy +msgid "* Transliteration forms" +msgstr "音译" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "打印机 %s 并不支持 PostScript 打印。" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "正在打印" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "等候打印" - -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "打印时发生了一个错误" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "无法打印您的文档：%s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "关于 Sword 模块" +#: ../src/gnome2/about_modules.c:612 +#, fuzzy +msgid "Distribution license:" +msgstr "属性" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "模块不包含关于信息。" +#: ../src/gnome2/about_modules.c:625 +#, fuzzy +msgid "Promotional: " +msgstr "选项" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -322,40 +288,42 @@ "Project 软件框架允许您容易地研修圣经文本、注释、词典和字典的应用。很多应用软" "件都使用这一框架。已安装的一套书籍可在所有前端使用此框架的软件共享。" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 +#, fuzzy msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" "你喜欢使用Xiphos研究圣经吗？你想看到它的显示使用您的母语是什么？你可以翻译" "Xiphos！" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "关于 Xiphos 翻译" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "请参考 Xiphos 资源中的 翻译指南" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "Xiphos 开发项目" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "版权所有 2000-2010 Xiphos 开发项目组" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "版权所有 2000-2015 Xiphos 开发项目组" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -367,235 +335,235 @@ "我们感谢 Troy Griffitts 和所有在 The SWORD Project 奉献的朋友。" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "书签" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "输入文件夹名称" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "文件夹名称" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "文件夹： " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 #, fuzzy msgid "Specify bookmarks file" msgstr "编辑书签" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "编辑" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "文件夹名称: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "书签名称 " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "经文 " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "模块: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "移除选择的文件夹" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(和所有的内容)？" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "删除选中的书签" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "添加" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "标签： " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "书签" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "授予:" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 #, fuzzy msgid "Enter Key: " msgstr "输入密码钥匙 " -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "关闭而不保存" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "关闭而不保存(_W)" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "经文列表" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "经文列表" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "搜索结果" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "请在导出文件之前检查是否有版权保护" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "查找" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "输入词语或短语" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "向后搜索" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "查找下一个" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "设置模块字体" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "变更字体为" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "模块" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "当前字体: " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "在此模块上使用默认字体" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "囧！Xiphos由于“STRDUP”错误而崩溃。" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "请向Xiphos小组报告这个错误:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "囧！Xiphos由于“STRING”错误而崩溃。" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "在模块中有突出数码" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - 圣经研修软件" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "在新标签页中打开" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "标准试图" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "注释视图" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "书卷视图" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "欢迎使用 Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -614,33 +582,33 @@ "因此，个人注释的重新命名将无法在\n" "Windows环境中使用。" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "重命名注释" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "选择注释名称" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "新名称" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "名称: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "模块名称只能包含英文字母和数字。" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "Xiphos 已经知道一个该名称的模块。" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" @@ -649,7 +617,7 @@ "创建新配置时失败:\n" "%s" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" @@ -657,7 +625,7 @@ "创建配置错误:\n" "\n" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -743,20 +711,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "是否移除这些模块" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "正在准备移除" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "正在移除中" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "移除" @@ -776,23 +744,23 @@ msgid "Install" msgstr "安装" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "正在准备存档" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "正在存档" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "存档" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" @@ -800,55 +768,59 @@ "是否为这些模块建立快速索引\n" "(可能会持续一会儿)？" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "正在准备建立索引" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "正在索引" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "索引" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "是否删除这些模块的快速索引记录？" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "正在准备删除索引记录" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "正在删除索引记录" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "删除" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "模块不包含关于信息。" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "模块名称" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "带对钩的标记表示这个模块已经安装" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "单击方框开始启用这个模块" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "单击方框选择安装/更新的模块" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "已安装" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" @@ -856,37 +828,37 @@ "索引图标表示您已经为这个模块的快速搜索建立了一个('lucene')优化索引(请参见此功" "能维护窗格)" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "锁形图标表示这个模块被加密，您需要向内容所有者购买一个解锁密码键" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "关于" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "更新图标表示已安装的模块要比可更新的模块要旧:我们推荐您更新模块" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "可用" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "大小" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "说明" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -895,33 +867,33 @@ "mkdir %s' 失败:\n" "%s。" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " 存档于: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "周记和祈祷名单不能被索引。" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s 失败" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "已完成" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "未知" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -930,154 +902,144 @@ "知识库:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "按模块类型分类。" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "圣经文本" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "注释" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "词典" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "每日灵修" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "普通书卷" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "地图" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "图片" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "按可用性分类。" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "更新" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "没有安装" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "更新远程数据源" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "远程数据源未找到" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "设置" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "类型" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "标题" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "数据源" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "目录" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "用户" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "密码" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "用户 ID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "模块数据源" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "添加/删除" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "选择" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "模块" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "安转个/更新" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "维护" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "请更新" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "您的模块清单不是最新的！" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1085,7 +1047,7 @@ "您刚刚删除了您的最后一本圣经。\n" "Xiphos 需要至少安装一本。" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1093,211 +1055,222 @@ "您仍然未安装任何圣经。\n" "Xiphos 由于缺少必要的书籍数据无法继续运行。" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "标准数据源已经载入。" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "不能从 CrossWire 载入标准数据源。" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "删除选择的数据源" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "请输入一个远程数据源" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "标题：" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "类型：" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "主机名：" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "目录:" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "用户名(选填):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "密码(选填):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "已存在同名数据源。" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "删除一个数据源" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr "整个模块" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "到上一处" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "到下一处" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "同步这个窗口与主窗口一起滚动" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "类似" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "卸载/安装" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "模块选项" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "类似视图" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "阅读选择性朗读" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "个人" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "-- 选择 --" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "重新启动后本地化设置才能生效。" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "首选项" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "常规" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "选项" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 #, fuzzy msgid "BibleSync" msgstr "圣经" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "字体" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "颜色" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "标签和窗格" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "指定" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "是否清除？" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "你确定要清除模块列列表？" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "移除模块" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "你确定是否要移除所选择的模块吗？" @@ -1316,20 +1289,20 @@ msgid "found in " msgstr "查找位于 " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "最后的模块列表也许不会被删除" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "要删除列表吗？" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "你确定要删除:" @@ -1349,7 +1322,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1394,7 +1367,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1412,15 +1385,15 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." @@ -1428,108 +1401,98 @@ "这是一个包含 (\\\"AND\\\") 搜索:\n" "查找并匹配显示所有的单词。" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 #, fuzzy msgid "_Open Advanced Search" msgstr "高级搜索(_A)" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "搜索模块" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "圣经" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "注释" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "搜索类型" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "复杂词汇" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "正则表达式" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "精确短语" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "搜索选项" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "区分大小写" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "搜索范围" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "没有范围" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "上次搜索" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "范围限制" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "小写" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "大写" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 #, fuzzy msgid "Open module in editor?" msgstr "在编辑器中打开" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "首选项" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "搜索" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "侧边栏" @@ -1537,73 +1500,73 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "祷告名单/日记 项目" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "新名称" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "移除所选项目" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "一月" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "二月" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "三月" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "四月" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "五月" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "六月" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "七月" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "八月" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "九月" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "十月" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "十一月" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "十二月" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 #, fuzzy msgid "" "An image file's size could not be determined.\n" @@ -1614,7 +1577,98 @@ "(或者可能是其他如 bmp/gif/jpg/png 类型的图像。)\n" "Xiphos 无法将图像调整为窗口大小。" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr "整个模块" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "单击方框开始启用这个模块" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "可用" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +#, fuzzy +msgid "Last Navigation" +msgstr "救恩" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" @@ -1623,248 +1677,270 @@ "个人注释标签非法:\n" "‘%s'" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "章" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "Xiphos 无法理解多于一个参数的指令。" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 #, fuzzy msgid "Initiating HTML" msgstr "正在初始化 Gecko 引擎" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "正在构建人机界面" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "正在启动 Sword" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "正在加载设置" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "正在显示 Xiphos 界面" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "预览器" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "脚注" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "互相对照" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "突出显示" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "回到 " -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "突出数字" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "脚注注释" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "希伯来文元音点" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "希伯来吟唱" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "希腊口音" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "交叉引用" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "引理" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "标题" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "基督的话语用红字显示" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "音译" -#: ../src/main/parallel_view.cc:507 +#: ../src/main/parallel_view.cc:512 msgid "Textual Variants" msgstr "原文变体" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 msgid "Primary Reading" msgstr "初次阅读" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 msgid "Secondary Reading" msgstr "第二遍阅读" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 msgid "All Readings" msgstr "所有的阅读" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +#, fuzzy +msgid "Transliterated Forms" +msgstr "音译" + +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" +msgstr "" + +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" +msgstr "" + +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "视图上下文" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "给与救恩" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "救恩" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "给与救恩" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "健康" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "给与救恩" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "杂项" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "杂项
" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "y 点" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "(y)
" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "z 点" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "(z)
" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "次要主题 1" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "次要主题 1
" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "次要主题 2" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "主题 2" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "副题 3" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "小标题 3
" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "副题 4" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "小标题 4
" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "新的祈祷名单或者日记的名称" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "Xiphos 认为那个名字重名" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" @@ -1873,19 +1949,19 @@ "Xiphos 不能创建模块的路径:\n" "%s" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "Xiphos 在.\\par\\par 中创建了一个基本列表" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "基本祈祷列表" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "我的祈祷列表" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" @@ -1893,102 +1969,102 @@ "人名:
鲍勃
萨姆
苏

地点:
座位
友谊
圣" "经传教士


" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "Xiphos 在.\\par\\par 目录建立了一个基本主题祈祷列表。" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "主题祈祷列表" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "苏
约翰
" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "属灵成长" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "麦克
史蒂夫
" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "苏
约翰
" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "每月祈祷列表" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "Xiphos 在.\\par\\par 创建了一个日记" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "日记" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "Xiphos 在.\\par\\par 目录中建立了一个专题概述(例如：撒母耳记 sermon)" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "专题概述" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "主题 A" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "主题 A
" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "主题 B" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "主题 B
" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "主题 C" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "主题 C
" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "用户注解" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "搜索 %s 的结果: %s" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "删除范围吗？" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "你确定是否要删除这个范围？" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "搜索： " -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1999,16 +2075,16 @@ "没有这样的模块被安装。\n" "%s" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "请调整模块列表。" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "%s 不存在快速搜索索引记录。%s%s" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." @@ -2016,7 +2092,7 @@ "\n" "现正在'多字'模块中搜索。." -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." @@ -2024,41 +2100,35 @@ "\n" "请参见模块管理器，维护窗格。" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "搜索已完成" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "符合" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "$HOME 未指定！" #: ../src/main/settings.c:120 -#, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +#, fuzzy, c-format +msgid "Xiphos can not create directory " msgstr "" -"Xiphos 不能创建 .xiphos 文件在下列目录:\n" -"%s\n" -"\n" -"Xiphos 无法继续执行。" +"Xiphos 不能创建模块的路径:\n" +"%s" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "无法创建 " -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." @@ -2066,11 +2136,11 @@ "空白的设置文件 -- 已尝试恢复备份。\n" "一些信息可能会丢失。" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "空白的设置文件 -- 没有备份吗？！？信息已丢失！" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 #, fuzzy msgid "" "There are no Bibles installed.\n" @@ -2087,11 +2157,11 @@ "Xiphos 将不能继续运行，\n" "程序将被迫退出。" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "圣经模块安装完成。" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2101,11 +2171,11 @@ msgid "verse" msgstr "经文" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "章" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." @@ -2113,7 +2183,7 @@ "Xiphos 的语言缩写文件\n" "已经丢失。" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." @@ -2121,13 +2191,13 @@ "Xiphos的语言缩写\n" "文件无法打开。" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "Xiphos 不能分配语言缩写空间。" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." @@ -2136,19 +2206,19 @@ "缩写文件。" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, fuzzy, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "未找到符合本地化语言设置" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 #, fuzzy msgid "Book names and menus may not be translated." msgstr "书卷名称和菜单可能没有被翻译" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2156,7 +2226,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2164,11 +2234,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "请求每日灵修模块，但是好像未安装。" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2182,89 +2252,94 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "清空历史" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +#, fuzzy +msgid "History ➛ Verse List" +msgstr "经文列表" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "URL地址没有找到:" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "Xiphos 无法执行 %s" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "查看器错误:\n" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "在主窗口中显示 %s" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "文档未成功创建。 \n" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "我怎样做才能拯救自己？" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "使徒行传 16:31" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "以弗所书 2:8,9" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "罗马书 1:16" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "福音是什么？" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "格林多前书 15:1-4" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "文档未解析成功。 \n" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "空白文档 \n" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "错误类型，根节点 != SwordBookmarks\n" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, fuzzy, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "错误类型，根节点 != %s\n" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, fuzzy, c-format msgid "" "%s\n" @@ -2273,7 +2348,7 @@ "\n" msgstr "章" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, fuzzy, c-format msgid "" "\n" @@ -2282,94 +2357,94 @@ "\n" msgstr "章" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "旧约全书" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "创世纪 - 马拉基书" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "新约全书" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "马太福音 - 启示录" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "示例模块列表" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "错误类型，根节点 != %s\n" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" @@ -2378,7 +2453,7 @@ "保存设置失败！ 状态 %d，文件大小 %d\n" "%s" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "正在试图恢复到上次的保存状态。" @@ -2392,13 +2467,13 @@ msgstr "书签对话框" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "新建文件夹" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "新建文件夹" @@ -2407,7 +2482,7 @@ msgstr "新建..." #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "撤销书签" @@ -2420,22 +2495,22 @@ msgstr "标签空白" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "经文:" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "经文条目" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "模块：" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "模块空白" @@ -2443,6 +2518,10 @@ msgid "Bookmark Folder Treeview" msgstr "书签文件夹树形视图" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "插入链接" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2498,6 +2577,12 @@ msgid "_Delete Personal Comment" msgstr "删除个人注释(_D)" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "文件(_F)" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "保存当前笔记" @@ -2506,6 +2591,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "打印预览(_v)" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "打印(_P)..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "退出(_X)" @@ -2514,6 +2607,11 @@ msgid "For_mat" msgstr "格式(_M)" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "保存" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "打印此文档" @@ -2551,7 +2649,7 @@ msgstr "新建文档" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "复制/导出 段落" @@ -2588,7 +2686,7 @@ msgstr "导出整卷书籍" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "书卷" @@ -2703,8 +2801,8 @@ msgid "Open about dialog" msgstr "在对话框中打开" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2747,13 +2845,17 @@ msgid "Delete selection" msgstr "删除选择的范围" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "删除" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "移除所选项目" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "删除项目" @@ -2928,6 +3030,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "新建" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 #, fuzzy msgid "Create new file" @@ -3062,122 +3168,86 @@ msgid "_Edit" msgstr "编辑(_E)" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "帮助(_H)" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 #, fuzzy msgid "Bulleted List" msgstr "要删除列表吗？" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 #, fuzzy msgid "Numbered List" msgstr "经文列表" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "标记/取消标记 经文" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "标记" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "取消标记" @@ -3257,97 +3327,109 @@ msgstr "是否删除这些模块的快速索引记录？" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "继续" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "Sword" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "模块管理器" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "警告: 如果您居住在受迫害的国家请谨慎使用。" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "添加和删除数据源" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "当前本地数据源" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "当前远程数据源" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "删除一个数据源" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "安装数据源" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "本地" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "远程" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "安装目标" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "用户数据，为您专用:" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "主目录" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "系统数据，所有用户:" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "Sword 系统目录" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "警告: 如果你居住在受迫害国家请不要冒险使用远程安装数据功能！ " -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "本地安装目录" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "历史下拉列表" @@ -3356,11 +3438,11 @@ msgid "Choose book to display" msgstr "选择要显示的书卷" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "书卷选择按钮" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "约翰的启示" @@ -3369,11 +3451,11 @@ msgid "Choose chapter to display" msgstr "选择要显示的书卷" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "章节切换按钮" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "1" @@ -3529,11 +3611,12 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" -msgstr "" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +#, fuzzy +msgid "Mode:" +msgstr "模块" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3605,12 +3688,12 @@ msgid "BSP privacy button" msgstr "经文单选按钮" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 #, fuzzy -msgid "Navigate" +msgid "Navigate:" msgstr "救恩" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3642,11 +3725,12 @@ msgid "BSP nav verse list radio button" msgstr "模块列表 单选按钮" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" -msgstr "" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +#, fuzzy +msgid "Listen:" +msgstr "列表名字" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3689,7 +3773,12 @@ msgid "BSP listen none radio button" msgstr "纯文本单选按钮" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "指定" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3877,194 +3966,193 @@ msgstr "启用祈祷名单复选框" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "经文小节号码" -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 #, fuzzy msgid "Show verse number in bold text" msgstr "显示经文前的数码(_N)" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 #, fuzzy msgid "Verse number bold checkbox" msgstr "经文小节号码大小" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 #, fuzzy msgid "Verse number bracket checkbox" msgstr "使用每行显示一节经文模式 复选框" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "说明" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 #, fuzzy msgid "Show verse number as a superscript" msgstr "显示经文前的数码(_N)" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 #, fuzzy msgid "Verse number superscript checkbox" msgstr "经文小节号码大小" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 #, fuzzy msgid "StudyPad default directory" msgstr "学习笔记(StudyPad) 默认目录 组合框" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "请选择一个目录" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "学习笔记(StudyPad) 默认目录 组合框" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "普通杂项" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "主要窗口模块" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "圣经文本" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "修改圣经文本组合框" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "修改注释组合框" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "字典" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "修改目录组合框" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "修改书卷组合框" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "模块" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "清除所有模块的列表" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "从列表模块清除按钮" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "从列表中移除选择的模块" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "从列表中删除选择的模块" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 #, fuzzy msgid "Open a dialog to select modules" msgstr "打开一个对话框以选择模块添加到列表" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "添加模块" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "打开选择对画框 按钮" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "类似模块" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "专用模块" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "每日灵修" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "每日灵修组合框" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "希伯来词典" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "希伯来词典组合框" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "希腊词典" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "希腊词典 组合框" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "默认目录" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "修改默认目录组合框" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "个人笔记" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "修改个人笔记组合框" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "模块杂项" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "模块选择" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -4095,6 +4183,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "高级搜索" @@ -4304,11 +4396,11 @@ msgid "Found" msgstr "已找到" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "结果摘要窗口" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "结果摘要总表" @@ -4500,6 +4592,11 @@ msgid "Attribute Search" msgstr "属性搜索" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "模块选择" + #: ../ui/search-dialog.gtkbuilder.h:6 #, fuzzy msgid "search module" @@ -4595,6 +4692,10 @@ msgid "_Module Manager" msgstr "模块管理器(_M)" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "查看 (_V)" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "预览每日奉献(_D)" @@ -4743,28 +4844,28 @@ msgid "Learn about Xiphos" msgstr "关于 Xiphos(_X)" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "注释经文" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "打开模块" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "注解" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "在编辑器中打开" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "使用每行显示一节经文模式" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4772,191 +4873,200 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "变体" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "图像内容" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "重置文字界面" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "按章注解" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 #, fuzzy msgid "Doublespace" msgstr "双空格文本(_o)" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "查找选择" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "使用当前字典" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "在 BibleMap.org 中浏览" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "解锁此模块" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "显示书卷标题" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "显示章节标题" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "重命名 Pers.Comm。" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "转储Pers.Comm。" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "阅读选择性朗读" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "将这些结果保存为一个单个书签" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "将列表全部保存为单个书签" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "将这些结果保存为一个系列书签并为其创建各自的文件夹" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "将列表全部保存为系列书签" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "经文列表" -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "历史下拉列表" + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "导出列表" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "在新标签页中打开此书签" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "在一个新的标签页中打开" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "在对话框中打开此书签" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "在对话框中打开" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "在选择的目录中新建一个文件夹" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "在此插入新书签" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "插入书签" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "编辑书签" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "编辑项目(_E)" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "删除项目" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "展开全部书签组" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "全部展开" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "收起全部标签组" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "收起全部" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "允许项目从一个文件夹被移动到另一个文件夹" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "允许重排" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 #, fuzzy msgid "Load other bookmarks file (default: from BibleTime)" msgstr "从 Bibletime 载入标签" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "插入书签" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "移除文件夹并保存" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "导出到文件夹" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "在新的标签页中打开选择的模块" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" @@ -4964,80 +5074,80 @@ "分开的['dialog']窗口中\n" "打开选定的模块" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "在一个单独的窗口中打开" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "创建一个新的简易祈祷名单" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "简洁" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "创建一个新的次要祈祷名单" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "题目" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "创建一个新的月记(月刊)" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "按月" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "创建一个新的日记" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "每天" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "创建一个新的专题" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "概述" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 #, fuzzy msgid "Open in separate window" msgstr "在一个单独的窗口中打开" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "添加一个子项目" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "添加子项目" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "添加一个项目" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "添加项目" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "移除此项" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "编辑此项" @@ -5049,6 +5159,91 @@ msgid "Study the Bible" msgstr "学习圣经" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr "整个模块" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s 失败" + +#~ msgid "Page %d of %d" +#~ msgstr "第 %d 页，共 %d 页" + +#~ msgid "Save As" +#~ msgstr "另存为" + +#~ msgid "HTML Output" +#~ msgstr "HTML 输出" + +#~ msgid "HTML Source" +#~ msgstr "HTML 源" + +#~ msgid "Plain Source" +#~ msgstr "原始代码" + +#~ msgid "_Quit" +#~ msgstr "退出(_Q)" + +#~ msgid "_Open" +#~ msgstr "打开(_O)" + +#~ msgid "_Save" +#~ msgstr "保存(_S)" + +#~ msgid "Save _As..." +#~ msgstr "另存为(_A)..." + +#~ msgid "Open new document" +#~ msgstr "打开新文档" + +#~ msgid "Delete current note" +#~ msgstr "删除当前笔记" + +#~ msgid "HTML _Output" +#~ msgstr "HTML 输出(_O)" + +#~ msgid "_HTML Source" +#~ msgstr "HTML 源代码(_H)" + +#~ msgid "_Plain Source" +#~ msgstr "纯源代码(_P)" + +#~ msgid "Unlock " +#~ msgstr "解锁 " + +#~ msgid "Preparing to print" +#~ msgstr "正在准备打印" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "此打印机上目前尚不支持打印" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "打印机 %s 并不支持 PostScript 打印。" + +#~ msgid "Printing" +#~ msgstr "正在打印" + +#~ msgid "Waiting to print" +#~ msgstr "等候打印" + +#~ msgid "An error occurred while printing" +#~ msgstr "打印时发生了一个错误" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "无法打印您的文档：%s" + +#~ msgid "" +#~ "Xiphos can not create .xiphos:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos cannot continue." +#~ msgstr "" +#~ "Xiphos 不能创建 .xiphos 文件在下列目录:\n" +#~ "%s\n" +#~ "\n" +#~ "Xiphos 无法继续执行。" + #~ msgid "Tabs" #~ msgstr "标签页" diff -Nru xiphos-4.0.0+dfsg1/po/zh_TW.po xiphos-4.0.4+dfsg1/po/zh_TW.po --- xiphos-4.0.0+dfsg1/po/zh_TW.po 2014-12-18 19:36:24.000000000 +0000 +++ xiphos-4.0.4+dfsg1/po/zh_TW.po 2015-06-16 17:44:26.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xiphos\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-17 07:30-0400\n" +"POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2010-03-20 18:19+0000\n" "Last-Translator: Dmitrijs Ledkovs \n" "Language-Team: Chinese (Traditional) \n" @@ -18,296 +18,242 @@ "X-Launchpad-Export-Date: 2010-03-21 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/biblesync/biblesync.cc:129 -msgid "network setup errors." -msgstr "" - -#: ../src/biblesync/biblesync.cc:175 -msgid " client socket" -msgstr "" - -#: ../src/biblesync/biblesync.cc:225 -msgid " server socket" +#: ../src/backend/sword_main.cc:792 +msgid "" +"Xiphos failure: \"can't happen\", display_mod: null\n" +"Please report this. sword_main.cc:set_treekey\n" +"What were you doing when this occurred?" msgstr "" -#: ../src/biblesync/biblesync.cc:370 -msgid "bad magic" -msgstr "" +#: ../src/backend/sword_main.cc:1149 +msgid "Configuration not found" +msgstr "無適當組態" -#: ../src/biblesync/biblesync.cc:373 -msgid "bad protocol version" -msgstr "" +#: ../src/editor/webkit_editor.c:311 +msgid "Are you sure you want to delete the note for" +msgstr "您確定要刪除所屬的附註嗎?" -#: ../src/biblesync/biblesync.cc:378 -msgid "bad msg type" +#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9 +#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58 +msgid "Open" msgstr "" -#: ../src/biblesync/biblesync.cc:381 -msgid "bad packet count" -msgstr "" +#: ../src/editor/webkit_editor.c:688 +msgid "Untitled document" +msgstr "未命名的文件" -#: ../src/biblesync/biblesync.cc:384 -msgid "bad packet index" -msgstr "" +#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213 +msgid "Save the changes to document" +msgstr "儲存變更" -#: ../src/biblesync/biblesync.cc:427 -msgid "bad body format" -msgstr "" +#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214 +msgid "before closing?" +msgstr "結束前" -#: ../src/biblesync/biblesync.cc:441 -msgid "missing required header " -msgstr "" +#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218 +msgid "If you don't save, changes will be permanently lost." +msgstr "如果您不儲存，變更將會永久消失。" -#: ../src/biblesync/biblesync.cc:466 -msgid "UUID spoofed: wrong ipaddr." -msgstr "" +#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59 +#: ../ui/xi-menus-popup.gtkbuilder.h:39 +msgid "File" +msgstr "檔案" -#: ../src/biblesync/biblesync.cc:493 -msgid "Ignoring echo." -msgstr "" +#: ../src/editor/webkit_editor.c:1255 +msgid "StudyPad" +msgstr "小筆記" -#: ../src/biblesync/biblesync.cc:522 -msgid "Domain not 'BIBLE-VERSE': " -msgstr "" +#: ../src/editor/webkit_editor.c:1270 +msgid "Note Editor" +msgstr "附註編輯器" -#: ../src/biblesync/biblesync.cc:530 -msgid "Invalid group: " -msgstr "" +#: ../src/editor/webkit_editor.c:1287 +msgid "Prayer List/Journal Editor" +msgstr "禱告表/日記編輯器" -#: ../src/biblesync/biblesync.cc:560 -msgid " present at " -msgstr "" +#: ../src/gnome2/about_modules.c:138 +msgid "About Sword Module" +msgstr "關於 Sword 模組" -#: ../src/biblesync/biblesync.cc:562 -msgid " using " +#. Don't use an icon with GTK3 +#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168 +#: ../src/gnome2/find_dialog.c:288 +msgid "Close" msgstr "" -#: ../src/biblesync/biblesync.cc:685 +#: ../src/gnome2/about_modules.c:411 #, fuzzy -msgid "[no dump ready]" -msgstr " 模組" +msgid "Module name: " +msgstr "模組名稱" -#: ../src/biblesync/biblesync.cc:692 -msgid "select < 0" +#: ../src/gnome2/about_modules.c:415 +msgid "Version: " msgstr "" -#: ../src/biblesync/biblesync.cc:702 -msgid "recvfrom < 0" +#: ../src/gnome2/about_modules.c:418 +msgid "No version stamp found" msgstr "" -#: ../src/biblesync/biblesync.cc:791 +#: ../src/gnome2/about_modules.c:421 #, fuzzy -msgid "Transmit failed.\n" -msgstr "%s 失敗" - -#: ../src/biblesync/biblesync.cc:792 -msgid "" -"Unable to multicast; BibleSync is now disabled. If your network connection " -"changed while this program was active, it may be sufficient to re-enable." -msgstr "" +msgid "Type: " +msgstr "模組名稱" -#: ../src/backend/sword_main.cc:740 -msgid "" -"Xiphos failure: \"can't happen\", display_mod: null\n" -"Please report this. sword_main.cc:set_treekey\n" -"What were you doing when this occurred?" -msgstr "" +#: ../src/gnome2/about_modules.c:423 +#, fuzzy +msgid "Daily Devotion" +msgstr "每日進度" -#: ../src/backend/sword_main.cc:1091 -msgid "Configuration not found" -msgstr "無適當組態" +#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558 +#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030 +#: ../src/main/sidebar.cc:1032 +msgid "Maps" +msgstr "地圖" -#: ../src/editor/slib-editor.c:224 -#, c-format -msgid "Page %d of %d" -msgstr "第 %d 頁 (共 %d 頁)" +#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562 +#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039 +#: ../src/main/sidebar.cc:1041 +msgid "Images" +msgstr "圖片" -#: ../src/editor/slib-editor.c:393 ../src/editor/webkit_editor.c:585 -#: ../ui/editor_studypad.xml.h:9 ../ui/gtk2_webedit.ui.h:58 -#: ../ui/gtk_webedit.ui.h:58 -msgid "Open" +#: ../src/gnome2/about_modules.c:429 +msgid "Glossary" msgstr "" -#: ../src/editor/slib-editor.c:435 -msgid "Save As" -msgstr "另存新檔" - -#: ../src/editor/slib-editor.c:453 ../src/editor/slib-editor.c:619 -#: ../src/editor/webkit_editor.c:806 -msgid "Untitled document" -msgstr "未命名的文件" - -#: ../src/editor/slib-editor.c:644 ../src/editor/webkit_editor.c:310 -msgid "Are you sure you want to delete the note for" -msgstr "您確定要刪除所屬的附註嗎?" +#: ../src/gnome2/about_modules.c:433 +msgid "Cult" +msgstr "" -#: ../src/editor/slib-editor.c:687 -msgid "HTML Output" -msgstr "HTML 輸出" - -#: ../src/editor/slib-editor.c:694 -msgid "HTML Source" -msgstr "HTML 原始檔" - -#: ../src/editor/slib-editor.c:701 -msgid "Plain Source" -msgstr "純文字來源" +#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261 +msgid "Bible" +msgstr "" -#: ../src/editor/slib-editor.c:711 ../ui/editor_note.xml.h:13 -#: ../ui/editor_studypad.xml.h:19 -msgid "_Print..." -msgstr "列印(_P)..." +#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269 +#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 +msgid "Commentary" +msgstr "" -#: ../src/editor/slib-editor.c:718 ../ui/editor_note.xml.h:12 -#: ../ui/editor_studypad.xml.h:18 -msgid "Print Pre_view" -msgstr "預覽列印(_V)" +#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136 +#: ../ui/prefs.gtkbuilder.h:136 +msgid "Dictionary" +msgstr "" -#: ../src/editor/slib-editor.c:725 -msgid "_Quit" -msgstr "結束(_Q)" +#: ../src/gnome2/about_modules.c:446 +#, fuzzy +msgid "General Book" +msgstr "一般書籍" -#: ../src/editor/slib-editor.c:732 -msgid "_Open" -msgstr "開啟(_O)" - -#: ../src/editor/slib-editor.c:739 -msgid "_Save" -msgstr "儲存(_S)" +#: ../src/gnome2/about_modules.c:451 +msgid "Personal Commentary" +msgstr "" -#: ../src/editor/slib-editor.c:746 -msgid "Save _As..." -msgstr "另存新檔(_A)..." +#: ../src/gnome2/about_modules.c:454 +msgid "Journal" +msgstr "" -#: ../src/editor/slib-editor.c:752 ../ui/gtk2_webedit.ui.h:56 -#: ../ui/gtk_webedit.ui.h:56 -msgid "New" -msgstr "新增" +#: ../src/gnome2/about_modules.c:457 +#, fuzzy +msgid "Unknown type" +msgstr "不詳" -#: ../src/editor/slib-editor.c:754 -msgid "Open new document" -msgstr "開啟新檔" +#: ../src/gnome2/about_modules.c:466 +msgid "Module abbreviation: " +msgstr "" -#: ../src/editor/slib-editor.c:758 ../ui/gtk2_webedit.ui.h:14 -#: ../ui/gtk_webedit.ui.h:14 -msgid "Delete" -msgstr "刪除" +#: ../src/gnome2/about_modules.c:471 +msgid "Language: " +msgstr "" -#: ../src/editor/slib-editor.c:760 -msgid "Delete current note" -msgstr "刪除此筆附註" +#: ../src/gnome2/about_modules.c:474 +msgid "Not specified" +msgstr "" -#: ../src/editor/slib-editor.c:765 ../ui/editor_note.xml.h:9 -#: ../ui/editor_studypad.xml.h:7 ../ui/gtk2_webedit.ui.h:86 -#: ../ui/gtk_webedit.ui.h:86 ../ui/xi-menus.glade.h:1 -#: ../ui/xi-menus.gtkbuilder.h:1 -msgid "_File" -msgstr "檔案(_F)" +#: ../src/gnome2/about_modules.c:483 +msgid "Installed size: " +msgstr "" -#: ../src/editor/slib-editor.c:820 -msgid "HTML _Output" -msgstr "HTML 輸出(_O)" - -#: ../src/editor/slib-editor.c:827 -msgid "_HTML Source" -msgstr "_HTML 來源" - -#: ../src/editor/slib-editor.c:834 -msgid "_Plain Source" -msgstr "純文字來源 (_P)" - -#: ../src/editor/slib-editor.c:841 ../ui/gtk2_webedit.ui.h:89 -#: ../ui/gtk_webedit.ui.h:89 ../ui/xi-menus.glade.h:17 -#: ../ui/xi-menus.gtkbuilder.h:11 -msgid "_View" -msgstr "檢視(_V)" +#: ../src/gnome2/about_modules.c:491 +msgid "Companion module(s):
" +msgstr "" -#: ../src/editor/slib-editor.c:852 ../ui/editor_note.xml.h:16 -#: ../ui/editor_studypad.xml.h:11 ../ui/gtk2_webedit.ui.h:75 -#: ../ui/gtk_webedit.ui.h:75 -msgid "Save" -msgstr "儲存" +#: ../src/gnome2/about_modules.c:501 +msgid "Features:" +msgstr "" -#: ../src/editor/slib-editor.c:863 ../src/editor/slib-editor.c:870 -#: ../ui/editor_link_dialog.xml.h:1 -msgid "Insert Link" -msgstr "插入連結" +#: ../src/gnome2/about_modules.c:505 +msgid "* Headings" +msgstr "" -#: ../src/editor/slib-editor.c:1254 ../src/editor/slib-editor.c:1292 -#: ../src/editor/webkit_editor.c:1336 ../src/editor/webkit_editor.c:1374 -msgid "Save the changes to document" -msgstr "儲存變更" +#: ../src/gnome2/about_modules.c:513 +msgid "* Footnotes" +msgstr "" -#: ../src/editor/slib-editor.c:1255 ../src/editor/slib-editor.c:1293 -#: ../src/editor/webkit_editor.c:1337 ../src/editor/webkit_editor.c:1375 -msgid "before closing?" -msgstr "結束前" +#: ../src/gnome2/about_modules.c:519 +#, fuzzy +msgid "* Cross references" +msgstr "偏好設定" -#: ../src/editor/slib-editor.c:1262 ../src/editor/slib-editor.c:1300 -#: ../src/editor/webkit_editor.c:1344 ../src/editor/webkit_editor.c:1382 -msgid "If you don't save, changes will be permanently lost." -msgstr "如果您不儲存，變更將會永久消失。" +#: ../src/gnome2/about_modules.c:526 +msgid "* Strong's numbers" +msgstr "" -#: ../src/editor/slib-editor.c:1291 ../src/editor/webkit_editor.c:1373 -#: ../ui/xi-menus.glade.h:59 ../ui/xi-menus-popup.gtkbuilder.h:38 -msgid "File" -msgstr "檔案" +#: ../src/gnome2/about_modules.c:534 +msgid "* Morphological tags" +msgstr "" -#: ../src/editor/slib-editor.c:1348 ../src/editor/webkit_editor.c:1423 -msgid "StudyPad" -msgstr "小筆記" +#: ../src/gnome2/about_modules.c:540 +msgid "* Lemmas" +msgstr "" -#: ../src/editor/slib-editor.c:1363 ../src/editor/webkit_editor.c:1438 -msgid "Note Editor" -msgstr "附註編輯器" +#: ../src/gnome2/about_modules.c:548 +msgid "* Words of Christ in red" +msgstr "" -#: ../src/editor/slib-editor.c:1379 ../src/editor/webkit_editor.c:1453 -msgid "Prayer List/Journal Editor" -msgstr "禱告表/日記編輯器" +#: ../src/gnome2/about_modules.c:553 +msgid "* Greek accents" +msgstr "" -#: ../src/gecko/gecko-html.cpp:177 -msgid "Unlock " -msgstr "解鎖 " +#: ../src/gnome2/about_modules.c:559 +msgid "* Hebrew Vowel Points" +msgstr "" -#: ../src/gecko/gecko-print.c:172 -msgid "Preparing to print" -msgstr "準備列印" +#: ../src/gnome2/about_modules.c:565 +msgid "* Hebrew Cantillation" +msgstr "" -#: ../src/gecko/gecko-print.c:266 -msgid "Printing is not supported on this printer" -msgstr "不支援本印表機之列印" +#: ../src/gnome2/about_modules.c:571 +msgid "* Variant readings" +msgstr "" -#: ../src/gecko/gecko-print.c:269 -#, c-format -msgid "Printer %s does not support PostScript printing." -msgstr "印表機 %s 無 PostScript 列印功能" +#: ../src/gnome2/about_modules.c:578 +msgid "* Transliteration forms" +msgstr "" -#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370 -msgid "Printing" -msgstr "列印" +#: ../src/gnome2/about_modules.c:583 +msgid "* Enumerations" +msgstr "" -#: ../src/gecko/gecko-print.c:372 -msgid "Waiting to print" -msgstr "等待列印" +#: ../src/gnome2/about_modules.c:588 +msgid "* Glosses" +msgstr "" -#: ../src/gecko/gecko-print.c:584 -msgid "An error occurred while printing" -msgstr "列印錯誤" +#: ../src/gnome2/about_modules.c:595 +msgid "* Morpheme Segmentation" +msgstr "" -#: ../src/gecko/gecko-print.c:588 -#, c-format -msgid "It was not possible to print your document: %s" -msgstr "無法列印您的文件: %s" +#: ../src/gnome2/about_modules.c:602 +msgid "* No features found" +msgstr "" -#: ../src/gnome2/about_modules.c:143 -msgid "About Sword Module" -msgstr "關於 Sword 模組" +#: ../src/gnome2/about_modules.c:612 +msgid "Distribution license:" +msgstr "" -#: ../src/gnome2/about_modules.c:347 ../src/gnome2/mod_mgr.c:322 -msgid "The module has no About information." -msgstr "該模組沒有相關資訊" +#: ../src/gnome2/about_modules.c:625 +msgid "Promotional: " +msgstr "" -#: ../src/gnome2/about_sword.c:81 +#: ../src/gnome2/about_sword.c:79 msgid "" "The SWORD Project is an effort to create an ever-expanding software package " "for research and study of God and His Word. The SWORD Project framework " @@ -319,38 +265,39 @@ " Books can be downloaded from the SWORD Project." msgstr "" -#: ../src/gnome2/about_sword.c:106 +#: ../src/gnome2/about_sword.c:98 msgid "The SWORD Project" msgstr "SWORD 計畫" -#: ../src/gnome2/about_trans.c:84 +#: ../src/gnome2/about_trans.c:82 msgid "" -"Do you like using Xiphos to study the Bible? Would you like to see its " -"display using your native language? You could translate Xiphos! \n" +"Do you like using Xiphos to study the Bible? Would you like to see its user " +"interface in your native language? You could translate Xiphos! \n" "\n" "We are always looking for contributions of new translations of Xiphos into " "other languages. If you are able to translate for us, please see the link " -"below, contact us, and get involved with our efforts." +"below, contact us, and get involved with our efforts. Your help will be much " +"appreciated!" msgstr "" -#: ../src/gnome2/about_trans.c:98 +#: ../src/gnome2/about_trans.c:96 msgid "About Xiphos Translation" msgstr "關於 Xiphos 翻譯" -#: ../src/gnome2/about_trans.c:140 +#: ../src/gnome2/about_trans.c:135 msgid "See TRANSLATION-HOWTO in Xiphos source" msgstr "參閱 Xiphos source 的翻譯說明" -#: ../src/gnome2/about_trans.c:146 +#: ../src/gnome2/about_trans.c:141 msgid "Xiphos development" msgstr "開發 Xiphos" -#: ../src/gnome2/about_xiphos.c:122 +#: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2014 Xiphos Development Team" -msgstr "Xiphos 開發團隊版權所有 2000 - 2009" +msgid "Copyright © 2000-2015 Xiphos Development Team" +msgstr "Xiphos 開發團隊版權所有 2000 - 2015" -#: ../src/gnome2/about_xiphos.c:125 +#: ../src/gnome2/about_xiphos.c:131 msgid "" "\n" "Powered by The SWORD Project.\n" @@ -359,233 +306,233 @@ msgstr "" #. info->stock_icon = GTK_STOCK_OPEN; -#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:369 -#: ../src/gnome2/bookmarks_menu.c:664 ../src/gnome2/bookmarks_menu.c:763 -#: ../src/gnome2/bookmarks_treeview.c:130 ../ui/editor_studypad.xml.h:15 -#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:35 +#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361 +#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753 +#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15 +#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36 msgid "Bookmark" msgstr "書籤" -#: ../src/gnome2/bookmark_dialog.c:177 ../src/gnome2/bookmarks_menu.c:765 -#: ../src/gnome2/bookmarks_treeview.c:131 +#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755 +#: ../src/gnome2/bookmarks_treeview.c:139 msgid "Enter Folder Name" msgstr "輸入資料夾名稱" -#: ../src/gnome2/bookmark_dialog.c:179 ../src/gnome2/bookmarks_menu.c:767 +#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757 msgid "Folder Name" msgstr "資料夾名稱" -#: ../src/gnome2/bookmark_dialog.c:180 ../src/gnome2/bookmarks_menu.c:768 -#: ../src/gnome2/bookmarks_treeview.c:133 +#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758 +#: ../src/gnome2/bookmarks_treeview.c:141 msgid "Folder: " msgstr "資料夾： " -#: ../src/gnome2/bookmarks_menu.c:212 +#: ../src/gnome2/bookmarks_menu.c:200 msgid "Specify bookmarks file" msgstr "" -#: ../src/gnome2/bookmarks_menu.c:355 ../ui/xi-menus.glade.h:61 -#: ../ui/xi-menus-popup.gtkbuilder.h:28 +#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61 +#: ../ui/xi-menus-popup.gtkbuilder.h:29 msgid "Edit" msgstr "編輯" -#: ../src/gnome2/bookmarks_menu.c:372 +#: ../src/gnome2/bookmarks_menu.c:364 msgid "Folder name: " msgstr "資料夾名稱: " -#: ../src/gnome2/bookmarks_menu.c:375 +#: ../src/gnome2/bookmarks_menu.c:367 msgid "Bookmark name: " msgstr "書簽名稱: " -#: ../src/gnome2/bookmarks_menu.c:378 ../src/gnome2/bookmarks_menu.c:672 +#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661 msgid "Verse: " msgstr "經句: " -#: ../src/gnome2/bookmarks_menu.c:379 ../src/gnome2/bookmarks_menu.c:673 +#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662 msgid "Module: " msgstr "模組: " -#: ../src/gnome2/bookmarks_menu.c:501 +#: ../src/gnome2/bookmarks_menu.c:493 msgid "Remove the selected folder" msgstr "刪除選取的資料夾" -#: ../src/gnome2/bookmarks_menu.c:503 +#: ../src/gnome2/bookmarks_menu.c:494 msgid "(and all its contents)?" msgstr "(以及其中的所有內容)?" -#: ../src/gnome2/bookmarks_menu.c:506 +#: ../src/gnome2/bookmarks_menu.c:498 msgid "Remove the selected bookmark" msgstr "刪除選取的書籤" -#: ../src/gnome2/bookmarks_menu.c:665 +#: ../src/gnome2/bookmarks_menu.c:654 msgid "Add" msgstr "新增" -#: ../src/gnome2/bookmarks_menu.c:671 +#: ../src/gnome2/bookmarks_menu.c:660 msgid "Label: " msgstr "標籤: " -#: ../src/gnome2/bookmarks_treeview.c:104 ../src/gnome2/export_bookmarks.c:195 -#: ../src/gnome2/export_bookmarks.c:254 +#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172 +#: ../src/gnome2/export_bookmarks.c:229 #, c-format msgid "Search result: %s" msgstr "搜尋結果: %s" -#: ../src/gnome2/bookmarks_treeview.c:754 +#: ../src/gnome2/bookmarks_treeview.c:747 msgid "" "Opening a multi-reference bookmark in\n" "separate tabs is not supported." msgstr "" -#: ../src/gnome2/bookmarks_treeview.c:849 ../src/gnome2/sidebar.c:1493 -#: ../src/gnome2/sidebar.c:1526 +#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500 +#: ../src/gnome2/sidebar.c:1536 msgid "Bookmarks" msgstr "書籤" -#: ../src/gnome2/cipher_key_dialog.c:60 +#: ../src/gnome2/cipher_key_dialog.c:63 #, c-format msgid "Cipher key for module %s" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:61 +#: ../src/gnome2/cipher_key_dialog.c:64 msgid "for:" msgstr "" -#: ../src/gnome2/cipher_key_dialog.c:64 +#: ../src/gnome2/cipher_key_dialog.c:67 msgid "Enter Key: " msgstr "" -#: ../src/gnome2/dialog.c:262 +#: ../src/gnome2/dialog.c:289 msgid "Close without Saving" msgstr "不儲檔關閉" -#: ../src/gnome2/dialog.c:679 +#: ../src/gnome2/dialog.c:724 msgid "Xiphos:" msgstr "Xiphos" -#: ../src/gnome2/dialog.c:781 +#: ../src/gnome2/dialog.c:854 msgid "Close _without Saving" msgstr "不存檔關閉(_W)" -#: ../src/gnome2/export_bookmarks.c:197 ../src/gnome2/export_bookmarks.c:256 -#: ../src/gnome2/sidebar.c:1505 ../src/gnome2/sidebar.c:1542 +#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232 +#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554 #, c-format msgid "Verse List" msgstr "" -#: ../src/gnome2/export_bookmarks.c:694 +#: ../src/gnome2/export_bookmarks.c:659 msgid "VerseList" msgstr "" -#: ../src/gnome2/export_bookmarks.c:699 +#: ../src/gnome2/export_bookmarks.c:663 msgid "SearchResults" msgstr "" -#: ../src/gnome2/export_dialog.c:319 ../ui/export-dialog.glade.h:4 +#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4 #: ../ui/export-dialog.gtkbuilder.h:4 msgid "Please check copyright before exporting!" msgstr "輸出前請先確認相關版權" -#: ../src/gnome2/find_dialog.c:186 ../src/gnome2/find_dialog.c:344 +#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359 #: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18 msgid "Find" msgstr "尋找" -#: ../src/gnome2/find_dialog.c:205 +#: ../src/gnome2/find_dialog.c:202 msgid "Enter Word or Phrase" msgstr "輸入字詞" -#: ../src/gnome2/find_dialog.c:220 +#: ../src/gnome2/find_dialog.c:217 msgid "Search backwards" msgstr "回頭搜尋" -#: ../src/gnome2/find_dialog.c:266 +#: ../src/gnome2/find_dialog.c:280 msgid "Find Next" msgstr "找下一個" -#: ../src/gnome2/font_dialog.c:302 +#: ../src/gnome2/font_dialog.c:296 msgid "Set Module Font" msgstr "設定模組字型" -#: ../src/gnome2/font_dialog.c:332 +#: ../src/gnome2/font_dialog.c:330 msgid "Change font for" msgstr "改變字型" -#: ../src/gnome2/font_dialog.c:336 ../ui/editor_link_dialog.xml.h:3 +#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3 msgid "Module" msgstr "模組" -#: ../src/gnome2/font_dialog.c:340 +#: ../src/gnome2/font_dialog.c:338 msgid "Current font: " msgstr "目前字型 " -#: ../src/gnome2/font_dialog.c:372 ../src/gnome2/font_dialog.c:388 +#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395 #: ../ui/prefs.gtkbuilder.h:3 msgid "+0" msgstr "+0" -#: ../src/gnome2/font_dialog.c:392 +#: ../src/gnome2/font_dialog.c:398 msgid "Use the default font for this module" msgstr "此模組使用預設字型" -#: ../src/gnome2/gui.c:186 +#: ../src/gnome2/gui.c:173 msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error." msgstr "BUG! Xiphos 由於 \"STRDUP\" 的錯誤必須關閉。" -#: ../src/gnome2/gui.c:187 ../src/gnome2/gui.c:222 +#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204 msgid "Please report this error to the Xiphos team with:" msgstr "請如下回報此錯誤給 Xiphos 團隊:" -#: ../src/gnome2/gui.c:221 +#: ../src/gnome2/gui.c:203 msgid "BUG! Xiphos is about to crash due to a \"STRING\" error." msgstr "BUG! Xiphos 由於 \"字串\" 的錯誤而關閉。" -#: ../src/gnome2/main_window.c:570 +#: ../src/gnome2/main_window.c:583 #, fuzzy, c-format msgid "Module has no support for %s." msgstr "該模組沒有相關資訊" -#: ../src/gnome2/main_window.c:640 +#: ../src/gnome2/main_window.c:656 #, fuzzy msgid "Xiphos: No windows." msgstr "Xiphos" -#: ../src/gnome2/main_window.c:696 +#: ../src/gnome2/main_window.c:708 msgid "BibleSync: Current navigation sent." msgstr "" -#: ../src/gnome2/main_window.c:700 +#: ../src/gnome2/main_window.c:710 msgid "BibleSync: Not speaking." msgstr "" -#: ../src/gnome2/main_window.c:884 +#: ../src/gnome2/main_window.c:897 msgid "Xiphos - Bible Study Software" msgstr "Xiphos - 聖經研讀軟體" -#: ../src/gnome2/main_window.c:940 +#: ../src/gnome2/main_window.c:972 msgid "Open a new tab" msgstr "開新分頁" -#: ../src/gnome2/main_window.c:1020 ../src/gnome2/sidebar.c:628 -#: ../src/gnome2/sidebar.c:634 ../src/main/sidebar.cc:659 -#: ../src/main/sidebar.cc:1004 ../src/main/sidebar.cc:1005 -#: ../src/main/sidebar.cc:1006 +#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656 +#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977 +#: ../src/main/sidebar.cc:978 msgid "Standard View" msgstr "標準檢視模式" -#: ../src/gnome2/main_window.c:1081 +#: ../src/gnome2/main_window.c:1109 msgid "Commentary View" msgstr "評註檢視模式" -#: ../src/gnome2/main_window.c:1097 +#: ../src/gnome2/main_window.c:1123 msgid "Book View" msgstr "" -#: ../src/gnome2/main_window.c:1124 +#: ../src/gnome2/main_window.c:1152 msgid "Welcome to Xiphos" msgstr "歡迎使用 Xiphos" -#: ../src/gnome2/menu_popup.c:1207 +#: ../src/gnome2/menu_popup.c:1296 msgid "" "Renaming is not available in Windows.\n" "\n" @@ -597,46 +544,46 @@ "not available in the Windows environment." msgstr "" -#: ../src/gnome2/menu_popup.c:1226 +#: ../src/gnome2/menu_popup.c:1315 msgid "Rename Commentary" msgstr "" -#: ../src/gnome2/menu_popup.c:1229 +#: ../src/gnome2/menu_popup.c:1318 msgid "Choose Commentary Name" msgstr "" -#: ../src/gnome2/menu_popup.c:1231 +#: ../src/gnome2/menu_popup.c:1320 msgid "New Name" msgstr "新檔名" -#: ../src/gnome2/menu_popup.c:1232 ../src/gnome2/treekey-editor.c:143 -#: ../src/gnome2/treekey-editor.c:202 ../src/gnome2/treekey-editor.c:288 -#: ../src/main/prayerlists.cc:231 +#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138 +#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293 +#: ../src/main/prayerlists.cc:230 msgid "Name: " msgstr "名稱: " -#: ../src/gnome2/menu_popup.c:1242 ../src/main/prayerlists.cc:245 +#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243 msgid "Module names must contain [A-Za-z0-9_] only." msgstr "模組名稱只能使用 [A-Za-z0-9_] 等字元" -#: ../src/gnome2/menu_popup.c:1249 ../src/main/prayerlists.cc:252 +#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249 msgid "Xiphos already knows a module by that name." msgstr "" -#: ../src/gnome2/menu_popup.c:1290 +#: ../src/gnome2/menu_popup.c:1378 #, c-format msgid "" "Failed to create new configuration:\n" "%s" msgstr "無法新建以下 %s 組態" -#: ../src/gnome2/menu_popup.c:1299 +#: ../src/gnome2/menu_popup.c:1387 msgid "" "Configuration build error:\n" "\n" msgstr "" -#: ../src/gnome2/menu_popup.c:1885 +#: ../src/gnome2/menu_popup.c:2032 msgid "No module in this pane." msgstr "" @@ -703,20 +650,20 @@ "dialog may be closed at any time." msgstr "" -#: ../src/gnome2/mod_mgr.c:189 +#: ../src/gnome2/mod_mgr.c:191 msgid "Remove these modules?" msgstr "刪除這些模組嗎?" -#: ../src/gnome2/mod_mgr.c:190 +#: ../src/gnome2/mod_mgr.c:192 msgid "Preparing to remove" msgstr "準備刪除" -#: ../src/gnome2/mod_mgr.c:191 +#: ../src/gnome2/mod_mgr.c:193 msgid "Removing" msgstr "刪除中" -#: ../src/gnome2/mod_mgr.c:192 ../ui/xi-menus.glade.h:148 -#: ../ui/xi-menus-popup.gtkbuilder.h:26 +#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154 +#: ../ui/xi-menus-popup.gtkbuilder.h:27 msgid "Remove" msgstr "删除" @@ -736,113 +683,117 @@ msgid "Install" msgstr "安裝" -#: ../src/gnome2/mod_mgr.c:201 +#: ../src/gnome2/mod_mgr.c:199 msgid "Archive these modules?" msgstr "" -#: ../src/gnome2/mod_mgr.c:202 +#: ../src/gnome2/mod_mgr.c:200 msgid "Preparing to archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:203 +#: ../src/gnome2/mod_mgr.c:201 msgid "Archiving" msgstr "" -#: ../src/gnome2/mod_mgr.c:204 +#: ../src/gnome2/mod_mgr.c:202 msgid "Archive" msgstr "" -#: ../src/gnome2/mod_mgr.c:207 +#: ../src/gnome2/mod_mgr.c:203 msgid "" "Build fast-search index for these\n" "modules (may take minutes/module)?" msgstr "要為這些模組編列快速搜尋索引嗎？（每個模組可能都需要幾分鐘時間）" -#: ../src/gnome2/mod_mgr.c:208 +#: ../src/gnome2/mod_mgr.c:204 msgid "Preparing to index" msgstr "準備編列索引" -#: ../src/gnome2/mod_mgr.c:209 +#: ../src/gnome2/mod_mgr.c:205 msgid "Indexing" msgstr "正在編列索引" -#: ../src/gnome2/mod_mgr.c:210 +#: ../src/gnome2/mod_mgr.c:206 msgid "Index" msgstr "索引" -#: ../src/gnome2/mod_mgr.c:213 +#: ../src/gnome2/mod_mgr.c:207 msgid "Delete fast-search index for these modules?" msgstr "要刪除這些模組的快速搜尋索引嗎？" -#: ../src/gnome2/mod_mgr.c:214 +#: ../src/gnome2/mod_mgr.c:208 msgid "Preparing to delete index" msgstr "準備刪除索引" -#: ../src/gnome2/mod_mgr.c:215 +#: ../src/gnome2/mod_mgr.c:209 msgid "Deleting index" msgstr "正在刪除索引" -#: ../src/gnome2/mod_mgr.c:216 +#: ../src/gnome2/mod_mgr.c:210 msgid "Deletion" msgstr "刪除" -#: ../src/gnome2/mod_mgr.c:510 +#: ../src/gnome2/mod_mgr.c:311 +msgid "The module has no About information." +msgstr "該模組沒有相關資訊" + +#: ../src/gnome2/mod_mgr.c:533 msgid "Module Name" msgstr "模組名稱" -#: ../src/gnome2/mod_mgr.c:531 +#: ../src/gnome2/mod_mgr.c:562 msgid "A checkmark means this module is already installed" msgstr "打勾代表該模組已經存在" -#: ../src/gnome2/mod_mgr.c:553 +#: ../src/gnome2/mod_mgr.c:589 msgid "Click the box to work on this module" msgstr "勾選此模組" -#: ../src/gnome2/mod_mgr.c:554 +#: ../src/gnome2/mod_mgr.c:590 msgid "Click the box to select this module for install/update" msgstr "勾選此模組以便安裝或更新" -#: ../src/gnome2/mod_mgr.c:573 +#: ../src/gnome2/mod_mgr.c:608 msgid "Installed" msgstr "已安裝" -#: ../src/gnome2/mod_mgr.c:583 +#: ../src/gnome2/mod_mgr.c:625 msgid "" "The index icon means you have built an optimized ('lucene') index for this " "module for fast searching (see the Maintenance pane for this function)" msgstr "索引圖示代表您已經為該模組編列且優化其快速搜尋索引" -#: ../src/gnome2/mod_mgr.c:601 +#: ../src/gnome2/mod_mgr.c:649 msgid "" "The lock icon means this module is encrypted, and requires that you purchase " "an unlock key from the content owner" msgstr "鎖定的圖示代表該模組經過加密，您需要向該模組之提供者購買解密金鑰" -#: ../src/gnome2/mod_mgr.c:618 ../ui/gtk2_webedit.ui.h:2 -#: ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55 -#: ../ui/xi-menus-popup.gtkbuilder.h:34 +#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580 +#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 +#: ../ui/xi-menus.glade.h:55 ../ui/xi-menus-popup.gtkbuilder.h:35 msgid "About" msgstr "關於" -#: ../src/gnome2/mod_mgr.c:638 +#: ../src/gnome2/mod_mgr.c:688 msgid "" "The refresh icon means the Installed module is older than the newer " "Available module: You should update the module" msgstr "更新圖示代表您所安裝的該模組版本較舊，您應該更新其版本" -#: ../src/gnome2/mod_mgr.c:650 +#: ../src/gnome2/mod_mgr.c:700 msgid "Available" msgstr "可用" -#: ../src/gnome2/mod_mgr.c:659 +#: ../src/gnome2/mod_mgr.c:709 msgid "Size" msgstr "大小" -#: ../src/gnome2/mod_mgr.c:668 +#: ../src/gnome2/mod_mgr.c:718 msgid "Description" msgstr "說明" -#: ../src/gnome2/mod_mgr.c:816 +#: ../src/gnome2/mod_mgr.c:872 #, c-format msgid "" "`mkdir %s' failed:\n" @@ -851,33 +802,33 @@ "'mkdir %s' 失敗：\n" "%s" -#: ../src/gnome2/mod_mgr.c:848 +#: ../src/gnome2/mod_mgr.c:906 msgid " archived in: \n" msgstr " 歸檔於: \n" -#: ../src/gnome2/mod_mgr.c:903 +#: ../src/gnome2/mod_mgr.c:985 msgid "Journals and prayer lists cannot be indexed." msgstr "日記檔和禱告表無法編列索引" -#: ../src/gnome2/mod_mgr.c:924 +#: ../src/gnome2/mod_mgr.c:1016 #, c-format msgid "%s failed" msgstr "%s 失敗" -#: ../src/gnome2/mod_mgr.c:927 ../src/gnome2/mod_mgr.c:1681 +#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784 msgid "Finished" msgstr "完成" -#: ../src/gnome2/mod_mgr.c:1095 ../src/gnome2/mod_mgr.c:1097 -#: ../src/gnome2/mod_mgr.c:1199 ../src/gnome2/mod_mgr.c:1234 -#: ../src/gnome2/mod_mgr.c:1236 ../src/gnome2/utilities.c:472 -#: ../src/gnome2/utilities.c:538 ../src/gnome2/utilities.c:540 -#: ../src/gnome2/utilities.c:1105 ../src/main/sidebar.cc:838 -#: ../src/main/sidebar.cc:910 ../src/main/sidebar.cc:912 +#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194 +#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337 +#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432 +#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497 +#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808 +#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881 msgid "Unknown" msgstr "不詳" -#: ../src/gnome2/mod_mgr.c:1399 +#: ../src/gnome2/mod_mgr.c:1515 #, c-format msgid "" "Repository:\n" @@ -886,154 +837,144 @@ "套件庫:\n" "%s" -#: ../src/gnome2/mod_mgr.c:1411 +#: ../src/gnome2/mod_mgr.c:1528 msgid "" "Categorized by\n" "Module Type" msgstr "" -#: ../src/gnome2/mod_mgr.c:1416 ../src/gnome2/utilities.c:606 -#: ../src/main/sidebar.cc:988 ../src/main/sidebar.cc:990 +#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574 +#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962 msgid "Biblical Texts" msgstr "" -#: ../src/gnome2/mod_mgr.c:1420 ../src/gnome2/utilities.c:613 -#: ../src/main/sidebar.cc:671 ../src/main/sidebar.cc:1013 -#: ../src/main/sidebar.cc:1015 +#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580 +#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985 +#: ../src/main/sidebar.cc:987 msgid "Commentaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1424 ../src/gnome2/utilities.c:621 -#: ../src/main/sidebar.cc:1022 ../src/main/sidebar.cc:1024 +#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587 +#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996 msgid "Dictionaries" msgstr "詞典" -#: ../src/gnome2/mod_mgr.c:1428 ../src/gnome2/utilities.c:628 -#: ../src/main/sidebar.cc:1031 ../src/main/sidebar.cc:1033 +#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593 +#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005 msgid "Glossaries" msgstr "" -#: ../src/gnome2/mod_mgr.c:1432 ../src/gnome2/utilities.c:635 -#: ../src/main/sidebar.cc:1040 ../src/main/sidebar.cc:1042 +#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600 +#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014 msgid "Daily Devotionals" msgstr "每日進度" -#: ../src/gnome2/mod_mgr.c:1436 ../src/gnome2/utilities.c:642 -#: ../src/main/sidebar.cc:681 ../src/main/sidebar.cc:1049 -#: ../src/main/sidebar.cc:1051 +#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606 +#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021 +#: ../src/main/sidebar.cc:1023 msgid "General Books" msgstr "一般書籍" -#: ../src/gnome2/mod_mgr.c:1440 ../src/gnome2/utilities.c:649 -#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 -msgid "Maps" -msgstr "地圖" - -#: ../src/gnome2/mod_mgr.c:1444 ../src/gnome2/utilities.c:656 -#: ../src/main/sidebar.cc:1067 ../src/main/sidebar.cc:1069 -msgid "Images" -msgstr "圖片" - -#: ../src/gnome2/mod_mgr.c:1448 ../src/gnome2/utilities.c:663 -#: ../src/main/sidebar.cc:1076 ../src/main/sidebar.cc:1078 +#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624 +#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050 msgid "Cult/Unorthodox" msgstr "" -#: ../src/gnome2/mod_mgr.c:1456 +#: ../src/gnome2/mod_mgr.c:1575 msgid "" "Categorized by\n" "Availability" msgstr "" -#: ../src/gnome2/mod_mgr.c:1461 +#: ../src/gnome2/mod_mgr.c:1579 msgid "Updates" msgstr "更新" -#: ../src/gnome2/mod_mgr.c:1465 +#: ../src/gnome2/mod_mgr.c:1584 msgid "Uninstalled" msgstr "解除安裝" -#: ../src/gnome2/mod_mgr.c:1469 ../src/gnome2/sidebar.c:644 -#: ../src/gnome2/utilities.c:671 ../src/main/prayerlists.cc:229 -#: ../src/main/sidebar.cc:1086 ../src/main/sidebar.cc:1088 +#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630 +#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228 +#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060 msgid "Prayer List/Journal" msgstr "禱告表/日記檔" -#: ../src/gnome2/mod_mgr.c:1665 +#: ../src/gnome2/mod_mgr.c:1767 msgid "Refreshing from remote source" msgstr "更新遠端資料" -#: ../src/gnome2/mod_mgr.c:1675 +#: ../src/gnome2/mod_mgr.c:1779 msgid "Remote source not found" msgstr "找不到遠端套件" -#: ../src/gnome2/mod_mgr.c:1745 +#: ../src/gnome2/mod_mgr.c:1850 msgid "Configure" msgstr "組態" -#: ../src/gnome2/mod_mgr.c:1776 +#: ../src/gnome2/mod_mgr.c:1879 msgid "Type" msgstr "類型" -#: ../src/gnome2/mod_mgr.c:1783 +#: ../src/gnome2/mod_mgr.c:1886 msgid "Caption" msgstr "標題" -#: ../src/gnome2/mod_mgr.c:1791 +#: ../src/gnome2/mod_mgr.c:1893 msgid "Source" msgstr "套件庫" -#: ../src/gnome2/mod_mgr.c:1799 +#: ../src/gnome2/mod_mgr.c:1900 msgid "Directory" msgstr "目錄" -#: ../src/gnome2/mod_mgr.c:1807 +#: ../src/gnome2/mod_mgr.c:1908 msgid "User" msgstr "使用者" -#: ../src/gnome2/mod_mgr.c:1815 +#: ../src/gnome2/mod_mgr.c:1915 msgid "Password" msgstr "密碼" -#: ../src/gnome2/mod_mgr.c:1823 +#: ../src/gnome2/mod_mgr.c:1922 msgid "UID" msgstr "UID" -#: ../src/gnome2/mod_mgr.c:1840 +#: ../src/gnome2/mod_mgr.c:1937 msgid "Module Sources" msgstr "模組來源" -#: ../src/gnome2/mod_mgr.c:1843 +#: ../src/gnome2/mod_mgr.c:1940 msgid "Add/Remove" msgstr "新增/移除" -#: ../src/gnome2/mod_mgr.c:1845 +#: ../src/gnome2/mod_mgr.c:1943 msgid "Choose" msgstr "選擇" -#: ../src/gnome2/mod_mgr.c:1849 ../src/gnome2/preferences_dialog.c:2063 -#: ../src/gnome2/sidebar.c:1511 ../src/gnome2/sidebar.c:1550 +#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023 +#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562 msgid "Modules" msgstr "模組" -#: ../src/gnome2/mod_mgr.c:1851 +#: ../src/gnome2/mod_mgr.c:1948 msgid "Install/Update" msgstr "安裝/更新" -#: ../src/gnome2/mod_mgr.c:1853 +#: ../src/gnome2/mod_mgr.c:1951 msgid "Maintenance" msgstr "維護" -#: ../src/gnome2/mod_mgr.c:2089 +#: ../src/gnome2/mod_mgr.c:2167 msgid "Please Refresh" msgstr "請更新" -#: ../src/gnome2/mod_mgr.c:2090 +#: ../src/gnome2/mod_mgr.c:2168 msgid "Your module list is not up to date!" msgstr "您的模組清單不是最新的" #. Zero Bibles is just not workable in Xiphos. -#: ../src/gnome2/mod_mgr.c:2409 +#: ../src/gnome2/mod_mgr.c:2485 msgid "" "You have uninstalled your last Bible.\n" "Xiphos requires at least one." @@ -1041,7 +982,7 @@ "您把最後一本聖經也移除了。\n" "Xiphos 請您至少安裝一本聖經。" -#: ../src/gnome2/mod_mgr.c:2415 +#: ../src/gnome2/mod_mgr.c:2491 msgid "" "There are still no Bibles installed.\n" "Xiphos cannot continue without one." @@ -1049,210 +990,221 @@ "仍然找不到任何一本聖經。\n" "沒有聖經 Xiphos 無事可做呢。" -#: ../src/gnome2/mod_mgr.c:2508 +#: ../src/gnome2/mod_mgr.c:2616 +#, c-format +msgid "" +"%s obsoletes %s.\n" +"Would you like to delete %s?\n" +"Beware: This cannot be undone." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2682 +msgid "No obsolete modules were found." +msgstr "" + +#: ../src/gnome2/mod_mgr.c:2704 msgid "Standard remote sources have been loaded." msgstr "已經載入標準的遠端套件庫資訊。" -#: ../src/gnome2/mod_mgr.c:2514 +#: ../src/gnome2/mod_mgr.c:2713 msgid "Could not load standard sources from CrossWire." msgstr "無法從 CrossWire 下載標準套件資訊。" -#: ../src/gnome2/mod_mgr.c:2682 ../src/gnome2/mod_mgr.c:2928 +#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120 msgid "Remove the selected source" msgstr "移除所選的套件" -#: ../src/gnome2/mod_mgr.c:2742 +#: ../src/gnome2/mod_mgr.c:2930 msgid "Enter a remote source" msgstr "輸入遠端套件資訊" -#: ../src/gnome2/mod_mgr.c:2746 +#: ../src/gnome2/mod_mgr.c:2939 msgid "Caption:" msgstr "標題：" -#: ../src/gnome2/mod_mgr.c:2747 +#: ../src/gnome2/mod_mgr.c:2940 msgid "Type:" msgstr "類型：" -#: ../src/gnome2/mod_mgr.c:2748 +#: ../src/gnome2/mod_mgr.c:2941 msgid "Host:" msgstr "主機：" -#: ../src/gnome2/mod_mgr.c:2749 +#: ../src/gnome2/mod_mgr.c:2942 msgid "Directory:" msgstr "目錄：" -#: ../src/gnome2/mod_mgr.c:2750 +#: ../src/gnome2/mod_mgr.c:2943 msgid "User (optional):" msgstr "使用者 (非必填):" -#: ../src/gnome2/mod_mgr.c:2751 +#: ../src/gnome2/mod_mgr.c:2944 msgid "Password (optional):" msgstr "密碼 (非必填):" #. this can happen at most once -#: ../src/gnome2/mod_mgr.c:2778 +#: ../src/gnome2/mod_mgr.c:2970 msgid "A source by that name already exists." msgstr "同名套件已經存在。" -#: ../src/gnome2/mod_mgr.c:2925 +#: ../src/gnome2/mod_mgr.c:3117 msgid "Delete a remote source" msgstr "" -#: ../src/gnome2/mod_mgr.c:3430 +#: ../src/gnome2/mod_mgr.c:3636 #, fuzzy msgid "[no module]" msgstr " 模組" -#: ../src/gnome2/navbar_book.c:363 ../src/gnome2/navbar_book_dialog.c:304 +#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300 msgid "Go outward, to the section containing this one" msgstr "" -#: ../src/gnome2/navbar_book.c:378 ../src/gnome2/navbar_book_dialog.c:319 +#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322 msgid "Go to previous item" msgstr "到前一個" -#: ../src/gnome2/navbar_book.c:392 ../src/gnome2/navbar_book_dialog.c:333 +#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342 msgid "Go to next item" msgstr "到下一個" -#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347 +#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362 msgid "Go inward, to the first subsection" msgstr "" -#: ../src/gnome2/navbar_versekey_dialog.c:888 -#: ../src/gnome2/navbar_versekey_editor.c:929 -#: ../src/gnome2/navbar_versekey_parallel.c:840 +#: ../src/gnome2/navbar_versekey_dialog.c:898 +#: ../src/gnome2/navbar_versekey_editor.c:926 +#: ../src/gnome2/navbar_versekey_parallel.c:847 msgid "Synchronize this window's scrolling with the main window" msgstr "" -#: ../src/gnome2/parallel_dialog.c:356 ../src/gnome2/preferences_dialog.c:2070 +#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030 msgid "Parallel" msgstr "" -#: ../src/gnome2/parallel_view.c:115 +#: ../src/gnome2/parallel_view.c:112 msgid "Detach/Attach" msgstr "" -#: ../src/gnome2/parallel_view.c:121 ../ui/xi-menus.glade.h:64 -#: ../ui/xi-menus-popup.gtkbuilder.h:42 +#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64 +#: ../ui/xi-menus-popup.gtkbuilder.h:43 msgid "Module Options" msgstr "模組選項" -#: ../src/gnome2/parallel_view.c:215 ../src/gnome2/sidebar.c:627 -#: ../src/gnome2/sidebar.c:633 ../src/gnome2/tabbed_browser.c:251 -#: ../src/main/sidebar.cc:640 ../src/main/sidebar.cc:996 -#: ../src/main/sidebar.cc:997 ../src/main/sidebar.cc:998 +#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614 +#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254 +#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968 +#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970 msgid "Parallel View" msgstr "" -#: ../src/gnome2/preferences_dialog.c:867 +#: ../src/gnome2/preferences_dialog.c:860 msgid "BibleSync session passphrase" msgstr "" -#: ../src/gnome2/preferences_dialog.c:869 +#: ../src/gnome2/preferences_dialog.c:862 msgid "Phrase:" msgstr "" #. mode selection failed? probably dead interface -#: ../src/gnome2/preferences_dialog.c:947 +#: ../src/gnome2/preferences_dialog.c:933 msgid "" "Mode selection failed.\n" "Set \"Debug\" and try again to see why." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1008 +#: ../src/gnome2/preferences_dialog.c:988 #, fuzzy msgid "Mode selection failed.\n" msgstr "刪除選取的資料夾" -#: ../src/gnome2/preferences_dialog.c:1014 +#: ../src/gnome2/preferences_dialog.c:991 #, c-format msgid "BibleSync: %s (passphrase \"%s\")." msgstr "" -#: ../src/gnome2/preferences_dialog.c:1016 +#: ../src/gnome2/preferences_dialog.c:993 msgid "Disabled" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1018 ../src/main/xml.c:93 +#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96 msgid "Personal" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1020 +#: ../src/gnome2/preferences_dialog.c:997 msgid "Speaker" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1021 +#: ../src/gnome2/preferences_dialog.c:998 msgid "Audience" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1592 -#: ../src/gnome2/preferences_dialog.c:1629 -#: ../src/gnome2/preferences_dialog.c:1665 -#: ../src/gnome2/preferences_dialog.c:1699 -#: ../src/gnome2/preferences_dialog.c:1733 -#: ../src/gnome2/preferences_dialog.c:1767 -#: ../src/gnome2/preferences_dialog.c:1801 -#: ../src/gnome2/preferences_dialog.c:1836 -#: ../src/gnome2/preferences_dialog.c:1872 -#: ../src/gnome2/preferences_dialog.c:1923 -#: ../src/gnome2/preferences_dialog.c:2400 +#: ../src/gnome2/preferences_dialog.c:1584 +#: ../src/gnome2/preferences_dialog.c:1618 +#: ../src/gnome2/preferences_dialog.c:1651 +#: ../src/gnome2/preferences_dialog.c:1683 +#: ../src/gnome2/preferences_dialog.c:1714 +#: ../src/gnome2/preferences_dialog.c:1745 +#: ../src/gnome2/preferences_dialog.c:1776 +#: ../src/gnome2/preferences_dialog.c:1808 +#: ../src/gnome2/preferences_dialog.c:1841 +#: ../src/gnome2/preferences_dialog.c:1892 +#: ../src/gnome2/preferences_dialog.c:2340 msgid "-- Select --" msgstr "" -#: ../src/gnome2/preferences_dialog.c:1886 +#: ../src/gnome2/preferences_dialog.c:1855 msgid "Locale will take effect after restart." msgstr "新的語言設定將在重新啟動後生效" -#: ../src/gnome2/preferences_dialog.c:1958 ../ui/prefs.glade.h:1 +#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1 #: ../ui/prefs.gtkbuilder.h:9 msgid "Preferences" msgstr "偏好設定" -#: ../src/gnome2/preferences_dialog.c:2043 +#: ../src/gnome2/preferences_dialog.c:2003 msgid "General" msgstr "一般" -#: ../src/gnome2/preferences_dialog.c:2046 +#: ../src/gnome2/preferences_dialog.c:2006 msgid "Options" msgstr "選項" -#: ../src/gnome2/preferences_dialog.c:2049 ../ui/prefs.glade.h:85 +#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85 #: ../ui/prefs.gtkbuilder.h:85 msgid "BibleSync" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2053 +#: ../src/gnome2/preferences_dialog.c:2013 msgid "Fonts" msgstr "字型" -#: ../src/gnome2/preferences_dialog.c:2056 +#: ../src/gnome2/preferences_dialog.c:2016 msgid "Color" msgstr "色彩" -#: ../src/gnome2/preferences_dialog.c:2059 +#: ../src/gnome2/preferences_dialog.c:2019 #, fuzzy msgid "Sizes and Faces" msgstr "分頁和版面" -#: ../src/gnome2/preferences_dialog.c:2073 ../ui/prefs.glade.h:71 -#: ../ui/prefs.gtkbuilder.h:71 +#: ../src/gnome2/preferences_dialog.c:2033 msgid "Special" msgstr "特殊" -#: ../src/gnome2/preferences_dialog.c:2782 ../src/gnome2/search_dialog.c:500 +#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519 msgid "Clear List?" msgstr "清理清單?" -#: ../src/gnome2/preferences_dialog.c:2783 ../src/gnome2/search_dialog.c:501 +#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520 msgid "Are you sure you want to clear the module list?" msgstr "您確定要清理模組清單嗎？" -#: ../src/gnome2/preferences_dialog.c:2828 ../src/main/search_dialog.cc:685 +#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658 msgid "Remove Module?" msgstr "" -#: ../src/gnome2/preferences_dialog.c:2829 ../src/main/search_dialog.cc:686 +#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659 msgid "Are you sure you want to remove the selected module?" msgstr "" @@ -1271,20 +1223,20 @@ msgid "found in " msgstr "尋找於 " -#: ../src/gnome2/search_dialog.c:459 +#: ../src/gnome2/search_dialog.c:483 #, c-format msgid "New List %s" msgstr "" -#: ../src/gnome2/search_dialog.c:683 +#: ../src/gnome2/search_dialog.c:700 msgid "The last module list may not be deleted" msgstr "" -#: ../src/gnome2/search_dialog.c:701 +#: ../src/gnome2/search_dialog.c:715 msgid "Delete list?" msgstr "" -#: ../src/gnome2/search_dialog.c:702 +#: ../src/gnome2/search_dialog.c:716 msgid "Are you sure you want to delete:" msgstr "" @@ -1304,7 +1256,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:825 +#: ../src/gnome2/search_dialog.c:842 msgid "" "Syntax overview for optimized \"lucene\" searches\n" "Search for verses that contain...\n" @@ -1349,7 +1301,7 @@ #. * Return value #. * void #. -#: ../src/gnome2/search_dialog.c:888 +#: ../src/gnome2/search_dialog.c:900 msgid "" "Attribute-based searches\n" "Searches for content contained in markup outside the main text. Attributes " @@ -1367,120 +1319,110 @@ "accusative singular feminine\" -- see the Robinson module for details." msgstr "" -#: ../src/gnome2/search_dialog.c:1190 +#: ../src/gnome2/search_dialog.c:1195 msgid "Module is neither Bible nor commentary" msgstr "" -#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:998 +#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973 msgid "BibleSync is not active for transmit." msgstr "" -#: ../src/gnome2/search_sidebar.c:185 +#: ../src/gnome2/search_sidebar.c:215 msgid "" "This is an inclusive (\"AND\") search:\n" "Find matches showing all words." msgstr "" -#. button to open advanced search -#: ../src/gnome2/search_sidebar.c:194 +#: ../src/gnome2/search_sidebar.c:227 msgid "_Open Advanced Search" msgstr "" -#: ../src/gnome2/search_sidebar.c:198 +#: ../src/gnome2/search_sidebar.c:232 msgid "Open the separate Advanced Search dialog." msgstr "" -#: ../src/gnome2/search_sidebar.c:210 +#: ../src/gnome2/search_sidebar.c:248 msgid "Search Module" msgstr "" -#: ../src/gnome2/search_sidebar.c:224 -msgid "Bible" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:233 ../ui/prefs.glade.h:132 -#: ../ui/prefs.gtkbuilder.h:132 -msgid "Commentary" -msgstr "" - -#: ../src/gnome2/search_sidebar.c:247 +#: ../src/gnome2/search_sidebar.c:285 msgid "Search Type" msgstr "" -#: ../src/gnome2/search_sidebar.c:261 ../ui/search-dialog.glade.h:39 +#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39 #: ../ui/search-dialog.gtkbuilder.h:39 msgid "Multi word" msgstr "" -#: ../src/gnome2/search_sidebar.c:272 ../ui/search-dialog.glade.h:41 +#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41 #: ../ui/search-dialog.gtkbuilder.h:41 msgid "Regular expression" msgstr "" -#: ../src/gnome2/search_sidebar.c:280 ../ui/search-dialog.glade.h:43 +#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43 #: ../ui/search-dialog.gtkbuilder.h:43 msgid "Exact phrase" msgstr "" -#: ../src/gnome2/search_sidebar.c:294 +#: ../src/gnome2/search_sidebar.c:330 msgid "Search Options" msgstr "" -#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:49 +#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49 #: ../ui/search-dialog.gtkbuilder.h:49 msgid "Match case" msgstr "大小寫不同" -#: ../src/gnome2/search_sidebar.c:322 +#: ../src/gnome2/search_sidebar.c:359 msgid "Search Scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:335 +#: ../src/gnome2/search_sidebar.c:372 msgid "No scope" msgstr "" -#: ../src/gnome2/search_sidebar.c:345 +#: ../src/gnome2/search_sidebar.c:381 msgid "Use bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:354 +#: ../src/gnome2/search_sidebar.c:389 msgid "Last search" msgstr "" -#: ../src/gnome2/search_sidebar.c:369 +#: ../src/gnome2/search_sidebar.c:406 msgid "Bounds" msgstr "" -#: ../src/gnome2/search_sidebar.c:384 ../src/gnome2/search_sidebar.c:413 +#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453 msgid "Lower" msgstr "" -#: ../src/gnome2/search_sidebar.c:394 ../src/gnome2/search_sidebar.c:420 +#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460 msgid "Upper" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:834 msgid "Open module in editor?" msgstr "" -#: ../src/gnome2/sidebar.c:850 +#: ../src/gnome2/sidebar.c:835 msgid "If no, it will open for display only." msgstr "" -#: ../src/gnome2/sidebar.c:952 +#: ../src/gnome2/sidebar.c:934 #, fuzzy msgid "Paste verse references" msgstr "偏好設定" -#: ../src/gnome2/sidebar.c:954 +#: ../src/gnome2/sidebar.c:936 msgid "List:" msgstr "" -#: ../src/gnome2/sidebar.c:1499 ../src/gnome2/sidebar.c:1534 +#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545 msgid "Search" msgstr "" -#: ../src/gnome2/sidebar_dialog.c:157 ../src/gnome2/sidebar_dialog.c:166 +#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180 msgid "Sidebar" msgstr "" @@ -1488,446 +1430,557 @@ msgid "Powered by the SWORD Project" msgstr "" -#: ../src/gnome2/tabbed_browser.c:360 +#: ../src/gnome2/tabbed_browser.c:358 msgid "Can't create tabs dir." msgstr "" -#: ../src/gnome2/treekey-editor.c:141 ../src/gnome2/treekey-editor.c:200 -#: ../src/gnome2/treekey-editor.c:286 +#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193 +#: ../src/gnome2/treekey-editor.c:291 msgid "Prayer List/Journal Item" msgstr "" -#: ../src/gnome2/treekey-editor.c:142 ../src/gnome2/treekey-editor.c:201 -#: ../src/gnome2/treekey-editor.c:287 +#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194 +#: ../src/gnome2/treekey-editor.c:292 msgid "New name" msgstr "" -#: ../src/gnome2/treekey-editor.c:257 +#: ../src/gnome2/treekey-editor.c:252 msgid "Remove the selected item" msgstr "" -#: ../src/gnome2/utilities.c:82 +#: ../src/gnome2/utilities.c:86 msgid "January" msgstr "" -#: ../src/gnome2/utilities.c:83 +#: ../src/gnome2/utilities.c:87 msgid "February" msgstr "" -#: ../src/gnome2/utilities.c:84 +#: ../src/gnome2/utilities.c:88 msgid "March" msgstr "" -#: ../src/gnome2/utilities.c:85 +#: ../src/gnome2/utilities.c:89 msgid "April" msgstr "" -#: ../src/gnome2/utilities.c:86 +#: ../src/gnome2/utilities.c:90 msgid "May" msgstr "" -#: ../src/gnome2/utilities.c:87 +#: ../src/gnome2/utilities.c:91 msgid "June" msgstr "" -#: ../src/gnome2/utilities.c:88 +#: ../src/gnome2/utilities.c:92 msgid "July" msgstr "" -#: ../src/gnome2/utilities.c:89 +#: ../src/gnome2/utilities.c:93 msgid "August" msgstr "" -#: ../src/gnome2/utilities.c:90 +#: ../src/gnome2/utilities.c:94 msgid "September" msgstr "" -#: ../src/gnome2/utilities.c:91 +#: ../src/gnome2/utilities.c:94 msgid "October" msgstr "" -#: ../src/gnome2/utilities.c:92 +#: ../src/gnome2/utilities.c:94 msgid "November" msgstr "" -#: ../src/gnome2/utilities.c:93 +#: ../src/gnome2/utilities.c:94 msgid "December" msgstr "" -#: ../src/gnome2/utilities.c:2087 +#: ../src/gnome2/utilities.c:2038 msgid "" "An image file's size could not be determined.\n" "Xiphos cannot resize images to fit window." msgstr "" -#: ../src/main/display.cc:237 +#: ../src/main/biblesync_glue.cc:104 +msgid "" +"Mismatched packet\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:118 +msgid "" +"Presence announcement:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:128 +msgid "" +"Navigation packet:\n" +"\n" +msgstr "" + +#: ../src/main/biblesync_glue.cc:179 +#, fuzzy +msgid "Unknown module " +msgstr " 模組" + +#: ../src/main/biblesync_glue.cc:179 +msgid "" +".\n" +"Navigated indirectly using verse list." +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "ERROR: unknown BibleSync indicator: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:255 +msgid "Other indications are:" +msgstr "" + +#: ../src/main/biblesync_glue.cc:530 +#, fuzzy +msgid "Check the box to listen to this Speaker" +msgstr "勾選此模組" + +#: ../src/main/biblesync_glue.cc:543 +#, fuzzy +msgid "Available Speakers" +msgstr "可用" + +#: ../src/main/biblesync_glue.cc:552 +msgid "D/I" +msgstr "" + +#: ../src/main/biblesync_glue.cc:562 +msgid "Last navigation was Direct or Indirect" +msgstr "" + +#: ../src/main/biblesync_glue.cc:571 +msgid "Last Navigation" +msgstr "" + +#: ../src/main/biblesync_glue.cc:590 +msgid "UUID" +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "IP address: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Application: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"Device: " +msgstr "" + +#: ../src/main/biblesync_glue.cc:610 +msgid "" +"\n" +"UUID: " +msgstr "" + +#: ../src/main/display.cc:89 +msgid "" +"

This module has no content at this point.
" +msgstr "" + +#: ../src/main/display.cc:249 #, c-format msgid "" "Improperly encoded personal annotation label:\n" "'%s'" msgstr "" -#: ../src/main/display.cc:1032 ../src/main/display.cc:1073 -#: ../src/main/display.cc:1158 ../ui/export-dialog.glade.h:14 +#: ../src/main/display.cc:1115 ../src/main/display.cc:1156 +#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14 #: ../ui/export-dialog.gtkbuilder.h:13 msgid "Chapter" msgstr "" -#: ../src/main/main.c:131 +#: ../src/main/main.c:129 msgid "Xiphos does not understand more than one argument." msgstr "" -#: ../src/main/main.c:245 +#: ../src/main/main.c:240 msgid "Initiating HTML" msgstr "" -#: ../src/main/main.c:250 +#: ../src/main/main.c:245 msgid "Building Interface" msgstr "" -#: ../src/main/main.c:253 +#: ../src/main/main.c:248 msgid "Starting Sword" msgstr "" -#: ../src/main/main.c:256 +#: ../src/main/main.c:251 msgid "Loading Settings" msgstr "" -#: ../src/main/main.c:259 +#: ../src/main/main.c:254 msgid "Displaying Xiphos" msgstr "" -#: ../src/main/module_dialogs.cc:189 ../src/main/previewer.cc:97 +#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100 msgid "Previewer" msgstr "" -#: ../src/main/module_dialogs.cc:244 ../src/main/module_dialogs.cc:355 -#: ../src/main/previewer.cc:184 +#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344 +#: ../src/main/previewer.cc:188 msgid "Footnote" msgstr "" -#: ../src/main/module_dialogs.cc:250 ../src/main/module_dialogs.cc:360 -#: ../src/main/previewer.cc:196 +#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349 +#: ../src/main/previewer.cc:198 msgid "Cross Reference" msgstr "" -#: ../src/main/module_dialogs.cc:256 ../src/main/module_dialogs.cc:270 -#: ../src/main/module_dialogs.cc:365 ../src/main/module_dialogs.cc:377 -#: ../src/main/previewer.cc:202 ../src/main/previewer.cc:221 +#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266 +#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366 +#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221 msgid "Strongs" msgstr "" -#: ../src/main/module_dialogs.cc:262 ../src/main/module_dialogs.cc:281 -#: ../src/main/module_dialogs.cc:370 ../src/main/module_dialogs.cc:387 +#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277 +#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376 #: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227 msgid "Morphology" msgstr "" -#: ../src/main/module_dialogs.cc:1013 ../src/main/url.cc:521 +#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515 msgid "Back to " msgstr "" -#: ../src/main/parallel_view.cc:383 ../ui/xi-menus.glade.h:68 -#: ../ui/xi-menus-popup.gtkbuilder.h:46 +#: ../src/main/parallel_view.cc:61 +msgid "Unknown parallel module: " +msgstr "" + +#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68 +#: ../ui/xi-menus-popup.gtkbuilder.h:47 msgid "Strong's Numbers" msgstr "" -#: ../src/main/parallel_view.cc:393 ../ui/search-dialog.glade.h:102 +#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102 #: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71 -#: ../ui/xi-menus-popup.gtkbuilder.h:49 +#: ../ui/xi-menus-popup.gtkbuilder.h:50 msgid "Footnotes" msgstr "" -#: ../src/main/parallel_view.cc:403 ../ui/search-dialog.glade.h:99 +#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99 #: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70 -#: ../ui/xi-menus-popup.gtkbuilder.h:48 +#: ../ui/xi-menus-popup.gtkbuilder.h:49 msgid "Morphological Tags" msgstr "" -#: ../src/main/parallel_view.cc:413 ../ui/xi-menus.glade.h:76 -#: ../ui/xi-menus-popup.gtkbuilder.h:53 +#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76 +#: ../ui/xi-menus-popup.gtkbuilder.h:54 msgid "Hebrew Vowel Points" msgstr "" -#: ../src/main/parallel_view.cc:423 ../ui/xi-menus.glade.h:77 -#: ../ui/xi-menus-popup.gtkbuilder.h:54 +#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77 +#: ../ui/xi-menus-popup.gtkbuilder.h:55 msgid "Hebrew Cantillation" msgstr "" -#: ../src/main/parallel_view.cc:433 ../ui/xi-menus.glade.h:75 -#: ../ui/xi-menus-popup.gtkbuilder.h:52 +#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75 +#: ../ui/xi-menus-popup.gtkbuilder.h:53 msgid "Greek Accents" msgstr "" -#: ../src/main/parallel_view.cc:443 ../ui/xi-menus.glade.h:72 -#: ../ui/xi-menus-popup.gtkbuilder.h:50 +#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72 +#: ../ui/xi-menus-popup.gtkbuilder.h:51 msgid "Cross-references" msgstr "" -#: ../src/main/parallel_view.cc:453 ../ui/xi-menus.glade.h:69 -#: ../ui/xi-menus-popup.gtkbuilder.h:47 +#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69 +#: ../ui/xi-menus-popup.gtkbuilder.h:48 msgid "Lemmas" msgstr "" -#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:66 -#: ../ui/xi-menus-popup.gtkbuilder.h:44 +#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66 +#: ../ui/xi-menus-popup.gtkbuilder.h:45 msgid "Headings" msgstr "" -#: ../src/main/parallel_view.cc:473 +#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574 +#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64 msgid "Morpheme Segmentation" msgstr "" -#: ../src/main/parallel_view.cc:487 ../ui/xi-menus.glade.h:67 -#: ../ui/xi-menus-popup.gtkbuilder.h:45 +#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67 +#: ../ui/xi-menus-popup.gtkbuilder.h:46 msgid "Words of Christ in Red" msgstr "" -#: ../src/main/parallel_view.cc:497 ../ui/xi-menus.glade.h:78 -#: ../ui/xi-menus-popup.gtkbuilder.h:55 +#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78 +#: ../ui/xi-menus-popup.gtkbuilder.h:56 msgid "Transliteration" msgstr "" -#: ../src/main/parallel_view.cc:507 -msgid "Textual Variants" +#: ../src/main/parallel_view.cc:512 +msgid "Textual Variants" +msgstr "" + +#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80 +#: ../ui/xi-menus-popup.gtkbuilder.h:58 +msgid "Primary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81 +#: ../ui/xi-menus-popup.gtkbuilder.h:59 +msgid "Secondary Reading" +msgstr "" + +#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82 +#: ../ui/xi-menus-popup.gtkbuilder.h:60 +msgid "All Readings" msgstr "" -#: ../src/main/parallel_view.cc:515 ../ui/xi-menus.glade.h:80 -#: ../ui/xi-menus-popup.gtkbuilder.h:57 -msgid "Primary Reading" +#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83 +#: ../ui/xi-menus-popup.gtkbuilder.h:61 +msgid "Transliterated Forms" msgstr "" -#: ../src/main/parallel_view.cc:524 ../ui/xi-menus.glade.h:81 -#: ../ui/xi-menus-popup.gtkbuilder.h:58 -msgid "Secondary Reading" +#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84 +#: ../ui/xi-menus-popup.gtkbuilder.h:62 +msgid "Enumerations" msgstr "" -#: ../src/main/parallel_view.cc:533 ../ui/xi-menus.glade.h:82 -#: ../ui/xi-menus-popup.gtkbuilder.h:59 -msgid "All Readings" +#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85 +#: ../ui/xi-menus-popup.gtkbuilder.h:63 +msgid "Glosses" msgstr "" -#: ../src/main/parallel_view.cc:700 +#: ../src/main/parallel_view.cc:745 msgid "view context" msgstr "" -#: ../src/main/prayerlists.cc:112 +#: ../src/main/prayerlists.cc:107 msgid "Growth" msgstr "" -#: ../src/main/prayerlists.cc:113 +#: ../src/main/prayerlists.cc:108 msgid "For Growth
" msgstr "" -#: ../src/main/prayerlists.cc:114 ../src/main/prayerlists.cc:371 +#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361 msgid "Salvation" msgstr "" -#: ../src/main/prayerlists.cc:115 +#: ../src/main/prayerlists.cc:110 msgid "For Salvation
" msgstr "" -#: ../src/main/prayerlists.cc:116 ../src/main/prayerlists.cc:375 +#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365 msgid "Health" msgstr "" -#: ../src/main/prayerlists.cc:117 +#: ../src/main/prayerlists.cc:112 msgid "For Health
" msgstr "" -#: ../src/main/prayerlists.cc:118 +#: ../src/main/prayerlists.cc:113 msgid "Misc" msgstr "" -#: ../src/main/prayerlists.cc:119 +#: ../src/main/prayerlists.cc:114 msgid "Miscellaneous
" msgstr "" -#: ../src/main/prayerlists.cc:127 +#: ../src/main/prayerlists.cc:122 msgid "Point x" msgstr "" -#: ../src/main/prayerlists.cc:128 +#: ../src/main/prayerlists.cc:123 msgid "(x)
" msgstr "" -#: ../src/main/prayerlists.cc:129 +#: ../src/main/prayerlists.cc:124 msgid "Point y" msgstr "" -#: ../src/main/prayerlists.cc:130 +#: ../src/main/prayerlists.cc:125 msgid "(y)
" msgstr "" -#: ../src/main/prayerlists.cc:131 +#: ../src/main/prayerlists.cc:126 msgid "Point z" msgstr "" -#: ../src/main/prayerlists.cc:132 +#: ../src/main/prayerlists.cc:127 msgid "(z)
" msgstr "" -#: ../src/main/prayerlists.cc:140 +#: ../src/main/prayerlists.cc:135 msgid "Minor Topic 1" msgstr "" -#: ../src/main/prayerlists.cc:141 +#: ../src/main/prayerlists.cc:136 msgid "Subtopic 1
" msgstr "" -#: ../src/main/prayerlists.cc:143 +#: ../src/main/prayerlists.cc:138 msgid "Minor Topic 2" msgstr "" -#: ../src/main/prayerlists.cc:144 +#: ../src/main/prayerlists.cc:139 msgid "Subtopic 2
" msgstr "" -#: ../src/main/prayerlists.cc:146 +#: ../src/main/prayerlists.cc:141 msgid "Minor Topic 3" msgstr "" -#: ../src/main/prayerlists.cc:147 +#: ../src/main/prayerlists.cc:142 msgid "Subtopic 3
" msgstr "" -#: ../src/main/prayerlists.cc:149 +#: ../src/main/prayerlists.cc:144 msgid "Minor Topic 4" msgstr "" -#: ../src/main/prayerlists.cc:150 +#: ../src/main/prayerlists.cc:145 msgid "Subtopic 4
" msgstr "" -#: ../src/main/prayerlists.cc:230 +#: ../src/main/prayerlists.cc:229 msgid "Name for new prayer list or journal" msgstr "" -#: ../src/main/prayerlists.cc:261 +#: ../src/main/prayerlists.cc:257 msgid "Xiphos finds that prayer list already." msgstr "" -#: ../src/main/prayerlists.cc:274 +#. this one matters. +#: ../src/main/prayerlists.cc:269 #, c-format msgid "" "Xiphos cannot create module's path:\n" "%s" msgstr "" -#: ../src/main/prayerlists.cc:314 +#: ../src/main/prayerlists.cc:308 msgid "A basic prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:315 +#: ../src/main/prayerlists.cc:309 msgid "BasicPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:329 +#: ../src/main/prayerlists.cc:322 msgid "MyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:330 +#: ../src/main/prayerlists.cc:323 msgid "" "People:
Bob
Sam
Sue

Church:
pews
fellowship
Bibles for missionaries


" msgstr "" -#: ../src/main/prayerlists.cc:356 +#: ../src/main/prayerlists.cc:347 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:357 +#: ../src/main/prayerlists.cc:348 msgid "SubjectPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:372 +#: ../src/main/prayerlists.cc:362 msgid "Bob
Sam
Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:373 +#: ../src/main/prayerlists.cc:363 msgid "Spiritual Growth" msgstr "" -#: ../src/main/prayerlists.cc:374 +#: ../src/main/prayerlists.cc:364 msgid "Mike
Steve
" msgstr "" -#: ../src/main/prayerlists.cc:376 +#: ../src/main/prayerlists.cc:366 msgid "Sue
John
" msgstr "" -#: ../src/main/prayerlists.cc:402 +#: ../src/main/prayerlists.cc:390 msgid "A monthly prayer list. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:403 +#: ../src/main/prayerlists.cc:391 msgid "MonthlyPrayerList" msgstr "" -#: ../src/main/prayerlists.cc:454 +#: ../src/main/prayerlists.cc:439 msgid "A daily journal. \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:455 +#: ../src/main/prayerlists.cc:440 msgid "DailyJournal" msgstr "" -#: ../src/main/prayerlists.cc:519 +#: ../src/main/prayerlists.cc:501 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos." msgstr "" -#: ../src/main/prayerlists.cc:520 +#: ../src/main/prayerlists.cc:502 msgid "OutlinedTopic" msgstr "" -#: ../src/main/prayerlists.cc:534 +#: ../src/main/prayerlists.cc:515 msgid "Major Topic A" msgstr "" -#: ../src/main/prayerlists.cc:535 +#: ../src/main/prayerlists.cc:516 msgid "Major Topic A
" msgstr "" -#: ../src/main/prayerlists.cc:537 +#: ../src/main/prayerlists.cc:518 msgid "Major Topic B" msgstr "" -#: ../src/main/prayerlists.cc:538 +#: ../src/main/prayerlists.cc:519 msgid "Major Topic B
" msgstr "" -#: ../src/main/prayerlists.cc:540 +#: ../src/main/prayerlists.cc:521 msgid "Major Topic C" msgstr "" -#: ../src/main/prayerlists.cc:541 +#: ../src/main/prayerlists.cc:522 msgid "Major Topic C
" msgstr "" -#: ../src/main/previewer.cc:190 +#: ../src/main/previewer.cc:193 msgid "User Annotation" msgstr "" -#: ../src/main/search_dialog.cc:193 +#: ../src/main/search_dialog.cc:188 #, c-format msgid "Search result %s: %s" msgstr "" -#: ../src/main/search_dialog.cc:425 +#: ../src/main/search_dialog.cc:404 msgid "Delete Range?" msgstr "" -#: ../src/main/search_dialog.cc:426 +#: ../src/main/search_dialog.cc:405 msgid "Are you sure you want to delete this range?" msgstr "" -#: ../src/main/search_dialog.cc:640 ../src/main/search_dialog.cc:1062 -#: ../src/main/search_dialog.cc:1065 ../src/main/search_dialog.cc:1087 -#: ../src/main/search_dialog.cc:1090 +#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021 +#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044 +#: ../src/main/search_dialog.cc:1047 msgid "Search: " msgstr "" -#: ../src/main/search_dialog.cc:1429 +#: ../src/main/search_dialog.cc:1376 #, c-format msgid "" "%s:\n" @@ -1935,68 +1988,64 @@ "%s" msgstr "" -#: ../src/main/search_dialog.cc:1431 +#: ../src/main/search_dialog.cc:1378 msgid "Please adjust the module list." msgstr "" -#: ../src/main/search_dialog.cc:1447 +#: ../src/main/search_dialog.cc:1394 #, c-format msgid "No fast-search index exists for %s.%s%s" msgstr "" -#: ../src/main/search_dialog.cc:1449 +#: ../src/main/search_dialog.cc:1396 msgid "" "\n" "Search on this module is now `multi word'." msgstr "" -#: ../src/main/search_dialog.cc:1450 +#: ../src/main/search_dialog.cc:1397 msgid "" "\n" "See the Module Manager, Maintenance pane." msgstr "" -#: ../src/main/search_dialog.cc:1513 +#: ../src/main/search_dialog.cc:1458 msgid "Search finished" msgstr "" -#: ../src/main/search_sidebar.cc:89 +#: ../src/main/search_sidebar.cc:88 msgid "matches" msgstr "" -#: ../src/main/search_sidebar.cc:207 +#: ../src/main/search_sidebar.cc:203 msgid "There is no commentary module." msgstr "" -#: ../src/main/settings.c:107 +#: ../src/main/settings.c:106 msgid "$HOME is not set!" msgstr "" #: ../src/main/settings.c:120 #, c-format -msgid "" -"Xiphos can not create .xiphos:\n" -"%s\n" -"\n" -"Xiphos cannot continue." +msgid "Xiphos can not create directory " msgstr "" -#: ../src/main/settings.c:133 ../src/main/settings.c:142 -#: ../src/main/settings.c:151 +#: ../src/main/settings.c:134 ../src/main/settings.c:144 +#: ../src/main/settings.c:155 msgid "can not create " msgstr "" -#: ../src/main/settings.c:181 +#: ../src/main/settings.c:187 msgid "" "Empty settings file -- backup recovery attempted.\n" "Some information may have been lost." msgstr "" -#: ../src/main/settings.c:184 +#: ../src/main/settings.c:190 msgid "Empty settings file -- no backup?!? Information lost!" msgstr "" -#: ../src/main/settings.c:212 +#: ../src/main/settings.c:217 msgid "" "There are no Bibles installed.\n" "Evidently, you declined to install any.\n" @@ -2006,11 +2055,11 @@ "and will now exit." msgstr "" -#: ../src/main/settings.c:218 +#: ../src/main/settings.c:223 msgid "Bible module installation complete." msgstr "" -#: ../src/main/sidebar.cc:149 +#: ../src/main/sidebar.cc:146 msgid "" "Module error: Unusable xref encoding.\n" "Please report this, with module & verse" @@ -2020,47 +2069,47 @@ msgid "verse" msgstr "" -#: ../src/main/sidebar.cc:472 +#: ../src/main/sidebar.cc:471 msgid "chapter" msgstr "" -#: ../src/main/sword.cc:554 +#: ../src/main/sword.cc:654 msgid "" "Xiphos's file for language\n" "abbreviations is missing." msgstr "" -#: ../src/main/sword.cc:561 +#: ../src/main/sword.cc:660 msgid "" "Xiphos's language abbreviation\n" "file cannot be opened." msgstr "" -#: ../src/main/sword.cc:574 +#: ../src/main/sword.cc:672 msgid "" "Xiphos cannot allocate space\n" "for language abbreviations." msgstr "" -#: ../src/main/sword.cc:581 +#: ../src/main/sword.cc:678 msgid "" "Xiphos cannot read the\n" "language abbreviation file." msgstr "" #. either we were given a null sys_locale, or it didn't match anything. -#: ../src/main/sword.cc:663 +#: ../src/main/sword.cc:758 #, c-format msgid "" "No matching locale found for `%s'.\n" "%s" msgstr "" -#: ../src/main/sword.cc:665 +#: ../src/main/sword.cc:760 msgid "Book names and menus may not be translated." msgstr "" -#: ../src/main/sword.cc:1014 ../src/main/sword.cc:1179 +#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283 #, c-format msgid "" "Module %s has companion modules:\n" @@ -2068,7 +2117,7 @@ "Would you like to open these as well?%s" msgstr "" -#: ../src/main/sword.cc:1018 ../src/main/sword.cc:1183 +#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287 msgid "" "\n" "\n" @@ -2076,11 +2125,11 @@ "and others in separate windows." msgstr "" -#: ../src/main/sword.cc:1309 +#: ../src/main/sword.cc:1411 msgid "Daily devotional was requested, but there are none installed." msgstr "" -#: ../src/main/sword.cc:1539 +#: ../src/main/sword.cc:1665 msgid "" "Locked Module.\n" "\n" @@ -2094,89 +2143,93 @@ "Please enter the key in the dialog." msgstr "" -#: ../src/main/tab_history.c:219 +#: ../src/main/tab_history.c:302 msgid "Clear History" msgstr "" -#: ../src/main/url.cc:103 +#: ../src/main/tab_history.c:308 +msgid "History ➛ Verse List" +msgstr "" + +#: ../src/main/url.cc:106 msgid "URL not found:" msgstr "" -#: ../src/main/url.cc:193 +#: ../src/main/url.cc:194 #, c-format msgid "Xiphos could not execute %s" msgstr "" -#: ../src/main/url.cc:201 +#: ../src/main/url.cc:202 msgid "Viewer error:\n" msgstr "" -#: ../src/main/url.cc:274 +#: ../src/main/url.cc:273 #, c-format msgid "Show %s in main window" msgstr "" -#: ../src/main/xml.c:84 ../src/main/xml.c:476 ../src/main/xml.c:567 +#: ../src/main/xml.c:87 ../src/main/xml.c:468 ../src/main/xml.c:599 #, c-format msgid "Document not created successfully. \n" msgstr "" -#: ../src/main/xml.c:94 +#: ../src/main/xml.c:99 msgid "What must I do to be saved?" msgstr "" -#: ../src/main/xml.c:96 ../src/main/xml.c:97 +#: ../src/main/xml.c:100 ../src/main/xml.c:101 msgid "Acts 16:31" msgstr "" -#: ../src/main/xml.c:101 ../src/main/xml.c:102 +#: ../src/main/xml.c:102 ../src/main/xml.c:103 msgid "Eph 2:8,9" msgstr "" -#: ../src/main/xml.c:106 ../src/main/xml.c:107 +#: ../src/main/xml.c:104 ../src/main/xml.c:105 msgid "Romans 1:16" msgstr "" -#: ../src/main/xml.c:110 +#: ../src/main/xml.c:107 msgid "What is the Gospel?" msgstr "" -#: ../src/main/xml.c:112 ../src/main/xml.c:113 +#: ../src/main/xml.c:108 ../src/main/xml.c:109 msgid "1 Cor 15:1-4" msgstr "" -#: ../src/main/xml.c:268 ../src/main/xml.c:414 ../src/main/xml.c:1291 +#: ../src/main/xml.c:263 ../src/main/xml.c:409 ../src/main/xml.c:1504 #, c-format msgid "Document not parsed successfully. \n" msgstr "" -#: ../src/main/xml.c:274 ../src/main/xml.c:420 ../src/main/xml.c:442 -#: ../src/main/xml.c:862 ../src/main/xml.c:1176 ../src/main/xml.c:1370 +#: ../src/main/xml.c:269 ../src/main/xml.c:415 ../src/main/xml.c:435 +#: ../src/main/xml.c:1061 ../src/main/xml.c:1391 ../src/main/xml.c:1587 #, c-format msgid "empty document \n" msgstr "" -#: ../src/main/xml.c:280 +#: ../src/main/xml.c:275 #, c-format msgid "wrong type, root node != SwordBookmarks\n" msgstr "" -#: ../src/main/xml.c:426 +#: ../src/main/xml.c:421 #, c-format msgid "wrong type, root node != Copy_Export\n" msgstr "" -#: ../src/main/xml.c:495 +#: ../src/main/xml.c:498 #, c-format msgid "%s
%s
Chapter %d

" msgstr "" -#: ../src/main/xml.c:496 +#: ../src/main/xml.c:502 #, c-format msgid "
Chapter %d

" msgstr "" -#: ../src/main/xml.c:497 +#: ../src/main/xml.c:505 #, c-format msgid "" "%s\n" @@ -2185,7 +2238,7 @@ "\n" msgstr "" -#: ../src/main/xml.c:498 +#: ../src/main/xml.c:508 #, c-format msgid "" "\n" @@ -2194,101 +2247,101 @@ "\n" msgstr "" -#: ../src/main/xml.c:504 +#: ../src/main/xml.c:517 #, c-format msgid "%s%s: %s Chapter %d

" msgstr "" -#: ../src/main/xml.c:505 +#: ../src/main/xml.c:520 #, c-format msgid "" "%s: %s Chapter %d\n" "\n" msgstr "" -#: ../src/main/xml.c:510 +#: ../src/main/xml.c:528 #, c-format msgid "  [%d]" msgstr "" -#: ../src/main/xml.c:511 +#: ../src/main/xml.c:531 #, c-format msgid " [%d]" msgstr "" -#: ../src/main/xml.c:517 +#: ../src/main/xml.c:540 #, c-format msgid "%s%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:518 +#: ../src/main/xml.c:543 #, c-format msgid "%s(%s %d:%d%s)%s " msgstr "" -#: ../src/main/xml.c:519 +#: ../src/main/xml.c:545 #, c-format msgid "%s (%s %d:%d%s)" msgstr "" -#: ../src/main/xml.c:520 +#: ../src/main/xml.c:548 #, c-format msgid "(%s %d:%d%s) %s" msgstr "" -#: ../src/main/xml.c:526 +#: ../src/main/xml.c:556 #, c-format msgid " %s%s" msgstr "" -#: ../src/main/xml.c:527 ../src/main/xml.c:529 +#: ../src/main/xml.c:558 ../src/main/xml.c:562 #, c-format msgid "%s(%s %d:%d-%d%s)" msgstr "" -#: ../src/main/xml.c:528 +#: ../src/main/xml.c:560 #, c-format msgid "(%s %d:%d-%d%s)
" msgstr "" -#: ../src/main/xml.c:530 +#: ../src/main/xml.c:565 #, c-format msgid "(%s %d:%d-%d%s)\n" msgstr "" -#: ../src/main/xml.c:579 +#: ../src/main/xml.c:614 msgid "Old Testament" msgstr "" -#: ../src/main/xml.c:580 +#: ../src/main/xml.c:616 msgid "Gen - Mal" msgstr "" -#: ../src/main/xml.c:585 +#: ../src/main/xml.c:622 msgid "New Testament" msgstr "" -#: ../src/main/xml.c:586 +#: ../src/main/xml.c:624 msgid "Mat - Rev" msgstr "" -#: ../src/main/xml.c:592 +#: ../src/main/xml.c:633 msgid "Sample Module List" msgstr "" -#: ../src/main/xml.c:868 ../src/main/xml.c:1182 +#: ../src/main/xml.c:1067 ../src/main/xml.c:1397 #, c-format msgid "wrong type, root node != %s\n" msgstr "" -#: ../src/main/xml.c:1332 +#: ../src/main/xml.c:1549 #, c-format msgid "" "Save of settings failed! stat %d, size %d\n" "%s" msgstr "" -#: ../src/main/xml.c:1334 +#: ../src/main/xml.c:1551 msgid "Attempting to revert to previous save." msgstr "" @@ -2302,13 +2355,13 @@ msgstr "" #: ../ui/bookmarks.glade.h:3 ../ui/bookmarks.gtkbuilder.h:2 -#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:6 +#: ../ui/markverse.glade.h:7 ../ui/markverse.gtkbuilder.h:2 msgid "Create new folder" msgstr "" #: ../ui/bookmarks.glade.h:4 ../ui/bookmarks.gtkbuilder.h:4 -#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:8 -#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:8 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:5 msgid "New Folder" msgstr "" @@ -2317,7 +2370,7 @@ msgstr "" #: ../ui/bookmarks.glade.h:6 ../ui/bookmarks.gtkbuilder.h:5 -#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:10 +#: ../ui/markverse.glade.h:11 ../ui/markverse.gtkbuilder.h:6 msgid "Cancel Bookmark" msgstr "" @@ -2330,22 +2383,22 @@ msgstr "" #: ../ui/bookmarks.glade.h:9 ../ui/bookmarks.gtkbuilder.h:8 -#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:2 +#: ../ui/markverse.glade.h:3 ../ui/markverse.gtkbuilder.h:7 msgid "Verse:" msgstr "" #: ../ui/bookmarks.glade.h:10 ../ui/bookmarks.gtkbuilder.h:9 -#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:3 +#: ../ui/markverse.glade.h:4 ../ui/markverse.gtkbuilder.h:8 msgid "Verse Entry" msgstr "" #: ../ui/bookmarks.glade.h:11 ../ui/bookmarks.gtkbuilder.h:10 -#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:4 +#: ../ui/markverse.glade.h:5 ../ui/markverse.gtkbuilder.h:9 msgid "Module:" msgstr "" #: ../ui/bookmarks.glade.h:12 ../ui/bookmarks.gtkbuilder.h:11 -#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:5 +#: ../ui/markverse.glade.h:6 ../ui/markverse.gtkbuilder.h:10 msgid "Module Entry" msgstr "" @@ -2353,6 +2406,10 @@ msgid "Bookmark Folder Treeview" msgstr "" +#: ../ui/editor_link_dialog.xml.h:1 +msgid "Insert Link" +msgstr "插入連結" + #: ../ui/editor_link_dialog.xml.h:2 ../ui/export-dialog.glade.h:17 #: ../ui/export-dialog.gtkbuilder.h:16 msgid "Verse" @@ -2407,6 +2464,12 @@ msgid "_Delete Personal Comment" msgstr "" +#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:7 +#: ../ui/gtk2_webedit.ui.h:86 ../ui/gtk_webedit.ui.h:86 +#: ../ui/xi-menus.glade.h:1 ../ui/xi-menus.gtkbuilder.h:1 +msgid "_File" +msgstr "檔案(_F)" + #: ../ui/editor_note.xml.h:10 msgid "Save the current note" msgstr "" @@ -2415,6 +2478,14 @@ msgid "_Save (Personal Comment)" msgstr "" +#: ../ui/editor_note.xml.h:12 ../ui/editor_studypad.xml.h:18 +msgid "Print Pre_view" +msgstr "預覽列印(_V)" + +#: ../ui/editor_note.xml.h:13 ../ui/editor_studypad.xml.h:19 +msgid "_Print..." +msgstr "列印(_P)..." + #: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20 msgid "E_xit" msgstr "" @@ -2423,6 +2494,11 @@ msgid "For_mat" msgstr "" +#: ../ui/editor_note.xml.h:16 ../ui/editor_studypad.xml.h:11 +#: ../ui/gtk2_webedit.ui.h:75 ../ui/gtk_webedit.ui.h:75 +msgid "Save" +msgstr "儲存" + #: ../ui/editor_studypad.xml.h:3 msgid "Print this document" msgstr "" @@ -2460,7 +2536,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:1 ../ui/export-dialog.gtkbuilder.h:1 -#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:37 +#: ../ui/xi-menus.glade.h:58 ../ui/xi-menus-popup.gtkbuilder.h:38 msgid "Copy/Export Passage" msgstr "" @@ -2497,7 +2573,7 @@ msgstr "" #: ../ui/export-dialog.glade.h:11 ../ui/export-dialog.gtkbuilder.h:10 -#: ../ui/prefs.glade.h:136 ../ui/prefs.gtkbuilder.h:136 +#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 msgid "Book" msgstr "" @@ -2610,8 +2686,8 @@ msgid "Open about dialog" msgstr "" -#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:116 -#: ../ui/prefs.gtkbuilder.h:116 +#: ../ui/gtk2_webedit.ui.h:4 ../ui/gtk_webedit.ui.h:4 ../ui/prefs.glade.h:118 +#: ../ui/prefs.gtkbuilder.h:118 msgid "Bold" msgstr "" @@ -2653,13 +2729,17 @@ msgid "Delete selection" msgstr "刪除" +#: ../ui/gtk2_webedit.ui.h:14 ../ui/gtk_webedit.ui.h:14 +msgid "Delete" +msgstr "刪除" + #: ../ui/gtk2_webedit.ui.h:15 ../ui/gtk_webedit.ui.h:15 #, fuzzy msgid "Remove selection" msgstr "刪除選取的資料夾" #: ../ui/gtk2_webedit.ui.h:16 ../ui/gtk_webedit.ui.h:16 -#: ../ui/xi-menus.glade.h:116 ../ui/xi-menus-popup.gtkbuilder.h:11 +#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:11 msgid "Delete Item" msgstr "" @@ -2832,6 +2912,10 @@ msgid "Right justify paragraph" msgstr "" +#: ../ui/gtk2_webedit.ui.h:56 ../ui/gtk_webedit.ui.h:56 +msgid "New" +msgstr "新增" + #: ../ui/gtk2_webedit.ui.h:57 ../ui/gtk_webedit.ui.h:57 msgid "Create new file" msgstr "" @@ -2960,120 +3044,84 @@ msgid "_Edit" msgstr "編輯(_E)" -#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 +#: ../ui/gtk2_webedit.ui.h:89 ../ui/gtk_webedit.ui.h:89 #: ../ui/xi-menus.glade.h:40 ../ui/xi-menus.gtkbuilder.h:25 msgid "_Help" msgstr "說明(_H)" -#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 -msgid "toolbutton1" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 -msgid "toolbutton10" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 -msgid "toolbutton3" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 -msgid "toolbutton2" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 -msgid "toolbutton4" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 -msgid "toolbutton6" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 -msgid "toolbutton7" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 +#: ../ui/gtk2_webedit.ui.h:90 ../ui/gtk_webedit.ui.h:90 msgid "Normal" msgstr "" -#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 +#: ../ui/gtk2_webedit.ui.h:91 ../ui/gtk_webedit.ui.h:91 msgid "Header 1" msgstr "" -#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 +#: ../ui/gtk2_webedit.ui.h:92 ../ui/gtk_webedit.ui.h:92 msgid "Header 2" msgstr "" -#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 +#: ../ui/gtk2_webedit.ui.h:93 ../ui/gtk_webedit.ui.h:93 msgid "Header 3" msgstr "" -#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 +#: ../ui/gtk2_webedit.ui.h:94 ../ui/gtk_webedit.ui.h:94 msgid "Header 4" msgstr "" -#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +#: ../ui/gtk2_webedit.ui.h:95 ../ui/gtk_webedit.ui.h:95 msgid "Header 5" msgstr "" -#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 +#: ../ui/gtk2_webedit.ui.h:96 ../ui/gtk_webedit.ui.h:96 msgid "Header 6" msgstr "" -#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 +#: ../ui/gtk2_webedit.ui.h:97 ../ui/gtk_webedit.ui.h:97 msgid "Address" msgstr "" -#: ../ui/gtk2_webedit.ui.h:106 ../ui/gtk_webedit.ui.h:106 +#: ../ui/gtk2_webedit.ui.h:98 ../ui/gtk_webedit.ui.h:98 msgid "Preformatted" msgstr "" -#: ../ui/gtk2_webedit.ui.h:107 ../ui/gtk_webedit.ui.h:107 +#: ../ui/gtk2_webedit.ui.h:99 ../ui/gtk_webedit.ui.h:99 msgid "Bulleted List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:108 ../ui/gtk_webedit.ui.h:108 +#: ../ui/gtk2_webedit.ui.h:100 ../ui/gtk_webedit.ui.h:100 msgid "Roman Numeral List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:109 ../ui/gtk_webedit.ui.h:109 +#: ../ui/gtk2_webedit.ui.h:101 ../ui/gtk_webedit.ui.h:101 msgid "Numbered List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:110 ../ui/gtk_webedit.ui.h:110 +#: ../ui/gtk2_webedit.ui.h:102 ../ui/gtk_webedit.ui.h:102 msgid "Alphabetical List" msgstr "" -#: ../ui/gtk2_webedit.ui.h:111 ../ui/gtk_webedit.ui.h:111 -msgid "toolbutton11" -msgstr "" - -#: ../ui/gtk2_webedit.ui.h:112 ../ui/gtk_webedit.ui.h:112 -msgid "toolbutton12" +#: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103 +msgid "Strike" msgstr "" -#: ../ui/gtk2_webedit.ui.h:113 ../ui/gtk_webedit.ui.h:113 +#: ../ui/gtk2_webedit.ui.h:104 ../ui/gtk_webedit.ui.h:104 msgid "Set font color of selected text." msgstr "" -#: ../ui/gtk2_webedit.ui.h:114 ../ui/gtk_webedit.ui.h:114 +#: ../ui/gtk2_webedit.ui.h:105 ../ui/gtk_webedit.ui.h:105 msgid "Highlight selected text by setting background color." msgstr "" -#: ../ui/gtk2_webedit.ui.h:115 ../ui/gtk_webedit.ui.h:115 -msgid "toolbutton9" -msgstr "" - #: ../ui/markverse.glade.h:1 ../ui/markverse.gtkbuilder.h:1 msgid "Mark/Unmark Verse" msgstr "" -#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:7 +#: ../ui/markverse.glade.h:9 ../ui/markverse.gtkbuilder.h:3 msgid "Mark" msgstr "" -#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:9 +#: ../ui/markverse.glade.h:10 ../ui/markverse.gtkbuilder.h:5 msgid "Unmark" msgstr "" @@ -3151,97 +3199,109 @@ msgstr "要刪除這些模組的快速搜尋索引嗎？" #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16 +msgid "Scan _Obsolete" +msgstr "" + +#: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17 +msgid "Scan for obsolete modules and offer to delete them." +msgstr "" + +#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19 msgid "Continue" msgstr "" #. do not translate and they are html formating -#: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:18 +#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:21 msgid "Sword" msgstr "" -#: ../ui/module-manager.glade.h:19 ../ui/module-manager.gtkbuilder.h:19 +#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:22 msgid "Module Manager" msgstr "" -#: ../ui/module-manager.glade.h:20 ../ui/module-manager.gtkbuilder.h:20 +#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23 msgid "WARNING: If you live in a persecuted country use with care." msgstr "" -#: ../ui/module-manager.glade.h:21 ../ui/module-manager.gtkbuilder.h:21 +#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24 msgid "Add and Remove Sources" msgstr "" -#: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:22 +#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:25 msgid "Current local sources" msgstr "" -#: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:23 +#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:26 msgid "" "Add a local folder as an install source, typically on a cdrom or flash " "drive. Such a folder contains subfolders \"mods.d\" and \"modules\"." msgstr "" -#: ../ui/module-manager.glade.h:24 ../ui/module-manager.gtkbuilder.h:24 +#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:27 msgid "Remove one of your local folders as an install source." msgstr "" -#: ../ui/module-manager.glade.h:25 ../ui/module-manager.gtkbuilder.h:25 +#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:28 msgid "Current Remote Sources" msgstr "" -#: ../ui/module-manager.glade.h:26 ../ui/module-manager.gtkbuilder.h:26 +#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:29 msgid "" "Add a custom remote install source. You must know its hostname and the " "folder where its repository lives." msgstr "" -#: ../ui/module-manager.glade.h:27 ../ui/module-manager.gtkbuilder.h:27 +#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:30 #, fuzzy msgid "Remove a remote install source." msgstr "移除所選的套件" -#: ../ui/module-manager.glade.h:28 ../ui/module-manager.gtkbuilder.h:28 +#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:31 msgid "Install Source" msgstr "" -#: ../ui/module-manager.glade.h:29 ../ui/module-manager.gtkbuilder.h:29 +#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:32 msgid "Local" msgstr "" -#: ../ui/module-manager.glade.h:30 ../ui/module-manager.gtkbuilder.h:30 +#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:33 msgid "Remote" msgstr "" -#: ../ui/module-manager.glade.h:31 ../ui/module-manager.gtkbuilder.h:31 +#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:34 msgid "Install Destination" msgstr "" -#: ../ui/module-manager.glade.h:32 ../ui/module-manager.gtkbuilder.h:32 +#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:35 msgid "Personal area, for your use only:" msgstr "" -#: ../ui/module-manager.glade.h:33 ../ui/module-manager.gtkbuilder.h:33 +#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:36 msgid "Home dir" msgstr "" -#: ../ui/module-manager.glade.h:34 ../ui/module-manager.gtkbuilder.h:34 +#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:37 msgid "System area, for all users:" msgstr "" -#: ../ui/module-manager.glade.h:35 ../ui/module-manager.gtkbuilder.h:35 +#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:38 msgid "Sword sys dir" msgstr "" -#: ../ui/module-manager.glade.h:36 ../ui/module-manager.gtkbuilder.h:36 +#: ../ui/module-manager.glade.h:38 ../ui/module-manager.gtkbuilder.h:39 msgid "" "Warning: If you live in a persecuted country and do not wish to risk " "detection you should NOT use the remote installation feature! " msgstr "" -#: ../ui/module-manager.glade.h:37 ../ui/module-manager.gtkbuilder.h:37 +#: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40 msgid "Local Install Folder" msgstr "" +#: ../ui/module-manager.gtkbuilder.h:18 +msgid "_Cancel" +msgstr "" + #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1 msgid "Drop down history list" msgstr "" @@ -3250,11 +3310,11 @@ msgid "Choose book to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:2 +#: ../ui/navbar_versekey.glade.h:3 ../ui/navbar_versekey.gtkbuilder.h:3 msgid "Book Selector Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:3 +#: ../ui/navbar_versekey.glade.h:4 ../ui/navbar_versekey.gtkbuilder.h:2 msgid "Revelation of John" msgstr "" @@ -3262,11 +3322,11 @@ msgid "Choose chapter to display" msgstr "" -#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:4 +#: ../ui/navbar_versekey.glade.h:6 ../ui/navbar_versekey.gtkbuilder.h:5 msgid "Toggle Chapter Button" msgstr "" -#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:5 +#: ../ui/navbar_versekey.glade.h:7 ../ui/navbar_versekey.gtkbuilder.h:4 msgid "1" msgstr "" @@ -3408,11 +3468,11 @@ "speaker's navigation." msgstr "" -#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:35 -msgid "Mode" +#: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36 +msgid "Mode:" msgstr "" -#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:36 +#: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35 msgid "Select the mode in which BibleSync should operate." msgstr "" @@ -3480,11 +3540,11 @@ msgid "BSP privacy button" msgstr "每句換行(_V)" -#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:52 -msgid "Navigate" +#: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53 +msgid "Navigate:" msgstr "" -#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:53 +#: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52 msgid "Choose how to accept incoming navigation synchronization." msgstr "" @@ -3514,11 +3574,11 @@ msgid "BSP nav verse list radio button" msgstr "" -#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:60 -msgid "Listen" +#: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61 +msgid "Listen:" msgstr "" -#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:61 +#: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60 msgid "Xiphos will listen to Speakers according to choice here." msgstr "" @@ -3561,7 +3621,12 @@ msgid "BSP listen none radio button" msgstr "每句換行(_V)" -#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:72 +#: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72 +#, fuzzy +msgid "Special:" +msgstr "特殊" + +#: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71 msgid "" "Additional traces can be presented during BibleSync operation by enabling " "presence, mismatch, and debug. Beware enabling these, they can be very " @@ -3741,187 +3806,186 @@ msgstr "" #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114 +msgid "Enable Statusbar" +msgstr "" + +#: ../ui/prefs.glade.h:115 +msgid "Enable/Disable Statusbar." +msgstr "" + +#: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117 #, fuzzy msgid "Verse number" msgstr "經句: " -#: ../ui/prefs.glade.h:115 ../ui/prefs.gtkbuilder.h:115 +#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116 msgid "Offset the verse number in several ways" msgstr "" -#: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:117 +#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 msgid "Show verse number in bold text" msgstr "" -#: ../ui/prefs.glade.h:118 ../ui/prefs.gtkbuilder.h:118 +#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 msgid "Verse number bold checkbox" msgstr "" -#: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119 +#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 msgid "Brackets" msgstr "" -#: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120 +#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 msgid "Show verse number with [surrounding brackets]" msgstr "" -#: ../ui/prefs.glade.h:121 ../ui/prefs.gtkbuilder.h:121 +#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 msgid "Verse number bracket checkbox" msgstr "" -#: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122 +#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 #, fuzzy msgid "Superscript" msgstr "說明" -#: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123 +#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 msgid "Show verse number as a superscript" msgstr "" -#: ../ui/prefs.glade.h:124 ../ui/prefs.gtkbuilder.h:124 +#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 msgid "Verse number superscript checkbox" msgstr "" -#: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125 +#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 msgid "StudyPad default directory" msgstr "" -#: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126 +#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 msgid "Select A Directory" msgstr "" -#: ../ui/prefs.glade.h:127 ../ui/prefs.gtkbuilder.h:127 +#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 msgid "StudyPad default directory combo" msgstr "" -#: ../ui/prefs.glade.h:128 ../ui/prefs.gtkbuilder.h:128 +#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 msgid "General Misc" msgstr "" -#: ../ui/prefs.glade.h:129 ../ui/prefs.gtkbuilder.h:129 +#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 msgid "Main Window Modules" msgstr "" -#: ../ui/prefs.glade.h:130 ../ui/prefs.gtkbuilder.h:130 +#: ../ui/prefs.glade.h:132 ../ui/prefs.gtkbuilder.h:132 msgid "Biblical Text" msgstr "" -#: ../ui/prefs.glade.h:131 ../ui/prefs.gtkbuilder.h:131 +#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 msgid "Change Biblical Text Combo" msgstr "" -#: ../ui/prefs.glade.h:133 ../ui/prefs.gtkbuilder.h:133 +#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 msgid "Change Commentary Combo" msgstr "" -#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134 -msgid "Dictionary" -msgstr "" - -#: ../ui/prefs.glade.h:135 ../ui/prefs.gtkbuilder.h:135 +#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 msgid "Change Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:137 ../ui/prefs.gtkbuilder.h:137 +#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 msgid "Change Book Combo" msgstr "" -#: ../ui/prefs.glade.h:138 ../ui/prefs.gtkbuilder.h:138 +#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 #: ../ui/search-dialog.glade.h:22 ../ui/search-dialog.gtkbuilder.h:23 msgid "Modules" msgstr "" -#: ../ui/prefs.glade.h:139 ../ui/prefs.gtkbuilder.h:139 +#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 #: ../ui/search-dialog.glade.h:86 ../ui/search-dialog.gtkbuilder.h:86 msgid "Clear all modules from the list" msgstr "" -#: ../ui/prefs.glade.h:140 ../ui/prefs.gtkbuilder.h:140 +#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 #: ../ui/search-dialog.glade.h:87 ../ui/search-dialog.gtkbuilder.h:87 msgid "Clear Modules from List Button" msgstr "" -#: ../ui/prefs.glade.h:141 ../ui/prefs.gtkbuilder.h:141 +#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 #: ../ui/search-dialog.glade.h:88 ../ui/search-dialog.gtkbuilder.h:88 msgid "Remove the selected module from the list" msgstr "" -#: ../ui/prefs.glade.h:142 ../ui/prefs.gtkbuilder.h:142 +#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 #: ../ui/search-dialog.glade.h:89 ../ui/search-dialog.gtkbuilder.h:89 msgid "Delete Selected Module From List Button" msgstr "" -#: ../ui/prefs.glade.h:143 ../ui/prefs.gtkbuilder.h:143 +#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 msgid "Open a dialog to select modules" msgstr "" -#: ../ui/prefs.glade.h:144 ../ui/prefs.gtkbuilder.h:144 +#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 #: ../ui/search-dialog.glade.h:91 ../ui/search-dialog.gtkbuilder.h:91 msgid "Add Modules" msgstr "" -#: ../ui/prefs.glade.h:145 ../ui/prefs.gtkbuilder.h:145 +#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 #: ../ui/search-dialog.glade.h:92 ../ui/search-dialog.gtkbuilder.h:92 msgid "Open Selection Dialog Button" msgstr "" -#: ../ui/prefs.glade.h:146 ../ui/prefs.gtkbuilder.h:146 +#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 msgid "Modules Parallel" msgstr "" -#: ../ui/prefs.glade.h:147 ../ui/prefs.gtkbuilder.h:147 +#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 msgid "Special Purpose Modules" msgstr "" -#: ../ui/prefs.glade.h:148 ../ui/prefs.gtkbuilder.h:148 +#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 msgid "Daily Devotional" msgstr "" -#: ../ui/prefs.glade.h:149 ../ui/prefs.gtkbuilder.h:149 +#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 msgid "Daily Devotional Combo" msgstr "" -#: ../ui/prefs.glade.h:150 ../ui/prefs.gtkbuilder.h:150 +#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 msgid "Hebrew Lexicon" msgstr "" -#: ../ui/prefs.glade.h:151 ../ui/prefs.gtkbuilder.h:151 +#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 msgid "Hebrew Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:152 ../ui/prefs.gtkbuilder.h:152 +#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 msgid "Greek Lexicon" msgstr "" -#: ../ui/prefs.glade.h:153 ../ui/prefs.gtkbuilder.h:153 +#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 msgid "Greek Lexicon Combo" msgstr "" -#: ../ui/prefs.glade.h:154 ../ui/prefs.gtkbuilder.h:154 +#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 msgid "Default Dictionary" msgstr "" -#: ../ui/prefs.glade.h:155 ../ui/prefs.gtkbuilder.h:155 +#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 msgid "Change Default Dictionary Combo" msgstr "" -#: ../ui/prefs.glade.h:156 ../ui/prefs.gtkbuilder.h:156 +#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 msgid "Personal Notes" msgstr "" -#: ../ui/prefs.glade.h:157 ../ui/prefs.gtkbuilder.h:157 +#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 msgid "Change Personal Notes Combo" msgstr "" -#: ../ui/prefs.glade.h:158 ../ui/prefs.gtkbuilder.h:158 +#: ../ui/prefs.glade.h:160 ../ui/prefs.gtkbuilder.h:160 msgid "Modules Misc" msgstr "" -#: ../ui/prefs.glade.h:159 ../ui/prefs.gtkbuilder.h:159 -#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 -msgid "Module Selection" -msgstr "" - #: ../ui/prefs.gtkbuilder.h:1 msgid "-2" msgstr "" @@ -3950,6 +4014,10 @@ msgid "+5" msgstr "" +#: ../ui/prefs.gtkbuilder.h:115 +msgid "Enable/disable the Statusbar" +msgstr "" + #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1 msgid "Advanced Search" msgstr "" @@ -4155,11 +4223,11 @@ msgid "Found" msgstr "" -#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:58 +#: ../ui/search-dialog.glade.h:58 ../ui/search-dialog.gtkbuilder.h:59 msgid "Result Summary Window" msgstr "" -#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:59 +#: ../ui/search-dialog.glade.h:59 ../ui/search-dialog.gtkbuilder.h:58 msgid "Result Summary Table" msgstr "" @@ -4351,6 +4419,11 @@ msgid "Attribute Search" msgstr "" +#: ../ui/search-dialog.glade.h:115 ../ui/search-dialog.gtkbuilder.h:115 +#: ../ui/selector-prefs.glade.h:1 ../ui/selector-prefs.gtkbuilder.h:1 +msgid "Module Selection" +msgstr "" + #: ../ui/search-dialog.gtkbuilder.h:6 msgid "search module" msgstr "" @@ -4444,6 +4517,10 @@ msgid "_Module Manager" msgstr "模組總管(_M)" +#: ../ui/xi-menus.glade.h:17 ../ui/xi-menus.gtkbuilder.h:11 +msgid "_View" +msgstr "檢視(_V)" + #: ../ui/xi-menus.glade.h:18 ../ui/xi-menus.gtkbuilder.h:12 msgid "Preview _Daily Devotion" msgstr "" @@ -4589,28 +4666,28 @@ msgid "Learn about Xiphos" msgstr "" -#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:36 +#: ../ui/xi-menus.glade.h:57 ../ui/xi-menus-popup.gtkbuilder.h:37 msgid "Annotate Verse" msgstr "" -#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:39 +#: ../ui/xi-menus.glade.h:60 ../ui/xi-menus-popup.gtkbuilder.h:40 msgid "Open Module" msgstr "" -#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:40 +#: ../ui/xi-menus.glade.h:62 ../ui/xi-menus-popup.gtkbuilder.h:41 msgid "Note" msgstr "" -#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:41 +#: ../ui/xi-menus.glade.h:63 ../ui/xi-menus-popup.gtkbuilder.h:42 msgid "Open in editor" msgstr "" -#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:43 +#: ../ui/xi-menus.glade.h:65 ../ui/xi-menus-popup.gtkbuilder.h:44 #, fuzzy msgid "Verse Per Line" msgstr "每句換行(_V)" -#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:51 +#: ../ui/xi-menus.glade.h:73 ../ui/xi-menus-popup.gtkbuilder.h:52 msgid "Footnote/Cross-ref Markers" msgstr "" @@ -4618,267 +4695,276 @@ msgid "Show non-anonymous markers e.g. \"*n23\"" msgstr "" -#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:56 +#: ../ui/xi-menus.glade.h:79 ../ui/xi-menus-popup.gtkbuilder.h:57 msgid "Variants" msgstr "" -#: ../ui/xi-menus.glade.h:83 ../ui/xi-menus-popup.gtkbuilder.h:60 +#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:65 msgid "Image Content" msgstr "" -#: ../ui/xi-menus.glade.h:84 ../ui/xi-menus-popup.gtkbuilder.h:61 +#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:66 msgid "Respect Font Faces" msgstr "" -#: ../ui/xi-menus.glade.h:85 ../ui/xi-menus-popup.gtkbuilder.h:62 +#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:67 msgid "Commentary by Chapter" msgstr "" -#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:63 +#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:68 msgid "Doublespace" msgstr "" -#: ../ui/xi-menus.glade.h:87 ../ui/xi-menus-popup.gtkbuilder.h:64 +#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:69 msgid "Lookup Selection" msgstr "" -#: ../ui/xi-menus.glade.h:88 ../ui/xi-menus-popup.gtkbuilder.h:65 +#: ../ui/xi-menus.glade.h:92 ../ui/xi-menus-popup.gtkbuilder.h:70 msgid "Use Current Dictionary" msgstr "" -#: ../ui/xi-menus.glade.h:89 ../ui/xi-menus-popup.gtkbuilder.h:66 +#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:71 msgid "Browse in BibleMap.org" msgstr "" -#: ../ui/xi-menus.glade.h:90 ../ui/xi-menus-popup.gtkbuilder.h:67 +#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:72 msgid "Unlock This Module" msgstr "" -#: ../ui/xi-menus.glade.h:91 ../ui/xi-menus-popup.gtkbuilder.h:68 +#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:73 msgid "Display Book Heading" msgstr "" -#: ../ui/xi-menus.glade.h:92 +#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:74 msgid "Display Chapter Heading" msgstr "" -#: ../ui/xi-menus.glade.h:93 ../ui/xi-menus-popup.gtkbuilder.h:69 +#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:75 msgid "Rename Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:94 ../ui/xi-menus-popup.gtkbuilder.h:70 +#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:76 msgid "Dump Pers.Comm." msgstr "" -#: ../ui/xi-menus.glade.h:95 ../ui/xi-menus-popup.gtkbuilder.h:71 +#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:77 msgid "Read Selection Aloud" msgstr "" -#: ../ui/xi-menus.glade.h:96 ../ui/xi-menus-popup.gtkbuilder.h:85 +#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:91 msgid "Save these results as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:97 ../ui/xi-menus-popup.gtkbuilder.h:84 +#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90 msgid "Save list as a single bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:98 ../ui/xi-menus-popup.gtkbuilder.h:87 +#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93 msgid "Save these results as a series of bookmarks in their own folder" msgstr "" -#: ../ui/xi-menus.glade.h:99 ../ui/xi-menus-popup.gtkbuilder.h:86 +#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92 msgid "Save list as a series of bookmarks" msgstr "" -#: ../ui/xi-menus.glade.h:100 ../ui/xi-menus-popup.gtkbuilder.h:89 +#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95 msgid "" "Provide a dialog in which to paste a line of verse references, to fill the " "verse list." msgstr "" -#: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:88 +#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94 #, fuzzy msgid "Populate verse list" msgstr "經句: " -#: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:91 +#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97 +msgid "Push the entire verse list contents directly into the history list." +msgstr "" + +#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96 +#, fuzzy +msgid "Preload history from verse list" +msgstr "經句: " + +#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99 msgid "" "Send this verse list via BibleSync to others, if you are in Personal or " "Speaker mode." msgstr "" -#: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:90 +#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98 msgid "Send list via BibleSync" msgstr "" -#: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:92 +#: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100 msgid "Export List" msgstr "" -#: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:2 +#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:2 msgid "Open this bookmark in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:1 +#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:1 msgid "Open in new tab" msgstr "" -#: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:4 +#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:4 msgid "Open this bookmark in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:3 +#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:3 msgid "Open in a dialog" msgstr "" -#: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:6 +#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:6 msgid "Add new folder to selected folder" msgstr "" -#: ../ui/xi-menus.glade.h:111 ../ui/xi-menus-popup.gtkbuilder.h:8 +#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:8 msgid "Insert new bookmark here" msgstr "" -#: ../ui/xi-menus.glade.h:112 ../ui/xi-menus-popup.gtkbuilder.h:7 +#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:7 msgid "Insert Bookmark" msgstr "" -#: ../ui/xi-menus.glade.h:113 ../ui/xi-menus-popup.gtkbuilder.h:10 +#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:10 msgid "Edit bookmark item" msgstr "" -#: ../ui/xi-menus.glade.h:114 ../ui/xi-menus-popup.gtkbuilder.h:9 +#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:9 msgid "_Edit Item" msgstr "" -#: ../ui/xi-menus.glade.h:115 ../ui/xi-menus-popup.gtkbuilder.h:12 +#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:12 msgid "Delete item" msgstr "" -#: ../ui/xi-menus.glade.h:117 ../ui/xi-menus-popup.gtkbuilder.h:14 +#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:14 msgid "Expand all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:118 ../ui/xi-menus-popup.gtkbuilder.h:13 +#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:13 msgid "Expand All" msgstr "" -#: ../ui/xi-menus.glade.h:119 ../ui/xi-menus-popup.gtkbuilder.h:16 +#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:16 msgid "Collapse all Bookmarks groups" msgstr "" -#: ../ui/xi-menus.glade.h:120 ../ui/xi-menus-popup.gtkbuilder.h:15 +#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:15 msgid "Collapse All" msgstr "" -#: ../ui/xi-menus.glade.h:121 ../ui/xi-menus-popup.gtkbuilder.h:17 +#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:17 msgid "Allow items to be moved from one folder to another" msgstr "" -#: ../ui/xi-menus.glade.h:122 ../ui/xi-menus-popup.gtkbuilder.h:18 +#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:18 msgid "Allow Reordering" msgstr "" -#: ../ui/xi-menus.glade.h:123 ../ui/xi-menus-popup.gtkbuilder.h:20 +#: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20 msgid "Load other bookmarks file (default: from BibleTime)" msgstr "" -#: ../ui/xi-menus.glade.h:124 ../ui/xi-menus-popup.gtkbuilder.h:19 +#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19 #, fuzzy msgid "Import Bookmarks" msgstr "書籤" -#: ../ui/xi-menus.glade.h:125 ../ui/xi-menus-popup.gtkbuilder.h:22 +#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:22 msgid "Remove folder and save it" msgstr "" -#: ../ui/xi-menus.glade.h:126 ../ui/xi-menus-popup.gtkbuilder.h:21 +#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:21 msgid "Export Folder" msgstr "" -#: ../ui/xi-menus.glade.h:127 ../ui/xi-menus-popup.gtkbuilder.h:30 +#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:31 msgid "Open selected module in a new tab" msgstr "" -#: ../ui/xi-menus.glade.h:128 ../ui/xi-menus-popup.gtkbuilder.h:32 +#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:33 msgid "" "Open selected module in a\n" "\tseparate ['dialog'] window" msgstr "" -#: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:31 +#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:32 msgid "Open in a separate window" msgstr "" -#: ../ui/xi-menus.glade.h:131 ../ui/xi-menus-popup.gtkbuilder.h:73 +#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 msgid "Create a new simple prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:132 ../ui/xi-menus-popup.gtkbuilder.h:72 +#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 msgid "Simple" msgstr "" -#: ../ui/xi-menus.glade.h:133 ../ui/xi-menus-popup.gtkbuilder.h:75 +#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 msgid "Create a new subject prayer list" msgstr "" -#: ../ui/xi-menus.glade.h:134 ../ui/xi-menus-popup.gtkbuilder.h:74 +#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 msgid "Subject" msgstr "主題" -#: ../ui/xi-menus.glade.h:135 ../ui/xi-menus-popup.gtkbuilder.h:77 +#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 msgid "Create a new monthly journal" msgstr "" -#: ../ui/xi-menus.glade.h:136 ../ui/xi-menus-popup.gtkbuilder.h:76 +#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 msgid "Monthly" msgstr "" -#: ../ui/xi-menus.glade.h:137 ../ui/xi-menus-popup.gtkbuilder.h:79 +#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:85 msgid "Create a new daily journal" msgstr "" -#: ../ui/xi-menus.glade.h:138 ../ui/xi-menus-popup.gtkbuilder.h:78 +#: ../ui/xi-menus.glade.h:144 ../ui/xi-menus-popup.gtkbuilder.h:84 msgid "Daily" msgstr "" -#: ../ui/xi-menus.glade.h:139 ../ui/xi-menus-popup.gtkbuilder.h:81 +#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:87 msgid "Create a new outlined topic" msgstr "" -#: ../ui/xi-menus.glade.h:140 ../ui/xi-menus-popup.gtkbuilder.h:80 +#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:86 msgid "Outlined" msgstr "" -#: ../ui/xi-menus.glade.h:141 ../ui/xi-menus-popup.gtkbuilder.h:83 +#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:89 msgid "Open module in editor or plain display window" msgstr "" -#: ../ui/xi-menus.glade.h:142 ../ui/xi-menus-popup.gtkbuilder.h:82 +#: ../ui/xi-menus.glade.h:148 ../ui/xi-menus-popup.gtkbuilder.h:88 msgid "Open in separate window" msgstr "" -#: ../ui/xi-menus.glade.h:143 ../ui/xi-menus-popup.gtkbuilder.h:23 +#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:24 msgid "Add a sub-item" msgstr "" -#: ../ui/xi-menus.glade.h:144 +#: ../ui/xi-menus.glade.h:150 ../ui/xi-menus-popup.gtkbuilder.h:23 msgid "Add Sub-Item" msgstr "" -#: ../ui/xi-menus.glade.h:145 ../ui/xi-menus-popup.gtkbuilder.h:25 +#: ../ui/xi-menus.glade.h:151 ../ui/xi-menus-popup.gtkbuilder.h:26 msgid "Add an item" msgstr "" -#: ../ui/xi-menus.glade.h:146 ../ui/xi-menus-popup.gtkbuilder.h:24 +#: ../ui/xi-menus.glade.h:152 ../ui/xi-menus-popup.gtkbuilder.h:25 msgid "Add Item" msgstr "" -#: ../ui/xi-menus.glade.h:147 ../ui/xi-menus-popup.gtkbuilder.h:27 +#: ../ui/xi-menus.glade.h:153 ../ui/xi-menus-popup.gtkbuilder.h:28 msgid "Remove this item" msgstr "" -#: ../ui/xi-menus.glade.h:149 ../ui/xi-menus-popup.gtkbuilder.h:29 +#: ../ui/xi-menus.glade.h:155 ../ui/xi-menus-popup.gtkbuilder.h:30 msgid "Edit this item" msgstr "" @@ -4890,6 +4976,80 @@ msgid "Study the Bible" msgstr "研讀聖經" +#, fuzzy +#~ msgid "[no dump ready]" +#~ msgstr " 模組" + +#, fuzzy +#~ msgid "Transmit failed.\n" +#~ msgstr "%s 失敗" + +#~ msgid "Page %d of %d" +#~ msgstr "第 %d 頁 (共 %d 頁)" + +#~ msgid "Save As" +#~ msgstr "另存新檔" + +#~ msgid "HTML Output" +#~ msgstr "HTML 輸出" + +#~ msgid "HTML Source" +#~ msgstr "HTML 原始檔" + +#~ msgid "Plain Source" +#~ msgstr "純文字來源" + +#~ msgid "_Quit" +#~ msgstr "結束(_Q)" + +#~ msgid "_Open" +#~ msgstr "開啟(_O)" + +#~ msgid "_Save" +#~ msgstr "儲存(_S)" + +#~ msgid "Save _As..." +#~ msgstr "另存新檔(_A)..." + +#~ msgid "Open new document" +#~ msgstr "開啟新檔" + +#~ msgid "Delete current note" +#~ msgstr "刪除此筆附註" + +#~ msgid "HTML _Output" +#~ msgstr "HTML 輸出(_O)" + +#~ msgid "_HTML Source" +#~ msgstr "_HTML 來源" + +#~ msgid "_Plain Source" +#~ msgstr "純文字來源 (_P)" + +#~ msgid "Unlock " +#~ msgstr "解鎖 " + +#~ msgid "Preparing to print" +#~ msgstr "準備列印" + +#~ msgid "Printing is not supported on this printer" +#~ msgstr "不支援本印表機之列印" + +#~ msgid "Printer %s does not support PostScript printing." +#~ msgstr "印表機 %s 無 PostScript 列印功能" + +#~ msgid "Printing" +#~ msgstr "列印" + +#~ msgid "Waiting to print" +#~ msgstr "等待列印" + +#~ msgid "An error occurred while printing" +#~ msgstr "列印錯誤" + +#~ msgid "It was not possible to print your document: %s" +#~ msgstr "無法列印您的文件: %s" + #~ msgid "Tabs and Panes" #~ msgstr "分頁和版面" diff -Nru xiphos-4.0.0+dfsg1/README xiphos-4.0.4+dfsg1/README --- xiphos-4.0.0+dfsg1/README 2014-12-18 19:35:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/README 2015-02-11 23:48:34.000000000 +0000 @@ -1,28 +1,58 @@ -****************************************************************** -Xiphos requires Gnome2 ,the Sword libs and GtkHTML3 -****************************************************************** - -****************************************************************** -you can start xiphos with command line options -1. xiphos newconfigs - this will create a new configuration file - with default settings - if xiphos will not start this might help -2. xiphos newbookmarks - this will create a new bookmark file should - the old get messed up. -3. xiphos newfiles - this will create both the above files -4. xiphos sword://KJV/1Tim1:15 - will open xiphos with KJV - open to 1 Tim 1:15 in the main window. -****************************************************************** +Xiphos +====== + +Xiphos is a Bible study application for Linux, UNIX, and Windows operating +systems. It uses Sword to display Bibles, commentaries, dictionary, and other +texts and images. Xiphos includes features such as, searching, biblesync, +bookmarks, parallel study, and original language study. + +To install Xiphos, search in you package manager for xiphos and install the +package. If you are using Windows, please download the exe from here: + +http://sourceforge.net/projects/gnomesword/files/Xiphos/4.0.0/xiphos-4.0.0-win32.exe/download + + +Building Xiphos +=============== + +Please see the INSTALL file. + + +History and Acknowledgements +============================ Xiphos started life as the Sword Project's Cheatah program. -Over the course of Xiphos development many ideas and some pieces of -code have come from the Bibletime program and the Sword Project's -BibleCS program. +Over the course of Xiphos development many ideas and some pieces of code have +come from the Bibletime program and the Sword Project's BibleCS program. + +We wish to thank the folks who have put so much time and work into the Sword +Project and then giving it to the world! God Bless you! + + +Developing Xiphos +================= + +If you want to help develop Xiphos your help will be very appreciated! + +The first steps would be to make yourself familiar with the Xiphos build +process, so go read the INSTALL file. + +If you are looking for things to do, the best place to find out is to jump into +the #xiphos channel of irc.freenode.net + +If you make changes to C or C++ files, please make sure they are cleaned up to +follow our style of coding. The best way to make sure of it is to run this: + + $ clang-format -i -style=file /path/to/edited.c + +Where /path/to/edited.c, the C or C++ file you edited. The option '-style=file' +uses a predefined style file called .clang-format in the source tree. -We wish to thank the folks who have put so much time and work into the -Sword Project and then giving it to the world! God Bless you! +Thank you! +========== -We hope that your Bible Study will be enhanced by Xiphos. +We hope that your Bible study will be enhanced by Xiphos! The Xiphos Development Team diff -Nru xiphos-4.0.0+dfsg1/RELEASE-NOTES xiphos-4.0.4+dfsg1/RELEASE-NOTES --- xiphos-4.0.0+dfsg1/RELEASE-NOTES 2014-12-24 03:04:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/RELEASE-NOTES 2015-08-30 16:16:08.000000000 +0000 @@ -3,6 +3,54 @@ XIPHOS RELEASE NOTES ____________________ +Release 4.0.4 +30 Aug 2015 + +- Implemented dynamic allocation enhancement to replace survivability fix. +- Updated language abbreviations to eliminate unknowns. +- Fixed module installation messages so they are not lost. +- Fixed abbrev support, to show abbrevs in all non-essential contexts. +- Fixed maximization restoral (mostly gtk3; partial for gtk2). +________________________________________________________________ + +Release 4.0.3 +06 Aug 2015 + +Another bugfix release, induced by the discovery that a hard limit on the +number of language groups that can be supported is too small with respect +to newer repositories supporting far larger groups of modules. The code +involved will be re-factored for a better near-term future release but +this is an immediate survivability fix. +________________________________________________________________ + +Release 4.0.2 +15 Apr 2015 + +This is an urgent bugfix-only release. A serious memory management error +has been uncovered in the editor, making it virtually useless in many +cases. This release corrects this error. +________________________________________________________________ + +Release 4.0.1 +30 Mar 2015 + +- Completed webkit editor, due to replace gtkhtml editor. +- Added Abbreviation module configuration support. +- Added Glosses (Ruby) and Morpheme Segmentation display support. +- Added obsolete module audit, during install and on maintenance page. +- Added more informative "About" for modules. +- Added status bar en/disable. +- Removed BibleSync from Xiphos' source, now referenced as a proper library. +- Fixed studypad directory choice. +- Fixed mis-handling of unreal "multiple verse" reference in URL handling. +- Fixed editor's mis-handling of the link editor subdialog. +- Updated Win32 URL clickability; updated "About Sword" URL properly. +- Huge GTK3 compatibility cleanliness hackery. +- WebKit2 compatibility hackery. +- Fix compiler flag choices. +- Numerous code internals updates due to cppcheck(1) diagnostics. +________________________________________________________________ + Release 4.0.0 24 Dec 2014 diff -Nru xiphos-4.0.0+dfsg1/src/backend/gs_stringmgr.cpp xiphos-4.0.4+dfsg1/src/backend/gs_stringmgr.cpp --- xiphos-4.0.0+dfsg1/src/backend/gs_stringmgr.cpp 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/gs_stringmgr.cpp 2015-02-11 23:48:34.000000000 +0000 @@ -6,7 +6,7 @@ * gs_stringmgr was mostly inspired by BTSringMgr from BibleTime * Credits to the BibleTime Team (http://www.bibletime.info) * - * Copyright (C) 2000-2011 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,8 @@ SWORD_NAMESPACE_START -char* GS_StringMgr::upperUTF8(char* text, unsigned int maxlen) const { +char *GS_StringMgr::upperUTF8(char *text, unsigned int maxlen) const +{ if ((text == NULL) || (*text == '\0')) { return g_strdup(""); } @@ -38,14 +39,16 @@ maxlen = strlen(text); char *upper_str = g_utf8_strup(text, -1); unsigned int newlen = strlen(upper_str); - if (newlen >= maxlen) newlen = maxlen; + if (newlen >= maxlen) + newlen = maxlen; memcpy(text, upper_str, newlen); //text[newlen] = 0; // be sure we're null terminated. g_free(upper_str); return text; } -bool GS_StringMgr::supportsUnicode() const { +bool GS_StringMgr::supportsUnicode() const +{ return true; } diff -Nru xiphos-4.0.0+dfsg1/src/backend/gs_stringmgr.h xiphos-4.0.4+dfsg1/src/backend/gs_stringmgr.h --- xiphos-4.0.0+dfsg1/src/backend/gs_stringmgr.h 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/gs_stringmgr.h 2015-02-11 23:48:34.000000000 +0000 @@ -5,6 +5,8 @@ * gs_stringmgr was mostly inspired by BTSringMgr from BibleTime * Credits to the BibleTime Team (http://www.bibletime.info) * + * Copyright (C) 2000-2015 Xiphos Developer Team + * * 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. @@ -22,32 +24,31 @@ #include SWORD_NAMESPACE_START - /* StringMgr is a way to provide UTf8 handling by the Sword frontend * Each platform, if it's up-to-date, should provide functions to handle * unicode and utf8. This class makes it possible to implement Unicode * support on the user-side and not in Sword itself. */ +class GS_StringMgr : public StringMgr +{ -class GS_StringMgr : public StringMgr { - -public: + public: /* Converts the param to an upper case Utf8 string - * @param text The text encoded in utf8 which should - * be turned into an upper case string - * @param max Only change max chars - */ + * @param text The text encoded in utf8 which should + * be turned into an upper case string + * @param max Only change max chars + */ virtual char *upperUTF8(char *text, unsigned int max = 0) const; -protected: + protected: /* Checks whether Utf8 support is available. - * Override the function supportsUnicode() to tell whether - * your implementation has utf8 support. - * @return True if this implementation provides support for - * Utf8 handling or false if just latin1 handling is available - */ + * Override the function supportsUnicode() to tell whether + * your implementation has utf8 support. + * @return True if this implementation provides support for + * Utf8 handling or false if just latin1 handling is available + */ virtual bool supportsUnicode() const; - }; + SWORD_NAMESPACE_END #endif diff -Nru xiphos-4.0.0+dfsg1/src/backend/module_manager.cc xiphos-4.0.4+dfsg1/src/backend/module_manager.cc --- xiphos-4.0.0+dfsg1/src/backend/module_manager.cc 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/module_manager.cc 2015-03-29 17:01:08.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_manager.cc * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -106,37 +106,40 @@ { if (!dltotal) return; - double filefraction = (dlnow / dltotal); + double filefraction = (dlnow / dltotal); update_install_progress(filefraction); } - -ModuleManager::ModuleManager() { +ModuleManager::ModuleManager() + : mgr(NULL), + list_mgr(NULL), + installMgr(NULL) +{ const gchar *envhomedir = g_getenv(HOMEVAR); baseDir = (envhomedir) ? envhomedir : "."; baseDir += "/" DOTSWORD "/InstallMgr"; statusReporter = new GSStatusReporter(); } -ModuleManager::~ModuleManager() { - +ModuleManager::~ModuleManager() +{ } -char *backend_mod_mgr_get_config_entry(const char *module_name, - const char *entry) { - SWModule *mod; - ModMap::iterator it; //-- iteratior - //-- iterate through the modules until we find modName +char *backend_mod_mgr_get_config_entry(char *module_name, + const char *entry) +{ + ModMap::iterator it; //-- iteratior + it = mgr->Modules.find(module_name); - //-- if we find the module if (it != mgr->Modules.end()) { - mod = (*it).second; - return g_strdup((char *) mod->getConfigEntry(entry)); + SWModule *mod = (*it).second; + return g_strdup((char *)mod->getConfigEntry(entry)); } else return NULL; } -int backend_mod_mgr_is_module(const char *mod_name) { +int backend_mod_mgr_is_module(const char *mod_name) +{ ModMap::iterator it = mgr->Modules.find(mod_name); if (it != mgr->Modules.end()) { return 1; @@ -163,15 +166,21 @@ MOD_MGR *backend_module_mgr_get_next_module(void) { MOD_MGR *mod_info = NULL; - SWModule *module; if (list_it != list_end) { - module = list_it->second; + SWModule *module = list_it->second; mod_info = g_new(MOD_MGR, 1); - const gchar *name = module->getName(); + gchar *name = g_strdup(module->getName()); if (name) { mod_info->name = g_strdup(name); + + mod_info->abbreviation = (char *)module->getConfigEntry("Abbreviation"); + if (mod_info->abbreviation) { + mod_info->abbreviation = g_strdup(mod_info->abbreviation); + main_add_abbreviation(mod_info->name, mod_info->abbreviation); + } + mod_info->language = main_get_language_map(module->getLanguage()); mod_info->type = g_strdup(module->getType()); @@ -185,12 +194,12 @@ int isize = atoi(installsize); char *num; // round to nearest M or k. - if (isize > (3*1024*1024)) { - num = main_format_number((isize+(512*1024))/(1024*1024)); + if (isize > (3 * 1024 * 1024)) { + num = main_format_number((isize + (512 * 1024)) / (1024 * 1024)); mod_info->installsize = g_strdup_printf("%sM", num); } else { - num = main_format_number((isize+512)/1024); + num = main_format_number((isize + 512) / 1024); mod_info->installsize = g_strdup_printf("%sk", num); } @@ -202,8 +211,8 @@ mod_info->is_devotional = (feature && !strcmp(feature, "DailyDevotion")); char *category = (char *)module->getConfigEntry("Category"); - mod_info->is_maps = (category && !strcmp(category, "Maps")); - mod_info->is_images = (category && !strcmp(category, "Images")); + mod_info->is_maps = (category && !strcmp(category, "Maps")); + mod_info->is_images = (category && !strcmp(category, "Images")); mod_info->is_glossary = (category && !strcmp(category, "Glossaries")); mod_info->is_cult = (category && @@ -216,15 +225,15 @@ mod_info->description = g_strdup(module->getDescription()); mod_info->locked = ((module->getConfigEntry("CipherKey")) ? 1 : 0); - list_it++; - return (MOD_MGR *) mod_info; + ++list_it; + g_free(name); + return (MOD_MGR *)mod_info; } } - g_free(mod_info); + g_free(mod_info); return NULL; } - /****************************************************************************** * Name * backend_module_mgr_remote_list_modules @@ -254,7 +263,6 @@ list_end = source->second->getMgr()->Modules.end(); } - /****************************************************************************** * Name * backend_module_mgr_list_local_modules @@ -273,14 +281,13 @@ void backend_module_mgr_list_local_modules_init(bool for_install) { - if (for_install){ - list_it = list_mgr->Modules.begin(); - list_end = list_mgr->Modules.end(); - } - else{ - list_it = mgr->Modules.begin(); - list_end = mgr->Modules.end(); - } + if (for_install) { + list_it = list_mgr->Modules.begin(); + list_end = list_mgr->Modules.end(); + } else { + list_it = mgr->Modules.begin(); + list_end = mgr->Modules.end(); + } } /****************************************************************************** @@ -304,7 +311,7 @@ const char *modName) { SWModule *module; - SWMgr *tmp_mgr; + SWMgr *tmp_mgr; int retval = -1; if (dir) tmp_mgr = new SWMgr(dir); @@ -314,7 +321,7 @@ ModMap::iterator it = tmp_mgr->Modules.find(modName); if (it == tmp_mgr->Modules.end()) { printf("Couldn't find module [%s] to remove\n", - modName); + modName); return -1; } module = it->second; @@ -323,7 +330,6 @@ return retval; } - /****************************************************************************** * Name * backend_remote_install_module @@ -349,7 +355,7 @@ installMgr->sources.find(sourceName); if (source == installMgr->sources.end()) { printf("Couldn't find remote source [%s]\n", - sourceName); + sourceName); return -1; } InstallSource *is = source->second; @@ -357,9 +363,8 @@ ModMap::iterator it = rmgr->Modules.find(modName); if (it == rmgr->Modules.end()) { printf("Remote source [%s] does not make available module [%s]\n", - sourceName, modName); + sourceName, modName); return -1; - } SWMgr dmgr((destdir ? destdir : settings.path_to_mods), @@ -367,7 +372,6 @@ return installMgr->installModule(&dmgr, 0, modName, is); } - /****************************************************************************** * Name * backend_local_install_module @@ -388,12 +392,11 @@ const char *srcdir, const char *mod_name) { - SWMgr lmgr((destdir ? destdir : settings.path_to_mods), + SWMgr lmgr((destdir ? destdir : settings.path_to_mods), true, 0, false, false); return installMgr->installModule(&lmgr, srcdir, mod_name); } - /****************************************************************************** * Name * backend_module_mgr_list_remote_sources @@ -412,22 +415,21 @@ GList *backend_module_mgr_list_remote_sources(void) { - MOD_MGR_SOURCE *mms; GList *retval = NULL; const gchar *envhomedir = g_getenv(HOMEVAR); SWBuf baseDir = (envhomedir) ? envhomedir : "."; baseDir += "/" DOTSWORD "/InstallMgr"; + InstallMgr *inst_mgr = new InstallMgr(baseDir, (StatusReporter *)0, - (SWBuf)"ftp", - (SWBuf)"xiphos@xiphos.org" - ); + (SWBuf) "ftp", + (SWBuf) ftp_password()); inst_mgr->setUserDisclaimerConfirmed(true); for (InstallSourceMap::iterator it = - inst_mgr->sources.begin(); - it != inst_mgr->sources.end(); it++) { - mms = g_new(MOD_MGR_SOURCE, 1); + inst_mgr->sources.begin(); + it != inst_mgr->sources.end(); ++it) { + MOD_MGR_SOURCE *mms = g_new(MOD_MGR_SOURCE, 1); mms->caption = g_strdup(it->second->caption); mms->type = g_strdup(it->second->type); mms->source = g_strdup(it->second->source); @@ -435,13 +437,12 @@ mms->user = g_strdup(it->second->u); mms->pass = g_strdup(it->second->p); mms->uid = g_strdup(it->second->uid); - retval = g_list_append(retval, (MOD_MGR_SOURCE *) mms); + retval = g_list_append(retval, (MOD_MGR_SOURCE *)mms); } delete inst_mgr; return retval; } - /****************************************************************************** * Name * backend_module_mgr_list_local_sources @@ -460,12 +461,11 @@ GList *backend_module_mgr_list_local_sources(void) { - MOD_MGR_SOURCE *mms; GList *retval = NULL; const gchar *envhomedir = g_getenv(HOMEVAR); SWBuf confPath = (envhomedir) ? envhomedir : "."; confPath += "/" DOTSWORD "/InstallMgr/InstallMgr.conf"; - SWConfig *installConf= new SWConfig(confPath.c_str()); + SWConfig *installConf = new SWConfig(confPath.c_str()); SectionMap::iterator sourcesSection; ConfigEntMap::iterator sourceBegin; @@ -477,9 +477,9 @@ sourceEnd = sourcesSection->second.upper_bound("DIRSource"); while (sourceBegin != sourceEnd) { - mms = g_new(MOD_MGR_SOURCE, 1); + MOD_MGR_SOURCE *mms = g_new(MOD_MGR_SOURCE, 1); InstallSource *is = new InstallSource("DIR", - sourceBegin->second.c_str()); + sourceBegin->second.c_str()); mms->caption = is->caption; mms->type = is->type; mms->source = is->source; @@ -487,15 +487,14 @@ mms->user = is->u; mms->pass = is->p; mms->uid = is->uid; - retval = g_list_append(retval,(MOD_MGR_SOURCE*) mms); - sourceBegin++; + retval = g_list_append(retval, (MOD_MGR_SOURCE *)mms); + ++sourceBegin; } } delete installConf; return retval; } - /****************************************************************************** * Name * backend_module_mgr_refresh_remote_source @@ -518,7 +517,7 @@ if (source == installMgr->sources.end()) { printf("Couldn't find remote source [%s]\n", - sourceName); + sourceName); return 1; } installMgr->refreshRemoteSource(source->second); @@ -639,7 +638,6 @@ installMgr->readInstallConf(); } - /****************************************************************************** * Name * backend_module_mgr_add_source @@ -663,14 +661,14 @@ * void */ -void backend_module_mgr_add_source(const char * vtype, - const char * type, - const char * caption, - const char * source, - const char * directory, - const char * user, - const char * pass, - const char * uid) +void backend_module_mgr_add_source(const char *vtype, + const char *type, + const char *caption, + const char *source, + const char *directory, + const char *user, + const char *pass, + const char *uid) { const gchar *envhomedir = g_getenv(HOMEVAR); SWBuf confPath = (envhomedir) ? envhomedir : "."; @@ -687,7 +685,7 @@ is.p = pass; is.uid = uid; config.Sections["Sources"].insert(ConfigEntMap::value_type(vtype, - is.getConfEnt().c_str())); + is.getConfEnt().c_str())); config.Save(); } @@ -711,14 +709,14 @@ gboolean augment, gboolean regular) { - // complicated overloading just to init a swmgr. - // beyond the directory, we send in 3 defaults plus "something." - // autoload -> true - // filtermgr -> null (0) - // multimod -> false - // AUGMENTHOME -> are we setting the regular mgr? - // then "as sent" ([a] total list or [b] per-area list) - // else "false for local install" (always per-area) +// complicated overloading just to init a swmgr. +// beyond the directory, we send in 3 defaults plus "something." +// autoload -> true +// filtermgr -> null (0) +// multimod -> false +// AUGMENTHOME -> are we setting the regular mgr? +// then "as sent" ([a] total list or [b] per-area list) +// else "false for local install" (always per-area) #ifdef CHATTY GTimer *t; @@ -726,10 +724,10 @@ t = g_timer_new(); #endif - if (regular) { // use main (regular) swmgr. + if (regular) { // use main (regular) swmgr. if (mgr) delete mgr; - mgr = new SWMgr(dir, true, 0, false, augment); + mgr = new SWMgr(dir, true, 0, false, augment); } else { if (list_mgr) delete list_mgr; @@ -752,8 +750,8 @@ delete installMgr; installMgr = new InstallMgr(baseDir, statusReporter, - (SWBuf)"ftp", - (SWBuf)"xiphos@xiphos.org"); + (SWBuf) "ftp", + (SWBuf) ftp_password()); installMgr->setUserDisclaimerConfirmed(true); } @@ -800,6 +798,6 @@ installMgr = NULL; delete mgr; mgr = NULL; - delete list_mgr; + delete list_mgr; list_mgr = NULL; } diff -Nru xiphos-4.0.0+dfsg1/src/backend/module_manager.hh xiphos-4.0.4+dfsg1/src/backend/module_manager.hh --- xiphos-4.0.0+dfsg1/src/backend/module_manager.hh 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/module_manager.hh 2015-03-29 17:01:08.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_manager.hh * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,8 @@ #ifndef __MODULE_MANAGER_HH__ #define __MODULE_MANAGER_HH__ +#ifdef __cplusplus + #include #include #include @@ -32,12 +34,14 @@ using namespace std; using namespace sword; -class GSStatusReporter : public StatusReporter { +class GSStatusReporter : public StatusReporter +{ virtual void statusUpdate(double dltotal, double dlnow); virtual void preStatus(long totalBytes, long completedBytes, const char *message); }; -class ModuleManager { +class ModuleManager +{ SWMgr *mgr; SWMgr *list_mgr; InstallMgr *installMgr; @@ -45,25 +49,38 @@ ModMap::iterator end; GSStatusReporter *statusReporter; SWBuf baseDir; -public: + + public: ModuleManager(); ~ModuleManager(); void init_ModuleManager(void); - + SWBuf ftp_password(); }; +inline SWBuf ftp_password() +{ + return +#ifdef WIN32 + (SWBuf) "W" +#else + (SWBuf) "L" +#endif + + (SWBuf) VERSION + + (SWBuf) "@xiphos.org"; +} -#ifdef __cplusplus extern "C" { + +void backend_module_mgr_list_local_modules_init(bool for_install); + #endif #include "main/mod_mgr.h" -char *backend_mod_mgr_get_config_entry(const char * module_name, char * entry); +char *backend_mod_mgr_get_config_entry(char *module_name, const char *entry); void backend_mod_mgr_init_language_map(void); MOD_MGR *backend_module_mgr_get_next_module(void); GList *backend_module_mgr_list_remote_sources(void); GList *backend_module_mgr_list_local_sources(void); -void backend_module_mgr_list_local_modules_init(bool for_install); int backend_local_install_module(const char *destdir, const char *srcdir, const char *mod_name); @@ -82,14 +99,14 @@ int backend_init_module_mgr_config_extras(void); void backend_module_mgr_clear_config(void); void backend_module_mgr_reread_config(void); -void backend_module_mgr_add_source(const char * vtype, - const char * type, - const char * caption, - const char * source, - const char * directory, - const char * user, - const char * pass, - const char * uid); +void backend_module_mgr_add_source(const char *vtype, + const char *type, + const char *caption, + const char *source, + const char *directory, + const char *user, + const char *pass, + const char *uid); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/backend/sword_main.cc xiphos-4.0.4+dfsg1/src/backend/sword_main.cc --- xiphos-4.0.0+dfsg1/src/backend/sword_main.cc 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/sword_main.cc 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_main.cc - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -57,7 +57,7 @@ BackEnd *backend = NULL; // rule of thumb for VerseKey usage: you can use -// VerseKey k = (VerseKey *)(SWKey *)(*mod); +// VerseKey k = dynamic_cast(mod->getKey()); // if you intend to do nothing more than setText() once plus // some gets (getTestament, getBook, getChapter, getVerse), // with no need to garbage collect when you're done. @@ -81,7 +81,6 @@ #endif main_mgr = new SWMgr(new MarkupFilterMgr(FMT_XHTML)); - //main_mgr->augmentModules("/home/terry/Dropbox/sword/"); #ifdef CHATTY g_timer_stop(t); @@ -91,14 +90,14 @@ display_mod = NULL; tree_key = NULL; - commDisplay = 0; - bookDisplay = 0; - dictDisplay = 0; - textDisplay = 0; - entryDisplay = 0; - chapDisplay = 0; - verselistDisplay = 0; - viewerDisplay = 0; + commDisplay = 0; + bookDisplay = 0; + dictDisplay = 0; + textDisplay = 0; + entryDisplay = 0; + chapDisplay = 0; + verselistDisplay = 0; + viewerDisplay = 0; } BackEnd::~BackEnd() @@ -123,24 +122,24 @@ if (viewerDisplay) delete viewerDisplay; - commDisplay = 0; - bookDisplay = 0; - dictDisplay = 0; - textDisplay = 0; - entryDisplay = 0; - chapDisplay = 0; - verselistDisplay = 0; - viewerDisplay = 0; + commDisplay = 0; + bookDisplay = 0; + dictDisplay = 0; + textDisplay = 0; + entryDisplay = 0; + chapDisplay = 0; + verselistDisplay = 0; + viewerDisplay = 0; } - void BackEnd::init_SWORD(int gsType) { ModMap::iterator it; if (gsType == 0) { main_setup_displays(); for (it = main_mgr->Modules.begin(); - it != main_mgr->Modules.end(); it++) { + it != main_mgr->Modules.end(); + ++it) { display_mod = (*it).second; if (!strcmp(display_mod->getType(), TEXT_MODS)) { display_mod->setDisplay(textDisplay); @@ -156,7 +155,9 @@ } } } else if (gsType == 1) { // dialogs - for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) { + for (it = main_mgr->Modules.begin(); + it != main_mgr->Modules.end(); + ++it) { display_mod = (*it).second; if (!strcmp(display_mod->getType(), TEXT_MODS)) { display_mod->setDisplay(chapDisplay); @@ -165,87 +166,95 @@ } } } else if (gsType == 2) { // search - for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) { + for (it = main_mgr->Modules.begin(); + it != main_mgr->Modules.end(); + ++it) { display_mod = (*it).second; display_mod->setDisplay(entryDisplay); } } } -void BackEnd::init_lists(MOD_LISTS * mods) +void BackEnd::init_lists(MOD_LISTS *mods) { ModMap::iterator it; for (it = main_mgr->Modules.begin(); - it != main_mgr->Modules.end(); it++) { - if (!strcmp((*it).second->getType(), TEXT_MODS)) { + it != main_mgr->Modules.end(); + ++it) { + SWModule *m = it->second; + const char *modtype = m->getType(); + const char *modname = m->getName(); + const char *abbreviation = m->getConfigEntry("Abbreviation"); + + if (abbreviation) { + main_add_abbreviation(modname, abbreviation); + } + + if (!strcmp(modtype, TEXT_MODS)) { mods->biblemods = g_list_append(mods->biblemods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); mods->text_descriptions = g_list_append(mods->text_descriptions, - strdup((char *) (*it).second-> - getDescription())); + strdup((char *)m->getDescription())); } - if (!strcmp((*it).second->getType(), COMM_MODS)) { + if (!strcmp(modtype, COMM_MODS)) { mods->commentarymods = g_list_append(mods->commentarymods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); mods->comm_descriptions = g_list_append(mods->comm_descriptions, - strdup((char *) (*it).second-> - getDescription())); - if (!strcmp((*it).second->getConfigEntry("ModDrv"), "RawFiles")) { - mods->percommods = g_list_append(mods->percommods, - strdup((char *) (*it).second->getName())); + strdup((char *)m->getDescription())); + if (!strcmp(m->getConfigEntry("ModDrv"), "RawFiles")) { + mods->percommods = g_list_append(mods->percommods, + strdup((char *)modname)); } } - if (!strcmp((*it).second->getType(), DICT_MODS)) { + if (!strcmp(modtype, DICT_MODS)) { char *feature = - (char *) (*it).second->getConfigEntry("Feature"); + (char *)m->getConfigEntry("Feature"); if (feature && !strcmp(feature, "DailyDevotion")) { mods->devotionmods = g_list_append(mods->devotionmods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); } else { mods->dictionarymods = g_list_append(mods->dictionarymods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); mods->dict_descriptions = g_list_append(mods->dict_descriptions, - strdup((char *) (*it).second-> - getDescription())); + strdup((char *)m->getDescription())); } } - if (!strcmp((*it).second->getType(), BOOK_MODS)) { - if ((*it).second->getConfigEntry("GSType") && - !strcmp((*it).second->getConfigEntry("GSType"), "PrayerList")) { - mods->prayermods = - g_list_append(mods->prayermods, - strdup((char *) (*it).second->getName())); + if (!strcmp(modtype, BOOK_MODS)) { + if (m->getConfigEntry("GSType") && + !strcmp(m->getConfigEntry("GSType"), "PrayerList")) { + mods->prayermods = + g_list_append(mods->prayermods, + strdup((char *)modname)); } else { mods->bookmods = g_list_append(mods->bookmods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); mods->book_descriptions = g_list_append(mods->book_descriptions, - strdup((char *) (*it).second-> - getDescription())); + strdup((char *)m->getDescription())); } } - char *category = (char *) (*it).second->getConfigEntry("Category"); + char *category = (char *)m->getConfigEntry("Category"); if (!category) continue; if (!strcmp(category, "Maps")) mods->mapmods = g_list_append(mods->mapmods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); if (!strcmp(category, "Images")) mods->imagemods = g_list_append(mods->imagemods, - strdup((char *) (*it).second->getName())); + strdup((char *)modname)); } } @@ -263,8 +272,8 @@ { ModMap::iterator it = main_mgr->Modules.find(module_name); return ((it != main_mgr->Modules.end()) - ? it->second - : NULL); + ? it->second + : NULL); } GList *BackEnd::get_module_options(void) @@ -272,13 +281,13 @@ GList *options = NULL; StringList optionslist = main_mgr->getGlobalOptions(); for (StringList::iterator it = optionslist.begin(); - it != optionslist.end(); it++) { - options = g_list_append(options, strdup((char *) (*it).c_str())); + it != optionslist.end(); ++it) { + options = g_list_append(options, strdup((char *)(*it).c_str())); } return options; } -int BackEnd::has_option(const char * module_name, const char * key, const char * option) +int BackEnd::has_option(const char *module_name, const char *key, const char *option) { SWModule *mod = get_SWModule(module_name); @@ -288,12 +297,12 @@ return 0; } -int BackEnd::has_global_option(const char * module_name, const char * option) +int BackEnd::has_global_option(const char *module_name, const char *option) { return has_option(module_name, "GlobalOptionFilter", option); } -char *BackEnd::get_config_entry(char * module_name, char * entry) +char *BackEnd::get_config_entry(char *module_name, char *entry) { if ((this == NULL) || (main_mgr == NULL)) return NULL; @@ -301,30 +310,31 @@ SWModule *mod = get_SWModule(module_name); if (mod) { - return g_strdup((char *) mod->getConfigEntry(entry)); + return g_strdup((char *)mod->getConfigEntry(entry)); } else return NULL; } -void BackEnd::set_cipher_key(char * module_name, char * key) +void BackEnd::set_cipher_key(char *module_name, char *key) { main_mgr->setCipherKey(module_name, key); } -int BackEnd::is_Bible_key(const char *module_name, const char * list, const char * current_key) +int BackEnd::is_Bible_key(const char *module_name, const char *list, const char *current_key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 0; + if (!mod) + return 0; VerseKey *key = dynamic_cast(mod->getKey()); - if (!key) return 0; + if (!key) + return 0; key->setText(current_key); ListKey vs = key->parseVerseList(list, *key); return vs.getCount(); } - char *BackEnd::get_render_text(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); @@ -342,12 +352,12 @@ if (mod) { mod->setKey(key); - return strdup((char *) mod->getRawEntry()); + return strdup((char *)mod->getRawEntry()); } return NULL; } -char *BackEnd::render_this_text(const char * module_name, const char * text) +char *BackEnd::render_this_text(const char *module_name, const char *text) { SWModule *mod = get_SWModule(module_name); @@ -357,12 +367,12 @@ return NULL; } -char *BackEnd::get_strip_text_from_string(const char * module_name, const char *string) +char *BackEnd::get_strip_text_from_string(const char *module_name, const char *string) { SWModule *mod = get_SWModule(module_name); if (mod) { - return strdup((char *) mod->stripText(string)); + return strdup((char *)mod->stripText(string)); } return NULL; } @@ -372,16 +382,16 @@ if (mod) { mod->setKey(key); - return strdup((char *) mod->stripText()); + return strdup((char *)mod->stripText()); } return NULL; } - char *BackEnd::get_valid_key(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return strdup("Gen.1.1"); + if (!mod) + return strdup("Gen.1.1"); VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); char *mykey; @@ -393,43 +403,45 @@ // what's with this flagrant anglocentrism? if (sword_locale && !strcmp(sword_locale, "en")) - mykey = strdup((char*)vkey->getShortText()); + mykey = strdup((char *)vkey->getShortText()); else - mykey = strdup((char*)vkey->getText()); + mykey = strdup((char *)vkey->getText()); return mykey; } char *BackEnd::key_get_book(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return strdup("Genesis"); + if (!mod) + return strdup("Genesis"); VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); vkey->setAutoNormalize(1); vkey->setText(key); - char *s = strdup((char*)vkey->getBookName()); + char *s = strdup((char *)vkey->getBookName()); return s; } - int BackEnd::key_get_chapter(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); vkey->setAutoNormalize(1); vkey->setText(key); - int c = vkey->getChapter(); + int c = vkey->getChapter(); return c; } int BackEnd::key_get_verse(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); @@ -442,7 +454,8 @@ unsigned int BackEnd::key_chapter_count(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); @@ -452,11 +465,11 @@ return max; } - unsigned int BackEnd::key_verse_count(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *vkey = (VerseKey *)(SWKey *)(*mod); @@ -466,41 +479,37 @@ return max; } - char *BackEnd::get_module_key() { - display_mod->getRawEntry(); + display_mod->getRawEntry(); - return strdup((char*)display_mod->getKeyText()); + return strdup((char *)display_mod->getKeyText()); } -void BackEnd::save_entry(const char * entry) +void BackEnd::save_entry(const char *entry) { - display_mod->setEntry((const char *) entry); + display_mod->setEntry((const char *)entry); } - -void BackEnd::save_note_entry(const char * module, const char * key, const char * entry) +void BackEnd::save_note_entry(const char *module, const char *key, const char *entry) { display_mod = main_mgr->Modules[module]; if (display_mod) { display_mod->setKey(key); display_mod->getKeyText(); /* snap to entry */ - display_mod->setEntry((const char *) entry); - XI_message (("\nsave_note_entry\nmod: %s\nkey: %s\nentry: %s", - display_mod->getName(), display_mod->getKeyText(), - display_mod->renderText().c_str())); + display_mod->setEntry((const char *)entry); + XI_message(("\nsave_note_entry\nmod: %s\nkey: %s\nentry: %s", + display_mod->getName(), display_mod->getKeyText(), + display_mod->renderText().c_str())); } } - void BackEnd::delete_entry(void) { display_mod->deleteEntry(); } - const char *BackEnd::module_get_language(const char *module_name) { SWModule *mod = get_SWModule(module_name); @@ -510,18 +519,17 @@ return "unknown"; } - char **BackEnd::get_module_language_list(void) { char **retval; int i; - std::set < SWBuf > module_languages; - std::set < SWBuf > ::iterator ml_it; + std::set module_languages; + std::set::iterator ml_it; // create a set of unique language names in use by modules. ModMap::iterator it; - for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) + for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); ++it) module_languages.insert((*it).second->getLanguage()); // construct a list of char* from the uniquified set. @@ -534,21 +542,19 @@ return retval; } - int BackEnd::is_module(const char *module_name) { -// if (module_name == NULL) -// return 0; + // if (module_name == NULL) + // return 0; SWModule *mod = get_SWModule(module_name); return ((mod != NULL) ? 1 : 0); } - int BackEnd::module_type(const char *mod_name) { -// if ((!mod_name) || (strlen(mod_name) < 2)) -// return -1; + // if ((!mod_name) || (strlen(mod_name) < 2)) + // return -1; SWModule *mod = get_SWModule(mod_name); @@ -559,7 +565,7 @@ } if (!strcmp(mod->getType(), COMM_MODS)) { - if (!strcmp((char *) mod->getConfigEntry("ModDrv"), "RawFiles")) + if (!strcmp((char *)mod->getConfigEntry("ModDrv"), "RawFiles")) return PERCOM_TYPE; return COMMENTARY_TYPE; } @@ -570,7 +576,7 @@ if (!strcmp(mod->getType(), BOOK_MODS)) { if (mod->getConfigEntry("GSType") && - !strcmp((char *) mod->getConfigEntry("GSType"), "PrayerList")) + !strcmp((char *)mod->getConfigEntry("GSType"), "PrayerList")) return PRAYERLIST_TYPE; return BOOK_TYPE; } @@ -600,18 +606,18 @@ return NULL; for (it = main_mgr->Modules.begin(); - it != main_mgr->Modules.end(); it++) { + it != main_mgr->Modules.end(); ++it) { if (!strcmp((*it).second->getDescription(), description)) retval = strdup((*it).second->getName()); } return retval; } - int BackEnd::get_key_testament(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *ikey = (VerseKey *)(SWKey *)(*mod); @@ -652,17 +658,16 @@ } switch (testament) { - case 1: - return ot > 0; - case 2: - return nt > 0; - default: - return false; + case 1: + return ot > 0; + case 2: + return nt > 0; + default: + return false; } } - -int BackEnd::module_get_testaments(const char * module_name) +int BackEnd::module_get_testaments(const char *module_name) { SWModule *module = get_SWModule(module_name); @@ -677,18 +682,18 @@ key->setText(module->getKeyText()); if (key->getTestament() == 1) { // OT && NT - ot = 1; + ot = 1; } else if (key->getTestament() == 2) { //no OT - ot = 0; + ot = 0; } *module = sword::BOTTOM; key->setText(module->getKeyText()); if (key->getTestament() == 1) { // only OT, no NT - nt = 0; + nt = 0; } else if (key->getTestament() == 2) { //has NT - nt = 1; + nt = 1; } delete key; @@ -722,7 +727,6 @@ return NULL; } - int BackEnd::set_module(const char *module_name) { display_mod = main_mgr->Modules[module_name]; @@ -730,7 +734,6 @@ return 1; else return 0; - } int BackEnd::set_module_key(const char *module_name, const char *key) @@ -740,10 +743,8 @@ if (display_mod) { display_mod->setKey(key); return 1; - } - else + } else return 0; - } int BackEnd::set_key(const char *key) @@ -751,36 +752,35 @@ if (!key) return 0; if (display_mod) { - XI_message((f_message,758,"key",key)); + XI_message((f_message, 758, "key", key)); display_mod->setKey(key); return 1; } return 0; - } char *BackEnd::get_key_from_offset(unsigned long offset) { if (tree_key) { - TreeKeyIdx treenode = *tree_key; - treenode.setOffset(offset); - /** if not root node then display **/ - if (treenode.getOffset() > 0) { + TreeKeyIdx treenode = *tree_key; + treenode.setOffset(offset); + /** if not root node then display **/ + if (treenode.getOffset() > 0) { display_mod->setKey(treenode); - display_mod->getKeyText(); //snap to entry - } + display_mod->getKeyText(); //snap to entry + } return strdup(display_mod->getKeyText()); - } - return NULL; + } + return NULL; } -unsigned long BackEnd::treekey_set_key(char * key) +unsigned long BackEnd::treekey_set_key(char *key) { if (tree_key) { TreeKeyIdx treenode = *tree_key; treenode.setText(key); display_mod->setKey(treenode); - display_mod->getKeyText(); //snap to entry + display_mod->getKeyText(); //snap to entry return treenode.getOffset(); } return 0; @@ -796,112 +796,103 @@ } if (tree_key) delete tree_key; - tree_key = (TreeKeyIdx *) display_mod->createKey(); + tree_key = (TreeKeyIdx *)display_mod->createKey(); if (tree_key) { - TreeKeyIdx treenode = *tree_key; - treenode.setOffset(offset); - /** if not root node then display **/ - if (treenode.getOffset() > 0) { + TreeKeyIdx treenode = *tree_key; + treenode.setOffset(offset); + /** if not root node then display **/ + if (treenode.getOffset() > 0) { display_mod->setKey(treenode); - display_mod->getKeyText(); //snap to entry - } - } + display_mod->getKeyText(); //snap to entry + } + } } -unsigned long BackEnd::get_treekey_offset_from_key(const char * module_name, const char * key) +unsigned long BackEnd::get_treekey_offset_from_key(const char *module_name, const char *key) { SWModule *mod = get_SWModule(module_name); unsigned long retval = 0; if (mod) { - TreeKeyIdx *tree_key_idx = (TreeKeyIdx *) mod->createKey(); + TreeKeyIdx *tree_key_idx = (TreeKeyIdx *)mod->createKey(); tree_key_idx->setText(key); mod->setKey(tree_key_idx); //(char*)mod; retval = tree_key_idx->getOffset(); delete tree_key_idx; } - return retval; + return retval; } - unsigned long BackEnd::get_treekey_offset(void) { - if (tree_key) - return tree_key->getOffset(); - return 0; + if (tree_key) + return tree_key->getOffset(); + return 0; } - int BackEnd::treekey_has_children(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); + if (tree_key) { + tree_key->setOffset(offset); return tree_key->hasChildren(); - } - return false; + } + return false; } - int BackEnd::treekey_first_child(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); + if (tree_key) { + tree_key->setOffset(offset); return tree_key->firstChild(); } - return false; + return false; } - int BackEnd::treekey_parent(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); + if (tree_key) { + tree_key->setOffset(offset); return tree_key->parent(); } - return false; + return false; } - char *BackEnd::treekey_get_local_name(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); - return strdup((char *) tree_key->getLocalName()); - } - return NULL; + if (tree_key) { + tree_key->setOffset(offset); + return strdup((char *)tree_key->getLocalName()); + } + return NULL; } - int BackEnd::treekey_next_sibling(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); - if (tree_key->nextSibling()) { + if (tree_key) { + tree_key->setOffset(offset); + if (tree_key->nextSibling()) { return 1; } - } - return 0; + } + return 0; } - - int BackEnd::treekey_prev_sibling(unsigned long offset) { - if (tree_key) { - tree_key->setOffset(offset); - if (tree_key->previousSibling()) { + if (tree_key) { + tree_key->setOffset(offset); + if (tree_key->previousSibling()) { return 1; } - } - return 0; + } + return 0; } - char *BackEnd::navigate_module(int direction) { if (direction == -1) - return strdup((char *) display_mod->getKeyText()); + return strdup((char *)display_mod->getKeyText()); switch (direction) { case 0: @@ -912,13 +903,14 @@ break; } display_mod->popError(); - return strdup((char *) display_mod->getKeyText()); + return strdup((char *)display_mod->getKeyText()); } -GList *BackEnd::parse_verse_list(const char *module_name, const char * list, char * current_key) +GList *BackEnd::parse_verse_list(const char *module_name, const char *list, char *current_key) { SWModule *mod = get_SWModule(module_name); - if (!mod) return NULL; + if (!mod) + return NULL; VerseKey *key = (VerseKey *)(SWKey *)(*mod); GList *retlist = NULL; @@ -926,23 +918,24 @@ if (!list) return retlist; - XI_message(("current_key=%s",current_key)); + XI_message(("current_key=%s", current_key)); key->setText(current_key); vs = key->parseVerseList(list, *key, TRUE); if (!vs.getCount()) return retlist; while (!vs.popError()) { - retlist = g_list_append(retlist, strdup((char*)vs.getText())); + retlist = g_list_append(retlist, strdup((char *)vs.getText())); vs++; } return retlist; } -GList *BackEnd::parse_range_list(const char * module_name, const char * list) +GList *BackEnd::parse_range_list(const char *module_name, const char *list) { SWModule *mod = get_SWModule(module_name); - if (!mod) return NULL; + if (!mod) + return NULL; VerseKey *key = (VerseKey *)(SWKey *)(*mod); GList *retlist = NULL; @@ -977,7 +970,7 @@ static char retval[128]; while (!results.popError()) { - (void) g_strlcpy(retval, results.getText(), 126); + (void)g_strlcpy(retval, results.getText(), 126); results++; return retval; } @@ -993,13 +986,14 @@ int BackEnd::clear_search_list(void) { search_scope_list.clear(); - return search_scope_list.getCount (); + return search_scope_list.getCount(); } -int BackEnd::set_range(const char *module_name, const char * list) +int BackEnd::set_range(const char *module_name, const char *list) { SWModule *mod = get_SWModule(module_name); - if (!mod) return 0; + if (!mod) + return 0; VerseKey *key = (VerseKey *)(SWKey *)(*mod); @@ -1015,7 +1009,7 @@ int BackEnd::set_scope2last_search(void) { - current_scope = &search_scope_list;//-- move searchlist into current_scope + current_scope = &search_scope_list; //-- move searchlist into current_scope return 1; } @@ -1031,7 +1025,7 @@ search_mod->deleteSearchFramework(); search_mod->createSearchFramework(main_index_percent_update, - (void *) &progressunits); + (void *)&progressunits); return 1; } @@ -1048,7 +1042,7 @@ return 1; } -int BackEnd::check_for_optimal_search(char * module_name) +int BackEnd::check_for_optimal_search(char *module_name) { search_mod = main_mgr->Modules[module_name]; @@ -1080,13 +1074,13 @@ return 0; results = search_mod->search(search_string, - search_type, - search_params, - current_scope, 0, - (is_dialog - ? main_dialog_search_percent_update - : main_sidebar_search_percent_update), - (void *) &progressunits); + search_type, + search_params, + current_scope, 0, + (is_dialog + ? main_dialog_search_percent_update + : main_sidebar_search_percent_update), + (void *)&progressunits); search_scope_list = results; if (search_type == -4) results.sort(); @@ -1099,23 +1093,23 @@ search_mod->terminateSearch = true; } -char *BackEnd::get_conf_file_item(const char * file, const char * mod_name, const char * item) +char *BackEnd::get_conf_file_item(const char *file, const char *mod_name, const char *item) { char *buf = NULL; SWConfig conf_file(file); conf_file.Load(); - buf = (char *) conf_file[mod_name][item].c_str(); + buf = (char *)conf_file[mod_name][item].c_str(); if (strlen(buf)) return strdup(buf); else return NULL; } -void BackEnd::save_conf_file_item(const char * file, - const char * mod_name, - const char * item, - const char * value) +void BackEnd::save_conf_file_item(const char *file, + const char *mod_name, + const char *item, + const char *value) { SWConfig conf_file(file); conf_file[mod_name][item] = value; diff -Nru xiphos-4.0.0+dfsg1/src/backend/sword_main.hh xiphos-4.0.4+dfsg1/src/backend/sword_main.hh --- xiphos-4.0.0+dfsg1/src/backend/sword_main.hh 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/backend/sword_main.hh 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_main.hh - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -35,16 +35,17 @@ using std::list; using namespace sword; -class BackEnd { +class BackEnd +{ SWMgr *main_mgr; ListKey results; ListKey search_range; - ListKey search_scope_list; //--search list for searching verses found on last search + ListKey search_scope_list; //--search list for searching verses found on last search ListKey verses; SWKey *current_scope; SWModule *search_mod; -public: + public: TreeKeyIdx *tree_key; SWModule *display_mod; @@ -63,21 +64,21 @@ BackEnd(); ~BackEnd(); void init_SWORD(int gsType); - void init_lists(MOD_LISTS * mods); + void init_lists(MOD_LISTS *mods); const char *get_sword_version(void); SWModule *get_SWModule(const char *module_name); GList *get_module_options(void); int has_option(const char *mod_name, const char *key, const char *option); int has_global_option(const char *mod_name, const char *option); - void set_cipher_key(char * module_name, char * key); - char *get_config_entry(char * module_name, char * entry); - int is_Bible_key(const char *module_name, const char * list, const char * current_key); + void set_cipher_key(char *module_name, char *key); + char *get_config_entry(char *module_name, char *entry); + int is_Bible_key(const char *module_name, const char *list, const char *current_key); char *get_render_text(const char *module_name, const char *key); char *get_raw_text(const char *module_name, const char *key); - char *render_this_text(const char * module_name, const char * text); + char *render_this_text(const char *module_name, const char *text); char *get_strip_text(const char *module_name, const char *key); - char *get_strip_text_from_string(const char * module_name, const char *string); + char *get_strip_text_from_string(const char *module_name, const char *string); char *get_valid_key(const char *module_name, const char *key); char *key_get_book(const char *module_name, const char *key); int key_get_chapter(const char *module_name, const char *key); @@ -85,10 +86,9 @@ unsigned int key_chapter_count(const char *module_name, const char *key); unsigned int key_verse_count(const char *module_name, const char *key); - char *get_module_key(void); - void save_entry(const char * entry); - void save_note_entry(const char * module, const char * key, const char * entry); + void save_entry(const char *entry); + void save_note_entry(const char *module, const char *key, const char *entry); void delete_entry(void); int set_module_key(const char *module_name, const char *key); int set_key(const char *key); @@ -102,8 +102,8 @@ char *module_name_from_description(char *description); const char *module_get_language(const char *module_name); char **get_module_language_list(void); - int module_has_testament(const char * module_name, int testament); - int module_get_testaments(const char * module_name); + int module_has_testament(const char *module_name, int testament); + int module_get_testaments(const char *module_name); char *get_entry_attribute(const char *level1, const char *level2, @@ -113,34 +113,34 @@ char *get_key_from_offset(unsigned long offset); void set_treekey(unsigned long offset); unsigned long get_treekey_offset(void); - unsigned long get_treekey_offset_from_key(const char * mod_name, const char * key); + unsigned long get_treekey_offset_from_key(const char *mod_name, const char *key); int treekey_parent(unsigned long offset); int treekey_has_children(unsigned long offset); int treekey_first_child(unsigned long offset); char *treekey_get_local_name(unsigned long offset); - unsigned long treekey_set_key(char * key) ; + unsigned long treekey_set_key(char *key); int treekey_prev_sibling(unsigned long offset); int treekey_next_sibling(unsigned long offset); - GList *parse_verse_list(const char * module_name, const char * list, char * current_key); - GList *parse_range_list(const char * module_name, const char * list); + GList *parse_verse_list(const char *module_name, const char *list, char *current_key); + GList *parse_range_list(const char *module_name, const char *list); void set_listkey_position(char pos); const char *get_next_listkey(void); int clear_scope(void); int clear_search_list(void); - int set_range(const char *module_name, const char * list); + int set_range(const char *module_name, const char *list); void set_scope2range(void); int set_scope2last_search(void); - int check_for_optimal_search(char * module_name); + int check_for_optimal_search(char *module_name); int do_module_index(char *module_name); int do_module_delete_index(char *module_name); int do_module_search(char *module_name, const char *search_string, - int search_type, int search_params, int is_dialog); + int search_type, int search_params, int is_dialog); void terminate_search(); - char *get_conf_file_item(const char * file, const char * mod_name, const char * item); - void save_conf_file_item(const char * file, const char * mod_name, const char * item, const char * value); + char *get_conf_file_item(const char *file, const char *mod_name, const char *item); + void save_conf_file_item(const char *file, const char *mod_name, const char *item, const char *value); void save_module_key(char *mod_name, char *key); - SWMgr *get_mgr(void) {return(main_mgr);}; + SWMgr *get_mgr(void) { return (main_mgr); }; const char *get_osisref_from_key(const char *module, const char *key); }; extern BackEnd *backend; diff -Nru xiphos-4.0.0+dfsg1/src/biblesync/biblesync.cc xiphos-4.0.4+dfsg1/src/biblesync/biblesync.cc --- xiphos-4.0.0+dfsg1/src/biblesync/biblesync.cc 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/biblesync/biblesync.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,1190 +0,0 @@ -/* - * BibleSync library - * biblesync.cc - * - * Karl Kleinpaste, May 2014 - * - * All files related to implementation of BibleSync, including program - * source, READMEs, manual pages, and related similar documents, are in - * the public domain. As a matter of simple decency, your social - * obligations are to credit the source and to coordinate any changes you - * make back to the origin repository. These obligations are non- - * binding for public domain software, but they are to be seriously - * handled nonetheless. - */ - -// -// BibleSync - class implementation. -// - -using namespace std; - -#include - -// sync is a proper superset of announce & beacon, -// both inbound as well as outbound. -// in these 2 arrays of strings, sync-specific -// fields are placed after announce fields. -// see field_count in ReceiveInternal and Transmit. -static string inbound_required[] = { - BSP_APP_NAME, - BSP_APP_INSTANCE_UUID, - BSP_APP_USER, - BSP_MSG_PASSPHRASE, - BSP_MSG_SYNC_DOMAIN, - BSP_MSG_SYNC_VERSE, - BSP_MSG_SYNC_BIBLEABBREV, - BSP_MSG_SYNC_GROUP -}; - -static string outbound_fill[] = { - BSP_APP_NAME, - BSP_APP_VERSION, - BSP_APP_INSTANCE_UUID, - BSP_APP_OS, - BSP_APP_DEVICE, - BSP_APP_USER, - BSP_MSG_PASSPHRASE, - BSP_MSG_SYNC_DOMAIN, - BSP_MSG_SYNC_GROUP, - BSP_MSG_SYNC_BIBLEABBREV, - BSP_MSG_SYNC_ALTVERSE, - BSP_MSG_SYNC_VERSE // last: could go overly long, risk cutoff. -}; - -// BibleSync class constructor. -// args identify the user of the class, by application, version, and user. -BibleSync::BibleSync(string a, string v, string u) - : BibleSync_version(BIBLESYNC_VERSION_STR), - application(a), - version(v), - user(u), - receiving(false), - beacon_countdown(0), - mode(BSP_MODE_DISABLE), - nav_func(NULL), - passphrase("BibleSync"), - server_fd(-1), - client_fd(-1) -{ -#ifndef WIN32 - // cobble together a description of this machine. - struct utsname uts; - uname(&uts); - device = (string)uts.machine - + ": " - + uts.sysname - + " @ " - + uts.nodename; -#else - device = "Windows PC"; -#endif - - interface_addr.s_addr = htonl(0x7f000001); // 127.0.0.1 - - // identify ourselves uniquely. - uuid_gen(uuid); - uuid_dump(uuid, uuid_string); -} - -#define BSP (string)"BibleSync: " -#define EMPTY (string)"" - -// BibleSync class destructor. -// kill it all off. -BibleSync::~BibleSync() -{ - if ((client_fd >= 0) || (server_fd >= 0)) - Shutdown(); -} - -// mode choice and setup invocation. -BibleSync_mode BibleSync::setMode(BibleSync_mode m, - BibleSync_navigate n, - string p) -{ - if ((mode == BSP_MODE_DISABLE) || - ((mode != BSP_MODE_DISABLE) && - (n != NULL))) // oops. - { - mode = m; - if (p != "") - { - passphrase = p; // use existing. - } - nav_func = n; - if (mode == BSP_MODE_DISABLE) - Shutdown(); - } - else - { - Shutdown(); - } - - string result = Setup(); - if (result != "") - { - if (nav_func != NULL) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("network setup errors."), result); - Shutdown(); - } - - // nav xmitters also xmit periodic beacons. - // send one soon...but not right this instant. - // otherwise cancel it. - beacon_countdown = ((mode == BSP_MODE_PERSONAL) || - (mode == BSP_MODE_SPEAKER)) - ? 2 : 0; - - // going to speaker mode means speaker list has become irrelevant. - if (mode == BSP_MODE_SPEAKER) - { - clearSpeakers(); - } - - return mode; -} - -// network init w/listener start. -string BibleSync::Setup() -{ - string retval = ""; - bool ok_so_far = true; - - if (mode == BSP_MODE_DISABLE) - Shutdown(); - - else - { - // learn the address to which to assign for multicast. - InterfaceAddress(); - - // prepare both xmitter and recvr, even though one or the other might - // be not generally in use in classroom setting (viz. announce). - - // in "personal" mode, user is both server and client, because he - // receives nav from other programs, and sends nav to them, as peers. - - // speaker == "client" insofar as he xmits nav to audience. - if (client_fd < 0) - { - if ((client_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - { - ok_so_far = false; - retval += _(" client socket"); - } - else - { - // basic xmit socket initialization. - memset((char *) &client, 0, sizeof(client)); - client.sin_family = AF_INET; - client.sin_port = htons(BSP_PORT); - client.sin_addr.s_addr = inet_addr(BSP_MULTICAST); - - // enable listening to our own multicast via loopback. - char loop=1; - if (setsockopt(client_fd, IPPROTO_IP, IP_MULTICAST_LOOP, - (char *)&loop, sizeof(loop)) < 0) - { - ok_so_far = false; - retval += " IP_MULTICAST_LOOP"; - } - else - { - // multicast join. - if (setsockopt(client_fd, IPPROTO_IP, IP_MULTICAST_IF, - (char *)&interface_addr, - sizeof(interface_addr)) < 0) - { - ok_so_far = false; - retval += (string)" IP_MULTICAST_IF " - + inet_ntoa(interface_addr); - } - } - // client is now ready for sendto(2) calls. - } - } - - // one way or another, if we got this far with a valid socket, - // and the app is in a public mode, "TTL 0" privacy makes no sense. - if ((client_fd >= 0) && - ((mode == BSP_MODE_SPEAKER) || - (mode == BSP_MODE_AUDIENCE))) - { - setPrivate(false); - } - - // audience == "server" insofar as he recvs nav from speaker. - if (ok_so_far && (server_fd < 0)) - { - if ((server_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - { - ok_so_far = false; - retval += _(" server socket"); - } - else - { - int reuse = 1; - if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, - (char *)&reuse, sizeof(reuse)) < 0) - { - ok_so_far = false; - retval += " SO_REUSEADDR"; - } - - memset((char *) &server, 0, sizeof(server)); - server.sin_family = AF_INET; - server.sin_port = htons(BSP_PORT); - server.sin_addr.s_addr = INADDR_ANY; - - // make it receive-ready. - if (bind(server_fd, (struct sockaddr*)&server, - sizeof(server)) == -1) - { - ok_so_far = false; - retval += " bind"; - } - - // multicast join. - multicast_req.imr_multiaddr.s_addr = inet_addr(BSP_MULTICAST); - multicast_req.imr_interface.s_addr = interface_addr.s_addr; - if (setsockopt(server_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, - (char *)&multicast_req, sizeof(multicast_req)) - < 0) - { - ok_so_far = false; - retval += " IP_ADD_MEMBERSHIP"; - } - // bind(2) leaves us ready for recvfrom(2) calls. - } - } - - // now that we're alive, tell the network world that we're here. - if (retval == "") - Transmit(BSP_ANNOUNCE); - } - - return retval; -} - -// disposal of network access. -void BibleSync::Shutdown() -{ - // managed speaker list shutdown. - clearSpeakers(); - - // network shutdown. - close(server_fd); - close(client_fd); - server_fd = client_fd = -1; - - // internal shutdown. - mode = BSP_MODE_DISABLE; - nav_func = NULL; -} - -// pick the OS' generation flavor. -void BibleSync::uuid_gen(uuid_t &u) -{ -#ifndef WIN32 - uuid_generate(u); -#else - UuidCreate(&u); -#endif /* WIN32 */ -} - -// conversion of UUID to printable form. -void BibleSync::uuid_dump(uuid_t &u, char *destination) -{ - unsigned char *s = (unsigned char *)&u; - snprintf((char *)destination, BSP_UUID_PRINT_LENGTH, - "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", - s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], - s[8], s[9], s[10], s[11], s[12], s[13], s[14], s[15]); -} - -// receiver, object-less, generally from C. -// to be called with "myself" as userdata. -// this exists so as to be able to dive from object-less C context -// into C++ context with reference to "this", the BibleSync object. -int BibleSync::Receive(void *myself) -{ - // dive back into object context. - return ((BibleSync *)myself)->ReceiveInternal(); -} - -// receiver, in C++ object context. -// note that, in expected usage, and per usage by glib's g_timeout_add(), -// return TRUE means the function is prepared to be called again, -// and return FALSE means the function calls should stop until something -// changes. we return FALSE only when mode has been set to BSP_MODE_DISABLE. -// ==> THEREFORE... -// whenever the application sets any enabled mode, it must also arrange for -// Receive() to begin being called regularly. - -#define DEBUG_LENGTH (4*BSP_MAX_SIZE) // print is bigger than raw - -int BibleSync::ReceiveInternal() -{ - if (mode == BSP_MODE_DISABLE) - return FALSE; // done: un-schedule polling. - - // nav_func unset => no point trying; no network => just leave. - if ((nav_func == NULL) || (server_fd < 0)) - return TRUE; - - char dump[DEBUG_LENGTH]; - struct sockaddr_in source; - BibleSyncMessage bsp; - int recv_size = 0; - - // anything non-empty here is at least legitimate network traffic. - // whether it passes muster for BibleSync is another matter. - while ((recv_size = InitSelectRead(dump, &source, &bsp)) > 0) - { - ((char*)&bsp)[recv_size] = '\0'; // as an ordinary C string - - // dump content into something humanly useful. - uuid_dump(bsp.uuid, uuid_dump_string); - snprintf(dump, DEBUG_LENGTH-1, - "[%s]\nmagic: 0x%08x\nversion: 0x%02x\ntype: 0x%02x (%s)\n" - "uuid: %s\n#pkt: %d\npkt index: %d\n\n-*- body -*-\n%s", - inet_ntoa(source.sin_addr), - ntohl(bsp.magic), bsp.version, - bsp.msg_type, ((bsp.msg_type == BSP_ANNOUNCE) - ? "announce" - : ((bsp.msg_type == BSP_SYNC) - ? "sync" - : ((bsp.msg_type == BSP_BEACON) - ? "beacon" - : "*???*"))), - uuid_dump_string, - bsp.num_packets, bsp.index_packet, - bsp.body); - - // validate message: fixed values. - if (bsp.magic != BSP_MAGIC) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad magic"), dump); - else if (bsp.version != BSP_PROTOCOL) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad protocol version"), dump); - else if ((bsp.msg_type != BSP_ANNOUNCE) && - (bsp.msg_type != BSP_SYNC) && - (bsp.msg_type != BSP_BEACON)) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad msg type"), dump); - else if (bsp.num_packets != 1) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad packet count"), dump); - else if (bsp.index_packet != 0) - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad packet index"), dump); - - // basic header sanity tests passed. now parse body content. - else - { - bool ok_so_far(true); - char *name, *value; - BibleSyncContent content; - - // structure test and content retrieval - // "name=value\n" for each. - for (char *s = bsp.body; ok_so_far && *s; ++s) - { - name = s; - // newline terminator of name/value pair. - if ((s = strchr(s, '\n')) == NULL) - { - ok_so_far = false; - break; - } - else - { - *s = '\0'; // NUL-terminate assignment (end of value). - - // separator ('=') between name and value. - if ((value = strchr(name, '=')) == NULL) - { - ok_so_far = false; - break; - } - else - { - *(value++) = '\0'; // NUL-terminate name. - - // valid content. - content[name] = value; - } - } - } - - if (!ok_so_far) - { - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("bad body format"), dump); - } - else - { - // verify minimum body content. - int field_count = ((bsp.msg_type == BSP_SYNC) - ? BSP_FIELDS_RECV_SYNC - : BSP_FIELDS_RECV_ANNOUNCE); // or beacon. - - for (int i = 0; i < field_count; ++i) - { - if (content.find(inbound_required[i]) == content.end()) - { - ok_so_far = false; - string info = BSP + _("missing required header ") - + inbound_required[i] - + "."; - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - info, dump); - // don't break -- find all missing. - } - } - - if (ok_so_far) - { - // find listening status for this guy. - string pkt_uuid = content.find(BSP_APP_INSTANCE_UUID)->second; - BibleSyncSpeakerMapIterator object = speakers.find(pkt_uuid); - string source_addr = inet_ntoa(source.sin_addr); - bool listening; - - // spoof & listen check: - if (object != speakers.end()) - { - // is some legit xmitter's UUID being borrowed? - if (object->second.addr != source_addr) // spoof? - { - // spock: "forbid...forbid!" - (*nav_func)('E', pkt_uuid, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("Spoof stopped: ") + pkt_uuid - + " from " + source_addr - + " instead of " - + object->second.addr, - dump); - continue; - } - listening = object->second.listen; - } - else - { - listening = false; // not in map => ignore. - } - - // loopback is enabled: reject self-uuid packets. - unsigned int i; - unsigned char *incoming = (unsigned char *)&uuid; - unsigned char *mine = (unsigned char *)&bsp.uuid; - for (i = 0; i < sizeof(uuid_t); ++i) - { - if (incoming[i] != mine[i]) - break; // not ourselves. - } - // if we end the loop without early break, - // then we matched UUID for ourselves. - // i.e. we're hearing an echo of ourselves. ignore. - if (i == sizeof(uuid_t)) - { -#if 0 - (*nav_func)('E', pkt_uuid, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("Ignoring echo."), dump); -#endif - continue; - } - - // give reference items initial filler content. - string bible = "<>", ref = "<>", alt = "<>", - group = "<>", domain = "<>", - info = "<>"; - char cmd; - - string version = content.find(BSP_APP_VERSION)->second; - if (version == "") - version = (string)"(version?)"; - - // generally good, so extract interesting content. - if (bsp.msg_type == BSP_SYNC) - { - // regular synchronized navigation - bible = content.find(BSP_MSG_SYNC_BIBLEABBREV)->second; - ref = content.find(BSP_MSG_SYNC_VERSE)->second; - alt = content.find(BSP_MSG_SYNC_ALTVERSE)->second; - group = content.find(BSP_MSG_SYNC_GROUP)->second; - domain = content.find(BSP_MSG_SYNC_DOMAIN)->second; - - if (domain != "BIBLE-VERSE") - { - cmd = 'E'; - info = BSP - + _("Domain not 'BIBLE-VERSE': ") - + domain; - } else if ((group.length() != 1) || - (group.c_str()[0] < '1') || - (group.c_str()[0] > '9')) - { - cmd = 'E'; - info = BSP - + _("Invalid group: ") - + group; - } - else if (((mode == BSP_MODE_PERSONAL) || // (receiver || - (mode == BSP_MODE_AUDIENCE)) && // receiver) && - listening && // being heard && - (passphrase == // match - content.find(BSP_MSG_PASSPHRASE)->second)) - { - cmd = 'N'; // navigation - } - else - { - cmd = 'M'; // mismatch - info = (string)"sync: " - + content.find(BSP_APP_USER)->second - + " @ " + source_addr; - } - } - else if (bsp.msg_type == BSP_ANNOUNCE) - { - // construct user's presence announcement - bible = content.find(BSP_APP_USER)->second; - ref = source_addr; - group = content.find(BSP_APP_NAME)->second - + " " + version; - domain = content.find(BSP_APP_DEVICE)->second; - - alt = BSP - + content.find(BSP_APP_USER)->second - + _(" present at ") - + source_addr - + _(" using ") - + group - + "."; - - info = (string)"announce: " - + content.find(BSP_APP_USER)->second - + " @ " + source_addr; - - cmd = ((passphrase == - content.find(BSP_MSG_PASSPHRASE)->second) - ? 'A' // presence announcement - : 'M'); // mismatch - } - else // bsp.msg_type == BSP_BEACON - { - bible = content.find(BSP_APP_USER)->second; - ref = source_addr; - group = content.find(BSP_APP_NAME)->second - + " " + version; - domain = content.find(BSP_APP_DEVICE)->second; - - info = (string)"beacon: " - + content.find(BSP_APP_USER)->second - + " @ " + source_addr; - - if (passphrase == - content.find(BSP_MSG_PASSPHRASE)->second) - { - cmd = ((object == speakers.end()) - ? 'S' // unknown: potential speaker. - : 'x'); // known: don't tell app again. - - unsigned int old_speakers_size, new_speakers_size; - old_speakers_size = speakers.size(); - - // whether previously known or not, - // a beacon (re)starts the aging countdown. - speakers[pkt_uuid].countdown = - BSP_BEACON_COUNT * BSP_BEACON_MULTIPLIER; - - new_speakers_size = speakers.size(); - - // record address for first-time-seen beacon, - // for anti-spoof checks in the future. - if (cmd == 'S') - speakers[pkt_uuid].addr = source_addr; - - if (mode == BSP_MODE_SPEAKER) - { - // speaker listens to no one. - speakers[pkt_uuid].listen = false; - } - else - { - // listen to 1st speaker, ignore everyone else. - // the app can make other choices. - if (cmd == 'S') - { - speakers[pkt_uuid].listen = - ((old_speakers_size == 0) && - (new_speakers_size == 1)); - } - // else someone previously known: don't touch. - } - } - else - { - cmd = 'M'; // mismatch. - } - } - - // delivery to application. - if (cmd != 'x') - { - receiving = true; // re-xmit lock. - (*nav_func)(cmd, pkt_uuid, - bible, ref, alt, group, domain, - info, dump); - receiving = false; // re-xmit unlock. - } - } - } - } - } - - // beacon-related tasks: others' aging and sending our beacon. - ageSpeakers(); - - if (((mode == BSP_MODE_PERSONAL) || - (mode == BSP_MODE_SPEAKER)) && - (--beacon_countdown == 0)) - { - Transmit(BSP_BEACON); - beacon_countdown = BSP_BEACON_COUNT; - } - - return TRUE; -} - -// network read access. -// do full initialization, no-wait select, and no-wait recvfrom -// to get potential nav data. returns size acquired. -// controls 'while' in ReceiveInternal(). -int BibleSync::InitSelectRead(char *dump, - struct sockaddr_in *source, - BibleSyncMessage *buffer) -{ - struct timeval tv = { 0, 0 }; // select returns immediately - fd_set read_set; - int recv_size = 0; -#ifndef WIN32 - // yes, really: - // linux insists on unsigned int, win32 insists on int. - // each complains bitterly of invalid conversion if wrongly used. - unsigned -#endif - int source_length = sizeof(*source); - - strcpy(dump, _("[no dump ready]")); // initial, pre-read filler - - FD_ZERO(&read_set); - FD_SET(server_fd, &read_set); - if (select(server_fd+1, &read_set, NULL, NULL, &tv) < 0) - { - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("select < 0"), dump); - return -1; - } - - if ((FD_ISSET(server_fd, &read_set)) && - ((recv_size = recvfrom(server_fd, (char *)buffer, BSP_MAX_SIZE, - 0, (sockaddr *)source, - &source_length)) < 0)) - { - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("recvfrom < 0"), dump); - return -1; - } - return recv_size; -} - -// speaker transmitter -// sanity checks for permission to xmit, -// then format and ship it. -BibleSync_xmit_status BibleSync::Transmit(char message_type, - string bible, - string ref, - string alt, - string group, - string domain) -{ - if (mode == BSP_MODE_DISABLE) - return BSP_XMIT_FAILED; - - if (receiving && (message_type == BSP_SYNC)) - return BSP_XMIT_RECEIVING; // if this occurs, app re-xmit'd. *NO*. - - if (client_fd < 0) - return BSP_XMIT_NO_SOCKET; - - if ((message_type != BSP_ANNOUNCE) && - (message_type != BSP_SYNC) && - (message_type != BSP_BEACON)) - return BSP_XMIT_BAD_TYPE; - - if ((mode == BSP_MODE_AUDIENCE) && - ((message_type == BSP_SYNC) || (message_type == BSP_BEACON))) - return BSP_XMIT_NO_AUDIENCE_XMIT; - - BibleSyncContent content; - BibleSyncMessage bsp; - string body = ""; - - // all name/value pairs. - content[BSP_APP_NAME] = application; - content[BSP_APP_VERSION] = version; - content[BSP_APP_USER] = user; - content[BSP_APP_DEVICE] = device; - content[BSP_APP_OS] = BSP_OS; - content[BSP_APP_INSTANCE_UUID] = uuid_string; - content[BSP_MSG_SYNC_BIBLEABBREV] = bible; - content[BSP_MSG_SYNC_VERSE] = ref; - content[BSP_MSG_SYNC_ALTVERSE] = alt; - content[BSP_MSG_SYNC_GROUP] = group; - content[BSP_MSG_SYNC_DOMAIN] = domain; - content[BSP_MSG_PASSPHRASE] = passphrase; - - // header. - bsp.magic = BSP_MAGIC; - bsp.version = BSP_PROTOCOL; - bsp.msg_type = message_type; - bsp.num_packets = 1; - bsp.index_packet = 0; - memcpy((void *)&bsp.uuid, (const void *)&uuid, sizeof(uuid_t)); - memset((void *)&bsp.reserved, 0, BSP_RES_SIZE); - - // body prep. - int field_count = ((message_type == BSP_SYNC) - ? BSP_FIELDS_XMIT_SYNC - : BSP_FIELDS_XMIT_ANNOUNCE); // or beacon. - - for (int i = 0; i < field_count; ++i) - { - body += outbound_fill[i] + "=" + content[outbound_fill[i]] + "\n"; - } - - // ship it. - strncpy(bsp.body, body.c_str(), BSP_MAX_PAYLOAD); - unsigned int xmit_size = min(BSP_MAX_SIZE, - BSP_HEADER_SIZE + body.length()); - - // force last == newline: attempt to preserve body format when long. - ((unsigned char*)&bsp)[BSP_MAX_SIZE-1] = '\n'; - - BibleSync_xmit_status retval; - if (sendto(client_fd, (char *)&bsp, xmit_size, 0, - (struct sockaddr *)&client, sizeof(client)) >= 0) - { - retval = BSP_XMIT_OK; - } - else - { - retval = BSP_XMIT_FAILED; - (*nav_func)('E', EMPTY, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - BSP + _("Transmit failed.\n"), - _("Unable to multicast; BibleSync is now disabled. " - "If your network connection changed while this program " - "was active, it may be sufficient to re-enable.")); - Shutdown(); - } - return retval; -} - -// -// privacy setting. -// only when in personal mode, allow setting TTL 0 -// so that packets do not leave this box. only programs -// running right here will hear. -// -bool BibleSync::setPrivate(bool privacy) -{ - if (mode != BSP_MODE_PERSONAL) - privacy = false; // regardless of caller intent. - - int ttl = (privacy ? 0 : 1); - - return (setsockopt(client_fd, IPPROTO_IP, IP_MULTICAST_TTL, - (char *)&ttl, sizeof(ttl)) >= 0); -} - -// -// user decision to listen or not to a certain speaker. -// speakerkey is the UUID given during (*nav_func)('S', ...). -// -void BibleSync::listenToSpeaker(bool listen, string speakerkey) -{ - BibleSyncSpeakerMapIterator object = speakers.find(speakerkey); - - if (object != speakers.end()) - { - object->second.listen = listen; - } -} - -// -// called from ReceiveInternal(). ages entries by one, waiting -// to reach zero. on zero, call (*nav_func)('D', ...) to inform -// the app that the speaker is dead, then eliminate the element. -// -void BibleSync::ageSpeakers() -{ - for (BibleSyncSpeakerMapIterator object = speakers.begin(); - object != speakers.end(); - /* no increment here */) - { - BibleSyncSpeakerMapIterator victim = object++; // loop increment - if (--(victim->second.countdown) == 0) - { - (*nav_func)('D', victim->first, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - EMPTY, EMPTY); - speakers.erase(victim); - } - } -} - -// -// unconditionally wipe the set of speakers clean. -// first, tell the app about each one, then clear. -// used when leaving Personal or Audience mode. -// -void BibleSync::clearSpeakers() -{ - if (nav_func != NULL) - { - for (BibleSyncSpeakerMapIterator object = speakers.begin(); - object != speakers.end(); - ++object) - { - (*nav_func)('D', object->first, - EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - EMPTY, EMPTY); - } - } - - speakers.clear(); -} - -#ifndef WIN32 - -#ifdef linux - -// routines below imported from the net as workable examples. -// in order to do multicast setup, we require the address -// of the interface that has our default route. code below -// finds the name of that interface. then getifaddrs(3) -// code (taken from its man page) lets us match that name -// against an entry that has the address we need. - -// extra includes needed only for the -// route & gateway discovery code below. - -#include -#include - -struct route_info -{ - struct in_addr dstAddr; - struct in_addr srcAddr; - struct in_addr gateWay; - char ifName[IF_NAMESIZE]; -}; - -int BibleSync::readNlSock(int sockFd, - char *bufPtr, - size_t buf_size, - unsigned int seqNum, - unsigned int pId) -{ - struct nlmsghdr *nlHdr; - int readLen = 0, msgLen = 0; - - do - { - if((readLen = recv(sockFd, bufPtr, buf_size - msgLen, 0)) < 0) - { - return -1; - } - - nlHdr = (struct nlmsghdr *)bufPtr; - - if((NLMSG_OK(nlHdr, readLen) == 0) || (nlHdr->nlmsg_type == NLMSG_ERROR)) - { - return -1; - } - - /* check if last message */ - if(nlHdr->nlmsg_type == NLMSG_DONE) - { - break; - } - else - { - /* else move pointer to buffer appropriately */ - bufPtr += readLen; - msgLen += readLen; - } - - /* check if multi part message */ - if((nlHdr->nlmsg_flags & NLM_F_MULTI) == 0) - { - /* return if its not */ - break; - } - } - while((nlHdr->nlmsg_seq != seqNum) || (nlHdr->nlmsg_pid != pId)); - - return msgLen; -} - -int BibleSync::parseRoutes(struct nlmsghdr *nlHdr, struct route_info *rtInfo) -{ - struct rtmsg *rtMsg; - struct rtattr *rtAttr; - int rtLen; - - rtMsg = (struct rtmsg *)NLMSG_DATA(nlHdr); - - /* if route is not AF_INET or not in main table, return. */ - if((rtMsg->rtm_family != AF_INET) || (rtMsg->rtm_table != RT_TABLE_MAIN)) - return -1; - - rtAttr = (struct rtattr *)RTM_RTA(rtMsg); - rtLen = RTM_PAYLOAD(nlHdr); - - for(; RTA_OK(rtAttr,rtLen); rtAttr = RTA_NEXT(rtAttr,rtLen)) - { - switch(rtAttr->rta_type) - { - case RTA_OIF: - if_indextoname(*(int *)RTA_DATA(rtAttr), rtInfo->ifName); - break; - - case RTA_GATEWAY: - memcpy(&rtInfo->gateWay, RTA_DATA(rtAttr), sizeof(rtInfo->gateWay)); - break; - - case RTA_PREFSRC: - memcpy(&rtInfo->srcAddr, RTA_DATA(rtAttr), sizeof(rtInfo->srcAddr)); - break; - - case RTA_DST: - memcpy(&rtInfo->dstAddr, RTA_DATA(rtAttr), sizeof(rtInfo->dstAddr)); - break; - } - } - - return 0; -} - -int BibleSync::get_default_if_name(char *name, socklen_t size) -{ - int found_default = 0; - - struct nlmsghdr *nlMsg; - //struct rtmsg *rtMsg; - struct route_info route_info; - char msgBuf[4096]; - - int sock, len, msgSeq = 0; - - name[1] = '\0'; // pre-set, in case of error. - - if((sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE)) < 0) - { - name[0] = 'x'; - return -1; - } - - memset(msgBuf, 0, sizeof(msgBuf)); - - nlMsg = (struct nlmsghdr *)msgBuf; - //rtMsg = (struct rtmsg *)NLMSG_DATA(nlMsg); - - nlMsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)); - nlMsg->nlmsg_type = RTM_GETROUTE; - - nlMsg->nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST; - nlMsg->nlmsg_seq = msgSeq++; - nlMsg->nlmsg_pid = getpid(); - - if(send(sock, nlMsg, nlMsg->nlmsg_len, 0) < 0) - { - name[0] = 'y'; - return -1; - } - - if((len = readNlSock(sock, msgBuf, sizeof(msgBuf), msgSeq, getpid())) < 0) - { - name[0] = 'z'; - return -1; - } - - for(; NLMSG_OK(nlMsg,len); nlMsg = NLMSG_NEXT(nlMsg,len)) - { - memset(&route_info, 0, sizeof(route_info)); - if ( parseRoutes(nlMsg, &route_info) < 0 ) - continue; // don't check: not set up - - if (strstr((char *)inet_ntoa(route_info.dstAddr), "0.0.0.0")) - { - // copy it over - strcpy(name, route_info.ifName); - found_default = 1; - break; - } - } - - close(sock); - return found_default; -} - -#include -#include - -void BibleSync::InterfaceAddress() -{ - // cancel any old interface value. - // we must fail with current info, if at all. - interface_addr.s_addr = htonl(0x7f000001); // 127.0.0.1 fallback - - char gw_if[IF_NAMESIZE]; // default gateway interface. - - (void)get_default_if_name(gw_if, 100); - - // if no error, search the interface list for that address. - if (gw_if[0] != '\0') - { - struct ifaddrs *ifaddr, *ifa; - - if (getifaddrs(&ifaddr) == -1) { - perror("getifaddrs"); - return; - } - - for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if (ifa->ifa_addr == NULL) - continue; - - if ((ifa->ifa_addr->sa_family == AF_INET) && - (strcmp(gw_if, ifa->ifa_name) == 0)) { - interface_addr.s_addr = - ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr; - break; - } - } - freeifaddrs(ifaddr); - } - return; -} - -#else /* linux */ - -// Solaris & BSD. - -// -// this seeming grotesqueness is in fact the most general command -// that could be found which finds the interface holding the default -// route and then collects that interface's address. handles both -// solaris and bsd. in fact, it suffices for linux as well, but -// we're leaving the existing code above in place for linux, if for -// no other reason than that it's more likely that someone will -// foolishly screw up ifconfig output format in the linux world. -// -#define ADDRESS "PATH=/sbin:/usr/sbin:/bin:/usr/bin " \ - "ifconfig \"`netstat -rn | egrep '^0\\.0\\.0\\.0|^default' | " \ - "tr ' ' '\\n' | sed -e '/^$/d' | tail -1`\" | grep 'inet ' | " \ - "tr ' ' '\\n' | grep '^[0-9.][0-9.]*$' | head -1 | tr -d '\\n'" - -void BibleSync::InterfaceAddress() -{ - // cancel any old interface value. - // we must fail with current info, if at all. - interface_addr.s_addr = htonl(0x7f000001); // 127.0.0.1 fallback - - FILE *c; - - if ((c = popen(ADDRESS, "r")) != NULL) - { - char addr_string[32]; - - fscanf(c, "%30s", addr_string); - interface_addr.s_addr = inet_addr(addr_string); - - pclose(c); - } - - return; -} - -#endif /* linux */ - -#else /* WIN32 */ - -void BibleSync::InterfaceAddress() -{ - // cancel any old interface value. - // we must fail with current info, if at all. - interface_addr.s_addr = htonl(0x7f000001); // 127.0.0.1 fallback - - // this code is rudely derived from, and courtesy of, - // http://tangentsoft.net/wskfaq/examples/getifaces.html - // to whom we are grateful. - - // this is more simplistic than the linux/unix case. - // here, we simply find a functioning multicast-capable interface. - - WSADATA WinsockData; - if (WSAStartup(MAKEWORD(2, 2), &WinsockData) != 0) { - return; - } - - SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0); - if (sd == SOCKET_ERROR) { - return; - } - - INTERFACE_INFO InterfaceList[20]; - unsigned long nBytesReturned; - if (WSAIoctl(sd, SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, - sizeof(InterfaceList), &nBytesReturned, 0, 0) - == SOCKET_ERROR) { - return; - } - - int nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO); - for (int i = 0; i < nNumInterfaces; ++i) { - - u_long nFlags = InterfaceList[i].iiFlags; - - if ((nFlags & IFF_UP) && // alive. - !(nFlags & IFF_LOOPBACK) && // not local. - (nFlags & IFF_MULTICAST)) // multicast-capable. - { - sockaddr_in *pAddress; - pAddress = (sockaddr_in *) & (InterfaceList[i].iiAddress); - - interface_addr.s_addr = pAddress->sin_addr.s_addr; - break; - } - } - return; -} -#endif /* WIN32 */ diff -Nru xiphos-4.0.0+dfsg1/src/biblesync/biblesync.hh xiphos-4.0.4+dfsg1/src/biblesync/biblesync.hh --- xiphos-4.0.0+dfsg1/src/biblesync/biblesync.hh 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/biblesync/biblesync.hh 1970-01-01 00:00:00.000000000 +0000 @@ -1,392 +0,0 @@ -/* - * BibleSync library - * biblesync.hh - * - * Karl Kleinpaste, May 2014 - * - * All files related to implementation of BibleSync, including program - * source, READMEs, manual pages, and related similar documents, are in - * the public domain. As a matter of simple decency, your social - * obligations are to credit the source and to coordinate any changes you - * make back to the origin repository. These obligations are non- - * binding for public domain software, but they are to be seriously - * handled nonetheless. - */ - -#ifndef __BIBLESYNC_HH__ -#define __BIBLESYNC_HH__ - -// XIPHOS-SPECIFIC - THIS #INCLUDE TO BE REMOVED WHEN -// BIBLESYNC IS EXTRICATED TO AN INDEPENDENT LIBRARY. -#include - -#include "biblesync-version.hh" - -// -// Bible Sync Protocol. -// http://biblesyncprotocol.wikispaces.com/ -// -// BSP provides a classroom type of arrangement, where one person -// (speaker) is in charge of inducing others' (audience) Bible -// software to navigate as speaker requires. The speaker only -// xmits and the audience only recvs. -// BSP also provides a personal mode which both xmits and recvs, where -// one user works with multiple programs across several devices, -// also suitable for small teams working together, such as translators. -// BSP is implemented using multicast UDP with small packets in a -// simple format employing a few bytes of packet control followed by a -// series of newline-terminated "name=value" pairs. -// -// * Application interface * -// -// - object creation. -// BibleSync *YourBibleSyncObjectPtr = new BibleSync(app, version, user); -// create exactly one. -// identify the application, its version, and the user. -// -// - mode selection. -// setMode(BSP_MODE_xyz, your_void_nav_func, "passphrase"); -// invoke a mode, including net.setup as needed. -// xyz = { DISABLE, PERSONAL, SPEAKER, AUDIENCE }. -// DISABLE kills it, shuts off network access. -// PERSONAL is bidirectional. -// SPEAKER xmits only. -// AUDIENCE recvs only. -// => empty passphrase ("") means re-use existing passphrase. -// => for any active mode, the application must then start polling using -// the receiver, BibleSync::Receive(), and stop polling when mode -// goes to DISABLE. if Receive() is called while disabled, it will -// return FALSE to indicate its polled use should stop, otherwise TRUE. -// => interface for your_void_nav_func: -// (char cmd, string speakerkey, -// string bible, string ref, string alt, -// string group, string domain, -// string info, string dump) -// there are 6 your_void_nav_func() use cases, identified in cmd. -// non-error cases provide valid speakerkey (UUID), else it is "". -// 1. 'A' (announce) -// presence message in alt. dump available. -// 2. 'N' (navigation) -// bible, ref, alt, group, domain as arrived. -// info + dump available. -// 3. 'M' (mismatch) against passphrase or mode or listen status. -// info == "announce" or "sync" or "beacon" (+ user @ [ipaddr]) -// sync: bible, ref, alt, group, domain as arrived. -// announce: presence message in alt. -// also, individual elements are also available: -// overload: bible ref group domain -// user [ipaddr] app+ver device -// dump available. -// 4. 'S' (new speaker) -// param overload as above. alt unused. see listenToSpeaker(). -// 5. 'D' (dead speaker) -// opposite of new speaker. only param is speakerkey. -// 6. 'E' (error) for network errors & malformed packets. -// only info + dump are useful. -// -// - get current mode. -// BibleSync_mode getMode(). -// -// - get current passphrase, for default use when setting a new one. -// string getPassphrase(). -// -// - receive navigation. -// BibleSync::Receive(YourBibleSyncObjPtr); // *-* poll often *-* -// see note below; calls your_void_nav_func(). -// -// - send navigation. -// BibleSync_xmit_status retval = -// Transmit(BSP_SYNC, -// "NASB", "John.3.16", "some alt ref", -// "1", "BIBLE-VERSE"); -// params: type (sync only), bible, ref, alt-ref, group, domain. -// all params have defaults. -// => it is the application's responsibility to send well-formed verse -// references. -// -// - set self as private -// bool setPrivate(boolean); -// sets outgoing TTL to zero so no one hears you off-machine. -// applicable only to BSP_PERSONAL mode. -// -// - allow another speaker to drive us -// void listenToSpeaker(bool listen, string speakerkey) -// say yes/no to listening. -// -// Receive() USAGE NOTE: -// the application must call BibleSync::Receive(YourBibleSyncObjPtr) -// frequently. For example: -// g_timeout_add(1000, // 1sec in msec. -// (GSourceFunc)BibleSync::Receive, -// biblesyncobj); // of type (BibleSync *). -// g_timeout_add is a glib function for polled function calls. -// this will induce timed-interval calls to the function, as long -// as the function returns TRUE; upon returning FALSE, calls stop. -// other than with glib, accomplish the same thing somehow else. -// Receive is a static method accessible from C or C++. it must be -// called with the pointer to your BibleSync object in order that -// object context be re-entered. the internal receive routine -// is private. -// -// Note on speaker beacons: -// Protocol operates using periodic (10sec) beacons of speaker availability. -// By default, PERSONAL & AUDIENCE accepts listening to 1st announced speaker, -// thereafter ignores any more, but includes them in the list of available -// speakers and notifies the app of their availability (see above, 'S'/'D'). -// Override this behavior choice however desired, using listenToSpeaker() in -// reaction to 'S' events or on user request. -// Speakers who stop xmitting beacons will timeout, be declared dead, and -// removed after 30sec beacon silence, with app notification ('D'). -// Observe that pure Speaker clears the speaker list and by default ignores -// all newly-identified claimants to speaker status. Again, this is default -// behavior, but it makes no sense to try to listen to one as the mode is -// a mismatch. -// Note also that Personal is both speaker and audience. - -using namespace std; - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#ifndef WIN32 -#include -#include -#include -#include -#include -#else -#define uuid_t UUID -#include -#include -#include -#endif - -typedef enum _BibleSync_mode { - BSP_MODE_DISABLE, - BSP_MODE_PERSONAL, - BSP_MODE_SPEAKER, - BSP_MODE_AUDIENCE, - N_BSP_MODE -} BibleSync_mode; - -typedef enum _BibleSync_xmit_status { - BSP_XMIT_OK, - BSP_XMIT_FAILED, - BSP_XMIT_NO_SOCKET, - BSP_XMIT_BAD_TYPE, - BSP_XMIT_NO_AUDIENCE_XMIT, - BSP_XMIT_RECEIVING, - N_BSP_XMIT -} BibleSync_xmit_status; - -// args: cmd, speakerkey, bible, verse, alt, group, domain, info, dump. -typedef void (*BibleSync_navigate)(char, string, - string, string, string, - string, string, - string, string); - -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -// message structure constants -#define BSP_MULTICAST "239.225.27.227" -#define BSP_PORT 22272 -#define BSP_MAX_SIZE 1280 // in spec, it's 512. experimenting. -#define BSP_RES_SIZE 6 // unused bytes, fill out header to 32. -#define BSP_HEADER_SIZE 32 -#define BSP_MAX_PAYLOAD (BSP_MAX_SIZE - BSP_HEADER_SIZE) - -// message indications -#define BSP_MAGIC htonl(0x409CAF11) -#define BSP_PROTOCOL 2 - -// message types -#define BSP_ANNOUNCE 1 // presence announcement. -#define BSP_SYNC 2 // navigation synchronization. -#define BSP_BEACON 3 // speaker availability beacon. -// beacon packet is identical to presence announcement except for type. - -// beacon constants -#define BSP_BEACON_COUNT 10 // xmit every N calls of Receive(). -#define BSP_BEACON_MULTIPLIER 3 // multiplier for aging to death. - -// message content names. -#define BSP_APP_NAME "app.name" // req'd -#define BSP_APP_VERSION "app.version" // opt -#define BSP_APP_INSTANCE_UUID "app.inst.uuid" // req'd -#define BSP_APP_OS "app.os" // opt -#define BSP_APP_DEVICE "app.device" // opt -#define BSP_APP_USER "app.user" // req'd -#define BSP_MSG_SYNC_DOMAIN "msg.sync.domain" // req'd -#define BSP_MSG_SYNC_VERSE "msg.sync.verse" // req'd -#define BSP_MSG_SYNC_ALTVERSE "msg.sync.altVerse" // opt -#define BSP_MSG_SYNC_BIBLEABBREV "msg.sync.bibleAbbrev" // req'd -#define BSP_MSG_SYNC_GROUP "msg.sync.group" // req'd -#define BSP_MSG_PASSPHRASE "msg.sync.passPhrase" // req'd - -// required number of fields to send (out) or verify (in). -#define BSP_FIELDS_RECV_ANNOUNCE 4 -#define BSP_FIELDS_RECV_SYNC 8 -#define BSP_FIELDS_XMIT_ANNOUNCE 7 -#define BSP_FIELDS_XMIT_SYNC 12 - -#ifdef linux -# define BSP_OS "Linux" -#else -# ifdef WIN32 -# define BSP_OS "Windows" -# else -# define BSP_OS "UNIX" -# endif -#endif - -#define BSP_UUID_PRINT_LENGTH 37 // actually 36, plus '\0'. - -class BibleSync { - -private: - - // simple name/value pairs. - typedef std::map < string, string > BibleSyncContent; - - typedef struct _BibleSyncMessage { - uint32_t magic; - uint8_t version; - uint8_t msg_type; - uint16_t num_packets; - uint16_t index_packet; - uint8_t reserved[BSP_RES_SIZE]; - uuid_t uuid; - char body[BSP_MAX_PAYLOAD+1]; // +1 for stuffing '\0'. - } BibleSyncMessage; - - typedef struct _BibleSyncSpeaker { - bool listen; // nav for this guy? - uint8_t countdown; // lifetime aging. - string addr; // for spoof check. - } BibleSyncSpeaker; - - // key string is origin uuid. - typedef std::map < string, BibleSyncSpeaker > BibleSyncSpeakerMap; - typedef BibleSyncSpeakerMap::iterator BibleSyncSpeakerMapIterator; - - // self identification. - string BibleSync_version; - - // application identifiers. - string application; - string version; - string user; - string device; - - // currently processing received navigation. - // prevents use of Transmit. - bool receiving; - - // when xmit-capable, we xmit BSP_BEACON every N calls of Receive(). - uint8_t beacon_countdown; - - // track currently-known speaker set. - BibleSyncSpeakerMap speakers; - - // what operational mode we're in. - BibleSync_mode mode; - - // callback by which Receive induces navigation. - BibleSync_navigate nav_func; - - // privacy - string passphrase; - - // network access - struct sockaddr_in server, client; - int server_fd, client_fd; - struct ip_mreq multicast_req; - - // default address discoverer, for multicast configuration. - void InterfaceAddress(); - struct in_addr interface_addr; - - // unique identification. - uuid_t uuid; - char uuid_string[BSP_UUID_PRINT_LENGTH]; // printable - - // socket init and listener start, called from setMode(). - string Setup(); - - // dispose of network access. - void Shutdown(); - - // real receiver. - int ReceiveInternal(); // C++ object context. - int InitSelectRead(char *, struct sockaddr_in *, BibleSyncMessage *); - - // speaker list management. - void ageSpeakers(); - void clearSpeakers(); - - // uuid dumper; - void uuid_dump(uuid_t &u, char *destination); - char uuid_dump_string[BSP_UUID_PRINT_LENGTH]; - void uuid_gen(uuid_t &u); // differentiates linux/win32. - -#ifdef linux - // network self-analysis, borrowed from the net. - int get_default_if_name(char *name, socklen_t size); - int parseRoutes(struct nlmsghdr *nlHdr, struct route_info *rtInfo); - int readNlSock(int sockFd, char *bufPtr, size_t buf_size, - unsigned int seqNum, unsigned int pId); -#else - // no other support routines needed for Windows/Solaris/BSD. -#endif /* linux */ - -public: - BibleSync(string a, string v, string u); - ~BibleSync(); - - // operation. - BibleSync_mode setMode(BibleSync_mode m, - BibleSync_navigate n = NULL, - string p = ""); - inline BibleSync_mode getMode(void) { return mode; }; - - // library identification. - inline string getVersion(void) { return BibleSync_version; }; - - // obtain passphrase, for default choice. - inline string getPassphrase(void) { return passphrase; }; - - // audience receiver - static int Receive(void *myself); // assume C context: poll from timeout. - - // speaker transmitter - BibleSync_xmit_status Transmit(char message_type = BSP_SYNC, - string bible = "KJV", - string ref = "Gen.1.1", - string alt = "", - string group = "1", - string domain = "BIBLE-VERSE"); - - // set privacy using TTL 0 in personal mode. - bool setPrivate(bool privacy); - - // say whether you want to hear from this speaker. - void listenToSpeaker(bool listen, string speakerkey); -}; - -#endif // __BIBLESYNC_HH__ diff -Nru xiphos-4.0.0+dfsg1/src/biblesync/biblesync-version.hh xiphos-4.0.4+dfsg1/src/biblesync/biblesync-version.hh --- xiphos-4.0.0+dfsg1/src/biblesync/biblesync-version.hh 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/biblesync/biblesync-version.hh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/****************************************************************************** - * - * biblesync-version.h - version constants. - * - * BibleSync library - * Karl Kleinpaste, May 2014 - * - * All files related to implementation of BibleSync, including program - * source, READMEs, manual pages, and related similar documents, are in - * the public domain. As a matter of simple decency, your social - * obligations are to credit the source and to coordinate any changes you - * make back to the origin repository. These obligations are non- - * binding for public domain software, but they are to be seriously - * handled nonetheless. - */ - -#ifndef BIBLESYNC_VERSION_HH -#define BIBLESYNC_VERSION_HH - -#define BIBLESYNC_VERSION_NUM 1001002000 -#define BIBLESYNC_VERSION_STR "1.1.2" -#define BIBLESYNC_VERSION_MAJOR 1 -#define BIBLESYNC_VERSION_MINOR 1 -#define BIBLESYNC_VERSION_MICRO 2 -#define BIBLESYNC_VERSION_NANO 0 - -#endif // BIBLESYNC_VERSION_HH diff -Nru xiphos-4.0.0+dfsg1/src/biblesync/README xiphos-4.0.4+dfsg1/src/biblesync/README --- xiphos-4.0.0+dfsg1/src/biblesync/README 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/biblesync/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -These files, biblesync.{cc,hh}, are the last commits of the BibleSync code -before it was removed from Xiphos itself so as to become its own -independent library. They are used iff libbiblesync.so is not available. -When BibleSync becomes a readily-available library, it will be removed -from Xiphos' source tree. diff -Nru xiphos-4.0.0+dfsg1/src/biblesync/wscript_build xiphos-4.0.4+dfsg1/src/biblesync/wscript_build --- xiphos-4.0.0+dfsg1/src/biblesync/wscript_build 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/biblesync/wscript_build 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/usr/bin/env python -# encoding: utf8 - -lib = bld.new_task_gen( - features='cxx cc', - includes = '. ../.. ../../src', - target='biblesync', - uselib= bld.env['ALL_LIBS'], -) - -lib.find_sources_in_dirs('.') diff -Nru xiphos-4.0.0+dfsg1/src/editor/editor.c xiphos-4.0.4+dfsg1/src/editor/editor.c --- xiphos-4.0.0+dfsg1/src/editor/editor.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/editor.c 2015-04-15 13:37:08.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * editor.c - webkit stuff * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,20 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - - #ifdef HAVE_CONFIG_H -# include +#include #endif #ifdef USE_WEBKIT_EDITOR - + /* X keyboard #definitions, to handle shortcuts */ /* we must define the categories of #definitions we need. */ #define XK_MISCELLANY #define XK_LATIN1 #include - + #include #include @@ -40,9 +38,11 @@ #include "editor/editor.h" #include "main/sword.h" -#include "main/settings.h" +#include "main/settings.h" + +#include "gui/utilities.h" -#define html_start "" +#define html_start "" BUTTONS_STATE buttons_state; @@ -51,7 +51,6 @@ //WebKitDOMElement * current_element; - /****************************************************************************** * Name * editor_insert_new_outline_level @@ -72,72 +71,80 @@ * gint */ -gint editor_insert_new_outline_level (gint level, EDITOR * e) +gint editor_insert_new_outline_level(gint level, EDITOR *e) { - WebKitDOMDocument * doc; - WebKitDOMElement * element_anchor = NULL; - WebKitDOMElement * element = NULL; - WebKitDOMElement * parent_ol_element = NULL; - WebKitDOMDOMWindow* window; - WebKitDOMDOMSelection* selection = NULL; + WebKitDOMDocument *doc; + WebKitDOMElement *element_anchor = NULL; + WebKitDOMElement *element = NULL; + WebKitDOMElement *parent_ol_element = NULL; + WebKitDOMDOMWindow *window; + WebKitDOMDOMSelection *selection = NULL; GError *error = NULL; - gchar * name = NULL; - gchar * class = NULL; - gchar * level_str = NULL; + gchar *name = NULL; + gchar *class = NULL; + gchar *level_str = NULL; - XI_message(("\n%s\n","editor_insert_new_outline_level")); - - doc = webkit_web_view_get_dom_document ((WebKitWebView*) e->html_widget); - - if(!doc) + XI_message(("\n%s\n", "editor_insert_new_outline_level")); + + doc = webkit_web_view_get_dom_document((WebKitWebView *) + e->html_widget); + + if (!doc) return 0; - + window = webkit_dom_document_get_default_view(doc); selection = webkit_dom_dom_window_get_selection(window); - if(selection == NULL) { - XI_message(("\n%s\n","failed to get selection")); + if (selection == NULL) { + XI_message(("\n%s\n", "failed to get selection")); return 0; } - - element_anchor = (WebKitDOMElement*)webkit_dom_dom_selection_get_anchor_node(selection); - if(element_anchor == NULL) { - XI_message(("\n%s\n","failed to get anchor")); + + element_anchor = (WebKitDOMElement *) + webkit_dom_dom_selection_get_anchor_node(selection); + if (element_anchor == NULL) { + XI_message(("\n%s\n", "failed to get anchor")); return 0; } - + name = webkit_dom_element_get_tag_name(element_anchor); - if (!g_strcmp0 ("LI",name) || !g_strcmp0 ("li",name)) { - XI_message(("current element: %s",name)); - element = webkit_dom_node_get_parent_element((WebKitDOMNode*)element_anchor); - } else return 1; - - parent_ol_element = webkit_dom_node_get_parent_element((WebKitDOMNode*)element); + if (!g_strcmp0("LI", name) || !g_strcmp0("li", name)) { + XI_message(("current element: %s", name)); + element = + webkit_dom_node_get_parent_element((WebKitDOMNode *) + element_anchor); + } else + return 1; + + parent_ol_element = + webkit_dom_node_get_parent_element((WebKitDOMNode *)element); name = webkit_dom_element_get_tag_name(parent_ol_element); - class = webkit_dom_element_get_attribute(parent_ol_element, "class"); - XI_message(("\nparent_ol_element: %s\nclass: %s\n",name,class)); - + class = + webkit_dom_element_get_attribute(parent_ol_element, "class"); + XI_message(("\nparent_ol_element: %s\nclass: %s\n", name, class)); + if (class) { - if (!g_strcmp0 ("L1",class)) + if (!g_strcmp0("L1", class)) level_str = g_strdup("L2"); - if (!g_strcmp0 ("L2",class)) + if (!g_strcmp0("L2", class)) level_str = g_strdup("L3"); - if (!g_strcmp0 ("L3",class)) + if (!g_strcmp0("L3", class)) level_str = g_strdup("L4"); - if (!g_strcmp0 ("L4",class)) + if (!g_strcmp0("L4", class)) level_str = g_strdup("L4"); - if(!level_str) { + if (!level_str) { return 0; } } - - webkit_dom_element_set_attribute(element, "class", level_str, &error); - if (error) - { - fprintf(stderr, "Failed to create new attribute: %s\n", error->message); - g_error_free(error); - error = NULL; + + webkit_dom_element_set_attribute(element, "class", level_str, + &error); + if (error) { + fprintf(stderr, "Failed to create new attribute: %s\n", + error->message); + g_error_free(error); + error = NULL; return 0; - } + } return 1; } @@ -158,31 +165,32 @@ * void */ -void editor_get_document_content (GString * data, EDITOR * e) +void editor_get_document_content(GString *data, EDITOR *e) { - WebKitDOMHTMLElement* html; - WebKitDOMHTMLHeadElement* header; - WebKitDOMDocument* dom_document = NULL; - //gchar * filename = NULL; - gchar* body = NULL; - gchar* head = NULL; - - dom_document = webkit_web_view_get_dom_document ((WebKitWebView*) e->html_widget); - if(!dom_document) + WebKitDOMHTMLElement *html; + WebKitDOMHTMLHeadElement *header; + WebKitDOMDocument *dom_document = NULL; + gchar *body = NULL; + gchar *head = NULL; + + dom_document = webkit_web_view_get_dom_document((WebKitWebView *) + e->html_widget); + if (!dom_document) return; /* get document info */ header = webkit_dom_document_get_head(dom_document); - head = webkit_dom_html_element_get_inner_html((WebKitDOMHTMLElement*)header); - + head = + webkit_dom_html_element_get_inner_html((WebKitDOMHTMLElement *) + header); + /* get document info */ html = webkit_dom_document_get_body(dom_document); body = webkit_dom_html_element_get_inner_html(html); - - - g_string_printf (data, "%s%s%s\n",html_start, head, body); -} + g_string_printf(data, "%s%s%s\n", + html_start, head, body); +} /****************************************************************************** * Name @@ -200,35 +208,39 @@ * gchar * */ -gchar * editor_get_selected_text (EDITOR * e) - { - WebKitDOMDocument * dom_document; - WebKitDOMDOMWindow* window = NULL; - WebKitDOMDOMSelection* selection = NULL; - WebKitDOMRange* range = NULL; +gchar *editor_get_selected_text(EDITOR *e) +{ + WebKitDOMDocument *dom_document; + WebKitDOMDOMWindow *window = NULL; + WebKitDOMDOMSelection *selection = NULL; gchar *text = NULL; GError *error = NULL; - dom_document = webkit_web_view_get_dom_document ((WebKitWebView*) e->html_widget); - if(!dom_document) + dom_document = webkit_web_view_get_dom_document((WebKitWebView *) + e->html_widget); + if (!dom_document) return NULL; window = webkit_dom_document_get_default_view(dom_document); selection = webkit_dom_dom_window_get_selection(window); - if(selection) { - range = webkit_dom_dom_selection_get_range_at(selection, 0, &error); + if (selection) { + WebKitDOMRange *range = + webkit_dom_dom_selection_get_range_at(selection, 0, + &error); if (error) { - fprintf(stderr, "Failed to get range: %s\n", error->message); - g_error_free(error); - error = NULL; + fprintf(stderr, "Failed to get range: %s\n", + error->message); + g_error_free(error); + error = NULL; //return; - } + } text = webkit_dom_range_to_string(range, &error); if (error) { - fprintf(stderr, "Failed range text: %s\n", error->message); - g_error_free(error); - error = NULL; + fprintf(stderr, "Failed range text: %s\n", + error->message); + g_error_free(error); + error = NULL; return NULL; - } + } } return g_strdup(text); } @@ -249,14 +261,10 @@ * void */ -void editor_find_string (gchar * needle, EDITOR * e) +void editor_find_string(gchar *needle, EDITOR *e) { - webkit_web_view_search_text ((WebKitWebView*)e->html_widget, - needle, - FALSE, - TRUE, - TRUE); - + webkit_web_view_search_text((WebKitWebView *)e->html_widget, + needle, FALSE, TRUE, TRUE); } /****************************************************************************** @@ -276,21 +284,18 @@ * void */ -void editor_replace_string (gchar * old_string, gchar * new_string, EDITOR * e) +void editor_replace_string(gchar *old_string, gchar *new_string, + EDITOR *e) { - WebKitWebFrame * frame = NULL; - - frame = webkit_web_view_get_main_frame ((WebKitWebView*) e->html_widget); - webkit_web_view_search_text ((WebKitWebView*) e->html_widget, - old_string, - FALSE, - TRUE, - FALSE); - webkit_web_frame_replace_selection (frame, new_string); + WebKitWebFrame *frame = NULL; + frame = webkit_web_view_get_main_frame((WebKitWebView *) + e->html_widget); + webkit_web_view_search_text((WebKitWebView *)e->html_widget, + old_string, FALSE, TRUE, FALSE); + webkit_web_frame_replace_selection(frame, new_string); } - /****************************************************************************** * Name * editor_execute_script @@ -308,16 +313,14 @@ * void */ -void editor_execute_script(gchar * script, EDITOR * e) +void editor_execute_script(gchar *script, EDITOR *e) { if (script) { - webkit_web_view_execute_script (WEBKIT_WEB_VIEW (e->html_widget), script); - XI_message(("script: %s",script)); - g_free (script); + webkit_web_view_execute_script(WEBKIT_WEB_VIEW(e->html_widget), script); + XI_message(("script: %s", script)); } } - /****************************************************************************** * Name * editor_insert_html @@ -334,13 +337,12 @@ * void */ -void editor_insert_html(const gchar * html, EDITOR * e) +void editor_insert_html(const gchar *html, EDITOR *e) { - gchar * str = NULL; - - str = g_strdup_printf("document.execCommand('insertHTML', null, \'%s\');", html); - XI_message(("script: %s",str)); + gchar *str = g_strdup_printf("document.execCommand('insertHTML', null, \'%s\');", html); + XI_message(("script: %s", str)); editor_execute_script(str, e); + g_free(str); } /* @@ -351,29 +353,32 @@ } */ -gboolean editor_cut( EDITOR * e ) +gboolean editor_cut(EDITOR *e) { - if (webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (e->html_widget))) { - webkit_web_view_cut_clipboard (WEBKIT_WEB_VIEW (e->html_widget)); + if (webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(e->html_widget))) { + webkit_web_view_cut_clipboard(WEBKIT_WEB_VIEW(e->html_widget)); return 1; - } else return 0; + } else + return 0; } -gboolean editor_copy( EDITOR * e ) +gboolean editor_copy(EDITOR *e) { - if (webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (e->html_widget))) { - webkit_web_view_copy_clipboard (WEBKIT_WEB_VIEW (e->html_widget)); + if (webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(e->html_widget))) { + webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(e->html_widget)); return 1; - } else return 0; + } else + return 0; } -gboolean editor_paste( EDITOR * e ) +gboolean editor_paste(EDITOR *e) { - if (webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (e->html_widget))) { - webkit_web_view_paste_clipboard (WEBKIT_WEB_VIEW (e->html_widget)); + if (webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(e->html_widget))) { + webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(e->html_widget)); return 1; - } else return 0; -} + } else + return 0; +} /* GtkWidget * entry_module; @@ -479,7 +484,6 @@ */ - /****************************************************************************** * Name * user_changed_contents_cb @@ -495,14 +499,12 @@ * Return value * void */ -static -void user_changed_contents_cb (WebKitWebView * web_view, EDITOR * e) -{ - XI_message(("%s","user_changed_contents_cb")); +static void user_changed_contents_cb(WebKitWebView *web_view, EDITOR *e) +{ + XI_message(("%s", "user_changed_contents_cb")); e->is_changed = TRUE; } - /****************************************************************************** * Name * on_navigation_requested @@ -521,27 +523,26 @@ * Return value * WebKitNavigationResponse */ -static -WebKitNavigationResponse on_navigation_requested (WebKitWebView * web_view, - WebKitWebFrame * frame, - WebKitNetworkRequest * request, - EDITOR * e) +static WebKitNavigationResponse on_navigation_requested(WebKitWebView *web_view, + WebKitWebFrame *frame, + WebKitNetworkRequest * + request, + EDITOR *e) { - const gchar * uri = NULL; - + const gchar *uri = NULL; + if (e->is_changed) { ask_about_saving(e); } - - uri = webkit_network_request_get_uri (request); - XI_message(("on_navigation_requested uri: %s",uri)); - if (g_strstr_len (uri, 6, "file:")) + + uri = webkit_network_request_get_uri(request); + XI_message(("on_navigation_requested uri: %s", uri)); + if (g_strstr_len(uri, 6, "file:")) return FALSE; - else + else return TRUE; } - /****************************************************************************** * Name * link_handler @@ -561,16 +562,12 @@ * void */ -static -void link_handler (GtkWidget *widget, - gchar *title, - gchar *uri, - EDITOR * e) +static void link_handler(GtkWidget *widget, + gchar *title, gchar *uri, EDITOR *e) { XI_message(("link_handler")); } - /****************************************************************************** * Name * _has_element @@ -587,103 +584,88 @@ * gint */ -static -gint _has_element(gchar * name, gchar * class, EDITOR * e) +static gint _has_element(gchar *name, gchar *class, EDITOR *e) { - if(!name) return 0; - if(!g_strcmp0 ("BODY",name)){ + if (!name) + return 0; + if (!g_strcmp0("BODY", name)) { return 0; } - if(!g_strcmp0 ("B",name)){ - buttons_state.bold = 1; + if (!g_strcmp0("B", name)) { + buttons_state.bold = 1; return 1; - } else - if(!g_strcmp0 ("I",name)){ - buttons_state.italic = 1; + } else if (!g_strcmp0("I", name)) { + buttons_state.italic = 1; return 1; - } else - if(!g_strcmp0 ("U",name)){ - buttons_state.underline = 1; + } else if (!g_strcmp0("U", name)) { + buttons_state.underline = 1; return 1; - } else - if(!g_strcmp0 ("STRIKE",name)){ - buttons_state.strike = 1; + } else if (!g_strcmp0("STRIKE", name)) { + buttons_state.strike = 1; return 1; - } else - if(!g_strcmp0 ("DIV",name)){ - buttons_state.style = 0; + } else if (!g_strcmp0("DIV", name)) { + buttons_state.style = 0; return 1; - } else - if(!g_strcmp0 ("H1",name)){ - buttons_state.style = 1; + } else if (!g_strcmp0("H1", name)) { + buttons_state.style = 1; return 1; - } else - if(!g_strcmp0 ("H2",name)){ - buttons_state.style = 2; + } else if (!g_strcmp0("H2", name)) { + buttons_state.style = 2; return 1; - } else - if(!g_strcmp0 ("H3",name)){ - buttons_state.style = 3; + } else if (!g_strcmp0("H3", name)) { + buttons_state.style = 3; return 1; - } else - if(!g_strcmp0 ("H4",name)){ - buttons_state.style = 4; + } else if (!g_strcmp0("H4", name)) { + buttons_state.style = 4; return 1; - } else - if(!g_strcmp0 ("H5",name)){ - buttons_state.style = 5; + } else if (!g_strcmp0("H5", name)) { + buttons_state.style = 5; return 1; - } else - if(!g_strcmp0 ("H6",name)){ - buttons_state.style = 6; + } else if (!g_strcmp0("H6", name)) { + buttons_state.style = 6; return 1; - } else - if(!g_strcmp0 ("ADDRESS",name)){ - buttons_state.style = 7; + } else if (!g_strcmp0("ADDRESS", name)) { + buttons_state.style = 7; return 1; - } else - if(!g_strcmp0 ("PRE",name)){ - buttons_state.style = 8; + } else if (!g_strcmp0("PRE", name)) { + buttons_state.style = 8; return 1; - } else - if(!g_strcmp0 ("UL",name)){ - buttons_state.style = 9; + } else if (!g_strcmp0("UL", name)) { + buttons_state.style = 9; return 1; - } else - if(!g_strcmp0 ("FONT",name)){ - //buttons_state.style = 9; + } else if (!g_strcmp0("FONT", name)) { + //buttons_state.style = 9; return 1; - } - if(!g_strcmp0 ("LI",name)){ + } + if (!g_strcmp0("LI", name)) { return 1; - } else - if(!g_strcmp0 ("OL",name)){ - buttons_state.style = 10; + } else if (!g_strcmp0("OL", name)) { + buttons_state.style = 10; if (class) { - XI_message(("\nclass: %s\n",class)); - if (!g_strcmp0 ("L1",class)) { + XI_message(("\nclass: %s\n", class)); + if (!g_strcmp0("L1", class)) { e->toolitems.outline_level = 1; - buttons_state.style = 10; + buttons_state.style = 10; } - if (!g_strcmp0 ("L2",class)){ + if (!g_strcmp0("L2", class)) { e->toolitems.outline_level = 2; - buttons_state.style = 12; + buttons_state.style = 12; } - if (!g_strcmp0 ("L3",class)) { + if (!g_strcmp0("L3", class)) { e->toolitems.outline_level = 3; - buttons_state.style = 11; + buttons_state.style = 11; } - if (!g_strcmp0 ("L4",class)) { + if (!g_strcmp0("L4", class)) { e->toolitems.outline_level = 4; - buttons_state.style = 12; + buttons_state.style = 12; } } return 0; - } else return 0; + } else + return 0; return 1; } - /****************************************************************************** * Name * key_handler @@ -702,25 +684,22 @@ * gboolean */ -static -gboolean key_handler (GtkWidget *widget, - GdkEventKey *event, - EDITOR * e) -{ +static gboolean key_handler(GtkWidget *widget, GdkEventKey *event, EDITOR *e) +{ /* these are the mods we actually use for global keys, we always only check for these set */ - guint state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK ); + guint state = + event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | + GDK_MOD1_MASK | GDK_MOD4_MASK); switch (event->keyval) { case XK_s: // Ctrl-L verse entry if (state == GDK_CONTROL_MASK) - action_save_activate_cb (e->html_widget, e); + action_save_activate_cb(e->html_widget, e); break; - } - - return 0; -} + return 0; +} /****************************************************************************** * Name @@ -739,18 +718,17 @@ * void */ -static -void menu_spell_item_activated (GtkWidget *menuitem, EDITOR * e) +static void menu_spell_item_activated(GtkWidget *menuitem, EDITOR *e) { - WebKitWebFrame * frame; + WebKitWebFrame *frame; const gchar *label; - label = gtk_menu_item_get_label (GTK_MENU_ITEM(menuitem)); - frame = webkit_web_view_get_main_frame ((WebKitWebView*) e->html_widget); - - webkit_web_frame_replace_selection (frame, label); -} + label = gtk_menu_item_get_label(GTK_MENU_ITEM(menuitem)); + frame = webkit_web_view_get_main_frame((WebKitWebView *) + e->html_widget); + webkit_web_frame_replace_selection(frame, label); +} /****************************************************************************** * Name @@ -768,17 +746,16 @@ * void */ -static -void menu_spell_add_item_activated (GtkWidget *menuitem, gpointer user_data) +static void menu_spell_add_item_activated(GtkWidget *menuitem, + gpointer user_data) { WebKitSpellChecker *checker = NULL; - checker = (WebKitSpellChecker *)webkit_get_text_checker (); - - webkit_spell_checker_learn_word (checker, (gchar*)user_data); - if ((gchar*)user_data) - g_free ((gchar*)user_data); -} + checker = (WebKitSpellChecker *)webkit_get_text_checker(); + webkit_spell_checker_learn_word(checker, (gchar *)user_data); + if ((gchar *)user_data) + g_free((gchar *)user_data); +} /****************************************************************************** * Name @@ -796,17 +773,16 @@ * void */ -static -void menu_spell_ignore_item_activated (GtkWidget *menuitem, gpointer user_data) -{ +static void menu_spell_ignore_item_activated(GtkWidget *menuitem, + gpointer user_data) +{ WebKitSpellChecker *checker = NULL; - checker = (WebKitSpellChecker *)webkit_get_text_checker (); - - webkit_spell_checker_ignore_word (checker, (gchar*)user_data); - if ((gchar*)user_data) - g_free ((gchar*)user_data); -} + checker = (WebKitSpellChecker *)webkit_get_text_checker(); + webkit_spell_checker_ignore_word(checker, (gchar *)user_data); + if ((gchar *)user_data) + g_free((gchar *)user_data); +} /****************************************************************************** * Name @@ -825,75 +801,72 @@ * gint */ -static -gint _fill_spell_menu(GtkWidget * menu, gchar * word, EDITOR * e) -{ +static gint _fill_spell_menu(GtkWidget *menu, gchar *word, EDITOR *e) +{ WebKitSpellChecker *checker = NULL; int misspelling_location; int misspelling_length; - int i = 0; - GtkWidget * item; - char** word_list = NULL; - - XI_message(("\nword: %s\n",word)); - checker = (WebKitSpellChecker *)webkit_get_text_checker (); + GtkWidget *item; + char **word_list = NULL; + + XI_message(("\nword: %s\n", word)); + checker = (WebKitSpellChecker *)webkit_get_text_checker(); - webkit_spell_checker_check_spelling_of_string (checker, - word, - &misspelling_location, - &misspelling_length); - if(!misspelling_length) + webkit_spell_checker_check_spelling_of_string(checker, + word, + &misspelling_location, + &misspelling_length); + if (!misspelling_length) return 0; - - word_list = webkit_spell_checker_get_guesses_for_word (checker, - word, - NULL); + + word_list = webkit_spell_checker_get_guesses_for_word(checker, + word, NULL); /* add guesses to menu */ if (word_list) { - while(word_list[i]) { - item = gtk_menu_item_new_with_label (word_list[i]); - gtk_widget_show (item); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (menu_spell_item_activated), - e); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); + int i = 0; + while (word_list[i]) { + item = gtk_menu_item_new_with_label(word_list[i]); + gtk_widget_show(item); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(menu_spell_item_activated), e); + gtk_menu_shell_append((GtkMenuShell *)menu, + (GtkWidget *)item); i++; - } + } } - + /* separator */ - item = gtk_separator_menu_item_new (); - gtk_widget_show (item); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); /* add word */ - item = gtk_menu_item_new_with_label ("Add word"); - gtk_widget_show (item); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (menu_spell_add_item_activated), - g_strdup((gchar*)word)); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); + item = gtk_menu_item_new_with_label("Add word"); + gtk_widget_show(item); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(menu_spell_add_item_activated), + g_strdup((gchar *)word)); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); /* ignore word */ - item = gtk_menu_item_new_with_label ("Ignore word"); - gtk_widget_show (item); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (menu_spell_ignore_item_activated), - g_strdup((gchar*)word)); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - + item = gtk_menu_item_new_with_label("Ignore word"); + gtk_widget_show(item); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(menu_spell_ignore_item_activated), + g_strdup((gchar *)word)); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + /* separator */ - item = gtk_separator_menu_item_new (); - gtk_widget_show (item); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - - if(word_list) - g_strfreev (word_list); - + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + + if (word_list) + g_strfreev(word_list); + return misspelling_length; } - /****************************************************************************** * Name * _create_context_menu @@ -910,107 +883,103 @@ * void */ -static -void _create_context_menu (WebKitDOMDocument * dom_document, guint32 time, EDITOR * e) +static void _create_context_menu(WebKitDOMDocument *dom_document, guint32 time, + EDITOR *e) { - WebKitDOMDOMWindow* window = NULL; - WebKitDOMDOMSelection* selection = NULL; - WebKitDOMRange* range = NULL; + WebKitDOMDOMWindow *window = NULL; + WebKitDOMDOMSelection *selection = NULL; GError *error = NULL; - GtkWidget *menu = NULL; - GtkWidget *item = NULL; - gchar *text; + GtkWidget *menu = NULL; + GtkWidget *item = NULL; gboolean have_selection = FALSE; - menu = gtk_menu_new (); + menu = gtk_menu_new(); window = webkit_dom_document_get_default_view(dom_document); selection = webkit_dom_dom_window_get_selection(window); - if(selection) { - range = webkit_dom_dom_selection_get_range_at(selection, 0, &error); + if (selection) { + WebKitDOMRange *range = + webkit_dom_dom_selection_get_range_at(selection, 0, + &error); if (error) { - fprintf(stderr, "Failed to get range: %s\n", error->message); - g_error_free(error); - error = NULL; - } - text = webkit_dom_range_to_string(range, &error); + fprintf(stderr, "Failed to get range: %s\n", + error->message); + g_error_free(error); + error = NULL; + } + gchar *text = webkit_dom_range_to_string(range, &error); if (error) { - fprintf(stderr, "Failed range text: %s\n", error->message); - g_error_free(error); - error = NULL; + fprintf(stderr, "Failed range text: %s\n", + error->message); + g_error_free(error); + error = NULL; return; - } - if(text && (g_strcmp0 (text,"") != 0)) { + } + if (text && (g_strcmp0(text, "") != 0)) { _fill_spell_menu(menu, text, e); have_selection = TRUE; - } else + } else have_selection = FALSE; - } - + /* cut */ - item = -#ifdef HAVE_GTK_310 - gtk_menu_item_new_with_label ("Cut"); -#else - gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT,NULL); -#endif - gtk_widget_show (item); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (action_cut_activate_cb), - e); - gtk_widget_set_sensitive (item,have_selection); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - + item = +#ifdef HAVE_GTK_310 + gtk_menu_item_new_with_label("Cut"); +#else + gtk_image_menu_item_new_from_stock(GTK_STOCK_CUT, NULL); +#endif + gtk_widget_show(item); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(action_cut_activate_cb), e); + gtk_widget_set_sensitive(item, have_selection); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + /* copy */ - item = -#ifdef HAVE_GTK_310 - gtk_menu_item_new_with_label ("Copy"); -#else - gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY,NULL); -#endif - gtk_widget_show (item); - gtk_widget_set_sensitive (item,have_selection); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (action_copy_activate_cb), - e); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - + item = +#ifdef HAVE_GTK_310 + gtk_menu_item_new_with_label("Copy"); +#else + gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL); +#endif + gtk_widget_show(item); + gtk_widget_set_sensitive(item, have_selection); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(action_copy_activate_cb), e); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + /* paste */ - item = -#ifdef HAVE_GTK_310 - gtk_menu_item_new_with_label ("Paste"); -#else - gtk_image_menu_item_new_from_stock (GTK_STOCK_PASTE,NULL); -#endif - gtk_widget_show (item); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (action_paste_activate_cb), - e); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - + item = +#ifdef HAVE_GTK_310 + gtk_menu_item_new_with_label("Paste"); +#else + gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL); +#endif + gtk_widget_show(item); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(action_paste_activate_cb), e); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + /* separator */ - item = gtk_separator_menu_item_new (); - gtk_widget_show (item); - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); /* select all */ item = -#ifdef HAVE_GTK_310 - gtk_menu_item_new_with_label ("Select All"); -#else - gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL,NULL); +#ifdef HAVE_GTK_310 + gtk_menu_item_new_with_label("Select All"); +#else + gtk_image_menu_item_new_from_stock(GTK_STOCK_SELECT_ALL, NULL); -#endif - gtk_widget_show (item); +#endif + gtk_widget_show(item); /*g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (action_paste_activate_cb), - NULL);*/ - gtk_menu_shell_append ((GtkMenuShell* )menu, (GtkWidget*) item); - - - gtk_menu_popup ((GtkMenu*)menu,NULL,NULL,NULL,NULL,3, time); -} + G_CALLBACK (action_paste_activate_cb), + NULL); */ + gtk_menu_shell_append((GtkMenuShell *)menu, (GtkWidget *)item); + gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 3, time); +} /****************************************************************************** * Name @@ -1031,13 +1000,10 @@ * gboolean */ -static -gboolean button_handler (GtkWidget *widget, - GdkEvent *event, - EDITOR * e) +static gboolean button_handler(GtkWidget *widget, GdkEvent *event, EDITOR *e) { - WebKitDOMDocument * dom_document; - WebKitDOMElement* element = NULL; + WebKitDOMDocument *dom_document; + WebKitDOMElement *element = NULL; buttons_state.bold = 0; buttons_state.italic = 0; buttons_state.underline = 0; @@ -1048,63 +1014,70 @@ gchar *class = NULL; gchar *color = NULL; gint i = 1; - + //current_element = NULL; e->toolitems.outline_level = 0; mouse_x = event->button.x; mouse_y = event->button.y; - dom_document = webkit_web_view_get_dom_document ((WebKitWebView*) e->html_widget); - if(!dom_document) + dom_document = webkit_web_view_get_dom_document((WebKitWebView *) + e->html_widget); + if (!dom_document) return 0; - if(event->button.button == 3) { - _create_context_menu (dom_document, event->button.time, e); + if (event->button.button == 3) { + _create_context_menu(dom_document, event->button.time, e); return 1; // return true so we don't get the webkit context menu } - - element = webkit_dom_document_element_from_point(dom_document, mouse_x, mouse_y); - if(!element) + + element = + webkit_dom_document_element_from_point(dom_document, mouse_x, + mouse_y); + if (!element) return 0; - + name = webkit_dom_element_get_tag_name(element); - if(!name) + if (!name) return 0; /* set buttons.color to font color element */ - if (buttons_state.color) - g_free (buttons_state.color); + if (buttons_state.color) + g_free(buttons_state.color); buttons_state.color = g_strdup("#000000"); /* start with black */ - + /* we have to set it here in case the color element is the only element */ color = webkit_dom_element_get_attribute(element, "color"); if (color[0] == '#') { - if (buttons_state.color) - g_free (buttons_state.color); + if (buttons_state.color) + g_free(buttons_state.color); buttons_state.color = g_strdup(color); } - - /* - if(!g_strcmp0 ("LI",name)){ - current_element = element; - } - */ + + /* + if(!g_strcmp0 ("LI",name)){ + current_element = element; + } + */ i = _has_element(name, class, e); while (i) { - if(name) { - XI_message(("\nelement name: %s\nclass: %s\ncolor: %s\n",name,class,color)); - element = webkit_dom_node_get_parent_element((WebKitDOMNode*)element); - if(element) { - class = webkit_dom_element_get_attribute(element, "class"); - color = webkit_dom_element_get_attribute(element, "color"); - name = webkit_dom_element_get_tag_name(element); + if (name) { + XI_message(("\nelement name: %s\nclass: %s\ncolor: %s\n", name, class, color)); + element = + webkit_dom_node_get_parent_element((WebKitDOMNode *)element); + if (element) { + class = + webkit_dom_element_get_attribute(element, "class"); + color = + webkit_dom_element_get_attribute(element, "color"); + name = + webkit_dom_element_get_tag_name(element); if (color[0] == '#') { - if (buttons_state.color) - g_free (buttons_state.color); - buttons_state.color = g_strdup(color); + if (buttons_state.color) + g_free(buttons_state.color); + buttons_state.color = + g_strdup(color); } - } } i = _has_element(name, class, e); @@ -1114,7 +1087,6 @@ return 0; } - /****************************************************************************** * Name * create_editor_window @@ -1131,51 +1103,57 @@ * void */ -void create_editor_window (GtkWidget * scrollwindow, EDITOR * e) +void create_editor_window(GtkWidget *scrollwindow, EDITOR *e) { WebKitWebSettings *setting; GtkWidget *webview; - gchar *uri = NULL; - + gchar *text = NULL, *fname = NULL; + webview = webkit_web_view_new(); e->html_widget = webview; - gtk_widget_show (webview); + gtk_widget_show(webview); /* Turn on editing */ - webkit_web_view_set_editable ((WebKitWebView*) webview, TRUE); - + webkit_web_view_set_editable((WebKitWebView *)webview, TRUE); + /* Create a new websettings and enable spell checking */ - setting = webkit_web_settings_new (); - g_object_set (G_OBJECT(setting), "enable-spell_checking", TRUE, NULL); + setting = webkit_web_settings_new(); + g_object_set(G_OBJECT(setting), "enable-spell_checking", TRUE, + NULL); /* Apply the result */ - webkit_web_view_set_settings (WEBKIT_WEB_VIEW(webview), setting); + webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webview), setting); - /* open with new empty document */ - uri = g_strdup_printf("file://%s/%s",settings.gSwordDir,"studypad.spt"); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW(webview), uri); - g_free (uri); - - e->is_changed = FALSE; - - gtk_container_add (GTK_CONTAINER(scrollwindow), webview); + /* new empty document from template */ + fname = g_build_filename(settings.gSwordDir, "studypad.spt", NULL); + XI_message(("action delete item [%s]", fname)); + text = inhale_text_from_file(fname); + g_free(fname); + + if (text && strlen(text)) { + webkit_web_view_load_string((WebKitWebView *) + e->html_widget, + text, + "text/html", "utf_8", + "file://"); + } + if (text) + g_free(text); - g_signal_connect(G_OBJECT(webview),"navigation-requested", - G_CALLBACK(on_navigation_requested) - ,e); - g_signal_connect (G_OBJECT (webview), "hovering-over-link", - G_CALLBACK (link_handler), - e); - g_signal_connect (G_OBJECT (webview), "user-changed-contents", - G_CALLBACK (user_changed_contents_cb), - e); - g_signal_connect (G_OBJECT (webview), "button-press-event", - G_CALLBACK (button_handler), - e); - g_signal_connect (G_OBJECT (webview), "key-press-event", - G_CALLBACK (key_handler), - e); - + e->is_changed = FALSE; + + gtk_container_add(GTK_CONTAINER(scrollwindow), webview); + + g_signal_connect(G_OBJECT(webview), "navigation-requested", + G_CALLBACK(on_navigation_requested), e); + g_signal_connect(G_OBJECT(webview), "hovering-over-link", + G_CALLBACK(link_handler), e); + g_signal_connect(G_OBJECT(webview), "user-changed-contents", + G_CALLBACK(user_changed_contents_cb), e); + g_signal_connect(G_OBJECT(webview), "button-press-event", + G_CALLBACK(button_handler), e); + g_signal_connect(G_OBJECT(webview), "key-press-event", + G_CALLBACK(key_handler), e); } #endif /* USE_WEBKIT_EDITOR */ diff -Nru xiphos-4.0.0+dfsg1/src/editor/editor.h xiphos-4.0.4+dfsg1/src/editor/editor.h --- xiphos-4.0.0+dfsg1/src/editor/editor.h 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/editor.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * editor.h - webkit stuff * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -21,41 +21,39 @@ #ifndef _EDITOR_H #define _EDITOR_H - + #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - -#include + +#include #ifdef USE_WEBKIT_EDITOR - -#include "editor/webkit_editor.h" +#include "editor/webkit_editor.h" -gchar * editor_get_selected_text (EDITOR * e); -void editor_find_string (gchar * needle, EDITOR * e); -void editor_replace_string (gchar * old_string, gchar * new_string, EDITOR * e); -gint editor_insert_new_outline_level (gint level, EDITOR * e); -gboolean editor_cut( EDITOR * e ); -gboolean editor_copy( EDITOR * e ); -gboolean editor_paste( EDITOR * e ); -void editor_get_document_content (GString * data, EDITOR * e); +gchar *editor_get_selected_text(EDITOR *e); +void editor_find_string(gchar *needle, EDITOR *e); +void editor_replace_string(gchar *old_string, gchar *new_string, + EDITOR *e); +gint editor_insert_new_outline_level(gint level, EDITOR *e); +gboolean editor_cut(EDITOR *e); +gboolean editor_copy(EDITOR *e); +gboolean editor_paste(EDITOR *e); +void editor_get_document_content(GString *data, EDITOR *e); //void editor_open_recent (const gchar * uri, EDITOR * e); -gboolean editor_insert_link(void); -gboolean editor_insert_sword_link(void); -void editor_insert_link_ok (void); -void editor_execute_script (gchar * script, EDITOR * e); -void editor_insert_html(const gchar * html, EDITOR * e); -void create_editor_window (GtkWidget * scrollwindow, EDITOR * e); +gboolean editor_insert_link(void); +gboolean editor_insert_sword_link(void); +void editor_insert_link_ok(void); +void editor_execute_script(gchar *script, EDITOR *e); +void editor_insert_html(const gchar *html, EDITOR *e); +void create_editor_window(GtkWidget *scrollwindow, EDITOR *e); #endif /* USE_WEBKIT_EDITOR */ #ifdef __cplusplus } #endif - #endif /* _EDITOR_H */ diff -Nru xiphos-4.0.0+dfsg1/src/editor/link_dialog.c xiphos-4.0.4+dfsg1/src/editor/link_dialog.c --- xiphos-4.0.0+dfsg1/src/editor/link_dialog.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/link_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * link_dialog.c - dialog for inserting a link * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,17 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #include - #include #include #include #include - - #ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #include "editor/editor.h" @@ -53,32 +49,29 @@ static GtkWidget *entry_text; static GtkWidget *linkage_verse_list; - -G_MODULE_EXPORT -void entry_verse_changed_cb(GObject *object, EDITOR *e) +G_MODULE_EXPORT void entry_verse_changed_cb(GObject *object, EDITOR *e) { const gchar *verse_str = NULL; - verse_str = gtk_entry_get_text (GTK_ENTRY (object)); - gtk_entry_set_text(GTK_ENTRY (entry_text),verse_str); + verse_str = gtk_entry_get_text(GTK_ENTRY(object)); + gtk_entry_set_text(GTK_ENTRY(entry_text), verse_str); } -G_MODULE_EXPORT -void button_ok_clicked_cb(GObject *object, EDITOR *e) +G_MODULE_EXPORT void button_ok_clicked_cb(GObject *object, EDITOR *e) { const gchar *mod_str = NULL; const gchar *verse_str = NULL; const gchar *text_str = NULL; const gchar *encoded_mod = NULL; const gchar *encoded_verse = NULL; - GString *str = g_string_new (NULL); + GString *str = g_string_new(NULL); gint type = 0; - mod_str = gtk_entry_get_text (GTK_ENTRY (entry_module)); - verse_str = gtk_entry_get_text (GTK_ENTRY (entry_verse)); - text_str = gtk_entry_get_text (GTK_ENTRY (entry_text)); + mod_str = gtk_entry_get_text(GTK_ENTRY(entry_module)); + verse_str = gtk_entry_get_text(GTK_ENTRY(entry_verse)); + text_str = gtk_entry_get_text(GTK_ENTRY(entry_text)); - type = main_get_mod_type((gchar*)mod_str); + type = main_get_mod_type((gchar *)mod_str); if (mod_str) encoded_mod = main_url_encode(mod_str); @@ -86,26 +79,23 @@ encoded_verse = main_url_encode(verse_str); g_string_printf(str, - (((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linkage_verse_list))) && - ((type == -1) || - (type == TEXT_TYPE) || - (type == COMMENTARY_TYPE))) - ? "%s" - : "%s"), - (encoded_mod ? encoded_mod : ""), + (((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linkage_verse_list))) && ((type == -1) || (type == TEXT_TYPE) || (type == COMMENTARY_TYPE))) + ? "%s" + : "%s"), + (encoded_mod ? encoded_mod : ""), (encoded_verse ? encoded_verse : ""), - (text_str ? text_str : "")); + (text_str ? text_str : "")); - XI_message (("link: %s", str->str)); + XI_message(("link: %s", str->str)); #ifdef USE_WEBKIT_EDITOR editor_insert_html(str->str, e); #else - gtkhtml_editor_insert_html (GTKHTML_EDITOR (e->window), str->str); + gtkhtml_editor_insert_html(GTKHTML_EDITOR(e->window), str->str); #endif - g_string_free (str, TRUE); - g_free((gchar*)encoded_mod); - g_free((gchar*)encoded_verse); + g_string_free(str, TRUE); + g_free((gchar *)encoded_mod); + g_free((gchar *)encoded_verse); gtk_widget_destroy(GTK_WIDGET(window)); } @@ -113,14 +103,14 @@ G_MODULE_EXPORT void button_test_clicked_cb(GObject *object, gpointer user_data) { - const gchar *mod_str = NULL; + const gchar *mod_str = NULL; const gchar *verse_str = NULL; const gchar *encoded_mod = NULL; const gchar *encoded_verse = NULL; - GString *str = g_string_new (NULL); + GString *str = g_string_new(NULL); - mod_str = gtk_entry_get_text (GTK_ENTRY (entry_module)); - verse_str = gtk_entry_get_text (GTK_ENTRY (entry_verse)); + mod_str = gtk_entry_get_text(GTK_ENTRY(entry_module)); + verse_str = gtk_entry_get_text(GTK_ENTRY(entry_verse)); if (mod_str) encoded_mod = main_url_encode(mod_str); @@ -129,47 +119,57 @@ g_string_printf(str, "passagestudy.jsp?action=showRef&type=scripRef&module=%s&value=%s", - (encoded_mod ? encoded_mod : ""), + (encoded_mod ? encoded_mod : ""), (encoded_verse ? encoded_verse : "")); - XI_message (("link: %s", str->str)); + XI_message(("link: %s", str->str)); main_url_handler(str->str, TRUE); - g_string_free (str, TRUE); - g_free((gchar*)encoded_mod); - g_free((gchar*)encoded_verse); + g_string_free(str, TRUE); + g_free((gchar *)encoded_mod); + g_free((gchar *)encoded_verse); } G_MODULE_EXPORT void button_cancel_clicked_cb(GObject *object, gpointer user_data) { - gtk_widget_destroy(GTK_WIDGET(window)); + gtk_widget_destroy(GTK_WIDGET(window)); } -void -editor_link_dialog (EDITOR *e) +void editor_link_dialog(EDITOR *e) { - GtkBuilder *builder; + GtkBuilder *builder; gchar *gbuilder_file; -#ifdef USE_WEBKIT_EDITOR - + +#ifndef USE_WEBKIT_EDITOR + GtkHTML *html = gtkhtml_editor_get_html(GTKHTML_EDITOR(e->window)); + if (html->pointer_url) /* are we in a link */ + return; /* if so don't do anything */ +#endif + + gbuilder_file = + gui_general_user_file("editor_link_dialog.xml", FALSE); + +#ifdef HAVE_GTK_310 + builder = gtk_builder_new_from_file(gbuilder_file); #else - GtkHTML *html = gtkhtml_editor_get_html (GTKHTML_EDITOR(e->window)); - if (html->pointer_url) /* are we in a link */ - return; /* if so don't do anything */ + builder = gtk_builder_new(); + gtk_builder_add_from_file(builder, gbuilder_file, NULL); #endif - builder = gtk_builder_new (); - gbuilder_file = gui_general_user_file ("editor_link_dialog.xml", FALSE); - gtk_builder_add_from_file (builder, gbuilder_file, NULL); - - window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog1")); - set_window_icon (GTK_WINDOW(window)); - gtk_builder_connect_signals (builder,(EDITOR*) e); - - entry_module = GTK_WIDGET (gtk_builder_get_object (builder, "entry_module")); - entry_verse = GTK_WIDGET (gtk_builder_get_object (builder, "entry_verse")); - entry_text = GTK_WIDGET (gtk_builder_get_object (builder, "entry_text")); - linkage_verse_list = GTK_WIDGET (gtk_builder_get_object (builder, "radio_verse_list")); - g_object_unref (G_OBJECT (builder)); - gtk_widget_show (window); + window = GTK_WIDGET(gtk_builder_get_object(builder, "dialog1")); + set_window_icon(GTK_WINDOW(window)); + gtk_builder_connect_signals(builder, (EDITOR *)e); + + entry_module = + GTK_WIDGET(gtk_builder_get_object(builder, "entry_module")); + entry_verse = + GTK_WIDGET(gtk_builder_get_object(builder, "entry_verse")); + entry_text = + GTK_WIDGET(gtk_builder_get_object(builder, "entry_text")); + linkage_verse_list = + GTK_WIDGET(gtk_builder_get_object(builder, "radio_verse_list")); + + g_object_unref(G_OBJECT(builder)); + gtk_widget_show(window); } + /************* end link dialog ****************/ diff -Nru xiphos-4.0.0+dfsg1/src/editor/link_dialog.h xiphos-4.0.4+dfsg1/src/editor/link_dialog.h --- xiphos-4.0.0+dfsg1/src/editor/link_dialog.h 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/link_dialog.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * link_dialog.f - dialog for inserting a link * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,31 +23,27 @@ #define _LINK_DIALOG_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #include #include - -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #include "editor/editor.h" #else #include "editor/slib-editor.h" #endif - -void editor_link_dialog (EDITOR *e); +void editor_link_dialog(EDITOR *e); void entry_verse_changed_cb(GObject *object, EDITOR *e); void button_ok_clicked_cb(GObject *object, EDITOR *e); void button_test_clicked_cb(GObject *object, gpointer user_data); -void button_cancel_clicked_cb(GObject *object, gpointer user_data); - +void button_cancel_clicked_cb(GObject *object, + gpointer user_data); #ifdef __cplusplus } #endif - #endif /* _LINK_DIALOG_H */ diff -Nru xiphos-4.0.0+dfsg1/src/editor/slib-editor.c xiphos-4.0.4+dfsg1/src/editor/slib-editor.c --- xiphos-4.0.0+dfsg1/src/editor/slib-editor.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/slib-editor.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * html-editor.c - the html editor * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -29,7 +29,6 @@ #include - #include #include #include @@ -58,42 +57,31 @@ extern gboolean do_display; -static -gboolean editor_is_dirty(EDITOR * e); - -static -int app_delete_cb(GtkWidget * widget, GdkEvent * event, gpointer data); +static gboolean editor_is_dirty(EDITOR *e); -static -void _load_file (EDITOR * e, const gchar * filename); +static int app_delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data); -static -void _save_file (EDITOR * e); +static void _load_file(EDITOR *e, const gchar *filename); -static -void _save_note (EDITOR * e); +static void _save_file(EDITOR *e); -static -void _save_book (EDITOR * e); +static void _save_note(EDITOR *e); -static -gint ask_about_saving(EDITOR * e); +static void _save_book(EDITOR *e); +static gint ask_about_saving(EDITOR *e); static GList *editors_all = NULL; - -static void -handle_error (GError **error) +static void handle_error(GError **error) { if (*error != NULL) { - g_warning ("%s", (*error)->message); - g_clear_error (error); + g_warning("%s", (*error)->message); + g_clear_error(error); } } -static -void do_exit(EDITOR * e) +static void do_exit(EDITOR *e) { if (e->filename) { g_free(e->filename); @@ -109,69 +97,68 @@ g_free(e); } -static -void change_window_title(GtkWidget * window, const gchar * window_title) +static void change_window_title(GtkWidget *window, const gchar *window_title) { gtk_window_set_title(GTK_WINDOW(window), window_title); } - #if 0 static gint -_calc_header_height (GtkHTML *html, GtkPrintOperation *operation, - GtkPrintContext *context) +_calc_header_height(GtkHTML * html, GtkPrintOperation * operation, + GtkPrintContext * context) { PangoContext *pango_context; PangoFontDescription *desc; PangoFontMetrics *metrics; gint header_height; - pango_context = gtk_print_context_create_pango_context (context); - desc = pango_font_description_from_string ("Sans Regular 10"); + pango_context = gtk_print_context_create_pango_context(context); + desc = pango_font_description_from_string("Sans Regular 10"); - metrics = pango_context_get_metrics ( - pango_context, desc, pango_language_get_default ()); + metrics = + pango_context_get_metrics(pango_context, desc, + pango_language_get_default()); header_height = - pango_font_metrics_get_ascent (metrics) + - pango_font_metrics_get_descent (metrics); - pango_font_metrics_unref (metrics); + pango_font_metrics_get_ascent(metrics) + + pango_font_metrics_get_descent(metrics); + pango_font_metrics_unref(metrics); - pango_font_description_free (desc); - g_object_unref (pango_context); + pango_font_description_free(desc); + g_object_unref(pango_context); return header_height; } static gint -_calc_footer_height (GtkHTML *html, GtkPrintOperation *operation, - GtkPrintContext *context) +_calc_footer_height(GtkHTML * html, GtkPrintOperation * operation, + GtkPrintContext * context) { PangoContext *pango_context; PangoFontDescription *desc; PangoFontMetrics *metrics; gint footer_height; - pango_context = gtk_print_context_create_pango_context (context); - desc = pango_font_description_from_string ("Sans Regular 10"); + pango_context = gtk_print_context_create_pango_context(context); + desc = pango_font_description_from_string("Sans Regular 10"); - metrics = pango_context_get_metrics ( - pango_context, desc, pango_language_get_default ()); + metrics = + pango_context_get_metrics(pango_context, desc, + pango_language_get_default()); footer_height = - pango_font_metrics_get_ascent (metrics) + - pango_font_metrics_get_descent (metrics); - pango_font_metrics_unref (metrics); + pango_font_metrics_get_ascent(metrics) + + pango_font_metrics_get_descent(metrics); + pango_font_metrics_unref(metrics); - pango_font_description_free (desc); - g_object_unref (pango_context); + pango_font_description_free(desc); + g_object_unref(pango_context); return footer_height; } + static void -_draw_header (GtkHTML *html, GtkPrintOperation *operation, - GtkPrintContext *context, - gint page_nr, - PangoRectangle *rec, - EDITOR * e) +_draw_header(GtkHTML * html, GtkPrintOperation * operation, + GtkPrintContext * context, + gint page_nr, PangoRectangle * rec, EDITOR * e) { PangoFontDescription *desc; PangoLayout *layout; @@ -179,39 +166,37 @@ gchar *text; cairo_t *cr; - text = g_strdup (e->filename); + text = g_strdup(e->filename); - desc = pango_font_description_from_string ("Sans Regular 10"); - layout = gtk_print_context_create_pango_layout (context); - pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); - pango_layout_set_font_description (layout, desc); - pango_layout_set_text (layout, text, -1); - pango_layout_set_width (layout, rec->width); - - x = pango_units_to_double (rec->x); - y = pango_units_to_double (rec->y); - - cr = gtk_print_context_get_cairo_context (context); - - cairo_save (cr); - cairo_set_source_rgb (cr, .0, .0, .0); - cairo_move_to (cr, x, y); - pango_cairo_show_layout (cr, layout); - cairo_restore (cr); + desc = pango_font_description_from_string("Sans Regular 10"); + layout = gtk_print_context_create_pango_layout(context); + pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, text, -1); + pango_layout_set_width(layout, rec->width); + + x = pango_units_to_double(rec->x); + y = pango_units_to_double(rec->y); + + cr = gtk_print_context_get_cairo_context(context); + + cairo_save(cr); + cairo_set_source_rgb(cr, .0, .0, .0); + cairo_move_to(cr, x, y); + pango_cairo_show_layout(cr, layout); + cairo_restore(cr); - g_object_unref (layout); - pango_font_description_free (desc); + g_object_unref(layout); + pango_font_description_free(desc); - g_free (text); + g_free(text); } static void -_draw_footer (GtkHTML *html, GtkPrintOperation *operation, - GtkPrintContext *context, - gint page_nr, - PangoRectangle *rec, - EDITOR * e) +_draw_footer(GtkHTML * html, GtkPrintOperation * operation, + GtkPrintContext * context, + gint page_nr, PangoRectangle * rec, EDITOR * e) { PangoFontDescription *desc; PangoLayout *layout; @@ -220,36 +205,35 @@ gchar *text; cairo_t *cr; - g_object_get (operation, "n-pages", &n_pages, NULL); - text = g_strdup_printf (_("Page %d of %d"), page_nr + 1, n_pages); + g_object_get(operation, "n-pages", &n_pages, NULL); + text = g_strdup_printf(_("Page %d of %d"), page_nr + 1, n_pages); - desc = pango_font_description_from_string ("Sans Regular 10"); - layout = gtk_print_context_create_pango_layout (context); - pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); - pango_layout_set_font_description (layout, desc); - pango_layout_set_text (layout, text, -1); - pango_layout_set_width (layout, rec->width); - - x = pango_units_to_double (rec->x); - y = pango_units_to_double (rec->y); - - cr = gtk_print_context_get_cairo_context (context); - - cairo_save (cr); - cairo_set_source_rgb (cr, .0, .0, .0); - cairo_move_to (cr, x, y); - pango_cairo_show_layout (cr, layout); - cairo_restore (cr); + desc = pango_font_description_from_string("Sans Regular 10"); + layout = gtk_print_context_create_pango_layout(context); + pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, text, -1); + pango_layout_set_width(layout, rec->width); + + x = pango_units_to_double(rec->x); + y = pango_units_to_double(rec->y); + + cr = gtk_print_context_get_cairo_context(context); + + cairo_save(cr); + cairo_set_source_rgb(cr, .0, .0, .0); + cairo_move_to(cr, x, y); + pango_cairo_show_layout(cr, layout); + cairo_restore(cr); - g_object_unref (layout); - pango_font_description_free (desc); + g_object_unref(layout); + pango_font_description_free(desc); - g_free (text); + g_free(text); } static GtkPrintOperationResult -_do_print (EDITOR * e, - GtkPrintOperationAction action) +_do_print(EDITOR * e, GtkPrintOperationAction action) { GtkPrintOperation *operation; GtkPrintSettings *psettings; @@ -257,131 +241,122 @@ GtkPrintOperationResult result; GError *error = NULL; - operation = gtk_print_operation_new (); - psettings = gtk_print_settings_new (); + operation = gtk_print_operation_new(); + psettings = gtk_print_settings_new(); - psettings = gtk_print_operation_get_print_settings (operation); + psettings = gtk_print_operation_get_print_settings(operation); - setup = gtk_page_setup_new (); - gtk_page_setup_set_top_margin (setup,30,GTK_UNIT_PIXEL); - gtk_page_setup_set_left_margin (setup,50,GTK_UNIT_PIXEL); + setup = gtk_page_setup_new(); + gtk_page_setup_set_top_margin(setup, 30, GTK_UNIT_PIXEL); + gtk_page_setup_set_left_margin(setup, 50, GTK_UNIT_PIXEL); #ifdef WIN32 gtk_print_operation_set_unit(operation, GTK_UNIT_POINTS); #endif - gtk_print_operation_set_default_page_setup (operation, setup); + gtk_print_operation_set_default_page_setup(operation, setup); - result = gtk_html_print_operation_run (GTK_HTML(e->html_widget), - operation, - action, - GTK_WINDOW (e->window), - (GtkHTMLPrintCalcHeight) _calc_header_height, /* GtkHTMLPrintCalcHeight calc_header_height*/ - (GtkHTMLPrintCalcHeight) _calc_footer_height, /* GtkHTMLPrintCalcHeight calc_footer_height*/ - (GtkHTMLPrintDrawFunc) _draw_header, /* GtkHTMLPrintDrawFunc draw_header */ - (GtkHTMLPrintDrawFunc) _draw_footer, /* GtkHTMLPrintDrawFunc draw_footer */ - e, /* gpointer user_data */ - &error); + result = gtk_html_print_operation_run(GTK_HTML(e->html_widget), operation, action, GTK_WINDOW(e->window), (GtkHTMLPrintCalcHeight) _calc_header_height, /* GtkHTMLPrintCalcHeight calc_header_height */ + (GtkHTMLPrintCalcHeight) _calc_footer_height, /* GtkHTMLPrintCalcHeight calc_footer_height */ + (GtkHTMLPrintDrawFunc) _draw_header, /* GtkHTMLPrintDrawFunc draw_header */ + (GtkHTMLPrintDrawFunc) _draw_footer, /* GtkHTMLPrintDrawFunc draw_footer */ + e, /* gpointer user_data */ + &error); - g_object_unref (operation); - handle_error (&error); + g_object_unref(operation); + handle_error(&error); return result; } #endif /* 0 */ - - - static const gchar *file_ui = -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -""; + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ""; static const gchar *note_file_ui = -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -""; + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ""; static const gchar *view_ui = -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -""; - + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ""; static const gchar *main_ui_note = -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -""; - + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ""; static const gchar *main_ui_studypad = -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -""; + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ""; static GtkPrintOperationResult -print (GtkhtmlEditor *editor, - GtkPrintOperationAction action) +print(GtkhtmlEditor *editor, GtkPrintOperationAction action) { GtkPrintOperation *operation; GtkPrintOperationResult result; GError *error = NULL; - operation = gtk_print_operation_new (); + operation = gtk_print_operation_new(); - result = gtk_html_print_operation_run ( - gtkhtml_editor_get_html (editor), operation, action, - GTK_WINDOW (editor), NULL, NULL, NULL, NULL, NULL, &error); + result = + gtk_html_print_operation_run(gtkhtml_editor_get_html(editor), + operation, action, + GTK_WINDOW(editor), NULL, NULL, + NULL, NULL, NULL, &error); - g_object_unref (operation); - handle_error (&error); + g_object_unref(operation); + handle_error(&error); return result; } -static gint -open_dialog (EDITOR * e) +static gint open_dialog(EDITOR *e) { GtkWidget *dialog; gint response; @@ -389,88 +364,89 @@ const gchar *filename; #endif - dialog = gtk_file_chooser_dialog_new ( - _("Open"), GTK_WINDOW (e->window), - GTK_FILE_CHOOSER_ACTION_OPEN, -#ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Open", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + dialog = + gtk_file_chooser_dialog_new(_("Open"), GTK_WINDOW(e->window), + GTK_FILE_CHOOSER_ACTION_OPEN, +#ifdef HAVE_GTK_310 + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, + GTK_RESPONSE_ACCEPT, #endif - NULL); + NULL); - /*gtk_file_chooser_set_do_overwrite_confirmation ( - GTK_FILE_CHOOSER (dialog), TRUE);*/ +/*gtk_file_chooser_set_do_overwrite_confirmation ( + GTK_FILE_CHOOSER (dialog), TRUE); */ #if 0 - filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window)); + filename = gtkhtml_editor_get_filename(GTKHTML_EDITOR(e->window)); #endif - - gtk_file_chooser_set_current_folder ( - GTK_FILE_CHOOSER (dialog), settings.studypaddir); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), + settings.studypaddir); + + response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar *new_filename; - new_filename = gtk_file_chooser_get_filename ( - GTK_FILE_CHOOSER (dialog)); + new_filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); //gtkhtml_editor_set_filename (e->window, new_filename); _load_file(e, new_filename); - g_free (new_filename); + g_free(new_filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); return response; } - -static gint -save_dialog (GtkhtmlEditor *editor, EDITOR * e) +static gint save_dialog(GtkhtmlEditor *editor, EDITOR *e) { GtkWidget *dialog; const gchar *filename; gint response; - dialog = gtk_file_chooser_dialog_new ( - _("Save As"), GTK_WINDOW (editor), - GTK_FILE_CHOOSER_ACTION_SAVE, -#ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Open", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + dialog = + gtk_file_chooser_dialog_new(_("Save As"), GTK_WINDOW(editor), + GTK_FILE_CHOOSER_ACTION_SAVE, +#ifdef HAVE_GTK_310 + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, + GTK_RESPONSE_ACCEPT, #endif - NULL); + NULL); - gtk_file_chooser_set_do_overwrite_confirmation ( - GTK_FILE_CHOOSER (dialog), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); - filename = gtkhtml_editor_get_filename (editor); + filename = gtkhtml_editor_get_filename(editor); if (filename != NULL) - gtk_file_chooser_set_filename ( - GTK_FILE_CHOOSER (dialog), filename); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), + filename); else { - gtk_file_chooser_set_current_folder ( - GTK_FILE_CHOOSER (dialog), settings.studypaddir); - gtk_file_chooser_set_current_name ( - GTK_FILE_CHOOSER (dialog), _("Untitled document")); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), + settings.studypaddir); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), + _("Untitled document")); } - response = gtk_dialog_run (GTK_DIALOG (dialog)); + response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar *new_filename; - new_filename = gtk_file_chooser_get_filename ( - GTK_FILE_CHOOSER (dialog)); - gtkhtml_editor_set_filename (editor, new_filename); + new_filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gtkhtml_editor_set_filename(editor, new_filename); if (e->filename) g_free(e->filename); @@ -483,334 +459,305 @@ change_window_title(e->window, e->filename); - g_free (new_filename); + g_free(new_filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); return response; } /* Helper for view_source_dialog() */ static gboolean -view_source_dialog_receiver (HTMLEngine *engine, - const gchar *data, - guint length, - GString *string) +view_source_dialog_receiver(HTMLEngine *engine, + const gchar *data, + guint length, GString *string) { - g_string_append_len (string, data, length); + g_string_append_len(string, data, length); return TRUE; } static void -view_source_dialog (GtkhtmlEditor *editor, - const gchar *title, - const gchar *content_type, - gboolean show_output) +view_source_dialog(GtkhtmlEditor *editor, + const gchar *title, + const gchar *content_type, gboolean show_output) { GtkWidget *dialog; GtkWidget *content; GtkWidget *scrolled_window; GString *string; - dialog = gtk_dialog_new_with_buttons ( - title, GTK_WINDOW (editor), - GTK_DIALOG_DESTROY_WITH_PARENT, + dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(editor), + GTK_DIALOG_DESTROY_WITH_PARENT, #ifdef HAVE_GTK_310 - "_Close", GTK_RESPONSE_CLOSE, + "_Close", GTK_RESPONSE_CLOSE, #else - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, #endif - NULL); + NULL); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type ( - GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN); - gtk_box_pack_start ( - GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), - scrolled_window, TRUE, TRUE, 0); - - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 6); - gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); - - string = g_string_sized_new (4096); - - gtk_html_export ( - gtkhtml_editor_get_html (editor), - content_type, (GtkHTMLSaveReceiverFn) - view_source_dialog_receiver, string); + scrolled_window = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), + GTK_SHADOW_IN); + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), scrolled_window, TRUE, + TRUE, 0); + + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); + gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 6); + gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 300); + + string = g_string_sized_new(4096); + + gtk_html_export(gtkhtml_editor_get_html(editor), + content_type, (GtkHTMLSaveReceiverFn) + view_source_dialog_receiver, + string); if (show_output) { GtkHTMLStream *stream; - content = gtk_html_new (); - stream = gtk_html_begin (GTK_HTML (content)); - gtk_html_stream_write (stream, string->str, string->len); - gtk_html_stream_close (stream, GTK_HTML_STREAM_OK); + content = gtk_html_new(); + stream = gtk_html_begin(GTK_HTML(content)); + gtk_html_stream_write(stream, string->str, string->len); + gtk_html_stream_close(stream, GTK_HTML_STREAM_OK); } else { GtkTextBuffer *buffer; - content = gtk_text_view_new (); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (content)); - gtk_text_buffer_set_text (buffer, string->str, string->len); - gtk_text_view_set_editable (GTK_TEXT_VIEW (content), FALSE); + content = gtk_text_view_new(); + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(content)); + gtk_text_buffer_set_text(buffer, string->str, string->len); + gtk_text_view_set_editable(GTK_TEXT_VIEW(content), FALSE); } - g_string_free (string, TRUE); + g_string_free(string, TRUE); - gtk_container_add (GTK_CONTAINER (scrolled_window), content); - gtk_widget_show_all (scrolled_window); + gtk_container_add(GTK_CONTAINER(scrolled_window), content); + gtk_widget_show_all(scrolled_window); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } -static void -action_print_cb (GtkAction *action, - EDITOR *e) +static void action_print_cb(GtkAction *action, EDITOR *e) { - print (GTKHTML_EDITOR(e->window), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); + print(GTKHTML_EDITOR(e->window), + GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); } -static void -action_print_preview_cb (GtkAction *action, - EDITOR *e) +static void action_print_preview_cb(GtkAction *action, EDITOR *e) { - print (GTKHTML_EDITOR(e->window), GTK_PRINT_OPERATION_ACTION_PREVIEW); + print(GTKHTML_EDITOR(e->window), + GTK_PRINT_OPERATION_ACTION_PREVIEW); } -static void -action_quit_cb (GtkAction *action, - EDITOR *e) +static void action_quit_cb(GtkAction *action, EDITOR *e) { app_delete_cb(NULL, NULL, e); } - -static void -action_open_cb (GtkAction * action, EDITOR * e) +static void action_open_cb(GtkAction *action, EDITOR *e) { open_dialog(e); } -static void -action_save_cb (GtkAction *action, - EDITOR *e) +static void action_save_cb(GtkAction *action, EDITOR *e) { switch (e->type) { case STUDYPAD_EDITOR: - _save_file (e); + _save_file(e); break; case NOTE_EDITOR: - _save_note (e); + _save_note(e); break; case BOOK_EDITOR: - _save_book (e); + _save_book(e); break; default: - XI_message (("\naction_save_cb oops!\n")); + XI_message(("\naction_save_cb oops!\n")); break; } } -static void -action_new_cb (GtkAction *action, - EDITOR *e) /* for studypad only */ -{ +static void action_new_cb(GtkAction *action, EDITOR *e) +{ /* for studypad only */ if (editor_is_dirty(e)) - _save_file (e); + _save_file(e); - _load_file(e, g_strdup_printf("%s/%s",settings.gSwordDir,"template.pad")); + _load_file(e, + g_strdup_printf("%s/%s", settings.gSwordDir, + "template.pad")); if (e->filename) g_free(e->filename); e->filename = g_strdup(_("Untitled document")); - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); + xml_set_value("Xiphos", "studypad", "lastfile", e->filename); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); change_window_title(e->window, e->filename); gtkhtml_editor_set_filename(GTKHTML_EDITOR(e->window), NULL); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), TRUE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), TRUE); } - -static void -action_delete_cb (GtkAction *action, - EDITOR *e) /* for note only */ -{ +static void action_delete_cb(GtkAction *action, EDITOR *e) +{ /* for note only */ gchar *buf; if (e->studypad) return; - buf = g_strdup_printf - ("%s %s?", - _("Are you sure you want to delete the note for") , e->key); + buf = g_strdup_printf("%s %s?", + _("Are you sure you want to delete the note for"), e->key); if (gui_yes_no_dialog(buf, -#ifdef HAVE_GTK_310 - "dialog-warning" +#ifdef HAVE_GTK_310 + "dialog-warning" #else GTK_STOCK_DIALOG_WARNING -#endif - )) { +#endif + )) { main_delete_note(e->module, e->key); - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - "", - strlen("")); + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + "", strlen("")); } g_free(buf); - } - -static void -action_insert_link_cb (GtkAction *action, EDITOR *e) +static void action_insert_link_cb(GtkAction *action, EDITOR *e) { - editor_link_dialog (e); + editor_link_dialog(e); } - - -static void -action_save_as_cb (GtkAction *action, - EDITOR *e) +static void action_save_as_cb(GtkAction *action, EDITOR *e) { const gchar *filename; gboolean as_html; GError *error = NULL; - if (save_dialog (GTKHTML_EDITOR(e->window), e) == GTK_RESPONSE_CANCEL) + if (save_dialog(GTKHTML_EDITOR(e->window), e) == + GTK_RESPONSE_CANCEL) return; - filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window)); - as_html = gtkhtml_editor_get_html_mode (GTKHTML_EDITOR(e->window)); + filename = gtkhtml_editor_get_filename(GTKHTML_EDITOR(e->window)); + as_html = gtkhtml_editor_get_html_mode(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_save (GTKHTML_EDITOR(e->window), filename, as_html, &error); - handle_error (&error); + gtkhtml_editor_save(GTKHTML_EDITOR(e->window), filename, as_html, + &error); + handle_error(&error); } static void -action_view_html_output (GtkAction *action, - GtkhtmlEditor *editor) +action_view_html_output(GtkAction *action, GtkhtmlEditor *editor) { - view_source_dialog (editor, _("HTML Output"), "text/html", TRUE); + view_source_dialog(editor, _("HTML Output"), "text/html", TRUE); } static void -action_view_html_source (GtkAction *action, - GtkhtmlEditor *editor) +action_view_html_source(GtkAction *action, GtkhtmlEditor *editor) { - view_source_dialog (editor, _("HTML Source"), "text/html", FALSE); + view_source_dialog(editor, _("HTML Source"), "text/html", FALSE); } static void -action_view_plain_source (GtkAction *action, - GtkhtmlEditor *editor) +action_view_plain_source(GtkAction *action, GtkhtmlEditor *editor) { - view_source_dialog (editor, _("Plain Source"), "text/plain", FALSE); + view_source_dialog(editor, _("Plain Source"), "text/plain", FALSE); } - - - static GtkActionEntry file_entries[] = { - { "print", -#ifdef HAVE_GTK_310 - "_Print...", + {"print", +#ifdef HAVE_GTK_310 + "_Print...", #else - GTK_STOCK_PRINT, + GTK_STOCK_PRINT, #endif - N_("_Print..."), - NULL, - NULL, - G_CALLBACK (action_print_cb) }, + N_("_Print..."), + NULL, + NULL, + G_CALLBACK(action_print_cb)}, - { "print-preview", -#ifdef HAVE_GTK_310 - "Print Pre_view...", + {"print-preview", +#ifdef HAVE_GTK_310 + "Print Pre_view...", #else - GTK_STOCK_PRINT_PREVIEW, + GTK_STOCK_PRINT_PREVIEW, #endif - N_("Print Pre_view"), - NULL, - NULL, - G_CALLBACK (action_print_preview_cb) }, + N_("Print Pre_view"), + NULL, + NULL, + G_CALLBACK(action_print_preview_cb)}, - { "quit", -#ifdef HAVE_GTK_310 - "_Quit...", + {"quit", +#ifdef HAVE_GTK_310 + "_Quit...", #else - GTK_STOCK_QUIT, + GTK_STOCK_QUIT, #endif - N_("_Quit"), - NULL, - NULL, - G_CALLBACK (action_quit_cb) }, + N_("_Quit"), + NULL, + NULL, + G_CALLBACK(action_quit_cb)}, - { "open", -#ifdef HAVE_GTK_310 - "_Open", + {"open", +#ifdef HAVE_GTK_310 + "_Open", #else - GTK_STOCK_OPEN, + GTK_STOCK_OPEN, #endif - N_("_Open"), - NULL, - NULL, - G_CALLBACK (action_open_cb) }, + N_("_Open"), + NULL, + NULL, + G_CALLBACK(action_open_cb)}, - { "save", -#ifdef HAVE_GTK_310 - "_Save", + {"save", +#ifdef HAVE_GTK_310 + "_Save", #else - GTK_STOCK_SAVE, + GTK_STOCK_SAVE, #endif - N_("_Save"), - NULL, - NULL, - G_CALLBACK (action_save_cb) }, + N_("_Save"), + NULL, + NULL, + G_CALLBACK(action_save_cb)}, - { "save-as", -#ifdef HAVE_GTK_310 - "Save _As...", + {"save-as", +#ifdef HAVE_GTK_310 + "Save _As...", #else - GTK_STOCK_SAVE_AS, + GTK_STOCK_SAVE_AS, #endif - N_("Save _As..."), - NULL, - NULL, - G_CALLBACK (action_save_as_cb) }, - { "new", - "gtk-new", - N_("New"), - NULL, - N_("Open new document"), - G_CALLBACK (action_new_cb) }, - { "delete", - "gtk-delete", - N_("Delete"), - NULL, - N_("Delete current note"), - G_CALLBACK (action_delete_cb) }, + N_("Save _As..."), + NULL, + NULL, + G_CALLBACK(action_save_as_cb)}, + {"new", + "gtk-new", + N_("New"), + NULL, + N_("Open new document"), + G_CALLBACK(action_new_cb)}, + {"delete", + "gtk-delete", + N_("Delete"), + NULL, + N_("Delete current note"), + G_CALLBACK(action_delete_cb)}, + + {"file-menu", + NULL, + N_("_File"), + NULL, + NULL, + NULL}}; - { "file-menu", - NULL, - N_("_File"), - NULL, - NULL, - NULL } -}; /* static GtkActionEntry note_file_entries[] = { @@ -859,237 +806,214 @@ */ static GtkActionEntry view_entries[] = { - { "view-html-output", - NULL, - N_("HTML _Output"), - NULL, - NULL, - G_CALLBACK (action_view_html_output) }, - - { "view-html-source", - NULL, - N_("_HTML Source"), - NULL, - NULL, - G_CALLBACK (action_view_html_source) }, - - { "view-plain-source", - NULL, - N_("_Plain Source"), - NULL, - NULL, - G_CALLBACK (action_view_plain_source) }, - - { "view-menu", - NULL, - N_("_View"), - NULL, - NULL, - NULL } -}; - + {"view-html-output", + NULL, + N_("HTML _Output"), + NULL, + NULL, + G_CALLBACK(action_view_html_output)}, + + {"view-html-source", + NULL, + N_("_HTML Source"), + NULL, + NULL, + G_CALLBACK(action_view_html_source)}, + + {"view-plain-source", + NULL, + N_("_Plain Source"), + NULL, + NULL, + G_CALLBACK(action_view_plain_source)}, + + {"view-menu", + NULL, + N_("_View"), + NULL, + NULL, + NULL}}; static GtkActionEntry main_entries[] = { - { "save", - "gtk-save", - N_("Save"), - NULL, - NULL, - G_CALLBACK (action_save_cb) } -}; - + {"save", + "gtk-save", + N_("Save"), + NULL, + NULL, + G_CALLBACK(action_save_cb)}}; static GtkActionEntry test_entries[] = { - { "context-insert-link", - "insert-link", - N_("Insert Link"), - NULL, - NULL, - G_CALLBACK (action_insert_link_cb) }, - - { "insert-link", - "insert-link", - N_("Insert Link"), - NULL, - NULL, - G_CALLBACK (action_insert_link_cb) } -}; - + {"context-insert-link", + "insert-link", + N_("Insert Link"), + NULL, + NULL, + G_CALLBACK(action_insert_link_cb)}, + + {"insert-link", + "insert-link", + N_("Insert Link"), + NULL, + NULL, + G_CALLBACK(action_insert_link_cb)}}; -GtkWidget * editor_new (const gchar * title, EDITOR *e) +GtkWidget *editor_new(const gchar *title, EDITOR *e) { GtkActionGroup *action_group; GtkUIManager *manager; GtkWidget *editor; GError *error = NULL; - editor = gtkhtml_editor_new (); + editor = gtkhtml_editor_new(); e->window = editor; - e->html_widget = GTK_WIDGET(gtkhtml_editor_get_html (GTKHTML_EDITOR (editor))); - gtk_window_set_title(GTK_WINDOW(editor),title); + e->html_widget = + GTK_WIDGET(gtkhtml_editor_get_html(GTKHTML_EDITOR(editor))); + gtk_window_set_title(GTK_WINDOW(editor), title); - set_window_icon (GTK_WINDOW(editor)); + set_window_icon(GTK_WINDOW(editor)); - manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (editor)); + manager = gtkhtml_editor_get_ui_manager(GTKHTML_EDITOR(editor)); if (e->type == STUDYPAD_EDITOR) - gtk_ui_manager_add_ui_from_string (manager, file_ui, -1, &error); + gtk_ui_manager_add_ui_from_string(manager, file_ui, -1, + &error); else - gtk_ui_manager_add_ui_from_string (manager, note_file_ui, -1, &error); + gtk_ui_manager_add_ui_from_string(manager, note_file_ui, + -1, &error); - handle_error (&error); + handle_error(&error); - - gtk_ui_manager_add_ui_from_string (manager, view_ui, -1, &error); - handle_error (&error); + gtk_ui_manager_add_ui_from_string(manager, view_ui, -1, &error); + handle_error(&error); if (e->type == STUDYPAD_EDITOR) - gtk_ui_manager_add_ui_from_string (manager, main_ui_studypad, -1, &error); + gtk_ui_manager_add_ui_from_string(manager, + main_ui_studypad, -1, + &error); else - gtk_ui_manager_add_ui_from_string (manager, main_ui_note, -1, &error); - - handle_error (&error); + gtk_ui_manager_add_ui_from_string(manager, main_ui_note, + -1, &error); - action_group = gtk_action_group_new ("file"); - gtk_action_group_set_translation_domain ( - action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions ( - action_group, file_entries, - G_N_ELEMENTS (file_entries), e); - gtk_ui_manager_insert_action_group (manager, action_group, 0); - - action_group = gtk_action_group_new ("view"); - gtk_action_group_set_translation_domain ( - action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions ( - action_group, view_entries, - G_N_ELEMENTS (view_entries), editor); - gtk_ui_manager_insert_action_group (manager, action_group, 0); - - action_group = gtk_action_group_new ("main"); - gtk_action_group_set_translation_domain ( - action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions ( - action_group, main_entries, - G_N_ELEMENTS (main_entries), e); - gtk_ui_manager_insert_action_group (manager, action_group, 0); - - - action_group = gtk_action_group_new ("context-menu"); - gtk_action_group_set_translation_domain ( - action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions ( - action_group, test_entries, - G_N_ELEMENTS (test_entries), e); - gtk_ui_manager_insert_action_group (manager, action_group, 0); + handle_error(&error); + action_group = gtk_action_group_new("file"); + gtk_action_group_set_translation_domain(action_group, + GETTEXT_PACKAGE); + gtk_action_group_add_actions(action_group, file_entries, + G_N_ELEMENTS(file_entries), e); + gtk_ui_manager_insert_action_group(manager, action_group, 0); + + action_group = gtk_action_group_new("view"); + gtk_action_group_set_translation_domain(action_group, + GETTEXT_PACKAGE); + gtk_action_group_add_actions(action_group, view_entries, + G_N_ELEMENTS(view_entries), editor); + gtk_ui_manager_insert_action_group(manager, action_group, 0); + + action_group = gtk_action_group_new("main"); + gtk_action_group_set_translation_domain(action_group, + GETTEXT_PACKAGE); + gtk_action_group_add_actions(action_group, main_entries, + G_N_ELEMENTS(main_entries), e); + gtk_ui_manager_insert_action_group(manager, action_group, 0); + + action_group = gtk_action_group_new("context-menu"); + gtk_action_group_set_translation_domain(action_group, + GETTEXT_PACKAGE); + gtk_action_group_add_actions(action_group, test_entries, + G_N_ELEMENTS(test_entries), e); + gtk_ui_manager_insert_action_group(manager, action_group, 0); - gtk_ui_manager_ensure_update (manager); - gtk_widget_show (editor); + gtk_ui_manager_ensure_update(manager); + gtk_widget_show(editor); gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), FALSE); g_signal_connect(editor, "delete-event", - G_CALLBACK(app_delete_cb), (EDITOR *) e); + G_CALLBACK(app_delete_cb), (EDITOR *)e); return editor; - } - /* Helper for _save_note() and _save_book()*/ static gboolean -_save_receiver (HTMLEngine *engine, - const gchar *data, - guint length, - GString *string) +_save_receiver(HTMLEngine *engine, + const gchar *data, guint length, GString *string) { - g_string_append_len (string, data, length); + g_string_append_len(string, data, length); return TRUE; } - -static void -_save_note(EDITOR * e) +static void _save_note(EDITOR *e) { GString *string; - string = g_string_sized_new (4096); + string = g_string_sized_new(4096); - gtk_html_export (gtkhtml_editor_get_html - (GTKHTML_EDITOR (e->window)), + gtk_html_export(gtkhtml_editor_get_html(GTKHTML_EDITOR(e->window)), "text/html", - (GtkHTMLSaveReceiverFn) _save_receiver, - string); - XI_message(("\n_save_note: %s\n",string->str)); - main_save_note (e->module, e->key, string->str); + (GtkHTMLSaveReceiverFn)_save_receiver, string); + XI_message(("\n_save_note: %s\n", string->str)); + main_save_note(e->module, e->key, string->str); - g_string_free(string,TRUE); + g_string_free(string, TRUE); gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), FALSE); } - -static void -_save_book(EDITOR * e) +static void _save_book(EDITOR *e) { GString *string; - string = g_string_sized_new (4096); + string = g_string_sized_new(4096); - gtk_html_export (gtkhtml_editor_get_html - (GTKHTML_EDITOR (e->window)), + gtk_html_export(gtkhtml_editor_get_html(GTKHTML_EDITOR(e->window)), "text/html", - (GtkHTMLSaveReceiverFn) _save_receiver, - string); + (GtkHTMLSaveReceiverFn)_save_receiver, string); main_treekey_save_book_text(e->module, e->key, string->str); - g_string_free(string,TRUE); + g_string_free(string, TRUE); gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), FALSE); } - -static void -_save_file (EDITOR * e) +static void _save_file(EDITOR *e) { const gchar *filename; gboolean as_html; GError *error = NULL; - if (gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window)) == NULL) - if (save_dialog (GTKHTML_EDITOR(e->window), e) == GTK_RESPONSE_CANCEL) + if (gtkhtml_editor_get_filename(GTKHTML_EDITOR(e->window)) == NULL) + if (save_dialog(GTKHTML_EDITOR(e->window), e) == + GTK_RESPONSE_CANCEL) return; - filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window)); - as_html = gtkhtml_editor_get_html_mode (GTKHTML_EDITOR(e->window)); + filename = gtkhtml_editor_get_filename(GTKHTML_EDITOR(e->window)); + as_html = gtkhtml_editor_get_html_mode(GTKHTML_EDITOR(e->window)); - XI_message (("\n_save_file filename: %s\n",filename)); + XI_message(("\n_save_file filename: %s\n", filename)); - gtkhtml_editor_save (GTKHTML_EDITOR(e->window), filename, as_html, &error); - handle_error (&error); + gtkhtml_editor_save(GTKHTML_EDITOR(e->window), filename, as_html, + &error); + handle_error(&error); gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), FALSE); } - -static void -_load_file (EDITOR * e, const gchar * filename) +static void _load_file(EDITOR *e, const gchar *filename) { //GtkWidget *choser; if (e->filename) g_free(e->filename); e->filename = g_strdup(filename); - XI_message(("_load_file filename: %s",filename)); + XI_message(("_load_file filename: %s", filename)); - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); + xml_set_value("Xiphos", "studypad", "lastfile", e->filename); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); change_window_title(e->window, e->filename); char *contents; @@ -1097,29 +1021,22 @@ gsize length; GFile *file; file = g_file_new_for_path(filename); - gtkhtml_editor_set_filename(GTKHTML_EDITOR(e->window),e->filename); - if (g_file_load_contents (file, - NULL, - &contents, - &length, - &etag_out, - NULL)) - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - contents, - length); + gtkhtml_editor_set_filename(GTKHTML_EDITOR(e->window), + e->filename); + if (g_file_load_contents(file, NULL, &contents, &length, &etag_out, NULL)) + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + contents, length); gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), FALSE); return; - } -gboolean editor_is_dirty(EDITOR * e) +gboolean editor_is_dirty(EDITOR *e) { return gtkhtml_editor_get_changed(GTKHTML_EDITOR(e->window)); } - -void editor_save_book(EDITOR * e) +void editor_save_book(EDITOR *e) { if (editor_is_dirty(e)) { _save_book(e); @@ -1127,34 +1044,34 @@ } /* save if needed is done in treeky-editor.c before calling editor_load_book() */ -void editor_load_book(EDITOR * e) +void editor_load_book(EDITOR *e) { gchar *title = NULL; gchar *text = NULL; - if (!g_ascii_isdigit(e->key[0])) return; /* make sure is a number (offset) */ - + if (!g_ascii_isdigit(e->key[0])) + return; /* make sure is a number (offset) */ title = g_strdup_printf("%s", e->module); - XI_message (("book: %s\noffset :%s", e->module, e->key)); + XI_message(("book: %s\noffset :%s", e->module, e->key)); if (atol(e->key) != 0) - text = main_get_book_raw_text (e->module, e->key); + text = main_get_book_raw_text(e->module, e->key); else text = g_strdup(e->module); if (strlen(text)) { - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - text, - strlen(text)); - gtkhtml_editor_drop_undo (GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + text, strlen(text)); + gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), + FALSE); } else { - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - "", - strlen("")); - gtkhtml_editor_drop_undo (GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + "", strlen("")); + gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), + FALSE); } change_window_title(e->window, title); @@ -1184,19 +1101,19 @@ void editor_sync_with_main(void) { GList *tmp = NULL; - EDITOR * e; tmp = g_list_first(editors_all); while (tmp != NULL) { - e = (EDITOR*)tmp->data; - + EDITOR *e = (EDITOR *)tmp->data; + switch (e->type) { - case STUDYPAD_EDITOR: - case BOOK_EDITOR: - break; - case NOTE_EDITOR: - if (e->sync) - editor_load_note(e, NULL, settings.currentverse); + case STUDYPAD_EDITOR: + case BOOK_EDITOR: + break; + case NOTE_EDITOR: + if (e->sync) + editor_load_note(e, NULL, + settings.currentverse); break; } tmp = g_list_next(tmp); @@ -1204,15 +1121,13 @@ } void -editor_load_note(EDITOR * e, const gchar * module_name, - const gchar * key) +editor_load_note(EDITOR *e, const gchar *module_name, const gchar *key) { gchar *title; gchar *text; - if (editor_is_dirty(e)) - _save_note (e); + _save_note(e); if (module_name) { if (e->module) @@ -1225,27 +1140,25 @@ e->key = g_strdup(key); } - title = g_strdup_printf("%s - %s", e->module, e->key); - text = main_get_raw_text((gchar *) e->module, (gchar *) e->key); + text = main_get_raw_text((gchar *)e->module, (gchar *)e->key); if (strlen(text)) { - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - text, - strlen(text)); - gtkhtml_editor_drop_undo (GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + text, strlen(text)); + gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), + FALSE); } else { - gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window), - "", - strlen("")); - gtkhtml_editor_drop_undo (GTKHTML_EDITOR(e->window)); - gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE); - + gtkhtml_editor_set_text_html(GTKHTML_EDITOR(e->window), + "", strlen("")); + gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window)); + gtkhtml_editor_set_changed(GTKHTML_EDITOR(e->window), + FALSE); } change_window_title(e->window, title); - if (e->type == NOTE_EDITOR) + if (e->type == NOTE_EDITOR) main_navbar_versekey_set(e->navbar, e->key); if (text) @@ -1254,16 +1167,15 @@ g_free(title); } - static int -app_delete_cb(GtkWidget * widget, GdkEvent * event, gpointer data) +app_delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data) { - if (editor_is_dirty((EDITOR *) data)) { - switch (ask_about_saving((EDITOR *) data)) { - case GS_YES: /* exit saving */ + if (editor_is_dirty((EDITOR *)data)) { + switch (ask_about_saving((EDITOR *)data)) { + case GS_YES: /* exit saving */ break; - case GS_NO: /* exit without saving */ + case GS_NO: /* exit without saving */ break; case GS_CANCEL: @@ -1271,14 +1183,12 @@ break; } } - editors_all = g_list_remove(editors_all, (EDITOR*) data); - do_exit((EDITOR *) data); + editors_all = g_list_remove(editors_all, (EDITOR *)data); + do_exit((EDITOR *)data); return FALSE; } - -static -gint ask_about_saving(EDITOR * e) +static gint ask_about_saving(EDITOR *e) { gint test; GS_DIALOG *info; @@ -1294,16 +1204,14 @@ info = gui_new_dialog(); info->stock_icon = GTK_STOCK_DIALOG_WARNING; - buf = g_strdup_printf("%s: %s",e->module, e->key); + buf = g_strdup_printf("%s: %s", e->module, e->key); buf1 = _("Save the changes to document"); buf2 = _("before closing?"); buf3 = - g_strdup_printf - ("%s %s %s", - buf1, buf, buf2); + g_strdup_printf("%s %s %s", + buf1, buf, buf2); info->label_top = buf3; - info->label2 = - _("If you don't save, changes will be permanently lost."); + info->label2 = _("If you don't save, changes will be permanently lost."); info->save = TRUE; info->cancel = TRUE; info->no_save = TRUE; @@ -1322,7 +1230,7 @@ } } g_free(info); - g_free(buf); + g_free(buf); g_free(buf3); break; @@ -1341,12 +1249,10 @@ buf1 = _("Save the changes to document"); buf2 = _("before closing?"); buf3 = - g_strdup_printf - ("%s %s %s", - buf1, buf, buf2); + g_strdup_printf("%s %s %s", + buf1, buf, buf2); info->label_top = buf3; - info->label2 = - _("If you don't save, changes will be permanently lost."); + info->label2 = _("If you don't save, changes will be permanently lost."); info->save = TRUE; info->cancel = TRUE; info->no_save = TRUE; @@ -1355,13 +1261,12 @@ retval = test; if (test == GS_YES) { if (e->filename) - gtkhtml_editor_save (GTKHTML_EDITOR(e->window), - e->filename, - TRUE, - NULL); + gtkhtml_editor_save(GTKHTML_EDITOR(e->window), + e->filename, TRUE, + NULL); /*else - open_or_save_as_dialog(e, - OP_SAVE_THROUGH_PERSIST_FILE);*/ + open_or_save_as_dialog(e, + OP_SAVE_THROUGH_PERSIST_FILE); */ } g_free(info); g_free(buf3); @@ -1371,15 +1276,13 @@ return retval; } - -static -gint _create_new(const gchar * filename, const gchar * key, gint editor_type) +static gint _create_new(const gchar *filename, const gchar *key, + gint editor_type) { EDITOR *editor; GtkWidget *vbox = NULL; GtkWidget *toolbar_nav = NULL; - editor = g_new(EDITOR, 1); editor->html_widget = NULL; editor->sync = FALSE; @@ -1394,7 +1297,7 @@ editor->key = NULL; editor->filename = NULL; widgets.studypad_dialog = - editor_new(_("StudyPad"), editor); + editor_new(_("StudyPad"), editor); if (filename) { editor->filename = g_strdup(filename); @@ -1413,8 +1316,10 @@ vbox = GTKHTML_EDITOR(editor->window)->vbox; toolbar_nav = gui_navbar_versekey_editor_new(editor); gtk_widget_show(toolbar_nav); - gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(toolbar_nav), FALSE, TRUE, 0); - gtk_box_reorder_child (GTK_BOX (vbox),GTK_WIDGET(toolbar_nav),1); + gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(toolbar_nav), + FALSE, TRUE, 0); + gtk_box_reorder_child(GTK_BOX(vbox), + GTK_WIDGET(toolbar_nav), 1); editor_load_note(editor, NULL, NULL); break; @@ -1429,47 +1334,45 @@ GtkWidget *box; UI_VBOX(box, TRUE, 0); - gtk_widget_show (box); + gtk_widget_show(box); GtkWidget *hpaned1 = UI_HPANE(); - gtk_widget_show (hpaned1); - gtk_paned_pack2 (GTK_PANED (hpaned1), box, TRUE, TRUE); + gtk_widget_show(hpaned1); + gtk_paned_pack2(GTK_PANED(hpaned1), box, TRUE, TRUE); GtkWidget *scrollbar = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrollbar); gtk_paned_pack1(GTK_PANED(hpaned1), GTK_WIDGET(scrollbar), - TRUE, TRUE); + TRUE, TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrollbar, - settings.shadow_type); + settings.shadow_type); editor->treeview = gui_create_editor_tree(editor); gtk_widget_show(editor->treeview); gtk_container_add(GTK_CONTAINER(scrollbar), - editor->treeview); - gtk_paned_set_position(GTK_PANED(hpaned1), - 125); - gtk_tree_view_collapse_all((GtkTreeView *)editor->treeview); + editor->treeview); + gtk_paned_set_position(GTK_PANED(hpaned1), 125); + gtk_tree_view_collapse_all((GtkTreeView *) + editor->treeview); // then we should expand on the item to which we've opened for edit. vbox = GTKHTML_EDITOR(editor->window)->vbox; - gtk_widget_reparent (vbox,box); + gtk_widget_reparent(vbox, box); - gtk_container_add (GTK_CONTAINER (editor->window), hpaned1); + gtk_container_add(GTK_CONTAINER(editor->window), hpaned1); editor_load_book(editor); break; } editor->is_changed = FALSE; - editors_all = g_list_append(editors_all,(EDITOR*) editor); + editors_all = g_list_append(editors_all, (EDITOR *)editor); return 1; - } - /****************************************************************************** * Name * editor_create_new @@ -1486,19 +1389,19 @@ * gint */ -gint editor_create_new(const gchar * filename, const gchar * key, gint editor_type) +gint editor_create_new(const gchar *filename, const gchar *key, + gint editor_type) { GList *tmp = NULL; - EDITOR *e; tmp = g_list_first(editors_all); while (tmp != NULL) { - e = (EDITOR*)tmp->data; + EDITOR *e = (EDITOR *)tmp->data; switch (editor_type) { case STUDYPAD_EDITOR: if (e->studypad) { if (editor_is_dirty(e)) - _save_file (e); + _save_file(e); if (e->filename) g_free(e->filename); e->filename = g_strdup(filename); @@ -1510,9 +1413,10 @@ } break; case NOTE_EDITOR: - if (!e->noteeditor) break; + if (!e->noteeditor) + break; if (editor_is_dirty(e)) - _save_note (e); + _save_note(e); if (e->module) g_free(e->module); e->module = g_strdup(filename); @@ -1527,9 +1431,10 @@ return 1; break; case BOOK_EDITOR: - if (!e->bookeditor) break; + if (!e->bookeditor) + break; if (editor_is_dirty(e)) - _save_book (e); + _save_book(e); if (e->module) g_free(e->module); e->module = g_strdup(filename); @@ -1538,7 +1443,8 @@ e->key = g_strdup(key); gtk_widget_show(e->window); gdk_window_raise(gtk_widget_get_parent_window(GTK_WIDGET(e->window))); - main_load_book_tree_in_editor (GTK_TREE_VIEW (e->treeview), e->module); + main_load_book_tree_in_editor(GTK_TREE_VIEW(e->treeview), + e->module); editor_load_book(e); return 1; @@ -1546,7 +1452,9 @@ } tmp = g_list_next(tmp); } - XI_message (("filename %s, key %s", (filename ? filename : "-null-"), (key ? key : "-null-"))); + XI_message(("filename %s, key %s", + (filename ? filename : "-null-"), + (key ? key : "-null-"))); return _create_new(filename, key, editor_type); } @@ -1560,7 +1468,7 @@ elements will be removed by the saver. */ tmp2 = g_list_next(tmp); - app_delete_cb(NULL, NULL, (EDITOR*)tmp->data); + app_delete_cb(NULL, NULL, (EDITOR *)tmp->data); tmp = tmp2; } } diff -Nru xiphos-4.0.0+dfsg1/src/editor/slib-editor.h xiphos-4.0.4+dfsg1/src/editor/slib-editor.h --- xiphos-4.0.0+dfsg1/src/editor/slib-editor.h 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/slib-editor.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * slib-editor.h - the html editor using gtkhtml-editor (slib) * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,23 +23,23 @@ #define _SLIB_EDITOR_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #include #ifndef USE_WEBKIT_EDITOR - + #include #include "main/navbar_versekey.h" typedef struct _editor EDITOR; -struct _editor { +struct _editor +{ GtkWidget *window; GtkWidget *toolbar; - GtkWidget *treeview; + GtkWidget *treeview; GtkWidget *sync_button; GtkWidget *html_widget; GtkWidget *statusbar; @@ -65,24 +65,22 @@ BOOK_EDITOR }; - /* void button_test_clicked_cb(GtkObject *object, gpointer user_data); void button_ok_clicked_cb(GtkObject *object, gpointer user_data); void button_cancel_clicked_cb(GtkObject *object, gpointer user_data);*/ void editor_sync_with_main(void); -void editor_load_note(EDITOR * e, const gchar * module_name, const gchar * key); -void editor_load_book(EDITOR * e); -gint editor_create_new(const gchar * filename, const gchar * key, gint note); -void editor_save_book(EDITOR * e); +void editor_load_note(EDITOR *e, const gchar *module_name, + const gchar *key); +void editor_load_book(EDITOR *e); +gint editor_create_new(const gchar *filename, const gchar *key, + gint note); +void editor_save_book(EDITOR *e); void editor_maybe_save_all(void); -GtkWidget * editor_new (const gchar * title, EDITOR *e); - +GtkWidget *editor_new(const gchar *title, EDITOR *e); #ifdef __cplusplus } #endif - - #endif /* !USE_WEBKIT_EDITOR */ #endif /* _SLIB_EDITOR_H */ diff -Nru xiphos-4.0.0+dfsg1/src/editor/template.h xiphos-4.0.4+dfsg1/src/editor/template.h --- xiphos-4.0.0+dfsg1/src/editor/template.h 2014-12-18 19:34:42.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/template.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,9 +2,9 @@ * Xiphos Bible Study Tool * template.h - data for studypad template (webkit editor) * - * ** this is only used by settings if studypad.spt does not exist ** + * ** this is used by settings only if studypad.spt does not exist ** * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -21,52 +21,52 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #define studypad_template \ -" \n \ - \n \ - \n \ -studypad template \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ -\n \ - \n \ -" + "\n\ +\n\ +\n\ +studypad template\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n" diff -Nru xiphos-4.0.0+dfsg1/src/editor/webkit_editor.c xiphos-4.0.4+dfsg1/src/editor/webkit_editor.c --- xiphos-4.0.0+dfsg1/src/editor/webkit_editor.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/webkit_editor.c 2015-04-15 13:37:08.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * webkit_editor.c - html editor using webkit * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -31,19 +31,15 @@ #include #include - #include #include #include #include #include -//#include -//#include #include "editor/webkit_editor.h" #include "editor/editor.h" #include "editor/link_dialog.h" -//#include "editor/html.h" #include "main/settings.h" #include "main/sword.h" @@ -66,301 +62,316 @@ extern gboolean do_display; extern BUTTONS_STATE buttons_state; -static -void change_window_title(GtkWidget * window, const gchar * window_title); - -static -gboolean editor_is_dirty(EDITOR * e); - -static -void _load_file (EDITOR * e, const gchar * filename); +static void change_window_title(GtkWidget *window, const gchar *window_title); -static -void _save_file (EDITOR * e); +static gboolean editor_is_dirty(EDITOR *e); -static -void _save_note (EDITOR * e); +static void _load_file(EDITOR *e, const gchar *filename); +static void _save_file(EDITOR *e); +static void _save_note(EDITOR *e); +static void _save_book(EDITOR *e); -static -void _save_book (EDITOR * e); - -static -GList *editors_all = NULL; +static GList *editors_all = NULL; +/****************************************************************************** + * Name + * on_about_dialog_response + * + * Synopsis + * #include "gui/.h" + * + * void on_about_dialog_response(GtkDialog * dialog, gint response_id, + * gpointer user_data) + * + * Description + * + * Return value + * void + */ -/* -static -gchar * editor_get_filename(EDITOR * e) +static void +on_about_dialog_response(GtkDialog *dialog, + gint response_id, gpointer user_data) { - return NULL; + gtk_widget_destroy(GTK_WIDGET(dialog)); } -static -void editor_set_filename(EDITOR * e, const gchar * new_filename) -{ - -} -*/ +/****************************************************************************** + * Name + * action_about_activate_cb + * + * Synopsis + * #include "gui/about_sword.h" + * + * void action_about_activate_cb(GtkWidget *widget, EDITOR *e); + * + * Description + * Create brief dialog for webkit editor. + * + * Return value + * void + */ -void action_about_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_about_activate_cb(GtkWidget *widget, EDITOR *e) { + GtkWidget *about; + GdkPixbuf *about_logo; -} + about_logo = pixbuf_finder("xiphos-button-125.png", 0, NULL); + about = gtk_about_dialog_new(); -void action_increase_indent_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; - - script = g_strdup ("document.execCommand('Indent', false, false);"); - editor_execute_script (script, e); - editor_insert_new_outline_level (e->toolitems.outline_level, e); + g_signal_connect(about, "response", + G_CALLBACK(on_about_dialog_response), NULL); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about), "WebKit editor, Xiphos"); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about), (gchar *)VERSION); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about), "Replacement for gtkhtml editor"); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), about_logo); + set_window_icon(GTK_WINDOW(about)); + gtk_widget_show(about); } -void action_decrease_indent_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; - - script = g_strdup ("document.execCommand('Outdent', false, false);"); - editor_execute_script (script, e); +G_MODULE_EXPORT void +action_increase_indent_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_execute_script("document.execCommand('Indent', false, false);", e); + editor_insert_new_outline_level(e->toolitems.outline_level, e); } - -void action_insert_rule_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_decrease_indent_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar * html = NULL; - html = g_strdup("
"); - editor_insert_html (html, e); - if (html) g_free(html); + editor_execute_script("document.execCommand('Outdent', false, false);", e); } -void action_insert_table_activate_cb (GtkWidget *widget,EDITOR * e) +G_MODULE_EXPORT void +action_insert_rule_activate_cb(GtkWidget *widget, EDITOR *e) { - + editor_insert_html("
", e); } -void action_insert_emoticon_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_insert_table_activate_cb(GtkWidget *widget, EDITOR *e) { - //script = g_strdup ("document.execCommand('', null, \"\");"); } +G_MODULE_EXPORT void +action_insert_emoticon_activate_cb(GtkWidget *widget, EDITOR *e) +{ + // This is stupid, if we don't have emoticons working, then we sould + // remove the button users see. -void action_insert_image_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; - gchar * filename = NULL; - - - GtkWidget * dialog = gtk_file_chooser_dialog_new ("Select an image file", - NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, -#ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_OK", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, -#endif - NULL); - - // gtk_file_chooser_set_filter ((GtkFileChooser *)dialog, GtkFileFilter *filter); - if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - script = g_strdup_printf ("document.execCommand('insertImage', null, '%s');" ,filename); - editor_execute_script (script, e); - } - - if (filename) g_free (filename); - gtk_widget_destroy (dialog); + //script = g_strdup ("document.execCommand('', null, \"\");"); } - -void action_insert_outline_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_insert_image_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar * script = NULL; - - script = g_strdup ("document.execCommand('insertHTML', null, \"
\");"); - editor_execute_script (script, e); - -} - + gchar *filename = NULL; -void action_justify_right_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; + GtkWidget *dialog = gtk_file_chooser_dialog_new("Select an image file", + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, +#ifdef HAVE_GTK_310 + "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, +#endif + NULL); - script = g_strdup ("document.execCommand('justifyright', false, false);"); - editor_execute_script (script, e); + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gchar *script = g_strdup_printf("document.execCommand('insertImage', null, '%s');", filename); + editor_execute_script(script, e); + g_free(script); + } + if (filename) + g_free(filename); + gtk_widget_destroy(dialog); } -void action_justify_left_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; - - script = g_strdup ("document.execCommand('justifyleft', false, false);"); - editor_execute_script (script, e); +G_MODULE_EXPORT void +action_insert_outline_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_execute_script("document.execCommand('insertHTML', null, \"
\");", e); } -void action_justify_center_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_justify_right_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar * script = NULL; - - script = g_strdup ("document.execCommand('justifycenter', false, false);"); - editor_execute_script (script, e); + editor_execute_script("document.execCommand('justifyright', false, false);", e); } -void action_justify_full_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_justify_left_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar * script = NULL; - - script = g_strdup ("document.execCommand('justifyfull', false, false);"); - editor_execute_script (script, e); + editor_execute_script("document.execCommand('justifyleft', false, false);", e); +} +G_MODULE_EXPORT void +action_justify_center_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_execute_script("document.execCommand('justifycenter', false, false);", e); } -void action_bold_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_justify_full_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar * script = NULL; - if(buttons_state.nochange) - return; - - script = g_strdup("document.execCommand('bold',false,false);"); - editor_execute_script (script, e); + editor_execute_script("document.execCommand('justifyfull', false, false);", e); } - -void action_italic_activate_cb (GtkWidget *widget, EDITOR * e) + +G_MODULE_EXPORT void +action_bold_activate_cb(GtkWidget *widget, EDITOR *e) { - //extern BUTTONS_STATE buttons_state; - gchar * script = NULL; - if(buttons_state.nochange) - return;; + if (buttons_state.nochange) + return; - script = g_strdup("document.execCommand('italic',false,false);"); - editor_execute_script (script, e); + editor_execute_script("document.execCommand('bold',false,false);", e); } - -void action_undo_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; - script = g_strdup("document.execCommand('undo',false,false);"); - editor_execute_script (script, e); +G_MODULE_EXPORT void +action_italic_activate_cb(GtkWidget *widget, EDITOR *e) +{ + //extern BUTTONS_STATE buttons_state; + if (buttons_state.nochange) + return; + + editor_execute_script("document.execCommand('italic',false,false);", e); } -void action_redo_activate_cb (GtkWidget *widget, EDITOR * e) -{ - gchar * script = NULL; +G_MODULE_EXPORT void +action_undo_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_execute_script("document.execCommand('undo',false,false);", e); +} - script = g_strdup("document.execCommand('redo',false,false);"); - editor_execute_script (script, e); +G_MODULE_EXPORT void +action_redo_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_execute_script("document.execCommand('redo',false,false);", e); } -void action_underline_activate_cb (GtkWidget *widget, EDITOR * e) -{ - //extern BUTTONS_STATE buttons_state; - gchar * script = NULL; - if(buttons_state.nochange) - return; +G_MODULE_EXPORT void +action_underline_activate_cb(GtkWidget *widget, EDITOR *e) +{ + //extern BUTTONS_STATE buttons_state; + if (buttons_state.nochange) + return; - script = g_strdup("document.execCommand('underline', false, false);"); - editor_execute_script (script, e); + editor_execute_script("document.execCommand('underline', false, false);", e); } -void action_strikethrough_activate_cb (GtkWidget *widget, EDITOR * e) -{ - //extern BUTTONS_STATE buttons_state; - gchar * script = NULL; - if(buttons_state.nochange) - return; - - script = g_strdup ("document.execCommand('strikethrough', false, false);"); - editor_execute_script (script, e); +G_MODULE_EXPORT void +action_strikethrough_activate_cb(GtkWidget *widget, EDITOR *e) +{ + //extern BUTTONS_STATE buttons_state; + if (buttons_state.nochange) + return; + editor_execute_script("document.execCommand('strikethrough', false, false);", e); } - -void action_cut_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void action_cut_activate_cb(GtkWidget *widget, EDITOR *e) { - editor_cut(e); + editor_cut(e); } - -void action_copy_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_copy_activate_cb(GtkWidget *widget, EDITOR *e) { - if(editor_copy(e)) - XI_message(("%s", "copy sucess")); - else - XI_message(("%s", "copy failed")); + if (editor_copy(e)) + XI_message(("%s", "copy sucess")); + else + XI_message(("%s", "copy failed")); } -void action_paste_activate_cb (GtkWidget *widget, EDITOR * e) -{ - editor_paste(e); +G_MODULE_EXPORT void +action_paste_activate_cb(GtkWidget *widget, EDITOR *e) +{ + editor_paste(e); } -void action_delete_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_delete_activate_cb(GtkWidget *widget, EDITOR *e) { - } -void action_delete_item_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_delete_item_activate_cb(GtkWidget *widget, EDITOR *e) { - gchar *buf = NULL; - gchar *uri = NULL; - if (e->studypad) return; - buf = g_strdup_printf - ("%s %s?", - _("Are you sure you want to delete the note for") , e->key); - - if (gui_yes_no_dialog(buf, -#ifdef HAVE_GTK_310 - "dialog-warning" + gchar *buf = + g_strdup_printf("%s %s?", + _("Are you sure you want to delete the note for"), e->key); + + if (gui_yes_no_dialog(buf, +#ifdef HAVE_GTK_310 + "dialog-warning" #else - GTK_STOCK_DIALOG_WARNING -#endif - )) { - + GTK_STOCK_DIALOG_WARNING +#endif + )) { + main_delete_note(e->module, e->key); - - /* open with new empty document */ - uri = g_strdup_printf("file://%s/%s",settings.gSwordDir,"studypad.spt"); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW(e->html_widget), uri); - g_free (uri); + + /* new empty document from template */ + gchar *fname = g_build_filename(settings.gSwordDir, "studypad.spt", NULL); + XI_message(("action delete item [%s]", fname)); + gchar *text = inhale_text_from_file(fname); + g_free(fname); + + if (text && strlen(text)) { + webkit_web_view_load_string((WebKitWebView *) + e->html_widget, + text, + "text/html", "utf_8", + "file://"); + } + if (text) + g_free(text); } + + g_free(buf); e->is_changed = FALSE; - g_free(buf); } - -void set_button_state(BUTTONS_STATE state, EDITOR * e) +void set_button_state(BUTTONS_STATE state, EDITOR *e) { #ifdef HAVE_GTK_34 GdkRGBA rgba; #else GdkColor color; #endif - gtk_toggle_tool_button_set_active (e->toolitems.bold,state.bold); - gtk_toggle_tool_button_set_active (e->toolitems.italic,state.italic); - gtk_toggle_tool_button_set_active (e->toolitems.underline,state.underline); - gtk_toggle_tool_button_set_active (e->toolitems.strike,state.strike); - gtk_combo_box_set_active ((GtkComboBox *)e->toolitems.cb, state.style); + gtk_toggle_tool_button_set_active(e->toolitems.bold, state.bold); + gtk_toggle_tool_button_set_active(e->toolitems.italic, state.italic); + gtk_toggle_tool_button_set_active(e->toolitems.underline, state.underline); + gtk_toggle_tool_button_set_active(e->toolitems.strike, state.strike); + gtk_combo_box_set_active((GtkComboBox *)e->toolitems.cb, state.style); + if (state.color) { - XI_message(("state.color: %s",state.color)); + XI_message(("state.color: %s", state.color)); #ifdef HAVE_GTK_34 - if(gdk_rgba_parse (&rgba, state.color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) e->toolitems.color, &rgba); + if (gdk_rgba_parse(&rgba, state.color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + e->toolitems.color, + &rgba); #else - if(gdk_color_parse (state.color, &color)) - gtk_color_button_set_color ((GtkColorButton*) e->toolitems.color, &color); + if (gdk_color_parse(state.color, &color)) + gtk_color_button_set_color((GtkColorButton *) + e->toolitems.color, + &color); #endif } } - -void colorbutton1_color_set_cb (GtkColorButton *widget, EDITOR * e ) +G_MODULE_EXPORT void +colorbutton1_color_set_cb(GtkColorButton *widget, EDITOR *e) { #ifdef HAVE_GTK_34 GdkRGBA color; @@ -370,20 +381,22 @@ gchar *color_str; gchar *forecolor = NULL; -#ifdef HAVE_GTK_34 - gtk_color_chooser_get_rgba ((GtkColorChooser *)widget, &color); - color_str = gdk_rgba_to_string (&color); +#ifdef HAVE_GTK_34 + gtk_color_chooser_get_rgba((GtkColorChooser *)widget, &color); + color_str = gdk_rgba_to_string(&color); #else - gtk_color_button_get_color ((GtkColorButton *)widget, &color); + gtk_color_button_get_color((GtkColorButton *)widget, &color); /* FIXME: ugly need something better */ - color_str = g_strdup_printf("rgb(%u,%u,%u)", color.red>>8, color.green>>8, color.blue>>8); + color_str = g_strdup_printf("rgb(%u,%u,%u)", color.red >> 8, color.green >> 8, color.blue >> 8); #endif - forecolor = g_strdup_printf("document.execCommand('forecolor', null, '%s');",color_str); - editor_execute_script (forecolor, e); + forecolor = g_strdup_printf("document.execCommand('forecolor', null, '%s');", color_str); + editor_execute_script(forecolor, e); + g_free(forecolor); + g_free(color_str); } - -void colorbutton_highlight_color_set_cb (GtkColorButton *widget, EDITOR * e ) +G_MODULE_EXPORT void +colorbutton_highlight_color_set_cb(GtkColorButton *widget, EDITOR *e) { #ifdef HAVE_GTK_34 @@ -392,136 +405,142 @@ GdkColor color; #endif gchar *color_str; - gchar *highligntcolor = NULL; - -#ifdef HAVE_GTK_34 - gtk_color_chooser_get_rgba ((GtkColorChooser *)widget, &color); - color_str = gdk_rgba_to_string (&color); + gchar *highlightcolor = NULL; + +#ifdef HAVE_GTK_34 + gtk_color_chooser_get_rgba((GtkColorChooser *)widget, &color); + color_str = gdk_rgba_to_string(&color); #else - gtk_color_button_get_color ((GtkColorButton *)widget, &color); + gtk_color_button_get_color((GtkColorButton *)widget, &color); /* FIXME: ugly need something better */ - color_str = g_strdup_printf("rgb(%u,%u,%u)", color.red>>8, color.green>>8, color.blue>>8); + color_str = g_strdup_printf("rgb(%u,%u,%u)", color.red >> 8, color.green >> 8, color.blue >> 8); #endif - highligntcolor = g_strdup_printf("document.execCommand('backColor', null, '%s');",color_str); - editor_execute_script (highligntcolor, e); + highlightcolor = g_strdup_printf("document.execCommand('backColor', null, '%s');", color_str); + editor_execute_script(highlightcolor, e); + g_free(highlightcolor); + g_free(color_str); } - -static -gchar *get_font_size_from_name(GString * fontname) +static gchar *get_font_size_from_name(GString *fontname) { gchar buf[80]; gint len, i = 0, j = 0; len = fontname->len; - XI_message(("\nlength: %d\n",len)); + XI_message(("\nlength: %d\n", len)); for (i = 0; (i < 79 && i < len); i++) { if (isdigit(fontname->str[i])) { - XI_message(("\n\nfontname->str[i]: %c",fontname->str[i])); + XI_message(("\n\nfontname->str[i]: %c", + fontname->str[i])); buf[j] = fontname->str[i]; buf[j + 1] = '\0'; j++; - } + } } return g_strdup(buf); } -void action_font_activate_cb (GtkWidget *widget, EDITOR * e) -{ - GtkWidget * dialog; - GString * name; - const gchar * fontname = NULL; - gchar * selected_text = NULL; - gchar * script = NULL; - gchar * size = NULL; - PangoFontDescription * font_description; +G_MODULE_EXPORT void +action_font_activate_cb(GtkWidget *widget, EDITOR *e) +{ + GtkWidget *dialog; + gchar *selected_text = NULL; + gchar *size = NULL; +#ifdef HAVE_GTK_32 + dialog = gtk_font_chooser_dialog_new("Select font", NULL); + gtk_font_chooser_set_font((GtkFontChooser *)dialog, +#else + dialog = gtk_font_selection_dialog_new("Select font"); + gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) + dialog, +#endif + "Droid Sans 14"); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { #ifdef HAVE_GTK_32 - dialog = gtk_font_chooser_dialog_new ("Select font",NULL); - gtk_font_chooser_set_font ((GtkFontChooser *)dialog, + const gchar *fontname = gtk_font_chooser_get_font((GtkFontChooser *)dialog); #else - dialog = gtk_font_selection_dialog_new ("Select font"); - gtk_font_selection_dialog_set_font_name ((GtkFontSelectionDialog *)dialog, + const gchar *fontname = gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)dialog); #endif - "Droid Sans 14"); - - if(gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) - { - #ifdef HAVE_GTK_32 - fontname = gtk_font_chooser_get_font ((GtkFontChooser*)dialog); - #else - fontname = gtk_font_selection_dialog_get_font_name ((GtkFontSelectionDialog*)dialog); - #endif - name = g_string_new (fontname); - size = get_font_size_from_name (name); - g_string_free (name,TRUE); - - selected_text = editor_get_selected_text (e); - #ifdef HAVE_GTK_32 - font_description = gtk_font_chooser_get_font_desc ((GtkFontChooser*)dialog); - fontname = pango_font_description_get_family (font_description); - #else - font_description = pango_font_description_from_string(fontname); + GString *name = g_string_new(fontname); + size = get_font_size_from_name(name); + g_string_free(name, TRUE); + + selected_text = editor_get_selected_text(e); +#ifdef HAVE_GTK_32 + PangoFontDescription *font_description = + gtk_font_chooser_get_font_desc((GtkFontChooser *) + dialog); fontname = pango_font_description_get_family(font_description); - #endif +#else + PangoFontDescription *font_description = + pango_font_description_from_string(fontname); + fontname = pango_font_description_get_family(font_description); +#endif - script = g_strdup_printf("%s", fontname, size, selected_text); + gchar *script = g_strdup_printf("%s", + fontname, size, selected_text); - editor_insert_html (script, e); + editor_insert_html(script, e); + g_free(script); } - if (size) g_free(size); - if (selected_text) g_free(selected_text); - if (script) g_free(script); - gtk_widget_destroy (dialog); + if (size) + g_free(size); + if (selected_text) + g_free(selected_text); + gtk_widget_destroy(dialog); } - -void find_replace_response_cb (GtkDialog *dialog, gint response_id, - EDITOR * e) +G_MODULE_EXPORT void +find_replace_response_cb(GtkDialog *dialog, gint response_id, EDITOR *e) { switch (response_id) { - case GTK_RESPONSE_CANCEL: - gtk_widget_hide (find_dialog.window); - break; - case 1: - editor_find_string ((gchar*)gtk_entry_get_text (GTK_ENTRY(find_dialog.find_entry)),e); - break; - case 2: - editor_replace_string((gchar*)gtk_entry_get_text (GTK_ENTRY(find_dialog.find_entry)), - (gchar*)gtk_entry_get_text (GTK_ENTRY(find_dialog.replace_entry)),e); - break; - default: - gtk_widget_hide (find_dialog.window); - break; + case GTK_RESPONSE_CANCEL: + gtk_widget_hide(find_dialog.window); + break; + case 1: + editor_find_string((gchar *) + gtk_entry_get_text(GTK_ENTRY(find_dialog.find_entry)), + e); + break; + case 2: + editor_replace_string((gchar *) + gtk_entry_get_text(GTK_ENTRY(find_dialog.find_entry)), + (gchar *) + gtk_entry_get_text(GTK_ENTRY(find_dialog.replace_entry)), + e); + break; + default: + gtk_widget_hide(find_dialog.window); + break; } - } - -void action_find_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_find_activate_cb(GtkWidget *widget, EDITOR *e) { - gtk_widget_show (find_dialog.window); - gtk_widget_hide (find_dialog.box_replace); - gtk_widget_hide (find_dialog.button_replace); + gtk_widget_show(find_dialog.window); + gtk_widget_hide(find_dialog.box_replace); + gtk_widget_hide(find_dialog.button_replace); } -void action_replace_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void +action_replace_activate_cb(GtkWidget *widget, EDITOR *e) { - gtk_widget_show (find_dialog.window); - gtk_widget_show (find_dialog.box_replace); - gtk_widget_show (find_dialog.button_replace); + gtk_widget_show(find_dialog.window); + gtk_widget_show(find_dialog.box_replace); + gtk_widget_show(find_dialog.button_replace); } -static void -handle_error (GError **error) +static void handle_error(GError **error) { if (*error != NULL) { - g_warning ("%s", (*error)->message); - g_clear_error (error); + g_warning("%s", (*error)->message); + g_clear_error(error); } } -static -void do_exit(EDITOR * e) +static void do_exit(EDITOR *e) { if (e->filename) { g_free(e->filename); @@ -537,697 +556,484 @@ g_free(e); } -static -void recent_item_cb (GtkRecentChooser *chooser, EDITOR * e) +static void recent_item_cb(GtkRecentChooser *chooser, EDITOR *e) { - gchar * file_uri = gtk_recent_chooser_get_current_uri (chooser); + gchar *file_uri = gtk_recent_chooser_get_current_uri(chooser); XI_message(("file_uri: %s", file_uri)); if (e->filename) g_free(e->filename); e->filename = g_strdup(file_uri); - - //editor_open_recent (file_uri, e); + + //editor_open_recent (file_uri, e); _load_file(e, file_uri); - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); - + xml_set_value("Xiphos", "studypad", "lastfile", e->filename); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); + change_window_title(e->window, e->filename); } -static -void change_window_title(GtkWidget * window, const gchar * window_title) +static void change_window_title(GtkWidget *window, const gchar *window_title) { gtk_window_set_title(GTK_WINDOW(window), window_title); } static GtkPrintOperationResult -print (WebKitWebView * html, GtkPrintOperationAction action) +print(WebKitWebView *html, GtkPrintOperationAction action) { GtkPrintOperation *operation; GtkPrintOperationResult result; GError *error = NULL; WebKitWebFrame *frame; - frame = webkit_web_view_get_main_frame ( html ); - operation = gtk_print_operation_new (); - - result = webkit_web_frame_print_full(frame, - operation, - action, - &error); + frame = webkit_web_view_get_main_frame(html); + operation = gtk_print_operation_new(); - g_object_unref (operation); - handle_error (&error); + result = webkit_web_frame_print_full(frame, operation, action, &error); + + g_object_unref(operation); + handle_error(&error); return result; } -static gint -open_dialog (EDITOR * e) +static gint open_dialog(EDITOR *e) { GtkWidget *dialog; gint response; - GtkFileFilter *filter = gtk_file_filter_new (); - - gtk_file_filter_add_mime_type (filter,"text/html"); - - dialog = gtk_file_chooser_dialog_new ( - _("Open"), GTK_WINDOW (e->window), - GTK_FILE_CHOOSER_ACTION_OPEN, -#ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Open", GTK_RESPONSE_ACCEPT, -#else - - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, -#endif - NULL); - - gtk_file_chooser_set_current_folder ( - GTK_FILE_CHOOSER (dialog), settings.studypaddir); - gtk_file_chooser_set_filter ((GtkFileChooser*)dialog, filter); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - - if (response == GTK_RESPONSE_ACCEPT) { - gchar *new_filename; - - new_filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER (dialog)); - _load_file(e, new_filename); - g_free (new_filename); - } - gtk_widget_destroy (dialog); - - return response; -} - -/* -static gint -save_dialog (EDITOR * e) -{ - GtkWidget *dialog; - const gchar *filename; - gint response; + dialog = gtk_file_chooser_dialog_new(_("Open"), GTK_WINDOW(e->window), + GTK_FILE_CHOOSER_ACTION_OPEN, +#ifdef HAVE_GTK_310 + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, + GTK_RESPONSE_ACCEPT, +#endif + NULL); - dialog = gtk_file_chooser_dialog_new ( - _("Save As"), GTK_WINDOW (e->window), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - - gtk_file_chooser_set_do_overwrite_confirmation ( - GTK_FILE_CHOOSER (dialog), TRUE); - - filename = editor_get_filename (e); - - if (filename != NULL) - gtk_file_chooser_set_filename ( - GTK_FILE_CHOOSER (dialog), filename); - else { - gtk_file_chooser_set_current_folder ( - GTK_FILE_CHOOSER (dialog), settings.studypaddir); - gtk_file_chooser_set_current_name ( - GTK_FILE_CHOOSER (dialog), _("Untitled document")); - } + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), settings.studypaddir); - response = gtk_dialog_run (GTK_DIALOG (dialog)); + response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar *new_filename; - new_filename = gtk_file_chooser_get_filename ( - GTK_FILE_CHOOSER (dialog)); - editor_set_filename (e, new_filename); - - if (e->filename) - g_free(e->filename); - e->filename = g_strdup(new_filename); - - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); - - change_window_title(e->window, e->filename); - - g_free (new_filename); + new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + _load_file(e, new_filename); + g_free(new_filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); return response; } -*/ -/* Helper for view_source_dialog() */ -/* -static gboolean -view_source_dialog_receiver (HTMLEngine *engine, - const gchar *data, - guint length, - GString *string) +G_MODULE_EXPORT void action_print_cb(GtkAction *action, EDITOR *e) { - g_string_append_len (string, data, length); - - return TRUE; + print(WEBKIT_WEB_VIEW(e->html_widget), + GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); } -static void -view_source_dialog (GtkhtmlEditor *editor, - const gchar *title, - const gchar *content_type, - gboolean show_output) +G_MODULE_EXPORT void action_print_preview_cb(GtkAction *action, EDITOR *e) { - GtkWidget *dialog; - GtkWidget *content; - GtkWidget *scrolled_window; - GString *string; - - dialog = gtk_dialog_new_with_buttons ( - title, GTK_WINDOW (editor), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); - - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type ( - GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN); - gtk_box_pack_start ( - GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), - scrolled_window, TRUE, TRUE, 0); - - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 6); - gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); - - string = g_string_sized_new (4096); - - gtk_html_export ( - gtkhtml_editor_get_html (editor), - content_type, (GtkHTMLSaveReceiverFn) - view_source_dialog_receiver, string); - - if (show_output) { - GtkHTMLStream *stream; - - content = gtk_html_new (); - stream = gtk_html_begin (GTK_HTML (content)); - gtk_html_stream_write (stream, string->str, string->len); - gtk_html_stream_close (stream, GTK_HTML_STREAM_OK); - } else { - GtkTextBuffer *buffer; - - content = gtk_text_view_new (); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (content)); - gtk_text_buffer_set_text (buffer, string->str, string->len); - gtk_text_view_set_editable (GTK_TEXT_VIEW (content), FALSE); - } - - g_string_free (string, TRUE); - - gtk_container_add (GTK_CONTAINER (scrolled_window), content); - gtk_widget_show_all (scrolled_window); - - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} -*/ -void -action_print_cb (GtkAction *action, - EDITOR *e) -{ - print ( WEBKIT_WEB_VIEW(e->html_widget), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG ); + print(WEBKIT_WEB_VIEW(e->html_widget), + GTK_PRINT_OPERATION_ACTION_PREVIEW); } -void -action_print_preview_cb (GtkAction *action, - EDITOR *e) +G_MODULE_EXPORT void action_quit_activate_cb(GtkWidget *widget, EDITOR *e) { - print (WEBKIT_WEB_VIEW(e->html_widget), GTK_PRINT_OPERATION_ACTION_PREVIEW); + delete_event(NULL, NULL, e); } -void action_quit_activate_cb (GtkWidget *widget, EDITOR * e) +G_MODULE_EXPORT void action_open_activate_cb(GtkWidget *widget, EDITOR *e) { - delete_event (NULL, NULL,e); + open_dialog(e); } -void action_open_activate_cb (GtkWidget * widget, EDITOR * e) -{ - open_dialog(e); -} - - -void -action_save_activate_cb (GtkWidget * widget, EDITOR *e) +G_MODULE_EXPORT void action_save_activate_cb(GtkWidget *widget, EDITOR *e) { switch (e->type) { case STUDYPAD_EDITOR: - _save_file (e); + _save_file(e); break; case NOTE_EDITOR: - _save_note (e); + _save_note(e); break; case BOOK_EDITOR: - _save_book (e); + _save_book(e); break; default: - XI_message (("\naction_save_cb oops!\n")); + XI_message(("\naction_save_cb oops!\n")); break; } } - -void -action_new_activate_cb ( GtkWidget * widget, - EDITOR *e) /* for studypad only */ -{ +G_MODULE_EXPORT void action_new_activate_cb(GtkWidget *widget, EDITOR *e) +{ /* for studypad only */ gchar *filename = NULL; - + if (e->is_changed) - ask_about_saving (e); + ask_about_saving(e); - filename = g_strdup_printf("%s/%s",settings.gSwordDir,"studypad.spt"); + filename = g_strdup_printf("%s/%s", settings.gSwordDir, "studypad.spt"); - _load_file(e, filename); if (e->filename) g_free(e->filename); e->filename = g_strdup(_("Untitled document")); - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); + xml_set_value("Xiphos", "studypad", "lastfile", e->filename); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); change_window_title(e->window, e->filename); e->is_changed = TRUE; } - -void -action_insert_sword_link_activate_cb (GtkWidget * widget, gpointer data) -{ - editor_link_dialog (data); //editor_insert_sword_link(); +G_MODULE_EXPORT void +action_insert_sword_link_activate_cb(GtkWidget *widget, gpointer data) +{ + editor_link_dialog(data); //editor_insert_sword_link(); } -void -action_insert_link_activate_cb (GtkWidget * widget, EDITOR *e) +G_MODULE_EXPORT void +action_insert_link_activate_cb(GtkWidget *widget, EDITOR *e) { - editor_link_dialog (e); + editor_link_dialog(e); } - -void -action_save_as_activate_cb (GtkWidget * widget, EDITOR *e) -{ +G_MODULE_EXPORT void +action_save_as_activate_cb(GtkWidget *widget, EDITOR *e) +{ if (e->filename) - g_free (e->filename); + g_free(e->filename); e->filename = NULL; - _save_file(e); -} -/* -static void -action_view_html_output (GtkAction *action, - GtkhtmlEditor *editor) -{ - view_source_dialog (editor, _("HTML Output"), "text/html", TRUE); + _save_file(e); } -static void -action_view_html_source (GtkAction *action, - GtkhtmlEditor *editor) +G_MODULE_EXPORT void combo_box_changed_cb(GtkComboBox *widget, EDITOR *e) { - view_source_dialog (editor, _("HTML Source"), "text/html", FALSE); -} + gchar *script = NULL; + gint choice = gtk_combo_box_get_active(widget); + /* we need the line of text where the cursor is */ + //extern BUTTONS_STATE buttons_state; -static void -action_view_plain_source (GtkAction *action, - GtkhtmlEditor *editor) -{ - view_source_dialog (editor, _("Plain Source"), "text/plain", FALSE); -} -*/ + if (buttons_state.nochange) + return; + switch (choice) { + case 0: /* Normal */ + script = "document.execCommand('formatBlock', false, \"div\");"; + break; -void combo_box_changed_cb (GtkComboBox *widget, EDITOR * e) -{ - gchar * script = NULL; - gint choice = gtk_combo_box_get_active(widget); - /* we need the line of text where the cursor is */ - //extern BUTTONS_STATE buttons_state; - - if(buttons_state.nochange) return; - - switch (choice) { - case 0: /* Normal */ - script = g_strdup ("document.execCommand('formatBlock', false, \"div\");"); - break; - case 1: /* H1 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H1\");"); - break; - case 2: /* H2 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H2\");"); - break; - case 3: /* H3 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H3\");"); + case 1: /* H1 */ + script = "document.execCommand('formatBlock', null, \"H1\");"; + break; - break; - case 4: /* H4 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H4\");"); + case 2: /* H2 */ + script = "document.execCommand('formatBlock', null, \"H2\");"; + break; - break; - case 5: /* H5 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H5\");"); + case 3: /* H3 */ + script = "document.execCommand('formatBlock', null, \"H3\");"; + break; - break; - case 6: /* H6 */ - script = g_strdup ("document.execCommand('formatBlock', null, \"H6\");"); + case 4: /* H4 */ + script = "document.execCommand('formatBlock', null, \"H4\");"; + break; - break; - case 7: /* Address */ - script = g_strdup ("document.execCommand('formatBlock', null, \"ADDRESS\");"); + case 5: /* H5 */ + script = "document.execCommand('formatBlock', null, \"H5\");"; + break; - break; - case 8: /* Preformatted */ - script = g_strdup ("document.execCommand('formatBlock', null, \"PRE\");"); + case 6: /* H6 */ + script = "document.execCommand('formatBlock', null, \"H6\");"; + break; - break; - case 9: /* Bulleted List insertUnorderedList*/ - script = g_strdup ("document.execCommand('insertUnorderedList', null, \"\");"); + case 7: /* Address */ + script = "document.execCommand('formatBlock', null, \"ADDRESS\");"; + break; - break; - case 10: /* Roman Numeral List */ - script = g_strdup ("document.execCommand('insertHTML', null, \"
\");"); - - break; - case 11: /* Numbered List insertOrderedList*/ - script = g_strdup ("document.execCommand('insertOrderedList', null, \"\");"); + case 8: /* Preformatted */ + script = "document.execCommand('formatBlock', null, \"PRE\");"; + break; - break; - case 12: /* Alphabetical List */ - script = g_strdup ("document.execCommand('insertHTML', null, \"
\");"); + case 9: /* Bulleted List insertUnorderedList */ + script = "document.execCommand('insertUnorderedList', null, \"\");"; + break; - break; - default: - return; - break; - } - if (script) { - XI_message(("%s",script)); - editor_execute_script (script, e); - } + case 10: /* Roman Numeral List */ + script = "document.execCommand('insertHTML', null, \"
\");"; + break; + + case 11: /* Numbered List insertOrderedList */ + script = "document.execCommand('insertOrderedList', null, \"\");"; + break; + + case 12: /* Alphabetical List */ + script = "document.execCommand('insertHTML', null, \"
\");"; + break; + + default: + break; + } + + if (script) { + XI_message(("%s", script)); + editor_execute_script(script, e); + } } /* need note toolbars when type is note */ -static -GtkWidget* editor_new (const gchar * title, EDITOR * e) -{ - GtkWidget *window; +static GtkWidget *editor_new(const gchar *title, EDITOR *e) +{ + GtkWidget *window; GtkWidget *scrollwindow; GtkWidget *statusbar; GtkBuilder *builder; gchar *gbuilder_file; - GError* error = NULL; + GError *error = NULL; GtkMenuItem *item; GtkWidget *recent_item; - //extern BUTTONS_STATE buttons_state; - //GtkRecentFilter *filter; buttons_state.nochange = 1; + gbuilder_file = gui_general_user_file( #ifdef USE_GTK_3 - gbuilder_file = gui_general_user_file ("gtk_webedit.ui", FALSE); + "gtk_webedit.ui" #else - gbuilder_file = gui_general_user_file ("gtk2_webedit.ui", FALSE); + "gtk2_webedit.ui" #endif - builder = gtk_builder_new (); - - if (!gtk_builder_add_from_file (builder, gbuilder_file, &error)) - { - g_warning ("Couldn't load builder file: %s", error->message); - g_error_free (error); - } - - - window = GTK_WIDGET (gtk_builder_get_object (builder, "window")); + , + FALSE); + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_file(builder, gbuilder_file, &error)) { + g_warning("Couldn't load builder file: %s", + error->message); + g_error_free(error); + } + + window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); e->window = window; - gtk_window_set_title(GTK_WINDOW(window),title); - - statusbar = GTK_WIDGET(gtk_builder_get_object (builder,"statusbar1")); - gtk_widget_hide (statusbar); - + gtk_window_set_title(GTK_WINDOW(window), title); + + statusbar = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar1")); + gtk_widget_hide(statusbar); + e->toolitems.outline_level = 0; - e->toolitems.bold = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_bold")); - e->toolitems.italic = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_italic")); - e->toolitems.underline = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbuttonunderline")); - e->toolitems.strike = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_strikethrough")); - e->toolitems.open = GTK_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_open")); - e->toolitems.newdoc = GTK_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_new")); - e->toolitems.deletedoc = GTK_TOOL_BUTTON(gtk_builder_get_object (builder,"toolbutton_delete")); - e->toolitems.color = GTK_COLOR_BUTTON(gtk_builder_get_object (builder,"colorbutton1")); - - e->toolitems.cb = GTK_COMBO_BOX_TEXT(gtk_builder_get_object (builder,"comboboxtext1")); - gtk_combo_box_set_active ((GtkComboBox *)e->toolitems.cb, 0); - - item = GTK_MENU_ITEM( gtk_builder_get_object( builder, "menuitem_recent" ) ); - - switch (e->type){ - case STUDYPAD_EDITOR: - gtk_widget_hide(GTK_WIDGET(e->toolitems.deletedoc)); - - //filter = gtk_recent_filter_new (); - //gtk_recent_filter_add_mime_type ( filter, "text/html"); - - recent_item = gtk_recent_chooser_menu_new(); - //gtk_recent_chooser_set_filter ((GtkRecentChooser*)recent_item, - // filter); - g_signal_connect (G_OBJECT (recent_item), "item-activated", - G_CALLBACK (recent_item_cb), - e); - gtk_menu_item_set_submenu( item, recent_item); - break; - case NOTE_EDITOR: - gtk_widget_hide(GTK_WIDGET(e->toolitems.open)); - gtk_widget_hide(GTK_WIDGET(e->toolitems.newdoc)); - gtk_widget_hide(GTK_WIDGET(item)); - break; - case BOOK_EDITOR: - gtk_widget_hide(GTK_WIDGET(e->toolitems.open)); - gtk_widget_hide(GTK_WIDGET(e->toolitems.newdoc)); - gtk_widget_hide(GTK_WIDGET(item)); - break; + e->toolitems.bold = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_bold")); + e->toolitems.italic = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_italic")); + e->toolitems.underline = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbuttonunderline")); + e->toolitems.strike = GTK_TOGGLE_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_strikethrough")); + e->toolitems.open = GTK_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_open")); + e->toolitems.newdoc = GTK_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_new")); + e->toolitems.deletedoc = GTK_TOOL_BUTTON(gtk_builder_get_object(builder, "toolbutton_delete")); + e->toolitems.color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "colorbutton1")); + e->toolitems.cb = GTK_COMBO_BOX_TEXT(gtk_builder_get_object(builder, "comboboxtext1")); + + gtk_combo_box_set_active((GtkComboBox *)e->toolitems.cb, 0); + item = GTK_MENU_ITEM(gtk_builder_get_object(builder, "menuitem_recent")); + + switch (e->type) { + case STUDYPAD_EDITOR: + gtk_widget_hide(GTK_WIDGET(e->toolitems.deletedoc)); + + recent_item = gtk_recent_chooser_menu_new(); + g_signal_connect(G_OBJECT(recent_item), "item-activated", + G_CALLBACK(recent_item_cb), e); + gtk_menu_item_set_submenu(item, recent_item); + break; + case NOTE_EDITOR: + gtk_widget_hide(GTK_WIDGET(e->toolitems.open)); + gtk_widget_hide(GTK_WIDGET(e->toolitems.newdoc)); + gtk_widget_hide(GTK_WIDGET(item)); + break; + case BOOK_EDITOR: + gtk_widget_hide(GTK_WIDGET(e->toolitems.open)); + gtk_widget_hide(GTK_WIDGET(e->toolitems.newdoc)); + gtk_widget_hide(GTK_WIDGET(item)); + break; } - - e->navbar_box = GTK_WIDGET (gtk_builder_get_object (builder, "box_navbar")); - e->box = GTK_WIDGET (gtk_builder_get_object (builder, "vbox1")); - - scrollwindow = GTK_WIDGET(gtk_builder_get_object (builder,"scrolledwindow1")); + e->navbar_box = GTK_WIDGET(gtk_builder_get_object(builder, "box_navbar")); + e->box = GTK_WIDGET(gtk_builder_get_object(builder, "vbox1")); + + scrollwindow = GTK_WIDGET(gtk_builder_get_object(builder, "scrolledwindow1")); create_editor_window(scrollwindow, e); e->is_changed = FALSE; - /* This is important */ - gtk_builder_connect_signals (builder, (EDITOR *) e); - - find_dialog.window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_find_replace")); - find_dialog.find_entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry1")); - find_dialog.replace_entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry2")); - find_dialog.box_replace = GTK_WIDGET (gtk_builder_get_object (builder, "box4")); - find_dialog.button_replace = GTK_WIDGET (gtk_builder_get_object (builder, "button_replace")); - - - g_object_unref (builder); - + gtk_builder_connect_signals(builder, (EDITOR *)e); + + find_dialog.window = GTK_WIDGET(gtk_builder_get_object(builder, "dialog_find_replace")); + find_dialog.find_entry = GTK_WIDGET(gtk_builder_get_object(builder, "entry1")); + find_dialog.replace_entry = GTK_WIDGET(gtk_builder_get_object(builder, "entry2")); + find_dialog.box_replace = GTK_WIDGET(gtk_builder_get_object(builder, "box4")); + find_dialog.button_replace = GTK_WIDGET(gtk_builder_get_object(builder, "button_replace")); + + g_object_unref(builder); + return window; } -static void -_save_note(EDITOR * e) -{ - GString * data = g_string_new (""); +static void _save_note(EDITOR *e) +{ + GString *data = g_string_new(""); - editor_get_document_content (data, e); - main_save_note (e->module, e->key, data->str); + editor_get_document_content(data, e); + main_save_note(e->module, e->key, data->str); e->is_changed = FALSE; - g_string_free (data, TRUE); + g_string_free(data, TRUE); } +static void _save_book(EDITOR *e) +{ + GString *data = g_string_new(""); -static void -_save_book(EDITOR * e) -{ - GString * data = g_string_new (""); - - editor_get_document_content (data, e); + editor_get_document_content(data, e); main_treekey_save_book_text(e->module, e->key, data->str); e->is_changed = FALSE; - g_string_free (data, TRUE); + g_string_free(data, TRUE); } - -static void -_save_file (EDITOR * e) +static void _save_file(EDITOR *e) { - gchar * filename = NULL; - GtkRecentManager * rm = NULL; - GString * data = g_string_new (""); - - - editor_get_document_content (data, e); - XI_message(("%s",data->str)); - - if (!e->filename || ( 0 == g_strcmp0 ("Untitled document",e->filename)) || - g_strrstr (e->filename, ".spt")) { - GtkWidget * dialog = gtk_file_chooser_dialog_new ("Save as", //const gchar *title, - NULL, //GtkWindow *parent, - GTK_FILE_CHOOSER_ACTION_SAVE, //GtkFileChooserAction action, -#ifdef HAVE_GTK_310 - "_OK", GTK_RESPONSE_OK, - "_Cancel", GTK_RESPONSE_CANCEL, -#else - GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -#endif - NULL); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - - gtk_file_chooser_set_current_folder ( GTK_FILE_CHOOSER (dialog), settings.studypaddir); - if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - e->filename = g_strdup (filename); - GFile * gfile = g_file_parse_name (filename); - g_file_replace_contents (gfile, - data->str, - data->len, - NULL, - TRUE, - G_FILE_CREATE_NONE, - NULL, - NULL, - NULL); //GError **error - - } + GtkRecentManager *rm = NULL; + GString *data = g_string_new(""); + + editor_get_document_content(data, e); + XI_message(("%s", data->str)); + + if (!e->filename || (0 == g_strcmp0("Untitled document", e->filename)) || g_strrstr(e->filename, ".spt")) { + GtkWidget *dialog = gtk_file_chooser_dialog_new("Save as", //const gchar *title, + NULL, //GtkWindow *parent, + GTK_FILE_CHOOSER_ACTION_SAVE, //GtkFileChooserAction action, +#ifdef HAVE_GTK_310 + "_OK", + GTK_RESPONSE_OK, + "_Cancel", + GTK_RESPONSE_CANCEL, +#else + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, +#endif + NULL); + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); + + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), + settings.studypaddir); + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { + gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + e->filename = g_strdup(filename); + GFile *gfile = g_file_parse_name(filename); + g_file_replace_contents(gfile, data->str, data->len, NULL, TRUE, G_FILE_CREATE_NONE, NULL, NULL, NULL); //GError **error + } change_window_title(e->window, e->filename); - gtk_widget_destroy (dialog); - + gtk_widget_destroy(dialog); + } else { - - GFile * gfile = g_file_parse_name (e->filename); - g_file_replace_contents (gfile, - data->str, - data->len, - NULL, - TRUE, - G_FILE_CREATE_NONE, - NULL, - NULL, - NULL); //GError **error - } - - rm = gtk_recent_manager_get_default (); - gtk_recent_manager_add_item (rm,e->filename); - + + GFile *gfile = g_file_parse_name(e->filename); + g_file_replace_contents(gfile, data->str, data->len, NULL, TRUE, G_FILE_CREATE_NONE, NULL, NULL, NULL); //GError **error + } + + rm = gtk_recent_manager_get_default(); + gtk_recent_manager_add_item(rm, e->filename); + e->is_changed = FALSE; - g_string_free (data,TRUE); + g_string_free(data, TRUE); } - -static void -_load_file (EDITOR * e, const gchar * filename) +static void _load_file(EDITOR *e, const gchar *filename) { - char *uri; - //gsize length; - GtkRecentManager * rm = NULL; - - rm = gtk_recent_manager_get_default (); - gtk_recent_manager_add_item (rm, filename); - + char *text = NULL; + GtkRecentManager *rm = NULL; + + rm = gtk_recent_manager_get_default(); + gtk_recent_manager_add_item(rm, filename); + if (e->filename) g_free(e->filename); e->filename = g_strdup(filename); - XI_message(("_load_file filename: %s",filename)); + XI_message(("_load_file filename: %s", filename)); + + xml_set_value("Xiphos", "studypad", "lastfile", e->filename); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); - xml_set_value("Xiphos", "studypad", "lastfile", - e->filename); - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); - change_window_title(e->window, e->filename); - if (g_strstr_len (filename,6,"file:")) - uri = g_strdup_printf("%s",filename); - else - uri = g_strdup_printf("file://%s",filename); - - webkit_web_view_load_uri (WEBKIT_WEB_VIEW(e->html_widget),uri); - - g_free (uri); - e->is_changed =FALSE; + text = inhale_text_from_file(!strncmp(filename, "file:", 5) + ? filename + 5 + : filename); + + XI_message(("web view load string [%s]", text)); + webkit_web_view_load_string(WEBKIT_WEB_VIEW(e->html_widget), + text, "text/html", "utf_8", "file://"); + + g_free(text); + e->is_changed = FALSE; } -gboolean editor_is_dirty(EDITOR * e) +gboolean editor_is_dirty(EDITOR *e) { return e->is_changed; } - -void editor_save_book(EDITOR * e) +void editor_save_book(EDITOR *e) { - if (editor_is_dirty(e)) { + if (editor_is_dirty(e)) _save_book(e); - } } /* save if needed is done in treeky-editor.c before calling editor_load_book() */ -void editor_load_book(EDITOR * e) +void editor_load_book(EDITOR *e) { - gchar *title = NULL; - gchar *text = NULL; - gchar *uri = NULL; - - if (!g_ascii_isdigit(e->key[0])) return; /* make sure is a number (offset) */ + gchar *title = NULL, *text = NULL; + if (!g_ascii_isdigit(e->key[0])) + return; /* make sure is a number (offset) */ - title = g_strdup_printf("%s", e->module); - XI_message (("book: %s\noffset :%s", e->module, e->key)); + XI_message(("book: %s\noffset :%s", e->module, e->key)); if (atol(e->key) != 0) - text = main_get_book_raw_text (e->module, e->key); + text = main_get_book_raw_text(e->module, e->key); else text = g_strdup(e->module); - if (strlen(text)) { - webkit_web_view_load_string ((WebKitWebView*)e->html_widget, - text, //const gchar *content, - "text/html", //const gchar *mime_type, - "utf_8", //const gchar *encoding, - "file://" ); //const gchar *base_uri); - } else { - /* open with new empty document */ - uri = g_strdup_printf("file://%s/%s",settings.gSwordDir,"studypad.spt"); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW(e->html_widget), uri); - g_free (uri); + if ((text == NULL) || strlen(text) == 0) { + if (text) + g_free(text); + + /* new empty document from template */ + gchar *fname = g_build_filename(settings.gSwordDir, "studypad.spt", NULL); + XI_message(("editor load BOOK [%s]", fname)); + text = inhale_text_from_file(fname); + g_free(fname); + } + + if (text && strlen(text)) { + webkit_web_view_load_string((WebKitWebView *) + e->html_widget, + text, + "text/html", "utf_8", + "file://"); } + if (text) + g_free(text); + title = g_strdup_printf("%s", e->module); change_window_title(e->window, title); - e->is_changed = FALSE; + g_free(title); - if (text) - g_free(text); - if (title) - g_free(title); + e->is_changed = FALSE; } /****************************************************************************** @@ -1249,19 +1055,19 @@ void editor_sync_with_main(void) { GList *tmp = NULL; - EDITOR * e; tmp = g_list_first(editors_all); while (tmp != NULL) { - e = (EDITOR*)tmp->data; - + EDITOR *e = (EDITOR *)tmp->data; + switch (e->type) { - case STUDYPAD_EDITOR: - case BOOK_EDITOR: - break; - case NOTE_EDITOR: - if (e->sync) - editor_load_note(e, NULL, settings.currentverse); + case STUDYPAD_EDITOR: + case BOOK_EDITOR: + break; + case NOTE_EDITOR: + if (e->sync) + editor_load_note(e, NULL, + settings.currentverse); break; } tmp = g_list_next(tmp); @@ -1269,16 +1075,12 @@ } void -editor_load_note(EDITOR * e, const gchar * module_name, - const gchar * key) +editor_load_note(EDITOR *e, const gchar *module_name, const gchar *key) { - gchar *title = NULL; - gchar *text = NULL; - gchar *uri = NULL; - + gchar *title = NULL, *text = NULL; if (e->is_changed) - _save_note (e); + _save_note(e); if (module_name) { if (e->module) @@ -1291,23 +1093,28 @@ e->key = g_strdup(key); } + text = main_get_raw_text((gchar *)e->module, (gchar *)e->key); - title = g_strdup_printf("%s - %s", e->module, e->key); - text = main_get_raw_text((gchar *) e->module, (gchar *) e->key); - if (strlen(text)) { - webkit_web_view_load_string ((WebKitWebView*)e->html_widget, - text, //const gchar *content, - "text/html", //const gchar *mime_type, - "utf_8", //const gchar *encoding, - "file://" ); //const gchar *base_uri); - } else { - /* open with new empty document */ - uri = g_strdup_printf("file://%s/%s",settings.gSwordDir,"studypad.spt"); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW(e->html_widget), uri); - g_free (uri); + if ((text == NULL) || strlen(text) == 0) { + if (text) + g_free(text); + + /* new empty document from template */ + gchar *fname = g_build_filename(settings.gSwordDir, "studypad.spt", NULL); + XI_message(("editor load NOTE [%s]", fname)); + text = inhale_text_from_file(fname); + g_free(fname); + } + + if (text && strlen(text)) { + webkit_web_view_load_string((WebKitWebView *) + e->html_widget, + text, + "text/html", "utf_8", + "file://"); } + e->is_changed = FALSE; - change_window_title(e->window, title); if (e->type == NOTE_EDITOR) { e->navbar.valid_key = TRUE; main_navbar_versekey_set(e->navbar, e->key); @@ -1315,25 +1122,25 @@ if (text) g_free(text); - if (title) - g_free(title); -} + title = g_strdup_printf("%s - %s", e->module, e->key); + change_window_title(e->window, title); + g_free(title); +} -int -delete_event (GtkWidget *widget, GdkEvent *event, EDITOR * e) +G_MODULE_EXPORT int +delete_event(GtkWidget *widget, GdkEvent *event, EDITOR *e) { if (e->is_changed) { switch (ask_about_saving(e)) { - case GS_YES: /* exit saving */ - + case GS_YES: /* exit saving */ break; - case GS_NO: /* exit without saving */ + case GS_NO: /* exit without saving */ break; + case GS_CANCEL: return TRUE; - break; } } editors_all = g_list_remove(editors_all, e); @@ -1341,8 +1148,7 @@ return FALSE; } - -gint ask_about_saving(EDITOR * e) +gint ask_about_saving(EDITOR *e) { gint test; GS_DIALOG *info; @@ -1356,23 +1162,20 @@ case BOOK_EDITOR: case NOTE_EDITOR: info = gui_new_dialog(); - info->stock_icon = + info->stock_icon = #ifdef HAVE_GTK_310 - "dialog-warning"; + "dialog-warning"; #else - GTK_STOCK_DIALOG_WARNING; -#endif + GTK_STOCK_DIALOG_WARNING; +#endif - buf = g_strdup_printf("%s: %s",e->module, e->key); + buf = g_strdup_printf("%s: %s", e->module, e->key); buf1 = _("Save the changes to document"); buf2 = _("before closing?"); - buf3 = - g_strdup_printf - ("%s %s %s", - buf1, buf, buf2); + buf3 = g_strdup_printf("%s %s %s", + buf1, buf, buf2); info->label_top = buf3; - info->label2 = - _("If you don't save, changes will be permanently lost."); + info->label2 = _("If you don't save, changes will be permanently lost."); info->save = TRUE; info->cancel = TRUE; info->no_save = TRUE; @@ -1391,31 +1194,28 @@ } } g_free(info); - g_free(buf); + g_free(buf); g_free(buf3); break; case STUDYPAD_EDITOR: info = gui_new_dialog(); - info->stock_icon = + info->stock_icon = #ifdef HAVE_GTK_310 "dialog-warning"; #else GTK_STOCK_DIALOG_WARNING; -#endif +#endif if (settings.studypadfilename) buf = settings.studypadfilename; else buf = N_("File"); buf1 = _("Save the changes to document"); buf2 = _("before closing?"); - buf3 = - g_strdup_printf - ("%s %s %s", - buf1, buf, buf2); + buf3 = g_strdup_printf("%s %s %s", + buf1, buf, buf2); info->label_top = buf3; - info->label2 = - _("If you don't save, changes will be permanently lost."); + info->label2 = _("If you don't save, changes will be permanently lost."); info->save = TRUE; info->cancel = TRUE; info->no_save = TRUE; @@ -1423,7 +1223,7 @@ test = gui_alert_dialog(info); retval = test; if (test == GS_YES) { - _save_file (e); + _save_file(e); } g_free(info); g_free(buf3); @@ -1433,15 +1233,12 @@ return retval; } - -static -gint _create_new(const gchar * filename, const gchar * key, gint editor_type) +static gint _create_new(const gchar *filename, const gchar *key, + gint editor_type) { EDITOR *editor; -// GtkWidget *vbox = NULL; GtkWidget *toolbar_nav = NULL; - editor = g_new(EDITOR, 1); editor->html_widget = NULL; editor->sync = FALSE; @@ -1455,8 +1252,7 @@ editor->module = NULL; editor->key = NULL; editor->filename = NULL; - widgets.studypad_dialog = - editor_new(_("StudyPad"), editor); + widgets.studypad_dialog = editor_new(_("StudyPad"), editor); if (filename) { editor->filename = g_strdup(filename); @@ -1472,11 +1268,13 @@ editor->key = g_strdup(key); editor->navbar.key = NULL; editor_new(_("Note Editor"), editor); - - toolbar_nav = gui_navbar_versekey_editor_new(editor); - gtk_widget_show(toolbar_nav); - gtk_box_pack_start (GTK_BOX (editor->navbar_box), GTK_WIDGET(toolbar_nav), FALSE, TRUE, 0); - + + toolbar_nav = gui_navbar_versekey_editor_new(editor); + gtk_widget_show(toolbar_nav); + gtk_box_pack_start(GTK_BOX(editor->navbar_box), + GTK_WIDGET(toolbar_nav), FALSE, TRUE, + 0); + editor_load_note(editor, NULL, NULL); break; case BOOK_EDITOR: @@ -1490,31 +1288,29 @@ GtkWidget *box; UI_VBOX(box, FALSE, 0); - gtk_widget_show (box); + gtk_widget_show(box); GtkWidget *hpaned1 = UI_HPANE(); - gtk_widget_show (hpaned1); - gtk_paned_pack2 (GTK_PANED (hpaned1), box, TRUE, TRUE); + gtk_widget_show(hpaned1); + gtk_paned_pack2(GTK_PANED(hpaned1), box, TRUE, TRUE); GtkWidget *scrollbar = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrollbar); gtk_paned_pack1(GTK_PANED(hpaned1), GTK_WIDGET(scrollbar), - TRUE, TRUE); + TRUE, TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrollbar, - settings.shadow_type); + settings.shadow_type); editor->treeview = gui_create_editor_tree(editor); gtk_widget_show(editor->treeview); gtk_container_add(GTK_CONTAINER(scrollbar), - editor->treeview); - gtk_paned_set_position(GTK_PANED(hpaned1), - 125); - gtk_tree_view_expand_all((GtkTreeView *)editor->treeview); - //gtk_tree_view_collapse_all((GtkTreeView *)editor->treeview); - // then we should expand on the item to which we've opened for edit. + editor->treeview); + gtk_paned_set_position(GTK_PANED(hpaned1), 125); + gtk_tree_view_expand_all((GtkTreeView *)editor->treeview); +// then we should expand on the item to which we've opened for edit. #ifdef HAVE_GTK_310 gtk_container_add(GTK_CONTAINER(box), editor->box); @@ -1522,19 +1318,17 @@ gtk_widget_reparent(editor->box, box); #endif - gtk_container_add (GTK_CONTAINER (editor->window), hpaned1); + gtk_container_add(GTK_CONTAINER(editor->window), hpaned1); editor_load_book(editor); break; } editor->is_changed = FALSE; - editors_all = g_list_append(editors_all,(EDITOR*) editor); + editors_all = g_list_append(editors_all, (EDITOR *)editor); return 1; - } - /****************************************************************************** * Name * editor_create_new @@ -1551,19 +1345,19 @@ * gint */ -gint editor_create_new(const gchar * filename, const gchar * key, gint editor_type) +gint editor_create_new(const gchar *filename, const gchar *key, + gint editor_type) { GList *tmp = NULL; - EDITOR *e; tmp = g_list_first(editors_all); while (tmp != NULL) { - e = (EDITOR*)tmp->data; + EDITOR *e = (EDITOR *)tmp->data; switch (editor_type) { case STUDYPAD_EDITOR: if (e->studypad) { if (editor_is_dirty(e)) - _save_file (e); + _save_file(e); if (e->filename) g_free(e->filename); e->filename = g_strdup(filename); @@ -1575,9 +1369,10 @@ } break; case NOTE_EDITOR: - if (!e->noteeditor) break; + if (!e->noteeditor) + break; if (editor_is_dirty(e)) - _save_note (e); + _save_note(e); if (e->module) g_free(e->module); e->module = g_strdup(filename); @@ -1592,9 +1387,10 @@ return 1; break; case BOOK_EDITOR: - if (!e->bookeditor) break; + if (!e->bookeditor) + break; if (editor_is_dirty(e)) - _save_book (e); + _save_book(e); if (e->module) g_free(e->module); e->module = g_strdup(filename); @@ -1603,7 +1399,8 @@ e->key = g_strdup(key); gtk_widget_show(e->window); gdk_window_raise(gtk_widget_get_parent_window(GTK_WIDGET(e->window))); - main_load_book_tree_in_editor (GTK_TREE_VIEW (e->treeview), e->module); + main_load_book_tree_in_editor(GTK_TREE_VIEW(e->treeview), + e->module); editor_load_book(e); return 1; @@ -1611,7 +1408,9 @@ } tmp = g_list_next(tmp); } - XI_message (("filename %s, key %s", (filename ? filename : "-null-"), (key ? key : "-null-"))); + XI_message(("filename %s, key %s", + (filename ? filename : "-null-"), + (key ? key : "-null-"))); return _create_new(filename, key, editor_type); } @@ -1625,7 +1424,7 @@ elements will be removed by the saver. */ tmp2 = g_list_next(tmp); - delete_event(NULL, NULL, (EDITOR*)tmp->data); + delete_event(NULL, NULL, (EDITOR *)tmp->data); tmp = tmp2; } } diff -Nru xiphos-4.0.0+dfsg1/src/editor/webkit_editor.h xiphos-4.0.4+dfsg1/src/editor/webkit_editor.h --- xiphos-4.0.0+dfsg1/src/editor/webkit_editor.h 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/editor/webkit_editor.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * webkit_editor.h - html editor using webkit * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,22 +22,20 @@ #ifndef _WEBKIT_EDITOR_H #define _WEBKIT_EDITOR_H - #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - #ifdef USE_WEBKIT_EDITOR #include #include "main/navbar_versekey.h" -struct _tool_items { +struct _tool_items +{ GtkToggleToolButton *bold; GtkToggleToolButton *italic; GtkToggleToolButton *underline; @@ -52,19 +50,20 @@ typedef struct _tool_items TOOL_ITEMS; typedef struct _editor EDITOR; -struct _editor { +struct _editor +{ GtkWidget *window; GtkWidget *box; GtkWidget *scrollwindow; GtkWidget *toolbar; - GtkWidget *treeview; + GtkWidget *treeview; GtkWidget *sync_button; GtkWidget *html_widget; GtkWidget *statusbar; GtkWidget *navbar_box; NAVBAR_VERSEKEY navbar; TOOL_ITEMS toolitems; - + gint type; gboolean studypad; @@ -84,8 +83,8 @@ BOOK_EDITOR }; - -struct _menu { +struct _menu +{ GtkWidget *menu; GtkWidget *cut; GtkWidget *copy; @@ -96,7 +95,8 @@ extern MENU popup; -struct _find_dialog { +struct _find_dialog +{ GtkWidget *window; GtkWidget *find_entry; GtkWidget *replace_entry; @@ -109,7 +109,8 @@ extern FIND_DIALOG find_dialog; -struct _buttons_state { +struct _buttons_state +{ gint bold; gint italic; gint underline; @@ -119,67 +120,85 @@ gchar *color; }; typedef struct _buttons_state BUTTONS_STATE; - -void action_about_activate_cb (GtkWidget *widget, EDITOR * e); -void action_increase_indent_activate_cb (GtkWidget *widget, EDITOR * e); -void action_decrease_indent_activate_cb (GtkWidget *widget, EDITOR * e); +void action_about_activate_cb(GtkWidget *widget, EDITOR *e); -void action_insert_image_activate_cb (GtkWidget *widget, EDITOR * e); -void action_insert_rule_activate_cb (GtkWidget *widget, EDITOR * e); -void action_insert_table_activate_cb (GtkWidget *widget, EDITOR * e); -void action_insert_emoticon_activate_cb (GtkWidget *widget, EDITOR * e); -void action_insert_sword_link_activate_cb (GtkWidget * widget, gpointer data); -void action_insert_link_activate_cb (GtkWidget * widget, EDITOR *e); - - -void action_insert_outline_activate_cb (GtkWidget *widget, EDITOR * e); - -void action_justify_right_activate_cb (GtkWidget *widget, EDITOR * e); -void action_justify_left_activate_cb (GtkWidget *widget, EDITOR * e); -void action_justify_center_activate_cb (GtkWidget *widget, EDITOR * e); -void action_justify_full_activate_cb (GtkWidget *widget, EDITOR * e); - -void action_bold_activate_cb (GtkWidget *widget, EDITOR * e); -void action_italic_activate_cb (GtkWidget *widget, EDITOR * e); -void action_underline_activate_cb (GtkWidget *widget, EDITOR * e); -void action_strikethrough_activate_cb (GtkWidget *widget, EDITOR * e); - -void action_undo_activate_cb (GtkWidget *widget, EDITOR * e); -void action_redo_activate_cb (GtkWidget *widget, EDITOR * e); - -void action_cut_activate_cb (GtkWidget *widget, EDITOR * e); -void action_copy_activate_cb (GtkWidget *widget, EDITOR * e); -void action_paste_activate_cb (GtkWidget *widget, EDITOR * e); -void action_delete_activate_cb (GtkWidget *widget, EDITOR * e); -void action_delete_item_activate_cb (GtkWidget *widget, EDITOR * e); - -void set_button_state(BUTTONS_STATE state, EDITOR * e); -void action_fontcolor_activate_cb (GtkWidget *widget, EDITOR * e); -void action_font_activate_cb (GtkWidget *widget, EDITOR * e); -void find_replace_response_cb (GtkDialog *dialog, gint response_id, - EDITOR * e); -void action_replace_activate_cb (GtkWidget *widget, EDITOR * e); -void action_find_activate_cb (GtkWidget *widget, EDITOR * e); -int delete_event (GtkWidget *widget, GdkEvent *event, EDITOR * e); -void action_quit_activate_cb (GtkWidget *widget, EDITOR * e); -void action_new_activate_cb (GtkWidget *widget, EDITOR *e); -void action_open_activate_cb (GtkWidget *widget, EDITOR *e); -void action_print_cb (GtkAction *action, EDITOR *e); -void action_print_preview_cb (GtkAction *action, EDITOR *e); -void action_save_activate_cb (GtkWidget *widget, EDITOR * e); -void action_save_as_activate_cb (GtkWidget *widget, EDITOR * e); +void action_increase_indent_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_decrease_indent_activate_cb(GtkWidget *widget, + EDITOR *e); + +void action_insert_image_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_insert_rule_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_insert_table_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_insert_emoticon_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_insert_sword_link_activate_cb(GtkWidget *widget, + gpointer data); +void action_insert_link_activate_cb(GtkWidget *widget, + EDITOR *e); + +void action_insert_outline_activate_cb(GtkWidget *widget, + EDITOR *e); + +void action_justify_right_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_justify_left_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_justify_center_activate_cb(GtkWidget *widget, + EDITOR *e); +void action_justify_full_activate_cb(GtkWidget *widget, + EDITOR *e); + +void action_bold_activate_cb(GtkWidget *widget, EDITOR *e); +void action_italic_activate_cb(GtkWidget *widget, EDITOR *e); +void action_underline_activate_cb(GtkWidget *widget, EDITOR *e); +void action_strikethrough_activate_cb(GtkWidget *widget, + EDITOR *e); + +void action_undo_activate_cb(GtkWidget *widget, EDITOR *e); +void action_redo_activate_cb(GtkWidget *widget, EDITOR *e); + +void action_cut_activate_cb(GtkWidget *widget, EDITOR *e); +void action_copy_activate_cb(GtkWidget *widget, EDITOR *e); +void action_paste_activate_cb(GtkWidget *widget, EDITOR *e); +void action_delete_activate_cb(GtkWidget *widget, EDITOR *e); +void action_delete_item_activate_cb(GtkWidget *widget, + EDITOR *e); + +void set_button_state(BUTTONS_STATE state, EDITOR *e); +void action_fontcolor_activate_cb(GtkWidget *widget, EDITOR *e); +void action_font_activate_cb(GtkWidget *widget, EDITOR *e); +void find_replace_response_cb(GtkDialog *dialog, gint response_id, + EDITOR *e); +void action_replace_activate_cb(GtkWidget *widget, EDITOR *e); +void action_find_activate_cb(GtkWidget *widget, EDITOR *e); +int delete_event(GtkWidget *widget, GdkEvent *event, EDITOR *e); +void action_quit_activate_cb(GtkWidget *widget, EDITOR *e); +void action_new_activate_cb(GtkWidget *widget, EDITOR *e); +void action_open_activate_cb(GtkWidget *widget, EDITOR *e); +void action_print_cb(GtkAction *action, EDITOR *e); +void action_print_preview_cb(GtkAction *action, EDITOR *e); +void action_save_activate_cb(GtkWidget *widget, EDITOR *e); +void action_save_as_activate_cb(GtkWidget *widget, EDITOR *e); void editor_sync_with_main(void); -void editor_load_note(EDITOR * e, const gchar * module_name, const gchar * key); -void editor_load_book(EDITOR * e); -gint editor_create_new(const gchar * filename, const gchar * key, gint note); -void editor_save_book(EDITOR * e); +void editor_load_note(EDITOR *e, const gchar *module_name, + const gchar *key); +void editor_load_book(EDITOR *e); +gint editor_create_new(const gchar *filename, const gchar *key, + gint note); +void editor_save_book(EDITOR *e); void editor_maybe_save_all(void); -gint ask_about_saving(EDITOR * e); -void colorbutton1_color_set_cb (GtkColorButton *widget, EDITOR * e ); -void colorbutton_highlight_color_set_cb (GtkColorButton *widget, EDITOR * e ); -void combo_box_changed_cb (GtkComboBox *widget, EDITOR * e); +gint ask_about_saving(EDITOR *e); +void colorbutton1_color_set_cb(GtkColorButton *widget, + EDITOR *e); +void colorbutton_highlight_color_set_cb(GtkColorButton *widget, + EDITOR *e); +void combo_box_changed_cb(GtkComboBox *widget, EDITOR *e); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/examples/ipc_client.c xiphos-4.0.4+dfsg1/src/examples/ipc_client.c --- xiphos-4.0.0+dfsg1/src/examples/ipc_client.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/examples/ipc_client.c 2015-02-11 23:48:34.000000000 +0000 @@ -31,21 +31,21 @@ //this function will be called every time the user does a sidebar search static gboolean -search_performed_signal_handler (DBusGProxy *proxy, - char* results, - gpointer user_data) +search_performed_signal_handler(DBusGProxy *proxy, + char *results, gpointer user_data) { char *ref; - printf ("number hits: %s\n", results); + printf("number hits: %s\n", results); //method generated automatically in ipc-client-stub.h //this method can be called anywhere in your program org_xiphos_remote_get_next_search_reference(proxy, &ref, NULL); - while (strcmp (ref, "XIPHOS_SEARCH_END")) { - printf ("ref: %s\n", ref); - org_xiphos_remote_get_next_search_reference(proxy, &ref, NULL); + while (strcmp(ref, "XIPHOS_SEARCH_END")) { + printf("ref: %s\n", ref); + org_xiphos_remote_get_next_search_reference(proxy, &ref, + NULL); } return FALSE; @@ -53,12 +53,11 @@ //this function will be called every time Xiphos navigates static gboolean -navigation_performed_signal_handler (DBusGProxy *proxy, - char* reference, - gpointer user_data) +navigation_performed_signal_handler(DBusGProxy *proxy, + char *reference, gpointer user_data) { - printf ("new reference is: %s\n", reference); - printf ("now calling remote method just to be sure\n"); + printf("new reference is: %s\n", reference); + printf("now calling remote method just to be sure\n"); char *ref; @@ -67,53 +66,49 @@ org_xiphos_remote_get_current_reference(proxy, &ref, NULL); //of course, this doesn't actually *check* to see if they're the same :) - printf ("yep! Xiphos says the new reference is %s\n", ref); + printf("yep! Xiphos says the new reference is %s\n", ref); return FALSE; } -int main (int argc, char **argv) +int main(int argc, char **argv) { DBusGConnection *bus; DBusGProxy *remote_object; GError *error = NULL; GMainLoop *mainloop; - //not necessary if using from a gtk/gnome program +//not necessary if using from a gtk/gnome program #if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init (); + g_type_init(); #endif - mainloop = g_main_loop_new (NULL, FALSE); + mainloop = g_main_loop_new(NULL, FALSE); //get the "session" dbus - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); //conect to xiphos - remote_object = dbus_g_proxy_new_for_name (bus, - "org.xiphos.remote", - "/org/xiphos/remote/ipc", - "org.xiphos.remote"); + remote_object = dbus_g_proxy_new_for_name(bus, + "org.xiphos.remote", + "/org/xiphos/remote/ipc", + "org.xiphos.remote"); //add and connect to the searchPerformedSignal - dbus_g_proxy_add_signal (remote_object, "searchPerformedSignal", - G_TYPE_STRING, G_TYPE_INVALID); - dbus_g_proxy_connect_signal (remote_object, "searchPerformedSignal", - G_CALLBACK(search_performed_signal_handler), - NULL, NULL); + dbus_g_proxy_add_signal(remote_object, "searchPerformedSignal", + G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(remote_object, "searchPerformedSignal", + G_CALLBACK(search_performed_signal_handler), + NULL, NULL); //add and connect to the navigationSignal - dbus_g_proxy_add_signal (remote_object, "navigationSignal", - G_TYPE_STRING, G_TYPE_INVALID); - dbus_g_proxy_connect_signal (remote_object, "navigationSignal", - G_CALLBACK(navigation_performed_signal_handler), - NULL, NULL); + dbus_g_proxy_add_signal(remote_object, "navigationSignal", + G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(remote_object, "navigationSignal", + G_CALLBACK(navigation_performed_signal_handler), + NULL, NULL); - g_main_loop_run (mainloop); - - exit (0); + g_main_loop_run(mainloop); + exit(0); } - - - diff -Nru xiphos-4.0.0+dfsg1/src/examples/xiphos-nav.c xiphos-4.0.4+dfsg1/src/examples/xiphos-nav.c --- xiphos-4.0.0+dfsg1/src/examples/xiphos-nav.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/examples/xiphos-nav.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.c - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,27 +27,28 @@ #include "ipc-interface.h" -int main (int argc, char **argv) +int main(int argc, char **argv) { DBusGConnection *bus; DBusGProxy *remote_object; GError *error = NULL; - /* not necessary if using from a gtk/gnome program */ +/* not necessary if using from a gtk/gnome program */ #if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init (); + g_type_init(); #endif /* get the "session" dbus */ - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); /* connect to Xiphos */ - remote_object = dbus_g_proxy_new_for_name (bus, - "org.xiphos.remote", - "/org/xiphos/remote/ipc", - "org.xiphos.remote"); + remote_object = dbus_g_proxy_new_for_name(bus, + "org.xiphos.remote", + "/org/xiphos/remote/ipc", + "org.xiphos.remote"); /* attempt to set reference in running instance of Xiphos */ - org_xiphos_remote_set_current_reference(remote_object, argv[1], &error); + org_xiphos_remote_set_current_reference(remote_object, argv[1], + &error); /* if error, then Xiphos is not running, so we just start it and pass it the arguments given to this program */ @@ -56,6 +57,3 @@ return 1; } - - - diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/about_modules.c xiphos-4.0.4+dfsg1/src/gnome2/about_modules.c --- xiphos-4.0.0+dfsg1/src/gnome2/about_modules.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/about_modules.c 2015-08-29 01:22:04.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_modules.c - Sword modules about dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -55,9 +55,7 @@ * void */ -static void -about_modules_ok(GtkButton * button, - gpointer user_data) +static void about_modules_ok(GtkButton *button, gpointer user_data) { GtkWidget *dlg; @@ -65,52 +63,43 @@ gtk_widget_destroy(dlg); } - -static void -on_copy_activate(GtkMenuItem * menuitem, - gpointer data) +static void on_copy_activate(GtkMenuItem *menuitem, gpointer data) { XI_message(("on_copy_activate")); XIPHOS_HTML_COPY_SELECTION(text_html); } -static void -create_menu1(void) +static void create_menu1(void) { - GtkWidget *menu; + GtkWidget *menu; GtkWidget *item; GtkAccelGroup *accel_group; - accel_group = gtk_accel_group_new (); + accel_group = gtk_accel_group_new(); - menu = gtk_menu_new (); + menu = gtk_menu_new(); item = #ifdef HAVE_GTK_310 - gtk_menu_item_new_with_mnemonic ("_Copy"); -#else - gtk_image_menu_item_new_from_stock ("gtk-copy", - accel_group); -#endif + gtk_menu_item_new_with_mnemonic("_Copy"); +#else + gtk_image_menu_item_new_from_stock("gtk-copy", accel_group); +#endif gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "clicked", - G_CALLBACK (on_copy_activate), - NULL); + G_CALLBACK(on_copy_activate), NULL); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); - gtk_menu_popup((GtkMenu*)menu, NULL, NULL, NULL, NULL, 2, - gtk_get_current_event_time()); + gtk_menu_set_accel_group(GTK_MENU(menu), accel_group); + gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 2, + gtk_get_current_event_time()); } static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { create_menu1(); } - /****************************************************************************** * Name * gui_create_about_modules @@ -127,8 +116,7 @@ * GtkWidget * */ -static GtkWidget * -gui_create_about_modules(void) +static GtkWidget *gui_create_about_modules(void) { GtkWidget *dialog_about_mods; GtkWidget *dialog_vbox28; @@ -136,7 +124,9 @@ GtkWidget *hbox21; GtkWidget *pixmap; GtkWidget *frame73; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow30; +#endif GtkWidget *dialog_action_area28; GtkWidget *hbuttonbox7; GtkWidget *button; @@ -146,19 +136,19 @@ "dialog_about_mods", dialog_about_mods); gtk_window_set_title(GTK_WINDOW(dialog_about_mods), _("About Sword Module")); - gtk_window_set_default_size(GTK_WINDOW(dialog_about_mods), 324, - 304); + gtk_window_set_default_size(GTK_WINDOW(dialog_about_mods), 500, + 400); gtk_window_set_resizable(GTK_WINDOW(dialog_about_mods), TRUE); - dialog_vbox28 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_mods)); - g_object_set_data(G_OBJECT(dialog_about_mods), - "dialog_vbox28", dialog_vbox28); + dialog_vbox28 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_mods)); + g_object_set_data(G_OBJECT(dialog_about_mods), "dialog_vbox28", + dialog_vbox28); gtk_widget_show(dialog_vbox28); UI_VBOX(vbox25, FALSE, 0); gtk_widget_show(vbox25); - gtk_box_pack_start(GTK_BOX(dialog_vbox28), vbox25, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(dialog_vbox28), vbox25, TRUE, TRUE, 0); UI_HBOX(hbox21, FALSE, 0); gtk_widget_show(hbox21); @@ -172,67 +162,78 @@ gtk_widget_show(frame73); gtk_box_pack_start(GTK_BOX(vbox25), frame73, TRUE, TRUE, 0); +#ifndef USE_WEBKIT2 scrolledwindow30 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow30); gtk_container_add(GTK_CONTAINER(frame73), scrolledwindow30); gtk_widget_set_size_request(scrolledwindow30, 304, 183); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow30), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow30), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow30, - settings.shadow_type); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow30, + settings.shadow_type); +#endif text_html = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, 12)); gtk_widget_show(text_html); g_signal_connect((gpointer)text_html, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), NULL); +#ifdef USE_WEBKIT2 + gtk_container_add(GTK_CONTAINER(frame73), text_html); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow30), text_html); +#endif dialog_action_area28 = - gtk_dialog_get_action_area(GTK_DIALOG(dialog_about_mods)); +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_mods)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_about_mods)); +#endif g_object_set_data(G_OBJECT(dialog_about_mods), - "dialog_action_area28", - dialog_action_area28); + "dialog_action_area28", dialog_action_area28); gtk_widget_show(dialog_action_area28); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area28), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area28), + 10); #ifdef USE_GTK_3 - hbuttonbox7 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox7 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else - hbuttonbox7 = gtk_hbutton_box_new(); + hbuttonbox7 = gtk_hbutton_box_new(); #endif gtk_widget_show(hbuttonbox7); +#ifdef HAVE_GTK_312 + gtk_box_pack_start(GTK_BOX(dialog_action_area28), hbuttonbox7, + FALSE, TRUE, 3); +#else gtk_box_pack_start(GTK_BOX(dialog_action_area28), hbuttonbox7, TRUE, TRUE, 0); +#endif gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox7), GTK_BUTTONBOX_END); - button = + button = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("window-close", - GTK_ICON_SIZE_BUTTON); -#else - gtk_button_new_from_stock (GTK_STOCK_CLOSE); -#endif + gtk_button_new_with_mnemonic(_("Close")); +#else + gtk_button_new_from_stock(GTK_STOCK_CLOSE); +#endif gtk_widget_show(button); gtk_container_add(GTK_CONTAINER(hbuttonbox7), button); #ifdef HAVE_GTK_218 - gtk_widget_set_can_default(button, TRUE); + gtk_widget_set_can_default(button, TRUE); #else - #ifdef USE_GTK_3 +#ifdef USE_GTK_3 gtk_widget_set_can_default(button, 1); - #else +#else GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - #endif +#endif #endif g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(about_modules_ok), NULL); + G_CALLBACK(about_modules_ok), NULL); return dialog_about_mods; - } /****************************************************************************** @@ -256,48 +257,49 @@ */ void -about_module_display(GString * str, - gchar * text, - gboolean tooltip) +about_module_display(GString *str, + const gchar *text, const gboolean tooltip) { gboolean center = FALSE; for (/* */; *text; ++text) { - if (*text == '\\') { // a RTF command + if (*text == '\\') { // a RTF command if ((text[1] == 'p') && (text[2] == 'a') && - (text[3] == 'r') && - (text[4] == 'd')) { + (text[3] == 'r') && (text[4] == 'd')) { if (center && !tooltip) { - str = g_string_append(str, "
"); + str = + g_string_append(str, + ""); center = FALSE; } text += 4; continue; } if ((text[1] == 'p') && - (text[2] == 'a') && - (text[3] == 'r')) { - str = g_string_append(str, (tooltip ? "\n" : "
\n")); + (text[2] == 'a') && (text[3] == 'r')) { + str = + g_string_append(str, + (tooltip ? "\n" : "
\n")); text += 3; continue; } - if ((text[1] == ' ') || - (text[1] == '\n')) { + if ((text[1] == ' ') || (text[1] == '\n')) { text += 1; continue; } - if ((text[1] == 'q') && - (text[2] == 'c')) { + if ((text[1] == 'q') && (text[2] == 'c')) { if (!center && !tooltip) { - str = g_string_append(str, "
"); + str = + g_string_append(str, + "
"); center = TRUE; } text += 2; continue; } } - if (tooltip && (*text == '<')) { /* no htmlisms in tooltips */ + if (tooltip && (*text == '<')) { /* no htmlisms in tooltips */ while (*text && (*text != '>')) ++text; continue; @@ -323,50 +325,43 @@ */ void -gui_core_display_about_dialog(const gchar * desc, - gchar * abouttext, - const gchar * version, - gchar * modname) +gui_core_display_about_dialog(const gchar *desc, + const gchar *abouttext, + const gchar *modname) { - GtkWidget *aboutbox; //-- pointer to about dialog + GtkWidget *aboutbox; //-- pointer to about dialog GString *str = g_string_new(NULL); GString *description = g_string_new(NULL); GString *text = g_string_new(NULL); GString *html_start = g_string_new(NULL); - + static const char *html_end = ""; MOD_FONT *mf = get_font(modname); - g_string_printf (html_start, - "", - settings.bible_bg_color, - settings.bible_text_color, - ((mf->old_font) ? mf->old_font : ""), - mf->old_font_size_value - 1); + g_string_printf(html_start, + "", + settings.bible_bg_color, + settings.bible_text_color, + ((mf->old_font) ? mf->old_font : ""), + mf->old_font_size_value - 1); free_font(mf); - + g_string_printf(description, - "
%s
%s %s

", - (desc ? desc : "No module present"), - (version ? "
Sword module version" : ""), - (version ? version : "")); + "

%s


", + (desc ? desc : "No module present")); aboutbox = gui_create_about_modules(); gtk_widget_show(aboutbox); - about_module_display(str, - ((abouttext && *abouttext) - ? abouttext - : _("The module has no About information.")), - FALSE); - - g_string_append_len(text, html_start->str, strlen(html_start->str)); - g_string_append_len(text, description->str, strlen(description->str)); - g_string_append_len(text, str->str, strlen(str->str)); - g_string_append_len(text, html_end, strlen(html_end)); + about_module_display(str, abouttext, FALSE); + + g_string_append(text, html_start->str); + g_string_append(text, description->str); + g_string_append(text, str->str); + g_string_append(text, html_end); HtmlOutput(text->str, text_html, NULL, NULL); g_string_free(text, TRUE); g_string_free(str, TRUE); - g_string_free(description, TRUE); + g_string_free(description, TRUE); g_string_free(html_start, TRUE); } @@ -386,19 +381,264 @@ * void */ -void -gui_display_about_module_dialog(gchar *modname) +void gui_display_about_module_dialog(gchar *modname) { - const gchar *buf; //-- pointer to text buffer for label (mod name) - gchar *bufabout; //-- pointer to text buffer for text widget (mod about) - const gchar * version; + const gchar *desc; + gchar *about; + const gchar *version, *language, *abbreviation, + *size, *promo, *dist, *langtoken, *companion, + *category, *feature; + int feature_count = 0; + GString *info = g_string_new(""); - buf = main_get_module_description(modname); - bufabout = main_get_mod_about_info(modname); + desc = main_get_mod_config_entry(modname, "Description"); + about = main_get_mod_config_entry(modname, "About"); version = main_get_mod_config_entry(modname, "Version"); + size = main_get_mod_config_entry(modname, "InstallSize"); + promo = main_get_mod_config_entry(modname, "ShortPromo"); + dist = main_get_mod_config_entry(modname, "DistributionLicense"); + companion = main_get_mod_config_entry(modname, "Companion"); + category = main_get_mod_config_entry(modname, "Category"); + feature = main_get_mod_config_entry(modname, "Feature"); + langtoken = main_get_mod_config_entry(modname, "Lang"); + language = main_get_module_language(modname); + abbreviation = main_get_abbreviation(modname); + + info = g_string_append(info, + "
"); + info = g_string_append(info, "" + "" + "
"); + + info = g_string_append(info, _("Module name: ")); + info = g_string_append(info, modname); + info = g_string_append(info, "
"); + + if (abbreviation && *abbreviation) { + info = + g_string_append(info, + _("Module abbreviation: ")); + info = g_string_append(info, abbreviation); + info = g_string_append(info, "
"); + } + + info = g_string_append(info, _("Version: ")); + info = g_string_append(info, ((version && *version) + ? version + : _("No version stamp found"))); + info = g_string_append(info, "
"); + + info = g_string_append(info, _("Type: ")); + if (feature && !strcmp(feature, "DailyDevotion")) + info = g_string_append(info, _("Daily Devotion")); + else if (category && !strcmp(category, "Maps")) + info = g_string_append(info, _("Maps")); + else if (category && !strcmp(category, "Images")) + info = g_string_append(info, _("Images")); + else if (category && !strcmp(category, "Glossaries")) + info = g_string_append(info, _("Glossary")); + else if (category && + !strcmp(category, + "Cults / Unorthodox / Questionable Material")) + info = g_string_append(info, _("Cult")); + else { + switch (main_get_mod_type(modname)) { + case TEXT_TYPE: + info = g_string_append(info, _("Bible")); + break; + case COMMENTARY_TYPE: + info = g_string_append(info, _("Commentary")); + break; + case DICTIONARY_TYPE: + info = g_string_append(info, _("Dictionary")); + break; + case BOOK_TYPE: + info = g_string_append(info, _("General Book")); + break; + case PERCOM_TYPE: + info = + g_string_append(info, + _("Personal Commentary")); + break; + case PRAYERLIST_TYPE: + info = g_string_append(info, _("Journal")); + break; + default: + info = g_string_append(info, _("Unknown type")); + break; + } + } + info = g_string_append(info, "
"); + + info = g_string_append(info, _("Language: ")); + info = g_string_append(info, ((language && *language) + ? language + : _("Not specified"))); + info = g_string_append(info, " ("); + info = g_string_append(info, ((langtoken && *langtoken) + ? langtoken + : "?")); + info = g_string_append(info, ")"); + info = g_string_append(info, "
"); + + if (size && *size) { + info = g_string_append(info, _("Installed size: ")); + info = g_string_append(info, size); + info = g_string_append(info, "
"); + } + + if (companion && *companion) { + info = + g_string_append(info, + _("Companion module(s):
")); + info = g_string_append(info, companion); + info = g_string_append(info, "
"); + } + + info = g_string_append(info, + "		        "); + + info = g_string_append(info, _("Features:")); + info = g_string_append(info, "
"); + if (main_check_for_global_option((gchar *)modname, "ThMLHeadings") || main_check_for_global_option((gchar *)modname, + "OSISHeadings")) { + info = g_string_append(info, _("* Headings")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "GBFFootnotes") || main_check_for_global_option((gchar *)modname, + "ThMLFootnotes") || + main_check_for_global_option((gchar *)modname, + "OSISFootnotes")) { + info = g_string_append(info, _("* Footnotes")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "ThMLScripref") || main_check_for_global_option((gchar *)modname, + "OSISScripref")) { + info = g_string_append(info, _("* Cross references")); + info = g_string_append(info, "
"); + feature_count++; + } + if ((main_check_for_global_option((gchar *)modname, "GBFStrongs")) || + (main_check_for_global_option((gchar *)modname, "ThMLStrongs")) || + (main_check_for_global_option((gchar *)modname, "OSISStrongs"))) { + info = g_string_append(info, _("* Strong's numbers")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "GBFMorph") || + main_check_for_global_option((gchar *)modname, "ThMLMorph") || + main_check_for_global_option((gchar *)modname, "OSISMorph")) { + info = + g_string_append(info, _("* Morphological tags")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "ThMLLemma") || + main_check_for_global_option((gchar *)modname, "OSISLemma")) { + info = g_string_append(info, _("* Lemmas")); + info = g_string_append(info, "
"); + feature_count++; + } + if ((main_check_for_global_option((gchar *)modname, "GBFRedLetterWords")) || + (main_check_for_global_option((gchar *)modname, "OSISRedLetterWords"))) { + info = + g_string_append(info, + _("* Words of Christ in red")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "UTF8GreekAccents")) { + info = g_string_append(info, _("* Greek accents")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "UTF8HebrewPoints")) { + info = + g_string_append(info, _("* Hebrew Vowel Points")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "UTF8Cantillation")) { + info = + g_string_append(info, _("* Hebrew Cantillation")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "ThMLVariants") || main_check_for_global_option((gchar *)modname, + "OSISVariants")) { + info = g_string_append(info, _("* Variant readings")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "OSISXlit")) { + info = + g_string_append(info, + _("* Transliteration forms")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "OSISEnum")) { + info = g_string_append(info, _("* Enumerations")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "OSISGlosses") || main_check_for_global_option((gchar *)modname, "OSISRuby")) { + info = g_string_append(info, _("* Glosses")); + info = g_string_append(info, "
"); + feature_count++; + } + if (main_check_for_global_option((gchar *)modname, "OSISMorphSegmentation")) { + info = + g_string_append(info, + _("* Morpheme Segmentation")); + info = g_string_append(info, "
"); + feature_count++; + } + if (feature_count == 0) { + info = + g_string_append(info, + _("* No features found")); + info = g_string_append(info, "
"); + } + + info = g_string_append(info, "
"); + + if (dist && *dist) { + info = g_string_append(info, "
"); + info = + g_string_append(info, + _("Distribution license:")); + info = g_string_append(info, "
"); + info = g_string_append(info, dist); + info = g_string_append(info, "
"); + } + + if (promo) { + /* if promo looks like just an undecorated url, hotlink it. */ + gboolean just_url = (((strncmp(promo, "http", 4) == 0) || + (strncmp(promo, "www.", 4) == 0)) && + (strchr(promo, ' ') == 0)); + + info = g_string_append(info, "
"); + info = g_string_append(info, _("Promotional: ")); + info = g_string_append(info, "
"); + if (just_url) { + g_string_append(info, ""); + } + info = g_string_append(info, promo); + if (just_url) + g_string_append(info, ""); + info = g_string_append(info, "
"); + } - gui_core_display_about_dialog(buf, bufabout, version, modname); + info = g_string_append(info, "

"); + info = g_string_append(info, about); - if (bufabout) - g_free(bufabout); + gui_core_display_about_dialog(desc, info->str, modname); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/about_sword.c xiphos-4.0.4+dfsg1/src/gnome2/about_sword.c --- xiphos-4.0.0+dfsg1/src/gnome2/about_sword.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/about_sword.c 2015-02-11 23:48:34.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * about_xiphos.c - Xiphos about dialog + * about_sword.c - Xiphos "About Sword" dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -49,7 +49,7 @@ */ static void -on_dialog_response(GtkDialog * dialog, gint response_id, +on_dialog_response(GtkDialog *dialog, gint response_id, gpointer user_data) { gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -71,14 +71,12 @@ * GtkWidget * */ -GtkWidget* -gui_create_about_sword(void) +GtkWidget *gui_create_about_sword(void) { GdkPixbuf *about1_logo_pixbuf; GtkWidget *about1; gchar *about = - _ - ("The SWORD Project is an effort to create an ever-expanding \ + _("The SWORD Project is an effort to create an ever-expanding \ software package for research and study of God and His Word. \ The SWORD Project framework allows easy use and study of Bible \ texts, commentaries, lexicons, dictionaries, and other books. \ @@ -87,28 +85,21 @@ framework.\n\n \ Books can be downloaded from the SWORD Project."); - about1_logo_pixbuf = pixbuf_finder("sword-big.png", 0, NULL); about1 = gtk_about_dialog_new(); g_signal_connect(about1, "response", G_CALLBACK(on_dialog_response), NULL); - gtk_about_dialog_set_program_name - (GTK_ABOUT_DIALOG (about1), "The SWORD Project"); - gtk_about_dialog_set_version - (GTK_ABOUT_DIALOG (about1), (gchar *)main_get_sword_version()); - gtk_about_dialog_set_comments - (GTK_ABOUT_DIALOG (about1), about); -#ifndef WIN32 - gtk_about_dialog_set_website - (GTK_ABOUT_DIALOG (about1), "http://www.crosswire.org/sword"); - gtk_about_dialog_set_website_label - (GTK_ABOUT_DIALOG (about1), _("The SWORD Project")); -#endif - gtk_about_dialog_set_logo - (GTK_ABOUT_DIALOG (about1), about1_logo_pixbuf); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about1), "The SWORD Project"); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about1), (gchar *)main_get_sword_version()); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about1), about); + + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about1), "http://www.crosswire.org/"); + gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(about1), _("The SWORD Project")); + + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about1), about1_logo_pixbuf); - set_window_icon (GTK_WINDOW(about1)); + set_window_icon(GTK_WINDOW(about1)); return about1; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/about_trans.c xiphos-4.0.4+dfsg1/src/gnome2/about_trans.c --- xiphos-4.0.0+dfsg1/src/gnome2/about_trans.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/about_trans.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_trans.c - About Translation * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * 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 @@ -41,8 +41,7 @@ * void */ -static void -about_trans_ok(GtkButton * button, gpointer user_data) +static void about_trans_ok(GtkButton *button, gpointer user_data) { GtkWidget *dlg; @@ -66,8 +65,7 @@ * GtkWidget * */ -GtkWidget * -gui_create_about_trans(void) +GtkWidget *gui_create_about_trans(void) { GtkWidget *dialog_about_trans; GtkWidget *dialog_vbox; @@ -82,32 +80,32 @@ GtkWidget *button; gchar *about = _("Do you like using Xiphos to study the Bible? " - "Would you like to see its display using your native language? " + "Would you like to see its user interface in your native language? " "You could translate Xiphos! " "\n\n" "We are always looking for contributions of new " "translations of Xiphos into other languages. " "If you are able to translate for us, please see the link " - "below, contact us, and get involved with our efforts." - ); + "below, contact us, and get involved with our efforts. Your help will " + "be much appreciated!"); dialog_about_trans = gtk_dialog_new(); g_object_set_data(G_OBJECT(dialog_about_trans), "dialog_about_trans", dialog_about_trans); gtk_window_set_title(GTK_WINDOW(dialog_about_trans), _("About Xiphos Translation")); - set_window_icon (GTK_WINDOW(dialog_about_trans)); - gtk_window_set_resizable(GTK_WINDOW(dialog_about_trans), FALSE); + set_window_icon(GTK_WINDOW(dialog_about_trans)); + gtk_window_set_resizable(GTK_WINDOW(dialog_about_trans), FALSE); - dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_trans)); - g_object_set_data(G_OBJECT(dialog_about_trans), - "dialog_vbox", dialog_vbox); + dialog_vbox = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_trans)); + g_object_set_data(G_OBJECT(dialog_about_trans), "dialog_vbox", + dialog_vbox); gtk_widget_show(dialog_vbox); UI_VBOX(vbox, FALSE, 0); gtk_widget_show(vbox); - gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0); pixmap = pixmap_finder("logo.png"); gtk_widget_show(pixmap); @@ -115,74 +113,72 @@ scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, - TRUE, 4); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 4); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_widget_set_size_request (scrolledwindow, 400, 150); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 4); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow, - settings.shadow_type); - - textview = gtk_text_view_new (); - gtk_widget_show (textview); - gtk_container_add (GTK_CONTAINER (scrolledwindow), textview); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD); - gtk_text_view_set_editable(GTK_TEXT_VIEW(textview),FALSE); - gtk_text_buffer_set_text (gtk_text_view_get_buffer - (GTK_TEXT_VIEW (textview)), about, -1); - gtk_widget_set_sensitive(textview,FALSE); - - label = - gtk_label_new(_ - ("See TRANSLATION-HOWTO in Xiphos source")); + gtk_widget_set_size_request(scrolledwindow, 400, 150); + gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow), 4); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow, + settings.shadow_type); + + textview = gtk_text_view_new(); + gtk_widget_show(textview); + gtk_container_add(GTK_CONTAINER(scrolledwindow), textview); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), + GTK_WRAP_WORD); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); + gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)), about, -1); + gtk_widget_set_sensitive(textview, FALSE); + + label = gtk_label_new(_("See TRANSLATION-HOWTO in Xiphos source")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_set_size_request(label, -2, 24); - href = gtk_link_button_new_with_label ("http://xiphos.org/development/", - _("Xiphos development")); + href = + gtk_link_button_new_with_label("http://xiphos.org/development/", _("Xiphos development")); gtk_widget_show(href); gtk_box_pack_start(GTK_BOX(vbox), href, FALSE, FALSE, 0); dialog_action_area = - gtk_dialog_get_action_area(GTK_DIALOG(dialog_about_trans)); +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_about_trans)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_about_trans)); +#endif g_object_set_data(G_OBJECT(dialog_about_trans), - "dialog_action_area", - dialog_action_area); + "dialog_action_area", dialog_action_area); gtk_widget_show(dialog_action_area); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area), 10); #ifdef USE_GTK_3 - hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else - hbuttonbox = gtk_hbutton_box_new(); + hbuttonbox = gtk_hbutton_box_new(); #endif gtk_widget_show(hbuttonbox); gtk_box_pack_start(GTK_BOX(dialog_action_area), hbuttonbox, TRUE, TRUE, 0); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END); - button = + button = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("window-close", - GTK_ICON_SIZE_BUTTON); -#else - gtk_button_new_from_stock (GTK_STOCK_CLOSE); -#endif + gtk_button_new_with_mnemonic(_("Close")); +#else + gtk_button_new_from_stock(GTK_STOCK_CLOSE); +#endif gtk_widget_show(button); gtk_container_add(GTK_CONTAINER(hbuttonbox), button); #ifdef HAVE_GTK_218 - gtk_widget_set_can_default(button, TRUE); + gtk_widget_set_can_default(button, TRUE); #elif defined(USE_GTK_3) gtk_widget_set_can_default(button, 1); #else GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); #endif g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(about_trans_ok), NULL); + G_CALLBACK(about_trans_ok), NULL); return dialog_about_trans; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/about_xiphos.c xiphos-4.0.4+dfsg1/src/gnome2/about_xiphos.c --- xiphos-4.0.0+dfsg1/src/gnome2/about_xiphos.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/about_xiphos.c 2015-05-04 17:14:08.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_xiphos.c - Xiphos about dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -45,8 +45,8 @@ "Simon Meers", "Martin Zibricky", "Dmitrijs Ledkovs", - NULL -}; + "Christopher Bayliss", + NULL}; static const gchar *documenters[] = { "Pierre Benz", @@ -55,10 +55,10 @@ "Karl Kleinpaste", "Matthew Talbert", "Simon Meers", - NULL -}; + NULL}; -static gchar *translators = "Jan Paul Schmidt\nJorge Chacon\nDominique Corbex\nZdenko Podobn\nPavlo Bohmat\nMartin Zibricky\nAri Constancio\nGertjan Francke\nEicke Godehardt\nAndy Piper\nThomas Abthorpe\nEeli Kaikkonen"; +static gchar *translators = + "Jan Paul Schmidt\nJorge Chacon\nDominique Corbex\nZdenko Podobn\nPavlo Bohmat\nMartin Zibricky\nAri Constancio\nGertjan Francke\nEicke Godehardt\nAndy Piper\nThomas Abthorpe\nEeli Kaikkonen"; /****************************************************************************** * Name @@ -78,7 +78,7 @@ */ static void -on_dialog_response(GtkDialog * dialog, gint response_id, +on_dialog_response(GtkDialog *dialog, gint response_id, gpointer user_data) { gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -100,14 +100,23 @@ * GtkWidget * */ -GtkWidget* -gui_create_about_xiphos(void) +#ifdef USE_GTK_3 +# ifdef USE_WEBKIT2 +# define BUILD_TYPE "gtk3 webkit2" +# else +# define BUILD_TYPE "gtk3 webkit1" +# endif +#else +# define BUILD_TYPE "gtk2 webkit1" +#endif + +GtkWidget *gui_create_about_xiphos(void) { GdkPixbuf *about1_logo_pixbuf; GtkWidget *about1; gchar versionbuild[128]; - snprintf(versionbuild, 120, "%s", VERSION); + snprintf(versionbuild, 120, "%s (%s)", VERSION, BUILD_TYPE); about1_logo_pixbuf = pixbuf_finder("about.png", 0, NULL); @@ -115,26 +124,19 @@ g_signal_connect(about1, "response", G_CALLBACK(on_dialog_response), NULL); - gtk_about_dialog_set_version - (GTK_ABOUT_DIALOG (about1), versionbuild); - gtk_about_dialog_set_copyright - (GTK_ABOUT_DIALOG (about1), - _("Copyright © 2000-2014 Xiphos Development Team")); - gtk_about_dialog_set_comments - (GTK_ABOUT_DIALOG (about1), - _("\nPowered by The SWORD Project.\nWe would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project.")); - gtk_about_dialog_set_website - (GTK_ABOUT_DIALOG (about1), "http://xiphos.org/"); - gtk_about_dialog_set_authors - (GTK_ABOUT_DIALOG (about1), authors); - gtk_about_dialog_set_documenters - (GTK_ABOUT_DIALOG (about1), documenters); - gtk_about_dialog_set_translator_credits - (GTK_ABOUT_DIALOG (about1), translators); - gtk_about_dialog_set_logo - (GTK_ABOUT_DIALOG (about1), about1_logo_pixbuf); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about1), versionbuild); + gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about1), + _("Copyright © 2000-2015 Xiphos Development Team")); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about1), + _("\nPowered by The SWORD Project.\nWe would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project.")); + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about1), + "http://xiphos.org/"); + gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about1), authors); + gtk_about_dialog_set_documenters(GTK_ABOUT_DIALOG(about1), documenters); + gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about1), translators); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about1), about1_logo_pixbuf); - set_window_icon (GTK_WINDOW(about1)); + set_window_icon(GTK_WINDOW(about1)); return about1; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/bibletext.c xiphos-4.0.4+dfsg1/src/gnome2/bibletext.c --- xiphos-4.0.0+dfsg1/src/gnome2/bibletext.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/bibletext.c 2015-02-21 02:22:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext.c - gui for Bible text modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,6 @@ #include "xiphos_html/xiphos_html.h" - #include "gui/xiphos.h" #include "gui/bibletext.h" #include "gui/bibletext_dialog.h" @@ -55,8 +54,10 @@ gboolean shift_key_pressed = FALSE; guint scroll_adj_signal; -GtkAdjustment* adjustment; +GtkAdjustment *adjustment; +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * @@ -75,21 +76,18 @@ void gui_popup_pm_text(void) { - /* gui_menu_popup (settings.MainWindowModule, - NULL);*/ + /* gui_menu_popup (settings.MainWindowModule, + NULL); */ } - +#endif static gboolean -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri , - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { - gui_menu_popup(html, settings.MainWindowModule, NULL); + gui_menu_popup(html, settings.MainWindowModule, NULL); return TRUE; } - /****************************************************************************** * Name * gui_create_bible_pane @@ -116,20 +114,17 @@ scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(vbox), - scrolledwindow, - TRUE, - TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 0); - widgets.html_text = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, TEXT_TYPE)); + widgets.html_text = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, TEXT_TYPE)); gtk_widget_show(widgets.html_text); gtk_container_add(GTK_CONTAINER(scrolledwindow), - widgets.html_text); - + widgets.html_text); + g_signal_connect((gpointer)widgets.html_text, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), NULL); - return vbox; + return vbox; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/bibletext_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/bibletext_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/bibletext_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/bibletext_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext_dialog.c - view Bible text module in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -48,7 +48,6 @@ #include "gui/debug_glib_null.h" - /****************************************************************************** * static - global to this file only */ @@ -75,15 +74,13 @@ * void */ -static void dialog_destroy(GObject *object, - DIALOG_DATA *vt) +static void dialog_destroy(GObject *object, DIALOG_DATA *vt) { if (!bible_freed) main_free_on_destroy(vt); bible_freed = FALSE; } - static gboolean on_dialog_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, DIALOG_DATA *vt) @@ -92,7 +89,6 @@ return FALSE; } - /****************************************************************************** * Name * sync_with_main @@ -116,7 +112,6 @@ g_free(url); } - /****************************************************************************** * Name * sync_toggled @@ -145,7 +140,6 @@ c->sync = FALSE; } - /****************************************************************************** * Name * create_nav_toolbar @@ -168,14 +162,11 @@ return gui_navbar_versekey_dialog_new(c); } - static void - _popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { - DIALOG_DATA * d = (DIALOG_DATA *)cur_vt; - gui_menu_popup (html, d->mod_name, d); //gui_text_dialog_create_menu(d); + DIALOG_DATA *d = (DIALOG_DATA *)cur_vt; + gui_menu_popup(html, d->mod_name, d); //gui_text_dialog_create_menu(d); } /****************************************************************************** @@ -194,7 +185,7 @@ * void */ -void gui_create_bibletext_dialog(DIALOG_DATA * vt) +void gui_create_bibletext_dialog(DIALOG_DATA *vt) { GtkWidget *vbox33; GtkWidget *paned; @@ -203,8 +194,7 @@ vt->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_object_set_data(G_OBJECT(vt->dialog), "dlg->dialog", - vt->dialog); + g_object_set_data(G_OBJECT(vt->dialog), "dlg->dialog", vt->dialog); gtk_window_set_title(GTK_WINDOW(vt->dialog), main_get_module_description(vt->mod_name)); gtk_window_set_default_size(GTK_WINDOW(vt->dialog), 350, 450); @@ -222,24 +212,23 @@ paned = UI_VPANE(); gtk_box_pack_start(GTK_BOX(vbox33), paned, TRUE, TRUE, 0); gtk_widget_show(paned); - + swVText = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(swVText); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swVText), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)swVText, - settings.shadow_type); + settings.shadow_type); gtk_paned_add1((GtkPaned *)paned, swVText); vt->html = GTK_WIDGET(XIPHOS_HTML_NEW(vt, TRUE, DIALOG_TEXT_TYPE)); gtk_widget_show(vt->html); gtk_container_add(GTK_CONTAINER(swVText), vt->html); g_signal_connect((gpointer)vt->html, - "popupmenu_requested", - G_CALLBACK(_popupmenu_requested_cb), - vt); - + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), vt); + swVText = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(swVText); //gtk_container_add(GTK_CONTAINER(frame), swVText); @@ -247,30 +236,26 @@ GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)swVText, - settings.shadow_type); - - gtk_paned_add2((GtkPaned *)paned,swVText); - - vt->previewer = GTK_WIDGET(XIPHOS_HTML_NEW(vt, TRUE, VIEWER_TYPE)); + settings.shadow_type); + + gtk_paned_add2((GtkPaned *)paned, swVText); + + vt->previewer = GTK_WIDGET(XIPHOS_HTML_NEW(vt, TRUE, VIEWER_TYPE)); gtk_widget_show(vt->previewer); gtk_container_add(GTK_CONTAINER(swVText), vt->previewer); - gtk_paned_set_position (GTK_PANED(paned), - 250); + gtk_paned_set_position(GTK_PANED(paned), 250); vt->statusbar = gtk_statusbar_new(); gtk_widget_show(vt->statusbar); gtk_box_pack_start(GTK_BOX(vbox33), vt->statusbar, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(vt->dialog), - "destroy", - G_CALLBACK(dialog_destroy), vt); - + "destroy", G_CALLBACK(dialog_destroy), vt); g_signal_connect(G_OBJECT(vt->dialog), - "motion_notify_event", - G_CALLBACK - (on_dialog_motion_notify_event), vt); + "motion_notify_event", + G_CALLBACK(on_dialog_motion_notify_event), vt); } /****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/bookmark_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/bookmark_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/bookmark_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/bookmark_dialog.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmark_dialog.c - gui to popup a dialog for adding a bookmark * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/bookmark_dialog.h" @@ -58,23 +58,17 @@ GtkWidget *bookmark_dialog; GtkWidget *mark_verse_dialog; -void on_buffer_changed (GtkTextBuffer *textbuffer, gpointer user_data) +void on_buffer_changed(GtkTextBuffer *textbuffer, gpointer user_data) { GtkTextIter start; GtkTextIter end; - - gtk_text_buffer_get_start_iter (textbuffer, &start); - gtk_text_buffer_get_end_iter (textbuffer, &end); + gtk_text_buffer_get_start_iter(textbuffer, &start); + gtk_text_buffer_get_end_iter(textbuffer, &end); if (note) g_free(note); - note = gtk_text_buffer_get_text (textbuffer, - &start, - &end, - FALSE); - XI_message (("note: %s", note)); - - + note = gtk_text_buffer_get_text(textbuffer, &start, &end, FALSE); + XI_message(("note: %s", note)); } /****************************************************************************** @@ -93,8 +87,7 @@ * void */ -static -void add_bookmark_button(void) +static void add_bookmark_button(void) { GtkTreeIter selected; GtkTreeIter iter; @@ -106,21 +99,17 @@ return; data = g_new(BOOKMARK_DATA, 1); - data->caption = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY - (entry_label))); - data->key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY - (entry_key))); - data->module = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY - (entry_module))); + data->caption = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_label))); + data->key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key))); + data->module = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_module))); - if (!strcmp(data->module,"studypad")) + if (!strcmp(data->module, "studypad")) data->module_desc = "studypad"; else data->module_desc = - g_strdup(main_get_module_description(data->module)); + g_strdup(main_get_module_description(data->module)); - data->description = g_strdup((gchar *)gtk_entry_get_text - (GTK_ENTRY(entry_label))); + data->description = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_label))); data->is_leaf = TRUE; data->opened = bm_pixbufs->pixbuf_helpdoc; @@ -158,13 +147,12 @@ GtkTreeIter iter; BOOKMARK_DATA *data; GtkTreeSelection *selection; - char *t, *buf; + char *t; gint test; GS_DIALOG *info; GString *str; - GtkTreePath *path; - selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; @@ -185,7 +173,7 @@ /*** open dialog to get name for new folder ***/ test = gui_gs_dialog(info); if (test == GS_OK) { - buf = g_strdelimit(info->text1, t, ' '); + char *buf = g_strdelimit(info->text1, t, ' '); data->caption = g_strdup(buf); data->key = NULL; data->module = NULL; @@ -198,9 +186,10 @@ bookmarks_changed = TRUE; gui_save_bookmarks(NULL, NULL); g_free(data->caption); - path = + GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW (treeview), path); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), + path); gtk_tree_selection_select_path(selection, path); gtk_tree_path_free(path); } @@ -226,9 +215,8 @@ * */ -void on_dialog_response(GtkDialog * dialog, - gint response_id, - gpointer user_data) +void on_dialog_response(GtkDialog *dialog, + gint response_id, gpointer user_data) { switch (response_id) { case GTK_RESPONSE_CANCEL: /* cancel button pressed */ @@ -245,7 +233,6 @@ } } - /****************************************************************************** * Name * on_dialog_enter @@ -263,8 +250,7 @@ void on_dialog_enter(void) { on_dialog_response(GTK_DIALOG(bookmark_dialog), - GTK_RESPONSE_OK, - NULL); + GTK_RESPONSE_OK, NULL); } /****************************************************************************** @@ -281,14 +267,13 @@ * void */ -void on_mark_verse_response(GtkDialog * dialog, - gint response_id, - gpointer user_data) +void on_mark_verse_response(GtkDialog *dialog, + gint response_id, gpointer user_data) { gchar reference[100], *module, *key; module = (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_module)); - key = (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key)); + key = (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key)); g_snprintf(reference, 100, "%s %s", module, main_get_osisref_from_key((const char *)module, @@ -300,17 +285,21 @@ break; case GTK_RESPONSE_ACCEPT: /* mark the verse */ xml_set_list_item("osisrefmarkedverses", "markedverse", - reference, (note ? note : "user content")); - marked_cache_fill(settings.MainWindowModule, settings.currentverse); + reference, + (note ? note : "user content")); + marked_cache_fill(settings.MainWindowModule, + settings.currentverse); main_display_bible(NULL, settings.currentverse); break; - case GTK_RESPONSE_OK: /* unmark the verse */ - xml_remove_node("osisrefmarkedverses", "markedverse", reference); - marked_cache_fill(settings.MainWindowModule, settings.currentverse); + case GTK_RESPONSE_OK: /* unmark the verse */ + xml_remove_node("osisrefmarkedverses", "markedverse", + reference); + marked_cache_fill(settings.MainWindowModule, + settings.currentverse); main_display_bible(NULL, settings.currentverse); break; } - g_free (note); + g_free(note); gtk_widget_destroy(GTK_WIDGET(dialog)); xml_save_settings_doc(settings.fnconfigure); } @@ -332,8 +321,7 @@ void on_mark_verse_enter(void) { on_mark_verse_response(GTK_DIALOG(mark_verse_dialog), - GTK_RESPONSE_ACCEPT, - NULL); + GTK_RESPONSE_ACCEPT, NULL); } /****************************************************************************** @@ -352,9 +340,9 @@ * */ -gboolean on_treeview_button_release_event(GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) +gboolean on_treeview_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkTreeSelection *selection = NULL; GtkTreeModel *gmodel; @@ -364,13 +352,14 @@ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); if (gtk_tree_selection_get_selected(selection, &gmodel, &selected)) { gtk_tree_model_get(gmodel, &selected, 3, &key, -1); - if (!gtk_tree_model_iter_has_child(gmodel, &selected) - && key != NULL) { + if (!gtk_tree_model_iter_has_child(gmodel, &selected) && key != NULL) { gtk_widget_set_sensitive(button_new_folder, FALSE); - gtk_widget_set_sensitive(button_add_bookmark, FALSE); + gtk_widget_set_sensitive(button_add_bookmark, + FALSE); } else { gtk_widget_set_sensitive(button_new_folder, TRUE); - gtk_widget_set_sensitive(button_add_bookmark, TRUE); + gtk_widget_set_sensitive(button_add_bookmark, + TRUE); } if (key) g_free(key); @@ -378,7 +367,6 @@ return FALSE; } - /****************************************************************************** * Name * @@ -401,7 +389,8 @@ GtkTreeIter iter; GtkTreeSelection *selection = NULL; - gtk_tree_view_set_model(GTK_TREE_VIEW(treeview),GTK_TREE_MODEL(model)); + gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), + GTK_TREE_MODEL(model)); gui_add_columns(GTK_TREE_VIEW(treeview)); gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); @@ -411,7 +400,6 @@ gtk_tree_path_free(path); } - /****************************************************************************** * Name * @@ -428,27 +416,27 @@ * */ -static GtkWidget *_create_bookmark_dialog(gchar * label, - gchar * module, - gchar * key) +static GtkWidget *_create_bookmark_dialog(gchar *label, + gchar *module, gchar *key) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; #else GladeXML *gxml; #endif - gchar *glade_file = gui_general_user_file ("bookmarks" UI_SUFFIX, TRUE); + gchar *glade_file = + gui_general_user_file("bookmarks" UI_SUFFIX, TRUE); g_return_val_if_fail(glade_file != NULL, NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, NULL, NULL); + gxml = glade_xml_new(glade_file, NULL, NULL); #endif - g_free (glade_file); + g_free(glade_file); g_return_val_if_fail(gxml != NULL, NULL); /* lookup the root widget */ @@ -460,7 +448,8 @@ treeview = UI_GET_ITEM(gxml, "treeview"); setup_treeview(); g_signal_connect(treeview, "button-release-event", - G_CALLBACK(on_treeview_button_release_event), NULL); + G_CALLBACK(on_treeview_button_release_event), + NULL); /* entrys */ entry_label = UI_GET_ITEM(gxml, "entry1"); entry_key = UI_GET_ITEM(gxml, "entry2"); @@ -483,7 +472,6 @@ return bookmark_dialog; } - /****************************************************************************** * Name * _create_mark_verse_dialog @@ -498,8 +486,7 @@ * void */ -static GtkWidget *_create_mark_verse_dialog(gchar * module, - gchar * key) +static GtkWidget *_create_mark_verse_dialog(gchar *module, gchar *key) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; @@ -510,19 +497,20 @@ gchar osisreference[100]; gchar *old_note = NULL; - gchar *glade_file = gui_general_user_file("markverse" UI_SUFFIX, TRUE); + gchar *glade_file = + gui_general_user_file("markverse" UI_SUFFIX, TRUE); g_return_val_if_fail(glade_file != NULL, NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - g_snprintf(osisreference, 100, "%s %s", module, + g_snprintf(osisreference, 100, "%s %s", module, main_get_osisref_from_key((const char *)module, (const char *)key)); note = NULL; - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, NULL, NULL); #endif @@ -531,8 +519,8 @@ /* lookup the root widget */ mark_verse_dialog = UI_GET_ITEM(gxml, "dialog"); - gtk_window_set_default_size (GTK_WINDOW (mark_verse_dialog), - 300, 350); + gtk_window_set_default_size(GTK_WINDOW(mark_verse_dialog), + 300, 350); g_signal_connect(mark_verse_dialog, "response", G_CALLBACK(on_mark_verse_response), NULL); @@ -542,32 +530,34 @@ entry_module = UI_GET_ITEM(gxml, "entry3"); textview = UI_GET_ITEM(gxml, "textview"); - textbuffer = gtk_text_view_get_buffer ((GtkTextView*)textview); + textbuffer = gtk_text_view_get_buffer((GtkTextView *)textview); gtk_entry_set_text(GTK_ENTRY(entry_key), key); gtk_entry_set_text(GTK_ENTRY(entry_module), module); sw = UI_GET_ITEM(gxml, "scrolledwindow1"); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), + GTK_WRAP_WORD); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); g_signal_connect(entry_key, "activate", G_CALLBACK(on_mark_verse_enter), NULL); g_signal_connect(entry_module, "activate", G_CALLBACK(on_mark_verse_enter), NULL); - - old_note = xml_get_list_from_label("osisrefmarkedverses", "markedverse", osisreference); - note = g_strdup ((old_note) ? old_note : ""); - gtk_text_buffer_set_text (textbuffer, (old_note) ? old_note : "", -1); + old_note = + xml_get_list_from_label("osisrefmarkedverses", "markedverse", + osisreference); + note = g_strdup((old_note) ? old_note : ""); + gtk_text_buffer_set_text(textbuffer, (old_note) ? old_note : "", + -1); g_signal_connect(textbuffer, "changed", G_CALLBACK(on_buffer_changed), NULL); return mark_verse_dialog; } - /****************************************************************************** * Name * gui_bookmark_dialog @@ -585,14 +575,15 @@ * void */ -void gui_bookmark_dialog(gchar * label, gchar * module_name, gchar * key) +void gui_bookmark_dialog(gchar *label, gchar *module_name, gchar *key) { - GtkWidget *dialog = _create_bookmark_dialog(label, module_name, key); - if (!dialog) return; + GtkWidget *dialog = + _create_bookmark_dialog(label, module_name, key); + if (!dialog) + return; gtk_dialog_run(GTK_DIALOG(dialog)); } - /****************************************************************************** * Name * gui_mark_verse_dialog @@ -608,9 +599,10 @@ * void */ -void gui_mark_verse_dialog(gchar * module_name, gchar * key) +void gui_mark_verse_dialog(gchar *module_name, gchar *key) { GtkWidget *dialog = _create_mark_verse_dialog(module_name, key); - if (!dialog) return; + if (!dialog) + return; gtk_dialog_run(GTK_DIALOG(dialog)); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/bookmarks_menu.c xiphos-4.0.4+dfsg1/src/gnome2/bookmarks_menu.c --- xiphos-4.0.0+dfsg1/src/gnome2/bookmarks_menu.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/bookmarks_menu.c 2015-02-20 04:02:23.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * bookmarks_treeview.c - gui for bookmarks using treeview + * bookmarks_menu.c - gui for bookmarks using menu * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ #include #include #ifndef USE_GTKBUILDER - #include +#include #endif #include @@ -64,15 +64,10 @@ #include "gui/debug_glib_null.h" - - - BOOKMARK_MENU menu; gboolean bookmarks_changed; - - /****************************************************************************** * Name * save_treeview_to_xml_bookmarks @@ -89,12 +84,13 @@ * void */ -static void save_treeview_to_xml_bookmarks(GtkTreeIter * iter, gchar * filename) +static void save_treeview_to_xml_bookmarks(GtkTreeIter *iter, + gchar *filename) { xmlNodePtr root_node = NULL; xmlNodePtr cur_node = NULL; xmlDocPtr root_doc; -// xmlAttrPtr root_attr; + // xmlAttrPtr root_attr; gchar *caption = NULL; gchar *key = NULL; gchar *module = NULL; @@ -104,50 +100,44 @@ if (!bookmarks_changed) return; - root_doc = xmlNewDoc((const xmlChar *) "1.0"); + root_doc = xmlNewDoc((const xmlChar *)"1.0"); if (root_doc != NULL) { - root_node = xmlNewNode(NULL, (const xmlChar *) - "SwordBookmarks"); + root_node = xmlNewNode(NULL, (const xmlChar *)"SwordBookmarks"); //root_attr = - xmlNewProp(root_node, (const xmlChar *) "syntaxVersion", - (const xmlChar *) "1"); + xmlNewProp(root_node, (const xmlChar *)"syntaxVersion", + (const xmlChar *)"1"); xmlDocSetRootElement(root_doc, root_node); } do { gtk_tree_model_get(GTK_TREE_MODEL(model), iter, - 2, &caption, - 3, &key, - 4, &module, - 5, &mod_desc, - 6, &description, - -1); - if ( gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model),iter)) { - cur_node = xml_add_folder_to_parent(root_node, caption); - utilities_parse_treeview(cur_node, iter, GTK_TREE_MODEL(model)); - } - else + 2, &caption, + 3, &key, + 4, &module, + 5, &mod_desc, 6, &description, -1); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), iter)) { + cur_node = + xml_add_folder_to_parent(root_node, caption); + utilities_parse_treeview(cur_node, iter, + GTK_TREE_MODEL(model)); + } else xml_add_bookmark_to_parent(root_node, - description, - key, - module, - mod_desc); + description, + key, module, mod_desc); g_free(caption); g_free(key); g_free(module); g_free(mod_desc); g_free(description); - } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model),iter)); + } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), iter)); - xmlSaveFormatFile(filename, root_doc,1); + xmlSaveFormatFile(filename, root_doc, 1); xmlFreeDoc(root_doc); g_free(filename); bookmarks_changed = FALSE; } - - /****************************************************************************** * Name * add_node_to_ctree @@ -165,23 +155,21 @@ * GtkCTreeNode */ -static void add_item_to_tree(GtkTreeIter *iter,GtkTreeIter *parent, - BOOKMARK_DATA * data) +static void add_item_to_tree(GtkTreeIter *iter, GtkTreeIter *parent, + BOOKMARK_DATA *data) { gtk_tree_store_append(GTK_TREE_STORE(model), iter, parent); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, + gtk_tree_store_set(GTK_TREE_STORE(model), iter, COL_OPEN_PIXBUF, data->opened, COL_CLOSED_PIXBUF, data->closed, COL_CAPTION, data->caption, COL_KEY, data->key, COL_MODULE, data->module, COL_MODULE_DESC, data->module_desc, - COL_DESCRIPTION, data->description, - -1); + COL_DESCRIPTION, data->description, -1); } - /****************************************************************************** * Name * @@ -198,7 +186,7 @@ * void */ -G_MODULE_EXPORT void bibletime_bookmarks_activate(GtkMenuItem * menuitem, +G_MODULE_EXPORT void bibletime_bookmarks_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter iter; @@ -206,44 +194,49 @@ gchar *fname; GtkWidget *dialog; - if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),&parent)) + if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &parent)) return; dialog = gtk_file_chooser_dialog_new(_("Specify bookmarks file"), GTK_WINDOW(widgets.app), GTK_FILE_CHOOSER_ACTION_OPEN, #ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_OK", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, -#endif + "_Cancel", + GTK_RESPONSE_CANCEL, "_OK", + GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, +#endif NULL); - fname = g_strdup_printf("%s/%s", settings.homedir, ".bibletime/bookmarks.xml"); + fname = + g_strdup_printf("%s/%s", settings.homedir, + ".bibletime/bookmarks.xml"); gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), fname); g_free(fname); - if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { gtk_tree_store_append(GTK_TREE_STORE(model), &iter, &parent); gtk_tree_store_set(GTK_TREE_STORE(model), &iter, - COL_OPEN_PIXBUF, bm_pixbufs->pixbuf_opened, - COL_CLOSED_PIXBUF, bm_pixbufs->pixbuf_closed, - COL_CAPTION, "Imported", - COL_KEY, NULL, - COL_MODULE, NULL, - -1); - - fname = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - gui_parse_bookmarks(bookmark_tree, (const xmlChar *)fname, &iter); + COL_OPEN_PIXBUF, + bm_pixbufs->pixbuf_opened, + COL_CLOSED_PIXBUF, + bm_pixbufs->pixbuf_closed, COL_CAPTION, + "Imported", COL_KEY, NULL, COL_MODULE, + NULL, -1); + + fname = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gui_parse_bookmarks(bookmark_tree, (const xmlChar *)fname, + &iter); g_free(fname); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); } - /****************************************************************************** * Name * on_allow_reordering_activate @@ -261,11 +254,11 @@ * void */ -G_MODULE_EXPORT void on_allow_reordering_activate(GtkMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_allow_reordering_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gtk_tree_view_set_reorderable(bookmark_tree, - gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))); + gtk_tree_view_set_reorderable(bookmark_tree, + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))); } /****************************************************************************** @@ -285,36 +278,34 @@ * void */ -G_MODULE_EXPORT void on_dialog_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_dialog_activate(GtkMenuItem *menuitem, + gpointer user_data) { GtkTreeIter selected; gchar *key = NULL; gchar *module = NULL; - gchar *url = NULL; - GtkTreeSelection* selection= gtk_tree_view_get_selection(bookmark_tree); + GtkTreeSelection *selection = + gtk_tree_view_get_selection(bookmark_tree); use_dialog = TRUE; if (gtk_tree_selection_get_selected(selection, NULL, &selected)) { gtk_tree_model_get(GTK_TREE_MODEL(model), - &selected, - 3, &key, - 4, &module, - -1); + &selected, 3, &key, 4, &module, -1); if (module && (main_get_mod_type(module) == PERCOM_TYPE)) { - editor_create_new(module,key,TRUE); + editor_create_new(module, key, TRUE); use_dialog = FALSE; g_free(module); g_free(key); return; } - url = g_strdup_printf("passagestudy.jsp?action=showBookmark&" - "type=%s&value=%s&module=%s", - "newDialog", - main_url_encode(key), - main_url_encode(module)); + gchar *url = + g_strdup_printf("passagestudy.jsp?action=showBookmark&" + "type=%s&value=%s&module=%s", + "newDialog", main_url_encode(key), + main_url_encode(module)); main_url_handler(url, TRUE); g_free(url); } @@ -323,7 +314,6 @@ g_free(key); } - /****************************************************************************** * Name * on_edit_item_activate @@ -340,14 +330,14 @@ * void */ -G_MODULE_EXPORT void on_edit_item_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_edit_item_activate(GtkMenuItem *menuitem, + gpointer user_data) { GS_DIALOG *info; - BOOKMARK_DATA * data; gint test; - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; -// GtkTreeIter iter; + // GtkTreeIter iter; gchar *caption = NULL; gchar *key = NULL; gchar *module = NULL; @@ -357,18 +347,15 @@ GString *str; str = g_string_new(NULL); - g_string_printf(str,"%s",_("Edit")); + g_string_printf(str, "%s", _("Edit")); selection = gtk_tree_view_get_selection(bookmark_tree); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, - 2, &caption, - 3, &key, - 4, &module, - 5, &mod_desc, - 6, &description, - -1); + 2, &caption, + 3, &key, + 4, &module, 5, &mod_desc, 6, &description, -1); info = gui_new_dialog(); info->title = N_("Bookmark"); @@ -389,10 +376,9 @@ info->ok = TRUE; info->cancel = TRUE; - test = gui_gs_dialog(info); if (test == GS_OK) { - data = g_new(BOOKMARK_DATA,1); + BOOKMARK_DATA *data = g_new(BOOKMARK_DATA, 1); data->caption = info->text1; data->key = NULL; data->module = NULL; @@ -403,11 +389,11 @@ data->closed = NULL; data->key = info->text2; data->module = info->text3; - data->module_desc = g_strdup(main_get_module_description(info->text3)); - if ((strlen(description) > 1) || (strcmp(caption,info->text1))) { + data->module_desc = + g_strdup(main_get_module_description(info->text3)); + if ((strlen(description) > 1) || (strcmp(caption, info->text1))) { data->description = info->text1; - } - else + } else data->description = NULL; data->is_leaf = TRUE; } else { @@ -417,28 +403,29 @@ } gtk_tree_store_set(GTK_TREE_STORE(model), &selected, - COL_OPEN_PIXBUF, data->opened, - COL_CLOSED_PIXBUF, data->closed, - COL_CAPTION, data->caption, - COL_KEY, data->key, - COL_MODULE, data->module, - COL_MODULE_DESC, data->module_desc, - COL_DESCRIPTION, data->description, - -1); + COL_OPEN_PIXBUF, data->opened, + COL_CLOSED_PIXBUF, data->closed, + COL_CAPTION, data->caption, + COL_KEY, data->key, + COL_MODULE, data->module, + COL_MODULE_DESC, data->module_desc, + COL_DESCRIPTION, data->description, -1); bookmarks_changed = TRUE; gui_save_bookmarks(NULL, NULL); g_free(data); } - g_free(info->text1); // we used g_strdup() - if (info->text2) g_free(info->text2); - if (info->text3) g_free(info->text3); + g_free(info->text1); // we used g_strdup() + if (info->text2) + g_free(info->text2); + if (info->text3) + g_free(info->text3); g_free(info); g_free(caption); g_free(key); g_free(module); g_free(mod_desc); g_free(description); - g_string_free(str,TRUE); + g_string_free(str, TRUE); } //dialog_export_bookmarks_response_cb @@ -459,14 +446,12 @@ * void */ -G_MODULE_EXPORT void on_export_folder_activate(GtkMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_export_folder_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gui_export_bookmarks_dialog(BOOKMARKS_EXPORT,NULL); - + gui_export_bookmarks_dialog(BOOKMARKS_EXPORT, NULL); } - /****************************************************************************** * Name * on_delete_item_activate @@ -483,12 +468,13 @@ * void */ -G_MODULE_EXPORT void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_delete_item_activate(GtkMenuItem *menuitem, + gpointer user_data) { gchar *name_string; - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; -// GtkTreeIter iter; + // GtkTreeIter iter; gchar *caption = NULL; gchar *key = NULL; gchar *module = NULL; @@ -498,26 +484,26 @@ if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, - 2, &caption, 3, &key, 4, &module, -1); + 2, &caption, 3, &key, 4, &module, -1); name_string = caption; if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected)) { - str = g_strdup_printf("%s\n\n%s %s", - _("Remove the selected folder"), - name_string, - _("(and all its contents)?")); + str = + g_strdup_printf("%s\n\n%s %s", + _("Remove the selected folder"), name_string, + _("(and all its contents)?")); } else { - str = g_strdup_printf("%s\n\n%s", - _("Remove the selected bookmark"), - name_string); + str = + g_strdup_printf("%s\n\n%s", + _("Remove the selected bookmark"), name_string); } - if (gui_yes_no_dialog(str, + if (gui_yes_no_dialog(str, #ifdef HAVE_GTK_310 - "dialog-warning")) { -#else - GTK_STOCK_DIALOG_WARNING)) { -#endif + "dialog-warning")) { +#else + GTK_STOCK_DIALOG_WARNING)) { +#endif gtk_tree_store_remove(GTK_TREE_STORE(model), &selected); bookmarks_changed = TRUE; gui_save_bookmarks(NULL, NULL); @@ -528,7 +514,6 @@ g_free(str); } - /****************************************************************************** * Name * gui_save_bookmarks @@ -545,7 +530,7 @@ * void */ -void gui_save_bookmarks(GtkMenuItem * menuitem, gpointer user_data) +void gui_save_bookmarks(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter root; @@ -554,8 +539,7 @@ if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &root)) return; - if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &first_child, - &root)) + if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &first_child, &root)) return; sprintf(buf, "%s/bookmarks/bookmarks.xml", settings.gSwordDir); @@ -583,7 +567,6 @@ gui_save_bookmarks(NULL, NULL); } - /****************************************************************************** * Name * @@ -600,13 +583,12 @@ * void */ -G_MODULE_EXPORT void on_expand_activate(GtkMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_expand_activate(GtkMenuItem *menuitem, + gpointer user_data) { gtk_tree_view_expand_all(bookmark_tree); } - /****************************************************************************** * Name * on_collapse_activate @@ -624,13 +606,12 @@ * void */ -G_MODULE_EXPORT void on_collapse_activate(GtkMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_collapse_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gtk_tree_view_collapse_all(bookmark_tree); + gtk_tree_view_collapse_all(bookmark_tree); } - /****************************************************************************** * Name * on_add_bookmark_activate @@ -649,27 +630,25 @@ * void */ -void on_add_bookmark_activate(GtkMenuItem * menuitem, - gpointer user_data) +void on_add_bookmark_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter selected; GtkTreeIter iter; -// gchar *caption = NULL; + // gchar *caption = NULL; gchar *key = NULL; gchar *mod_name = NULL; gint test; - BOOKMARK_DATA * data; + BOOKMARK_DATA *data; GS_DIALOG *info; gchar buf[256]; GString *str = g_string_new(NULL); - - if (!gtk_tree_selection_get_selected(current_selection,NULL,&selected)) + if (!gtk_tree_selection_get_selected(current_selection, NULL, &selected)) return; mod_name = main_get_active_pane_module(); key = main_get_active_pane_key(); - data = g_new(BOOKMARK_DATA,1); + data = g_new(BOOKMARK_DATA, 1); info = gui_new_dialog(); info->title = N_("Bookmark"); g_string_printf(str, "%s", _("Add")); @@ -689,24 +668,25 @@ data->caption = info->text1; data->key = info->text2; data->module = info->text3; - data->module_desc = g_strdup(main_get_module_description(info->text3)); - if (!strcmp(data->caption,buf)) + data->module_desc = + g_strdup(main_get_module_description(info->text3)); + if (!strcmp(data->caption, buf)) data->description = NULL; else data->description = info->text1; data->is_leaf = TRUE; data->opened = bm_pixbufs->pixbuf_helpdoc; data->closed = NULL; - add_item_to_tree(&iter,&selected, data); + add_item_to_tree(&iter, &selected, data); bookmarks_changed = TRUE; gui_save_bookmarks(NULL, NULL); } - g_free(info->text1); /* we used g_strdup() */ + g_free(info->text1); /* we used g_strdup() */ g_free(info->text2); g_free(info->text3); g_free(info); - g_free(data); - g_string_free(str,TRUE); + g_free(data); + g_string_free(str, TRUE); } /****************************************************************************** @@ -726,13 +706,12 @@ * void */ -G_MODULE_EXPORT void on_insert_bookmark_activate(GtkMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_insert_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data) { - on_add_bookmark_activate(menuitem,NULL); + on_add_bookmark_activate(menuitem, NULL); } - /****************************************************************************** * Name * on_new_subgroup_activate @@ -750,17 +729,18 @@ * void */ -G_MODULE_EXPORT void on_new_folder_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_new_folder_activate(GtkMenuItem *menuitem, + gpointer user_data) { GtkTreeIter selected; GtkTreeIter iter; -// gchar *caption = NULL; -// gchar *key = NULL; -// gchar *module = NULL; - char *t, *buf; + // gchar *caption = NULL; + // gchar *key = NULL; + // gchar *module = NULL; + char *t; gint test; GS_DIALOG *info; - BOOKMARK_DATA * data; + BOOKMARK_DATA *data; GString *str; if (!gtk_tree_selection_get_selected(current_selection, NULL, &selected)) @@ -779,11 +759,11 @@ info->ok = TRUE; info->cancel = TRUE; - data = g_new(BOOKMARK_DATA,1); + data = g_new(BOOKMARK_DATA, 1); /*** open dialog to get name for new folder ***/ test = gui_gs_dialog(info); if (test == GS_OK) { - buf = g_strdelimit(info->text1, t, ' '); + char *buf = g_strdelimit(info->text1, t, ' '); data->caption = g_strdup(buf); data->key = NULL; data->module = NULL; @@ -792,7 +772,7 @@ data->is_leaf = FALSE; data->opened = bm_pixbufs->pixbuf_opened; data->closed = bm_pixbufs->pixbuf_closed; - add_item_to_tree(&iter,&selected, data); + add_item_to_tree(&iter, &selected, data); bookmarks_changed = TRUE; gui_save_bookmarks(NULL, NULL); g_free(data->caption); @@ -800,7 +780,7 @@ g_free(data); g_free(info->text1); g_free(info); - g_string_free(str,TRUE); + g_string_free(str, TRUE); } /****************************************************************************** @@ -819,35 +799,32 @@ * void */ -G_MODULE_EXPORT void on_open_in_tab_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_open_in_tab_activate(GtkMenuItem *menuitem, + gpointer user_data) { - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; -// GtkTreeIter iter; + // GtkTreeIter iter; gchar *key = NULL; gchar *module = NULL; gchar *url = NULL; - selection = gtk_tree_view_get_selection(bookmark_tree); - if (!gtk_tree_selection_get_selected(selection,NULL,&selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, - 3, &key, - 4, &module, - -1); + 3, &key, 4, &module, -1); url = g_strdup_printf("passagestudy.jsp?action=showBookmark&" - "type=%s&value=%s&module=%s", - "newTab", - main_url_encode(key), - main_url_encode(module)); - main_url_handler(url,TRUE); + "type=%s&value=%s&module=%s", + "newTab", + main_url_encode(key), + main_url_encode(module)); + main_url_handler(url, TRUE); g_free(key); g_free(module); g_free(url); } - /****************************************************************************** * Name * create_bookmark_menu @@ -870,21 +847,27 @@ gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_if_fail ((glade_file != NULL)); + g_return_if_fail((glade_file != NULL)); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_bookmark", NULL); + gxml = glade_xml_new(glade_file, "menu_bookmark", NULL); #endif - g_free (glade_file); - g_return_if_fail ((gxml != NULL)); + g_free(glade_file); + g_return_if_fail((gxml != NULL)); menu.menu = UI_GET_ITEM(gxml, "menu_bookmark"); menu.in_tab = UI_GET_ITEM(gxml, "open_in_new_tab"); @@ -907,13 +890,13 @@ gtk_widget_set_sensitive(menu.remove, TRUE); gtk_widget_hide(menu.remove); - /* connect signals and data */ -#ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ +/* connect signals and data */ +#ifdef USE_GTKBUILDER + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/bookmarks_treeview.c xiphos-4.0.4+dfsg1/src/gnome2/bookmarks_treeview.c --- xiphos-4.0.0+dfsg1/src/gnome2/bookmarks_treeview.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/bookmarks_treeview.c 2015-08-23 23:14:10.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks_treeview.c - gui for bookmarks using treeview * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * 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 @@ -82,42 +82,45 @@ * void */ -void gui_verselist_to_bookmarks(GList * verses, gint save_as_single) +void gui_verselist_to_bookmarks(GList *verses, gint save_as_single) { gint test; - gchar *tmpbuf; gchar *module_name = NULL; - GString *str; GtkTreeIter parent; GtkTreeIter iter; GS_DIALOG *info; RESULTS *list_item; /*gchar *dlg = g_strdup_printf("%s\n%s", - _("Save these results as a single bookmark?"), - _("(rather than as a series of bookmarks)"));*/ + _("Save these results as a single bookmark?"), + _("(rather than as a series of bookmarks)")); */ if (save_as_single) { GString *name = g_string_new(NULL); GString *verse_string = g_string_new(""); gboolean first_entry = TRUE; - g_string_printf(name, _("Search result: %s"), settings.searchText); + g_string_printf(name, _("Search result: %s"), + settings.searchText); while (verses) { - list_item = (RESULTS *) verses->data; + list_item = (RESULTS *)verses->data; if (main_is_Bible_key(list_item->module, list_item->key)) { if (first_entry) { - module_name = g_strdup(list_item->module); + module_name = + g_strdup(list_item->module); first_entry = FALSE; } else { - verse_string = g_string_append(verse_string, - "; "); + verse_string = + g_string_append(verse_string, + "; "); } - verse_string = g_string_append(verse_string, - list_item->key); + verse_string = + g_string_append(verse_string, + list_item->key); } verses = g_list_next(verses); } - gui_bookmark_dialog(name->str, module_name, verse_string->str); + gui_bookmark_dialog(name->str, module_name, + verse_string->str); g_string_free(name, TRUE); g_string_free(verse_string, TRUE); g_free(module_name); @@ -128,10 +131,10 @@ info = gui_new_dialog(); #ifdef HAVE_GTK_310 info->stock_icon = "document-open"; -#else +#else info->stock_icon = GTK_STOCK_OPEN; -#endif - +#endif + info->title = _("Bookmark"); info->label_top = _("Enter Folder Name"); info->text1 = g_strdup(settings.searchText); @@ -151,18 +154,16 @@ COL_CLOSED_PIXBUF, bm_pixbufs->pixbuf_closed, COL_CAPTION, info->text1, - COL_KEY, NULL, - COL_MODULE, NULL, - -1); -// set_results_position((char) 1); // TOP - str = g_string_new(" "); + COL_KEY, NULL, COL_MODULE, NULL, -1); + // set_results_position((char) 1); // TOP + GString *str = g_string_new(" "); while (verses) { - list_item = (RESULTS *) verses->data; + list_item = (RESULTS *)verses->data; module_name = list_item->module; - tmpbuf = list_item->key; + gchar *tmpbuf = list_item->key; g_string_printf(str, "%s, %s", tmpbuf, - module_name); - XI_message(("bookmark: %s",str->str)); + module_name); + XI_message(("bookmark: %s", str->str)); gtk_tree_store_append(GTK_TREE_STORE(model), &iter, &parent); gtk_tree_store_set(GTK_TREE_STORE(model), &iter, @@ -171,8 +172,7 @@ COL_CLOSED_PIXBUF, NULL, COL_CAPTION, str->str, COL_KEY, tmpbuf, - COL_MODULE, module_name, - -1); + COL_MODULE, module_name, -1); verses = g_list_next(verses); } g_string_free(str, TRUE); @@ -200,11 +200,11 @@ * void */ -static void get_xml_folder_data(xmlNodePtr cur, BOOKMARK_DATA * data) +static void get_xml_folder_data(xmlNodePtr cur, BOOKMARK_DATA *data) { xmlChar *folder; - folder = xmlGetProp(cur, (const xmlChar *) "caption"); + folder = xmlGetProp(cur, (const xmlChar *)"caption"); data->caption = g_strdup((char *)folder); data->key = NULL; data->module = NULL; @@ -215,7 +215,6 @@ data->closed = bm_pixbufs->pixbuf_closed; } - /****************************************************************************** * Name * get_xml_bookmark_data @@ -232,7 +231,7 @@ * void */ -static void get_xml_bookmark_data(xmlNodePtr cur, BOOKMARK_DATA * data) +static void get_xml_bookmark_data(xmlNodePtr cur, BOOKMARK_DATA *data) { xmlChar *mod1; xmlChar *key; @@ -264,7 +263,6 @@ data->is_leaf = TRUE; } - /****************************************************************************** * Name * free_bookmark_data @@ -281,7 +279,7 @@ * void */ -static void free_bookmark_data(BOOKMARK_DATA * data) +static void free_bookmark_data(BOOKMARK_DATA *data) { if (data->caption) g_free(data->caption); @@ -312,8 +310,8 @@ * GtkCTreeNode */ -void gui_add_item_to_tree(GtkTreeIter * iter, GtkTreeIter * parent, - BOOKMARK_DATA * data) +void gui_add_item_to_tree(GtkTreeIter *iter, GtkTreeIter *parent, + BOOKMARK_DATA *data) { gtk_tree_store_append(GTK_TREE_STORE(model), iter, parent); @@ -344,7 +342,7 @@ * void */ -static void add_node(xmlNodePtr cur, GtkTreeIter * parent) +static void add_node(xmlNodePtr cur, GtkTreeIter *parent) { GtkTreeIter iter; BOOKMARK_DATA data, *p = NULL; @@ -355,13 +353,11 @@ return; for (work = cur->xmlChildrenNode; work; work = work->next) { - if (!xmlStrcmp - (work->name, (const xmlChar *) "Bookmark")) { + if (!xmlStrcmp(work->name, (const xmlChar *)"Bookmark")) { get_xml_bookmark_data(work, p); gui_add_item_to_tree(&iter, parent, p); free_bookmark_data(p); - } else if (!xmlStrcmp - (work->name, (const xmlChar *) "Folder")) { + } else if (!xmlStrcmp(work->name, (const xmlChar *)"Folder")) { get_xml_folder_data(work, p); gui_add_item_to_tree(&iter, parent, p); free_bookmark_data(p); @@ -370,7 +366,6 @@ } } - /****************************************************************************** * Name * gui_parse_bookmarks @@ -387,8 +382,8 @@ * void */ -void gui_parse_bookmarks(GtkTreeView * tree, const xmlChar * file, - GtkTreeIter * parent) +void gui_parse_bookmarks(GtkTreeView *tree, const xmlChar *file, + GtkTreeIter *parent) { xmlNodePtr cur = NULL; BOOKMARK_DATA data, *p = NULL; @@ -399,7 +394,7 @@ cur = xml_load_bookmark_file(file); //cur = cur->xmlChildrenNode; while (cur != NULL) { - if (!xmlStrcmp(cur->name, (const xmlChar *) "Bookmark")) { + if (!xmlStrcmp(cur->name, (const xmlChar *)"Bookmark")) { get_xml_bookmark_data(cur, p); gui_add_item_to_tree(&iter, parent, p); free_bookmark_data(p); @@ -439,19 +434,18 @@ * void */ -static void load_xml_bookmarks(GtkTreeView * tree, GtkTreeIter * iter) +static void load_xml_bookmarks(GtkTreeView *tree, GtkTreeIter *iter) { GString *str; const xmlChar *file; str = g_string_new(NULL); g_string_printf(str, "%s/bookmarks.xml", settings.swbmDir); - file = (const xmlChar *) str->str; + file = (const xmlChar *)str->str; gui_parse_bookmarks(tree, file, iter); g_string_free(str, TRUE); } - /****************************************************************************** * Name * row_changed @@ -469,14 +463,13 @@ * void */ -static void row_changed(GtkTreeModel * treemodel, GtkTreePath * arg1, - GtkTreeIter * arg2, gpointer user_data) +static void row_changed(GtkTreeModel *treemodel, GtkTreePath *arg1, + GtkTreeIter *arg2, gpointer user_data) { bookmarks_changed = TRUE; gui_save_bookmarks_treeview(); } - /****************************************************************************** * Name * row_changed @@ -494,14 +487,13 @@ * void */ -static void row_deleted(GtkTreeModel * treemodel, GtkTreePath * arg1, +static void row_deleted(GtkTreeModel *treemodel, GtkTreePath *arg1, gpointer user_data) { bookmarks_changed = TRUE; gui_save_bookmarks_treeview(); } - /****************************************************************************** * Name * create_pixbufs @@ -520,57 +512,53 @@ static void create_pixbufs(void) { - GtkTextDirection dir = gtk_widget_get_direction (GTK_WIDGET(widgets.app)); + GtkTextDirection dir = + gtk_widget_get_direction(GTK_WIDGET(widgets.app)); bm_pixbufs = g_new0(BookMarksPixbufs, 1); if (dir == GTK_TEXT_DIR_LTR) { /* leave this for if we make custom reversable icons - if (!bm_pixbufs->pixbuf_closed) - bm_pixbufs->pixbuf_closed = - pixbuf_finder("book_closed.png", 16, NULL); - */ + if (!bm_pixbufs->pixbuf_closed) + bm_pixbufs->pixbuf_closed = + pixbuf_finder("book_closed.png", 16, NULL); + */ bm_pixbufs->pixbuf_opened = - pixbuf_finder("book_open.png", 16, NULL); - } - else { + pixbuf_finder("book_open.png", 16, NULL); + } else { /* leave this for if we make custom reversable icons - if (!bm_pixbufs->pixbuf_closed) - bm_pixbufs->pixbuf_closed = - pixbuf_finder("book_closed_rtol.png", 16, NULL); - */ + if (!bm_pixbufs->pixbuf_closed) + bm_pixbufs->pixbuf_closed = + pixbuf_finder("book_closed_rtol.png", 16, NULL); + */ bm_pixbufs->pixbuf_opened = - pixbuf_finder("book_open_rtol.png", 16, NULL); + pixbuf_finder("book_open_rtol.png", 16, NULL); } bm_pixbufs->pixbuf_closed = - pixbuf_finder("epiphany-bookmarks.png", 0, NULL); - + pixbuf_finder("epiphany-bookmarks.png", 0, NULL); bm_pixbufs->pixbuf_helpdoc = - pixbuf_finder("epiphany-bookmark-page.png", 0, NULL); + pixbuf_finder("epiphany-bookmark-page.png", 0, NULL); if (!bm_pixbufs->pixbuf_helpdoc) - #ifdef USE_GTK_3 - bm_pixbufs->pixbuf_helpdoc = + bm_pixbufs->pixbuf_helpdoc = #ifdef HAVE_GTK_310 - GDK_PIXBUF(gtk_image_new_from_icon_name ("gtk-dnd", - GTK_ICON_SIZE_BUTTON)); -#else - - gtk_widget_render_icon_pixbuf(widgets.app, - GTK_STOCK_DND, - GTK_ICON_SIZE_MENU ); -#endif - -#else - bm_pixbufs->pixbuf_helpdoc - = gtk_widget_render_icon(widgets.app, - GTK_STOCK_DND, - GTK_ICON_SIZE_MENU, NULL); + GDK_PIXBUF(gtk_image_new_from_icon_name("gtk-dnd", + GTK_ICON_SIZE_BUTTON)); +#else + gtk_widget_render_icon_pixbuf(widgets.app, + GTK_STOCK_DND, + GTK_ICON_SIZE_MENU); +#endif + +#else + bm_pixbufs->pixbuf_helpdoc = gtk_widget_render_icon(widgets.app, + GTK_STOCK_DND, + GTK_ICON_SIZE_MENU, NULL); #endif } @@ -590,7 +578,7 @@ * void */ -void gui_add_columns(GtkTreeView * tree) +void gui_add_columns(GtkTreeView *tree) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -599,13 +587,10 @@ renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_set_attributes - (column, renderer, - "pixbuf", COL_OPEN_PIXBUF, - "pixbuf-expander-open", COL_OPEN_PIXBUF, - "pixbuf-expander-closed", COL_CLOSED_PIXBUF, NULL); - - + gtk_tree_view_column_set_attributes(column, renderer, + "pixbuf", COL_OPEN_PIXBUF, + "pixbuf-expander-open", COL_OPEN_PIXBUF, + "pixbuf-expander-closed", COL_CLOSED_PIXBUF, NULL); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -614,7 +599,6 @@ gtk_tree_view_append_column(tree, column); gtk_tree_view_column_set_sort_column_id(column, COL_CAPTION); - column = gtk_tree_view_column_new(); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -635,8 +619,7 @@ renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, - "text", COL_MODULE_DESC, - NULL); + "text", COL_MODULE_DESC, NULL); gtk_tree_view_append_column(tree, column); gtk_tree_view_column_set_visible(column, FALSE); @@ -644,13 +627,11 @@ renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, - "text", COL_DESCRIPTION, - NULL); + "text", COL_DESCRIPTION, NULL); gtk_tree_view_append_column(tree, column); gtk_tree_view_column_set_visible(column, FALSE); } - /****************************************************************************** * Name * create_model @@ -681,7 +662,6 @@ return GTK_TREE_MODEL(model); } - /****************************************************************************** * Name * button_release_event @@ -700,20 +680,17 @@ * void */ -static gboolean button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer data) +static gboolean button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeIter selected; - GtkTreePath *path; gboolean is_selected = FALSE; gchar *caption = NULL; gchar *key = NULL; gchar *module = NULL; gchar *mod_desc = NULL; gchar *description = NULL; - gchar *url = NULL; button_one = FALSE; selection = gtk_tree_view_get_selection(bookmark_tree); @@ -723,11 +700,8 @@ 2, &caption, 3, &key, 4, &module, - 5, &mod_desc, - 6, &description, - -1); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) && key != NULL) { + 5, &mod_desc, 6, &description, -1); + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && key != NULL) { gboolean multi = (strpbrk(key, "-;,") != NULL); gtk_widget_set_sensitive(menu.in_tab, !multi); gtk_widget_set_sensitive(menu.in_dialog, !multi); @@ -736,15 +710,16 @@ gtk_widget_set_sensitive(menu.remove, FALSE); } else { /* click on treeview folder to expand or collapse it */ - path = gtk_tree_model_get_path( - GTK_TREE_MODEL (model), &selected); - if (gtk_tree_view_row_expanded (bookmark_tree, path)) - gtk_tree_view_collapse_row (bookmark_tree, + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(model), + &selected); + if (gtk_tree_view_row_expanded(bookmark_tree, path)) + gtk_tree_view_collapse_row(bookmark_tree, path); else - gtk_tree_view_expand_row (bookmark_tree, + gtk_tree_view_expand_row(bookmark_tree, path, FALSE); - gtk_tree_path_free ( path ); + gtk_tree_path_free(path); gtk_widget_set_sensitive(menu.in_tab, FALSE); gtk_widget_set_sensitive(menu.in_dialog, FALSE); @@ -799,27 +774,31 @@ return FALSE; } break; - } if (is_selected) { - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) && key != NULL) { - if (!strcmp(module,"studypad")) + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && key != NULL) { + // might have an abbrev. get the real. + const gchar *real_mod = main_get_name(module); + gchar *url = NULL; + + if (!strcmp(module, "studypad")) url = - g_strdup_printf - ("passagestudy.jsp?action=showStudypad&" - "type=9&value=%s&module=%s", - main_url_encode(key), - main_url_encode(module)); + g_strdup_printf("passagestudy.jsp?action=showStudypad&" + "type=9&value=%s&module=%s", + main_url_encode(key), + main_url_encode((real_mod + ? real_mod + : module))); else if (button_one) url = - g_strdup_printf - ("passagestudy.jsp?action=showBookmark&" - "type=%s&value=%s&module=%s", - "currentTab", - main_url_encode(key), - main_url_encode(module)); + g_strdup_printf("passagestudy.jsp?action=showBookmark&" + "type=%s&value=%s&module=%s", + "currentTab", + main_url_encode(key), + main_url_encode((real_mod + ? real_mod + : module))); if (url) { main_url_handler(url, TRUE); g_free(url); diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/cipher_key_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/cipher_key_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/cipher_key_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/cipher_key_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * cipher_key_dialog.c - asks for key to unlock sword module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -32,8 +32,6 @@ #include "main/settings.h" #include "main/sword.h" - - /****************************************************************************** * Name * gui_add_cipher_key @@ -58,12 +56,13 @@ info = gui_new_dialog(); #ifdef HAVE_GTK_310 info->stock_icon = "dialog-warning"; -#else +#else info->stock_icon = GTK_STOCK_DIALOG_WARNING; -#endif - info->label_top = g_strdup_printf(_("Cipher key for module %s"), mod_name); +#endif + info->label_top = + g_strdup_printf(_("Cipher key for module %s"), mod_name); info->label_middle = _("for:"); - info->label_bottom = (char*)mod_name; + info->label_bottom = (char *)mod_name; info->text1 = g_strdup(cipher_old); info->label1 = _("Enter Key: "); info->ok = TRUE; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/commentary.c xiphos-4.0.4+dfsg1/src/gnome2/commentary.c --- xiphos-4.0.0+dfsg1/src/gnome2/commentary.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/commentary.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary.c - gui for commentary modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -43,7 +43,7 @@ #include "gui/widgets.h" #include "gui/utilities.h" -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #else #include "editor/slib-editor.h" @@ -60,7 +60,6 @@ #include "gui/debug_glib_null.h" - /****************************************************************************** * Name * @@ -84,29 +83,26 @@ if (!main_is_module(personal)) return; - editor_create_new (personal,(gchar *) settings.currentverse,NOTE_EDITOR); + editor_create_new(personal, (gchar *)settings.currentverse, + NOTE_EDITOR); } - -static gboolean on_enter_notify_event(GtkWidget * widget, - GdkEventCrossing * event, +static gboolean on_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, gpointer user_data) { //shift_key_pressed = FALSE; //gtk_widget_grab_focus (widgets.html_comm); //settings.whichwindow = COMMENTARY_WINDOW; //gui_change_window_title(settings.CommWindowModule); - return FALSE; + return FALSE; } - static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { //g_print ("in comm _popupmenu_requested_cb\n"); - gui_menu_popup (html, settings.CommWindowModule, NULL); + gui_menu_popup(html, settings.CommWindowModule, NULL); } /****************************************************************************** @@ -136,22 +132,19 @@ scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(box_comm), - scrolledwindow, TRUE, - TRUE, 0); + scrolledwindow, TRUE, TRUE, 0); - widgets.html_comm = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, COMMENTARY_TYPE)); + widgets.html_comm = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, COMMENTARY_TYPE)); gtk_widget_show(widgets.html_comm); gtk_container_add(GTK_CONTAINER(scrolledwindow), - widgets.html_comm); + widgets.html_comm); g_signal_connect((gpointer)widgets.html_comm, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); - g_signal_connect ((gpointer) scrolledwindow, "enter_notify_event", - G_CALLBACK (on_enter_notify_event), - NULL); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), NULL); + g_signal_connect((gpointer)scrolledwindow, "enter_notify_event", + G_CALLBACK(on_enter_notify_event), NULL); return box_comm; } - diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/commentary_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/commentary_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/commentary_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/commentary_dialog.c 2015-03-12 02:57:29.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary_dialog.c - dialog for a commentary module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -54,7 +54,6 @@ */ DIALOG_DATA *cur_d; - /****************************************************************************** * Name * on_dialog_destroy @@ -72,15 +71,15 @@ * void */ -static void on_dialog_destroy(GObject *object, - DIALOG_DATA *d) +static void on_dialog_destroy(GObject *object, DIALOG_DATA *d) { if (!dialog_freed) main_free_on_destroy(d); dialog_freed = FALSE; } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_close_comm_dialog @@ -97,14 +96,14 @@ * void */ -void gui_close_comm_dialog(DIALOG_DATA * d) +void gui_close_comm_dialog(DIALOG_DATA *d) { if (d->dialog) { dialog_freed = FALSE; gtk_widget_destroy(d->dialog); } } - +#endif /****************************************************************************** * Name @@ -131,7 +130,7 @@ return FALSE; } - +#if 0 /****************************************************************************** * Name * sync_with_main @@ -150,13 +149,12 @@ static void sync_with_main(DIALOG_DATA *d) { - gchar *url = - g_strdup_printf("sword:///%s", settings.currentverse); + gchar *url = g_strdup_printf("sword:///%s", settings.currentverse); main_dialogs_url_handler(d, url, TRUE); cur_d = d; g_free(url); } - +#endif /****************************************************************************** * Name @@ -181,11 +179,9 @@ } static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - DIALOG_DATA *d) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, DIALOG_DATA *d) { - gui_menu_popup (html, cur_d->mod_name, cur_d); + gui_menu_popup(html, cur_d->mod_name, cur_d); //gui_commentary_dialog_create_menu(d); } @@ -205,8 +201,7 @@ * void */ -void gui_create_commentary_dialog(DIALOG_DATA *d, - gboolean do_edit) +void gui_create_commentary_dialog(DIALOG_DATA *d, gboolean do_edit) { GtkWidget *vbox30; GtkWidget *vbox_toolbars; @@ -217,8 +212,7 @@ cur_d = d; d->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_object_set_data(G_OBJECT(d->dialog), "d->dialog", - d->dialog); + g_object_set_data(G_OBJECT(d->dialog), "d->dialog", d->dialog); gtk_window_set_title(GTK_WINDOW(d->dialog), main_get_module_description(d->mod_name)); //gtk_window_set_default_size(GTK_WINDOW(d->dialog), 462, 280); @@ -251,22 +245,23 @@ scrolledwindow38 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow38); gtk_container_add(GTK_CONTAINER(frame19), scrolledwindow38); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow38), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow38), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow38, settings.shadow_type); - d->html = GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA*) d),TRUE,DIALOG_COMMENTARY_TYPE)); + d->html = + GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA *)d), TRUE, + DIALOG_COMMENTARY_TYPE)); gtk_container_add(GTK_CONTAINER(scrolledwindow38), d->html); gtk_widget_show(d->html); g_signal_connect((gpointer)d->html, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - (DIALOG_DATA*)d); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), + (DIALOG_DATA *)d); g_signal_connect(G_OBJECT(d->dialog), "destroy", G_CALLBACK(on_dialog_destroy), d); @@ -275,9 +270,10 @@ G_CALLBACK(on_dialog_motion_notify_event), d); } - -void gui_commentary_dialog_sync_toggled(GtkToggleButton * button, - DIALOG_DATA * d) +#if 0 +// unneeded at this time. disabled to silence cppcheck. +void gui_commentary_dialog_sync_toggled(GtkToggleButton *button, + DIALOG_DATA *d) { if (d == NULL) d = cur_d; @@ -287,6 +283,6 @@ } else d->sync = FALSE; } - +#endif /****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/dialog.c xiphos-4.0.4+dfsg1/src/gnome2/dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/dialog.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dialog.c - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -41,8 +41,8 @@ static GtkWidget *entry6 = NULL; static gint retval = 3; -GS_DIALOG * standard_info; -GtkWidget * dialog_request; +GS_DIALOG *standard_info; +GtkWidget *dialog_request; /****************************************************************************** * Name @@ -60,7 +60,7 @@ * void */ -static void get_entry_text(GS_DIALOG * info) +static void get_entry_text(GS_DIALOG *info) { if (entry1) { if (info->text1) @@ -98,11 +98,8 @@ info->text6 = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry6))); } - } - - /****************************************************************************** * Name * on_dialog_response @@ -119,7 +116,8 @@ * void */ -static void on_dialog_response(GtkDialog * dialog, gint response_id, GS_DIALOG * info) +static void on_dialog_response(GtkDialog *dialog, gint response_id, + GS_DIALOG *info) { switch (response_id) { case GTK_RESPONSE_OK: @@ -136,7 +134,6 @@ case GTK_RESPONSE_CANCEL: retval = GS_CANCEL; break; - } } @@ -158,33 +155,30 @@ static void on_dialog_enter(void) { - on_dialog_response(GTK_DIALOG(dialog_request), GTK_RESPONSE_OK, standard_info); + on_dialog_response(GTK_DIALOG(dialog_request), GTK_RESPONSE_OK, + standard_info); gtk_widget_destroy(GTK_WIDGET(dialog_request)); } - -static GtkWidget *create_dialog_alert(GS_DIALOG * info) +static GtkWidget *create_dialog_alert(GS_DIALOG *info) { GtkWidget *dialog_alert; GtkWidget *dialog_vbox2; GtkWidget *hbox3; - GtkWidget *image5; GtkWidget *vbox2; GtkWidget *label7; - GtkWidget *label10; GtkWidget *dialog_action_area2; - GtkWidget *scrolledwindow; - GtkWidget *viewport; dialog_alert = gtk_dialog_new(); gtk_container_set_border_width(GTK_CONTAINER(dialog_alert), 5); gtk_window_set_title(GTK_WINDOW(dialog_alert), " "); - + #ifndef USE_GTK_3 gtk_dialog_set_has_separator(GTK_DIALOG(dialog_alert), FALSE); #endif - dialog_vbox2 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_alert)); + dialog_vbox2 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_alert)); gtk_widget_show(dialog_vbox2); UI_HBOX(hbox3, FALSE, 12); @@ -193,24 +187,21 @@ gtk_container_set_border_width(GTK_CONTAINER(hbox3), 6); if (info->stock_icon) { - image5 = + GtkWidget *image5 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name -#else - gtk_image_new_from_stock -#endif - (info->stock_icon, - GTK_ICON_SIZE_DIALOG); + gtk_image_new_from_icon_name +#else + gtk_image_new_from_stock +#endif + (info->stock_icon, GTK_ICON_SIZE_DIALOG); gtk_widget_show(image5); - gtk_box_pack_start(GTK_BOX(hbox3), image5, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(hbox3), image5, FALSE, TRUE, 0); #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(image5), 0.5, 0); gtk_misc_set_padding(GTK_MISC(image5), 12, 0); #endif } - UI_VBOX(vbox2, FALSE, 6); gtk_widget_show(vbox2); gtk_box_pack_start(GTK_BOX(hbox3), vbox2, TRUE, TRUE, 0); @@ -226,27 +217,36 @@ #endif if (info->label2) { - gtk_window_set_default_size (GTK_WINDOW (dialog_alert), 380, 200); - scrolledwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow); - gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - viewport = gtk_viewport_new (NULL, NULL); - gtk_widget_show (viewport); - gtk_container_add (GTK_CONTAINER (scrolledwindow), viewport); + gtk_window_set_default_size(GTK_WINDOW(dialog_alert), 380, + 200); + GtkWidget *scrolledwindow = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scrolledwindow); + gtk_box_pack_start(GTK_BOX(vbox2), scrolledwindow, TRUE, + TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + + GtkWidget *viewport = gtk_viewport_new(NULL, NULL); + gtk_widget_show(viewport); + gtk_container_add(GTK_CONTAINER(scrolledwindow), viewport); - label10 = gtk_label_new(info->label2); + GtkWidget *label10 = gtk_label_new(info->label2); gtk_widget_show(label10); - gtk_container_add (GTK_CONTAINER (viewport), label10); - gtk_label_set_justify(GTK_LABEL(label10), GTK_JUSTIFY_LEFT); + gtk_container_add(GTK_CONTAINER(viewport), label10); + gtk_label_set_justify(GTK_LABEL(label10), + GTK_JUSTIFY_LEFT); #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(label10), 0, 0.5); #endif } - dialog_action_area2 = gtk_dialog_get_action_area(GTK_DIALOG(dialog_alert)); + dialog_action_area2 = +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_alert)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_alert)); +#endif gtk_widget_show(dialog_action_area2); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area2), GTK_BUTTONBOX_END); @@ -265,9 +265,8 @@ "_No", GTK_RESPONSE_NO); if (info->cancel) gtk_dialog_add_button(GTK_DIALOG(dialog_alert), - "_Cancel", - GTK_RESPONSE_CANCEL); -#else + "_Cancel", GTK_RESPONSE_CANCEL); +#else if (info->ok) gtk_dialog_add_button(GTK_DIALOG(dialog_alert), GTK_STOCK_OK, GTK_RESPONSE_OK); @@ -276,8 +275,7 @@ GTK_STOCK_YES, GTK_RESPONSE_YES); if (info->save) gtk_dialog_add_button(GTK_DIALOG(dialog_alert), - GTK_STOCK_SAVE, - GTK_RESPONSE_YES); + GTK_STOCK_SAVE, GTK_RESPONSE_YES); if (info->no) gtk_dialog_add_button(GTK_DIALOG(dialog_alert), GTK_STOCK_NO, GTK_RESPONSE_NO); @@ -285,19 +283,18 @@ gtk_dialog_add_button(GTK_DIALOG(dialog_alert), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -#endif +#endif if (info->no_save) gtk_dialog_add_button(GTK_DIALOG(dialog_alert), - _("Close without Saving"), - GTK_RESPONSE_NO); + _("Close without Saving"), + GTK_RESPONSE_NO); - g_signal_connect((gpointer) dialog_alert, "response", + g_signal_connect((gpointer)dialog_alert, "response", G_CALLBACK(on_dialog_response), info); return dialog_alert; } - /****************************************************************************** * Name * create_dialog_request @@ -314,11 +311,10 @@ * GtkWidget * */ -static GtkWidget *create_dialog_request(GS_DIALOG * info) +static GtkWidget *create_dialog_request(GS_DIALOG *info) { GtkWidget *dialog_vbox3 = NULL; GtkWidget *hbox4 = NULL; - GtkWidget *image6 = NULL; GtkWidget *vbox3 = NULL; GtkWidget *label8 = NULL; GtkWidget *table2 = NULL; @@ -343,7 +339,8 @@ #ifndef USE_GTK_3 gtk_dialog_set_has_separator(GTK_DIALOG(dialog_request), FALSE); #endif - dialog_vbox3 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_request)); + dialog_vbox3 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_request)); gtk_widget_show(dialog_vbox3); UI_HBOX(hbox4, FALSE, 12); @@ -353,18 +350,17 @@ if (info->stock_icon) { #ifdef HAVE_GTK_310 - image6 = - gtk_image_new_from_icon_name (info->stock_icon, - GTK_ICON_SIZE_DIALOG); + GtkWidget *image6 = + gtk_image_new_from_icon_name(info->stock_icon, + GTK_ICON_SIZE_DIALOG); #else - image6 = + GtkWidget *image6 = gtk_image_new_from_stock(info->stock_icon, GTK_ICON_SIZE_DIALOG); #endif gtk_widget_show(image6); - gtk_box_pack_start(GTK_BOX(hbox4), image6, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(hbox4), image6, FALSE, TRUE, 0); #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(image6), 0.5, 0); gtk_misc_set_padding(GTK_MISC(image6), 12, 0); @@ -387,8 +383,7 @@ if (info->label1) { label9 = gtk_label_new(info->label1); gtk_widget_show(label9); - gtk_label_set_justify(GTK_LABEL(label9), - GTK_JUSTIFY_LEFT); + gtk_label_set_justify(GTK_LABEL(label9), GTK_JUSTIFY_LEFT); #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(label9), 0, 0.5); #endif @@ -396,9 +391,8 @@ entry1 = gtk_entry_new(); gtk_widget_show(entry1); if (info->text1) - gtk_entry_set_text(GTK_ENTRY(entry1), - info->text1); - g_signal_connect((gpointer) entry1, "activate", + gtk_entry_set_text(GTK_ENTRY(entry1), info->text1); + g_signal_connect((gpointer)entry1, "activate", G_CALLBACK(on_dialog_enter), info); } @@ -414,9 +408,8 @@ entry2 = gtk_entry_new(); gtk_widget_show(entry2); if (info->text2) - gtk_entry_set_text(GTK_ENTRY(entry2), - info->text2); - g_signal_connect((gpointer) entry2, "activate", + gtk_entry_set_text(GTK_ENTRY(entry2), info->text2); + g_signal_connect((gpointer)entry2, "activate", G_CALLBACK(on_dialog_enter), info); } @@ -432,9 +425,8 @@ entry3 = gtk_entry_new(); gtk_widget_show(entry3); if (info->text3) - gtk_entry_set_text(GTK_ENTRY(entry3), - info->text3); - g_signal_connect((gpointer) entry3, "activate", + gtk_entry_set_text(GTK_ENTRY(entry3), info->text3); + g_signal_connect((gpointer)entry3, "activate", G_CALLBACK(on_dialog_enter), info); } @@ -449,11 +441,10 @@ entry4 = gtk_entry_new(); gtk_widget_show(entry4); - + if (info->text4) - gtk_entry_set_text(GTK_ENTRY(entry4), - info->text4); - g_signal_connect((gpointer) entry4, "activate", + gtk_entry_set_text(GTK_ENTRY(entry4), info->text4); + g_signal_connect((gpointer)entry4, "activate", G_CALLBACK(on_dialog_enter), info); } @@ -468,11 +459,10 @@ entry5 = gtk_entry_new(); gtk_widget_show(entry5); - + if (info->text5) - gtk_entry_set_text(GTK_ENTRY(entry5), - info->text5); - g_signal_connect((gpointer) entry5, "activate", + gtk_entry_set_text(GTK_ENTRY(entry5), info->text5); + g_signal_connect((gpointer)entry5, "activate", G_CALLBACK(on_dialog_enter), info); } @@ -487,73 +477,70 @@ entry6 = gtk_entry_new(); gtk_widget_show(entry6); - + if (info->text6) - gtk_entry_set_text(GTK_ENTRY(entry6), - info->text6); - g_signal_connect((gpointer) entry6, "activate", + gtk_entry_set_text(GTK_ENTRY(entry6), info->text6); + g_signal_connect((gpointer)entry6, "activate", G_CALLBACK(on_dialog_enter), info); } - #ifdef HAVE_GTK_34 table2 = gtk_grid_new(); gtk_widget_show(table2); gtk_box_pack_start(GTK_BOX(vbox3), table2, TRUE, TRUE, 0); - gtk_grid_set_row_spacing (GTK_GRID(table2), 3); - gtk_grid_set_column_spacing (GTK_GRID(table2), 3); + gtk_grid_set_row_spacing(GTK_GRID(table2), 3); + gtk_grid_set_column_spacing(GTK_GRID(table2), 3); if (info->label1) { gtk_grid_attach(GTK_GRID(table2), label9, 0, 0, 1, 1); - gtk_grid_attach(GTK_GRID(table2), entry1, 1, 0, 1, 1); + gtk_grid_attach(GTK_GRID(table2), entry1, 1, 0, 1, 1); ++nextrow; - } if (info->label2) { - gtk_grid_insert_row (GTK_GRID(table2),nextrow); - + gtk_grid_insert_row(GTK_GRID(table2), nextrow); + gtk_grid_attach(GTK_GRID(table2), label10, 0, 1, 1, 1); - + gtk_grid_attach(GTK_GRID(table2), entry2, 1, 1, 1, 1); ++nextrow; } if (info->label3) { - gtk_grid_insert_row (GTK_GRID(table2),nextrow); - + gtk_grid_insert_row(GTK_GRID(table2), nextrow); + gtk_grid_attach(GTK_GRID(table2), label11, 0, 2, 1, 1); - + gtk_grid_attach(GTK_GRID(table2), entry3, 1, 2, 1, 1); ++nextrow; } if (info->label4) { - gtk_grid_insert_row (GTK_GRID(table2),nextrow); - + gtk_grid_insert_row(GTK_GRID(table2), nextrow); + gtk_grid_attach(GTK_GRID(table2), label12, 0, 3, 1, 1); - + gtk_grid_attach(GTK_GRID(table2), entry4, 1, 3, 1, 1); ++nextrow; } if (info->label5) { - gtk_grid_insert_row (GTK_GRID(table2),nextrow); - + gtk_grid_insert_row(GTK_GRID(table2), nextrow); + gtk_grid_attach(GTK_GRID(table2), label13, 0, 4, 1, 1); - + gtk_grid_attach(GTK_GRID(table2), entry5, 1, 4, 1, 1); ++nextrow; } if (info->label6) { - gtk_grid_insert_row (GTK_GRID(table2),nextrow); - + gtk_grid_insert_row(GTK_GRID(table2), nextrow); + gtk_grid_attach(GTK_GRID(table2), label14, 0, 5, 1, 1); - + gtk_grid_attach(GTK_GRID(table2), entry6, 1, 5, 1, 1); } -#else +#else table2 = gtk_table_new(3, 2, FALSE); gtk_widget_show(table2); gtk_box_pack_start(GTK_BOX(vbox3), table2, TRUE, TRUE, 0); @@ -562,74 +549,78 @@ if (info->label1) { gtk_table_attach(GTK_TABLE(table2), label9, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_table_attach(GTK_TABLE(table2), entry1, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } if (info->label2) { gtk_table_attach(GTK_TABLE(table2), label10, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_table_attach(GTK_TABLE(table2), entry2, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } if (info->label3) { gtk_table_attach(GTK_TABLE(table2), label11, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_table_attach(GTK_TABLE(table2), entry3, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } if (info->label4) { gtk_table_attach(GTK_TABLE(table2), label12, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_table_attach(GTK_TABLE(table2), entry4, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } if (info->label5) { - + gtk_table_attach(GTK_TABLE(table2), label13, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_table_attach(GTK_TABLE(table2), entry5, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } if (info->label6) { - + gtk_table_attach(GTK_TABLE(table2), label14, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_table_attach(GTK_TABLE(table2), entry6, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | - GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | + GTK_FILL), + (GtkAttachOptions)(0), 0, 0); } - #endif - dialog_action_area3 = gtk_dialog_get_action_area(GTK_DIALOG(dialog_request)); + dialog_action_area3 = +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_request)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_request)); +#endif gtk_widget_show(dialog_action_area3); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area3), GTK_BUTTONBOX_END); @@ -642,12 +633,11 @@ "_Yes", GTK_RESPONSE_YES); if (info->cancel) gtk_dialog_add_button(GTK_DIALOG(dialog_request), - "_Cancel", - GTK_RESPONSE_CANCEL); + "_Cancel", GTK_RESPONSE_CANCEL); if (info->ok) gtk_dialog_add_button(GTK_DIALOG(dialog_request), "_OK", GTK_RESPONSE_OK); -#else +#else if (info->no) gtk_dialog_add_button(GTK_DIALOG(dialog_request), GTK_STOCK_NO, GTK_RESPONSE_NO); @@ -662,13 +652,12 @@ gtk_dialog_add_button(GTK_DIALOG(dialog_request), GTK_STOCK_OK, GTK_RESPONSE_OK); #endif - g_signal_connect((gpointer) dialog_request, "response", + g_signal_connect((gpointer)dialog_request, "response", G_CALLBACK(on_dialog_response), info); return dialog_request; } - /****************************************************************************** * Name * gui_new_dialog @@ -700,7 +689,6 @@ return standard_info; } - /****************************************************************************** * Name * gui_generic_warning_modal @@ -727,9 +715,9 @@ dialog = gui_new_dialog(); dialog->stock_icon = #ifdef HAVE_GTK_310 - "dialog-information"; + "dialog-information"; #else - GTK_STOCK_DIALOG_INFO; + GTK_STOCK_DIALOG_INFO; #endif dialog_text = g_strdup_printf("%s", @@ -743,7 +731,6 @@ g_free(dialog_text); } - /****************************************************************************** * Name * gui_generic_warning @@ -765,20 +752,18 @@ { GtkWidget *dialog; - dialog = gtk_message_dialog_new_with_markup - (NULL, /* no need for a parent window */ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - "Xiphos\n\n%s", message); - - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + dialog = gtk_message_dialog_new_with_markup(NULL, /* no need for a parent window */ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "Xiphos\n\n%s", + message); + + g_signal_connect_swapped(dialog, "response", + G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show(dialog); } - /****************************************************************************** * Name * gui_gs_dialog @@ -795,16 +780,15 @@ * gint */ -gint gui_gs_dialog(GS_DIALOG * info) +gint gui_gs_dialog(GS_DIALOG *info) { - GtkWidget *dialog; static gboolean is_running = FALSE; if (!is_running) { - dialog = create_dialog_request(info); + GtkWidget *dialog = create_dialog_request(info); retval = 4; is_running = TRUE; - gtk_dialog_run((GtkDialog *) dialog); + gtk_dialog_run((GtkDialog *)dialog); is_running = FALSE; gtk_widget_destroy(dialog); return retval; @@ -828,16 +812,15 @@ * gint */ -gint gui_alert_dialog(GS_DIALOG * info) +gint gui_alert_dialog(GS_DIALOG *info) { - GtkWidget *dialog; static gboolean is_running = FALSE; if (!is_running) { - dialog = create_dialog_alert(info); //gs_dialog_build(info); + GtkWidget *dialog = create_dialog_alert(info); //gs_dialog_build(info); retval = 4; is_running = TRUE; - gtk_dialog_run((GtkDialog *) dialog); + gtk_dialog_run((GtkDialog *)dialog); is_running = FALSE; gtk_widget_destroy(dialog); return retval; @@ -861,28 +844,29 @@ * gint */ -gint gui_close_confirmation_dialog(GS_DIALOG * info) +gint gui_close_confirmation_dialog(GS_DIALOG *info) { - GtkWidget *dialog; static gboolean is_running = FALSE; if (!is_running) { - dialog = create_dialog_alert(info); - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("Close _without Saving"), - GTK_RESPONSE_NO); -#ifdef HAVE_GTK_310 - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - "_Cancel", GTK_RESPONSE_CANCEL, - "document-save", GTK_RESPONSE_YES, NULL); -#else - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_YES, NULL); + GtkWidget *dialog = create_dialog_alert(info); + gtk_dialog_add_button(GTK_DIALOG(dialog), + _("Close _without Saving"), + GTK_RESPONSE_NO); +#ifdef HAVE_GTK_310 + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + "_Cancel", GTK_RESPONSE_CANCEL, + "document-save", GTK_RESPONSE_YES, + NULL); +#else + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, + GTK_RESPONSE_YES, NULL); #endif retval = 4; is_running = TRUE; - gtk_dialog_run((GtkDialog *) dialog); + gtk_dialog_run((GtkDialog *)dialog); is_running = FALSE; gtk_widget_destroy(dialog); return retval; @@ -912,11 +896,11 @@ gint result; yes_no = gui_new_dialog(); -#ifdef HAVE_GTK_310 +#ifdef HAVE_GTK_310 yes_no->stock_icon = (icon ? icon : "dialog-question"); -#else +#else yes_no->stock_icon = (icon ? icon : GTK_STOCK_DIALOG_QUESTION); -#endif +#endif yes_no->label_top = question; yes_no->yes = TRUE; yes_no->no = TRUE; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/dictlex.c xiphos-4.0.4+dfsg1/src/gnome2/dictlex.c --- xiphos-4.0.0+dfsg1/src/gnome2/dictlex.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/dictlex.c 2015-02-21 02:22:54.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * _dictlex.c - gui for commentary modules + * dictlex.c - gui for commentary modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -53,16 +53,12 @@ * externs */ extern gboolean dict_display_change; -extern gboolean isrunningSD; /* is the view dictionary dialog runing */ - - - +extern gboolean isrunningSD; /* is the view dictionary dialog runing */ /****************************************************************************** * static */ - /****************************************************************************** * Name * gui_get_clipboard_text_for_lookup @@ -85,25 +81,24 @@ * void */ -void gui_get_clipboard_text_for_lookup (GtkClipboard *clipboard, - const gchar *text, - gpointer data) +void gui_get_clipboard_text_for_lookup(GtkClipboard *clipboard, + const gchar *text, gpointer data) { char *key = NULL; gchar *dict = NULL; int len = 0; - if (text == NULL) return; - XI_message(("src/gnome2/dictlex.c: text =>%s<",text)); + if (text == NULL) + return; + XI_message(("src/gnome2/dictlex.c: text =>%s<", text)); - key = g_strdelimit((char*)text, "&.,\"<>;:?", ' '); - key = g_strstrip((char*)key); + key = g_strdelimit((char *)text, "&.,\"<>;:?", ' '); + key = g_strstrip((char *)key); len = strlen(key); if (key[len - 1] == 's' || key[len - 1] == 'd') key[len - 1] = '\0'; - if (key[len - 1] == 'h' && key[len - 2] == 't' - && key[len - 3] == 'e') + if (key[len - 1] == 'h' && key[len - 2] == 't' && key[len - 3] == 'e') key[len - 3] = '\0'; if (settings.useDefaultDict) @@ -142,13 +137,13 @@ * void */ -void on_entryDictLookup_changed(GtkEditable * editable, gpointer data) +void on_entryDictLookup_changed(GtkEditable *editable, gpointer data) { main_dictionary_entry_changed(settings.DictWindowModule); } - - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_display_dictlex @@ -165,12 +160,14 @@ * void */ -void gui_display_dictlex(gchar * key) +void gui_display_dictlex(gchar *key) { gtk_entry_set_text(GTK_ENTRY(widgets.entry_dict), key); } +#endif - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_set_dictlex_mod_and_key @@ -187,7 +184,7 @@ * void */ -void gui_set_dictlex_mod_and_key(gchar * mod_name, gchar * key) +void gui_set_dictlex_mod_and_key(gchar *mod_name, gchar *key) { const gchar *old_key; @@ -202,35 +199,34 @@ on_entryDictLookup_changed(NULL, NULL); else gtk_entry_set_text(GTK_ENTRY(widgets.entry_dict), key); - } +#endif - -void dict_key_entry_changed(GtkEntry * entry, gpointer data) +void dict_key_entry_changed(GtkEntry *entry, gpointer data) { gchar *buf = NULL; - buf = (gchar*)gtk_entry_get_text(entry); - XI_message(("dict_key_entry_changed: %s",buf)); - if (strlen(buf) < 2 ) + buf = (gchar *)gtk_entry_get_text(entry); + XI_message(("dict_key_entry_changed: %s", buf)); + if (strlen(buf) < 2) return; main_display_dictionary(settings.DictWindowModule, buf); //gtk_widget_grab_focus(widgets.entry_dict); } -void button_back_clicked(GtkButton * button, gpointer user_data) +void button_back_clicked(GtkButton *button, gpointer user_data) { - if (settings.havedict) main_dictionary_button_clicked(0); + if (settings.havedict) + main_dictionary_button_clicked(0); } -void button_forward_clicked(GtkButton * button, gpointer user_data) +void button_forward_clicked(GtkButton *button, gpointer user_data) { - if (settings.havedict) main_dictionary_button_clicked(1); + if (settings.havedict) + main_dictionary_button_clicked(1); } - - /****************************************************************************** * Name * menu_deactivate_callback @@ -247,16 +243,17 @@ * void */ -static void menu_deactivate_callback (GtkWidget *widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; - menu_button = GTK_WIDGET (user_data); + menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * @@ -273,32 +270,30 @@ * */ -static void menu_position_under (GtkMenu *menu, - int *x, - int *y, - gboolean *push_in, - gpointer user_data) +static void menu_position_under(GtkMenu *menu, + int *x, + int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; - - g_return_if_fail (GTK_IS_BUTTON (user_data)); + + g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif - widget = GTK_WIDGET (user_data); + widget = GTK_WIDGET(user_data); - gdk_window_get_origin (gtk_widget_get_window(widget), x, y); - gtk_widget_get_allocation (widget,&allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; *push_in = FALSE; } - /****************************************************************************** * Name * select_button_press_callback @@ -318,27 +313,28 @@ * gboolean */ -static gboolean select_button_press_callback (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) +static gboolean select_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { if (!settings.DictWindowModule || (*settings.DictWindowModule == '\0')) return 0; - GtkWidget *menu = main_dictionary_drop_down_new(settings.DictWindowModule, - settings.dictkey); + GtkWidget *menu = + main_dictionary_drop_down_new(settings.DictWindowModule, + settings.dictkey); - g_signal_connect (menu, "deactivate", - G_CALLBACK (menu_deactivate_callback), - widget); + g_signal_connect(menu, "deactivate", + G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { - gtk_widget_grab_focus (widget); + gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_menu_popup (GTK_MENU (menu), - NULL, NULL, menu_position_under, widget, - event->button, event->time); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, + menu_position_under, widget, event->button, + event->time); return TRUE; } @@ -346,11 +342,9 @@ } static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { - gui_menu_popup (html, settings.DictWindowModule, NULL); + gui_menu_popup(html, settings.DictWindowModule, NULL); //gui_create_pm_dictionary(); } @@ -369,47 +363,44 @@ UI_VBOX(box_dict, FALSE, 0); gtk_widget_show(box_dict); - gtk_container_set_border_width (GTK_CONTAINER (box_dict), 1); + gtk_container_set_border_width(GTK_CONTAINER(box_dict), 1); UI_HBOX(hbox2, FALSE, 0); gtk_widget_show(hbox2); gtk_box_pack_start(GTK_BOX(box_dict), hbox2, FALSE, FALSE, 0); - widgets.entry_dict = gtk_entry_new (); - gtk_widget_show (widgets.entry_dict); - gtk_box_pack_start(GTK_BOX(hbox2), widgets.entry_dict, TRUE, TRUE, 0); - + widgets.entry_dict = gtk_entry_new(); + gtk_widget_show(widgets.entry_dict); + gtk_box_pack_start(GTK_BOX(hbox2), widgets.entry_dict, TRUE, TRUE, + 0); - dict_drop_down = gtk_toggle_button_new (); - gtk_widget_show (dict_drop_down); + dict_drop_down = gtk_toggle_button_new(); + gtk_widget_show(dict_drop_down); gtk_box_pack_start(GTK_BOX(hbox2), dict_drop_down, FALSE, TRUE, 0); -#ifdef HAVE_GTK_310 - { - gchar *arrow_path = image_locator("arrow_down_box.png"); - arrow1 = gtk_image_new_from_file(arrow_path); - g_free(arrow_path); - } +#ifdef HAVE_GTK_314 + arrow1 = + gtk_image_new_from_icon_name("open-menu-symbolic", + GTK_ICON_SIZE_BUTTON); #else arrow1 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); #endif - gtk_widget_show (arrow1); - gtk_container_add (GTK_CONTAINER (dict_drop_down), arrow1); + gtk_widget_show(arrow1); + gtk_container_add(GTK_CONTAINER(dict_drop_down), arrow1); button10 = gtk_button_new(); gtk_widget_show(button10); gtk_box_pack_start(GTK_BOX(hbox2), button10, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button10), GTK_RELIEF_NONE); - image1 = + image1 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name("go-up", + gtk_image_new_from_icon_name("go-up-symbolic", GTK_ICON_SIZE_BUTTON); -#else - +#else gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); -#endif +#endif gtk_widget_show(image1); gtk_container_add(GTK_CONTAINER(button10), image1); @@ -418,49 +409,46 @@ gtk_box_pack_start(GTK_BOX(hbox2), button11, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button11), GTK_RELIEF_NONE); - image2 = + image2 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("go-down", - GTK_ICON_SIZE_BUTTON); -#else - + gtk_image_new_from_icon_name("go-down-symbolic", + GTK_ICON_SIZE_BUTTON); +#else gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON); -#endif +#endif gtk_widget_show(image2); gtk_container_add(GTK_CONTAINER(button11), image2); scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(box_dict), scrolledwindow, TRUE, TRUE, 0); - - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow, - settings.shadow_type); + gtk_box_pack_start(GTK_BOX(box_dict), scrolledwindow, TRUE, TRUE, + 0); - widgets.html_dict = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DICTIONARY_TYPE)); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow, + settings.shadow_type); + + widgets.html_dict = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DICTIONARY_TYPE)); gtk_widget_show(widgets.html_dict); gtk_container_add(GTK_CONTAINER(scrolledwindow), - widgets.html_dict); + widgets.html_dict); g_signal_connect((gpointer)widgets.html_dict, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); - - g_signal_connect (dict_drop_down, - "button_press_event", - G_CALLBACK (select_button_press_callback), - NULL); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), NULL); + + g_signal_connect(dict_drop_down, + "button_press_event", + G_CALLBACK(select_button_press_callback), NULL); g_signal_connect(G_OBJECT(widgets.entry_dict), "activate", G_CALLBACK(dict_key_entry_changed), NULL); - g_signal_connect ((gpointer) button10, "clicked", - G_CALLBACK (button_back_clicked), - NULL); - g_signal_connect ((gpointer) button11, "clicked", - G_CALLBACK (button_forward_clicked), - NULL); + g_signal_connect((gpointer)button10, "clicked", + G_CALLBACK(button_back_clicked), NULL); + g_signal_connect((gpointer)button11, "clicked", + G_CALLBACK(button_forward_clicked), NULL); return box_dict; } - //****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/dictlex_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/dictlex_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/dictlex_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/dictlex_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex_dialog.c - dialog for displaying a dictlex module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -71,8 +71,7 @@ gchar *buf = NULL; GtkTreeModel *model; - if (!gtk_tree_selection_get_selected - (selection, &model, &selected)) + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return; gtk_tree_model_get(model, &selected, 0, &buf, -1); @@ -80,7 +79,6 @@ gtk_entry_set_text(GTK_ENTRY(d->entry), buf); g_free(buf); } - } /****************************************************************************** @@ -128,11 +126,10 @@ */ static void dialog_set_focus(GtkWindow *window, - GtkWidget *widget, - DIALOG_DATA *dlg) + GtkWidget *widget, DIALOG_DATA *dlg) { -// cur_dlg = dlg; -// XI_warning(("current module = %s",cur_dlg->mod_name)); + // cur_dlg = dlg; + // XI_warning(("current module = %s",cur_dlg->mod_name)); } /****************************************************************************** @@ -151,8 +148,7 @@ * void */ -static void dialog_destroy(GObject *object, - DIALOG_DATA *dlg) +static void dialog_destroy(GObject *object, DIALOG_DATA *dlg) { if (!dialog_freed) main_free_on_destroy(dlg); @@ -177,13 +173,13 @@ */ static gint list_button_released(GtkWidget *html, - GdkEventButton *event, - DIALOG_DATA *d) + GdkEventButton *event, DIALOG_DATA *d) { switch (event->button) { case 1: list_selection_changed((GtkTreeSelection *) - d->mod_selection, d); + d->mod_selection, + d); break; case 2: case 3: @@ -194,44 +190,39 @@ return FALSE; } - static void add_columns(GtkTreeView *treeview) { GtkCellRenderer *renderer; - GtkTreeViewColumn *column; + GtkTreeViewColumn *column; #ifdef USE_GTK_3 - GtkRequisition size; + GtkRequisition size; #endif - -// GtkTreeModel *model = gtk_tree_view_get_model(treeview); + + // GtkTreeModel *model = gtk_tree_view_get_model(treeview); /* column for fixed toggles */ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Keys", renderer, - "text", 0, - NULL); + "text", 0, NULL); gtk_tree_view_column_set_sort_column_id(column, 0); gtk_tree_view_append_column(treeview, column); - /* get cell (row) height */ +/* get cell (row) height */ #ifdef USE_GTK_3 - gtk_cell_renderer_get_preferred_size (renderer, - GTK_WIDGET(treeview) , - NULL, - &size); - cell_height = size.height; + gtk_cell_renderer_get_preferred_size(renderer, + GTK_WIDGET(treeview), + NULL, &size); + cell_height = size.height; #else gtk_cell_renderer_get_size(renderer, GTK_WIDGET(treeview), - NULL, - NULL, NULL, NULL, &cell_height); + NULL, NULL, NULL, NULL, &cell_height); #endif settings.cell_height = cell_height; } - /****************************************************************************** * Name * on_btnSyncDL_clicked @@ -248,11 +239,11 @@ * void */ -void on_btnSyncDL_clicked(GtkButton * button, DIALOG_DATA * d) +void on_btnSyncDL_clicked(GtkButton *button, DIALOG_DATA *d) { gchar *key = NULL; - key=settings.dictkey; + key = settings.dictkey; gtk_entry_set_text(GTK_ENTRY(d->entry), key); } @@ -272,26 +263,23 @@ * void */ -static void entry_changed(GtkEditable *editable, - DIALOG_DATA *d) +static void entry_changed(GtkEditable *editable, DIALOG_DATA *d) { gchar *key = NULL; if (d->key) g_free(d->key); - key = g_strdup((gchar *) gtk_entry_get_text(GTK_ENTRY(d->entry))); + key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(d->entry))); d->key = g_utf8_strup(key, -1); g_free(key); main_dialogs_dictionary_entry_changed(d); } static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - DIALOG_DATA * d) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, DIALOG_DATA *d) { - gui_menu_popup (html, cur_dlg->mod_name, cur_dlg); + gui_menu_popup(html, cur_dlg->mod_name, cur_dlg); } /****************************************************************************** @@ -318,11 +306,11 @@ GtkWidget *hbox_toolbar; GtkWidget *tmp_toolbar_icon; GtkWidget *btnSyncDL; -// GtkWidget *label205; + // GtkWidget *label205; GtkWidget *frameDictHTML; GtkWidget *scrolledwindowDictHTML; GtkWidget *scrolledwindow; -// GtkWidget *label; + // GtkWidget *label; GtkListStore *model; dlg->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -330,8 +318,7 @@ g_object_set_data(G_OBJECT(dlg->dialog), "dlg->dialog", dlg->dialog); gtk_window_set_title(GTK_WINDOW(dlg->dialog), - main_get_module_description(dlg-> - mod_name)); + main_get_module_description(dlg->mod_name)); gtk_window_set_default_size(GTK_WINDOW(dlg->dialog), 465, 275); gtk_window_set_resizable(GTK_WINDOW(dlg->dialog), TRUE); @@ -339,7 +326,6 @@ gtk_widget_show(vbox); gtk_container_add(GTK_CONTAINER(dlg->dialog), vbox); - dlg->frame = gtk_frame_new(NULL); gtk_widget_show(dlg->frame); gtk_box_pack_start(GTK_BOX(vbox), dlg->frame, TRUE, TRUE, 0); @@ -353,11 +339,9 @@ gtk_widget_show(vbox56); gtk_paned_pack1(GTK_PANED(hpaned7), vbox56, FALSE, TRUE); - UI_HBOX(hbox_toolbar, FALSE, 0); gtk_widget_show(hbox_toolbar); - gtk_box_pack_start(GTK_BOX(vbox56), hbox_toolbar, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(vbox56), hbox_toolbar, FALSE, TRUE, 0); btnSyncDL = gtk_button_new(); gtk_widget_show(btnSyncDL); @@ -367,13 +351,11 @@ tmp_toolbar_icon = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("gtk-refresh", - GTK_ICON_SIZE_BUTTON); -#else - - gtk_image_new_from_stock("gtk-refresh", - GTK_ICON_SIZE_BUTTON); -#endif + gtk_image_new_from_icon_name("gtk-refresh", + GTK_ICON_SIZE_BUTTON); +#else + gtk_image_new_from_stock("gtk-refresh", GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(tmp_toolbar_icon); gtk_container_add(GTK_CONTAINER(btnSyncDL), tmp_toolbar_icon); @@ -382,17 +364,14 @@ gtk_box_pack_start(GTK_BOX(hbox_toolbar), dlg->entry, TRUE, TRUE, 0); - /* create tree model */ model = gtk_list_store_new(1, G_TYPE_STRING); scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(vbox56), scrolledwindow, TRUE, - TRUE, 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_box_pack_start(GTK_BOX(vbox56), scrolledwindow, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) @@ -410,9 +389,7 @@ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(dlg->listview), FALSE); add_columns(GTK_TREE_VIEW(dlg->listview)); - dlg->mod_selection = G_OBJECT(gtk_tree_view_get_selection - (GTK_TREE_VIEW(dlg->listview))); - + dlg->mod_selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->listview))); frameDictHTML = gtk_frame_new(NULL); gtk_widget_show(frameDictHTML); @@ -422,22 +399,23 @@ gtk_widget_show(scrolledwindowDictHTML); gtk_container_add(GTK_CONTAINER(frameDictHTML), scrolledwindowDictHTML); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindowDictHTML), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindowDictHTML), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindowDictHTML, settings.shadow_type); - dlg->html = GTK_WIDGET(XIPHOS_HTML_NEW((DIALOG_DATA*) dlg,TRUE,DIALOG_DICTIONARY_TYPE)); + dlg->html = + GTK_WIDGET(XIPHOS_HTML_NEW((DIALOG_DATA *)dlg, TRUE, + DIALOG_DICTIONARY_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindowDictHTML), dlg->html); + gtk_container_add(GTK_CONTAINER(scrolledwindowDictHTML), + dlg->html); gtk_widget_show(dlg->html); g_signal_connect((gpointer)dlg->html, - "popupmenu_requested", - G_CALLBACK(_popupmenu_requested_cb), - dlg); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), dlg); g_signal_connect(G_OBJECT(dlg->dialog), "set_focus", G_CALLBACK(dialog_set_focus), dlg); @@ -446,12 +424,11 @@ g_signal_connect(G_OBJECT(btnSyncDL), "clicked", G_CALLBACK(on_btnSyncDL_clicked), dlg); g_signal_connect(G_OBJECT(dlg->entry), "changed", - G_CALLBACK(entry_changed), - (DIALOG_DATA *) dlg); + G_CALLBACK(entry_changed), (DIALOG_DATA *)dlg); g_signal_connect(G_OBJECT(dlg->listview), "button_release_event", G_CALLBACK(list_button_released), dlg); - cur_dlg = dlg; + cur_dlg = dlg; } //****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/display_info.c xiphos-4.0.4+dfsg1/src/gnome2/display_info.c --- xiphos-4.0.0+dfsg1/src/gnome2/display_info.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/display_info.c 2015-02-21 02:22:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display_info.c - display information (ie strongs) in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,13 +20,13 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include "xiphos_html/xiphos_html.h" - + #include "gui/display_info.h" #include "gui/utilities.h" @@ -37,10 +37,8 @@ gboolean gsI_isrunning = FALSE; GtkWidget *dialog_display_info; - static GtkWidget *html_widget; - /****************************************************************************** * Name * @@ -57,23 +55,22 @@ * void */ -void gui_display_mod_and_key(const gchar * mod_name, const gchar * key) +void gui_display_mod_and_key(const gchar *mod_name, const gchar *key) { gchar *text = NULL; - XI_message(("mod_name: %s key: %s",mod_name,key)); + XI_message(("mod_name: %s key: %s", mod_name, key)); text = main_get_rendered_text(mod_name, key); - XI_message(("%s",text)); + XI_message(("%s", text)); if (text) { main_entry_display(html_widget, - (gchar*)mod_name, - text, - (gchar*)key, - TRUE); + (gchar *)mod_name, + text, (gchar *)key, TRUE); g_free(text); } } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * @@ -90,12 +87,13 @@ * void */ -void gui_display_text_information(gchar * information) +void gui_display_text_information(gchar *information) { XIPHOS_HTML_OPEN_STREAM(html_widget, "text/html"); - XIPHOS_HTML_WRITE(html_widget,information,strlen(information)); + XIPHOS_HTML_WRITE(html_widget, information, strlen(information)); XIPHOS_HTML_CLOSE(html_widget); } +#endif /****************************************************************************** * Name @@ -114,8 +112,7 @@ * void */ -static void on_dlgInformation_destroy(GObject * object, - gpointer user_data) +static void on_dlgInformation_destroy(GObject *object, gpointer user_data) { gsI_isrunning = FALSE; } @@ -136,7 +133,7 @@ * void */ -static void button_close_clicked(GtkButton * button, gpointer user_data) +static void button_close_clicked(GtkButton *button, gpointer user_data) { gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button))); } @@ -171,64 +168,60 @@ gtk_container_set_border_width(GTK_CONTAINER(dialog_display_info), 6); g_object_set_data(G_OBJECT(dialog_display_info), - "dialog_display_info", - dialog_display_info); - gtk_window_set_title(GTK_WINDOW(dialog_display_info), - " "); + "dialog_display_info", dialog_display_info); + gtk_window_set_title(GTK_WINDOW(dialog_display_info), " "); //GTK_WINDOW(dialog_display_info)->type = GTK_WINDOW_TOPLEVEL; - gtk_window_set_default_size(GTK_WINDOW - (dialog_display_info), 350, - 200); + gtk_window_set_default_size(GTK_WINDOW(dialog_display_info), 350, 200); gtk_window_set_resizable(GTK_WINDOW(dialog_display_info), TRUE); - + #ifndef USE_GTK_3 - gtk_dialog_set_has_separator(GTK_DIALOG(dialog_display_info), FALSE); -#endif + gtk_dialog_set_has_separator(GTK_DIALOG(dialog_display_info), + FALSE); +#endif - dialog_vbox23 = gtk_dialog_get_content_area(GTK_DIALOG (dialog_display_info)); //GTK_DIALOG(dialog_display_info)->vbox; + dialog_vbox23 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_display_info)); //GTK_DIALOG(dialog_display_info)->vbox; g_object_set_data(G_OBJECT(dialog_display_info), "dialog_vbox23", dialog_vbox23); gtk_widget_show(dialog_vbox23); - UI_HBOX(hbox, FALSE, 12); gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(dialog_vbox23), hbox, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); - image = + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("dialog-information", - GTK_ICON_SIZE_DIALOG); -#else - + gtk_image_new_from_icon_name("dialog-information", + GTK_ICON_SIZE_DIALOG); +#else gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG); #endif gtk_widget_show(image); - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, TRUE, 0); #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0); #endif - html_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL,FALSE,30));//gtk_html_new(); + html_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, 30)); //gtk_html_new(); gtk_widget_show(html_widget); gtk_box_pack_start(GTK_BOX(hbox), html_widget, TRUE, TRUE, 0); //gtk_container_add(GTK_CONTAINER(scrolledwindow70), html_widget); dialog_action_area23 = - gtk_dialog_get_action_area (GTK_DIALOG (dialog_display_info)); +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_display_info)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_display_info)); +#endif g_object_set_data(G_OBJECT(dialog_display_info), - "dialog_action_area23", - dialog_action_area23); + "dialog_action_area23", dialog_action_area23); gtk_widget_show(dialog_action_area23); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area23), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area23), 10); #ifdef USE_GTK_3 - hbuttonbox2 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox2 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else - hbuttonbox2 = gtk_hbutton_box_new(); + hbuttonbox2 = gtk_hbutton_box_new(); #endif gtk_widget_show(hbuttonbox2); gtk_box_pack_start(GTK_BOX(dialog_action_area23), hbuttonbox2, @@ -236,25 +229,24 @@ gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox2), GTK_BUTTONBOX_END); - button_close = + button_close = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("window-close", - GTK_ICON_SIZE_BUTTON); -#else - gtk_button_new_from_stock(GTK_STOCK_CLOSE); -#endif + gtk_button_new_from_icon_name("window-close", + GTK_ICON_SIZE_BUTTON); +#else + gtk_button_new_from_stock(GTK_STOCK_CLOSE); +#endif gtk_widget_show(button_close); gtk_container_add(GTK_CONTAINER(hbuttonbox2), button_close); gtk_widget_set_can_default(button_close, 1); g_signal_connect(G_OBJECT(button_close), "clicked", - G_CALLBACK(button_close_clicked), NULL); + G_CALLBACK(button_close_clicked), NULL); g_signal_connect(G_OBJECT(dialog_display_info), - "destroy", - G_CALLBACK(on_dlgInformation_destroy), - NULL); + "destroy", + G_CALLBACK(on_dlgInformation_destroy), NULL); gtk_widget_show(dialog_display_info); gsI_isrunning = TRUE; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/export_bookmarks.c xiphos-4.0.4+dfsg1/src/gnome2/export_bookmarks.c --- xiphos-4.0.0+dfsg1/src/gnome2/export_bookmarks.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/export_bookmarks.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_bookmarks.c - * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ #include #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/export_bookmarks.h" @@ -36,7 +36,6 @@ #include "gui/sidebar.h" #include "gui/utilities.h" - #include "main/settings.h" #include "main/sidebar.h" #include "main/search_dialog.h" @@ -44,54 +43,47 @@ #include "main/xml.h" #include "main/url.hh" - enum { BOOKMARKS, HTML, PLAIN }; - //extern GList *list_for_bookmarking; +void dialog_export_bookmarks_response_cb(GtkDialog *dialog, + gint response_id, + BK_EXPORT *data); +void checkbutton_include_text_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data); +void radiobutton_plain_text_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data); +void radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton * + togglebutton, + BK_EXPORT *data); +void radiobutton_html_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data); +gboolean dialog_vbox1_key_press_event_cb(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); -void dialog_export_bookmarks_response_cb ( GtkDialog * dialog, - gint response_id, - BK_EXPORT * data); -void checkbutton_include_text_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data); - void radiobutton_plain_text_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data); - void radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data); -void radiobutton_html_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data); -gboolean dialog_vbox1_key_press_event_cb (GtkWidget * widget, - GdkEventKey * event, - gpointer user_data); - - -static gchar *get_module(const gchar * key) +static gchar *get_module(const gchar *key) { - if (main_is_Bible_key(settings.MainWindowModule, (gchar*)key)) + if (main_is_Bible_key(settings.MainWindowModule, (gchar *)key)) return g_strdup(settings.MainWindowModule); return NULL; - } - -void gui_set_html_item (GString * str, - const gchar * description, - const gchar * module, - const gchar * key, - gboolean with_scripture) +void gui_set_html_item(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, gboolean with_scripture) { - gchar *mod_tmp = NULL; gchar *scripture = NULL; - gchar *text = NULL; gchar *buf = NULL; if (with_scripture) { + gchar *mod_tmp = NULL; gint modtype; if (strlen(module) < 2) @@ -99,43 +91,36 @@ else mod_tmp = g_strdup(module); - if (((modtype = main_get_mod_type(mod_tmp)) == TEXT_TYPE) || - (modtype == COMMENTARY_TYPE)) { - text = main_get_rendered_text(mod_tmp, key); + if (((modtype = main_get_mod_type(mod_tmp)) == TEXT_TYPE) || (modtype == COMMENTARY_TYPE)) { + gchar *text = main_get_rendered_text(mod_tmp, key); scripture = g_strdup_printf("
  • %s
    • ", text); g_free(text); } if (mod_tmp) g_free(mod_tmp); - } - else - scripture = g_strdup (""); + } else + scripture = g_strdup(""); buf = g_strdup_printf("
  • %s
    • %s %s
      • %s

    • ", - description, - module, - key, - (scripture?scripture:"")); - + description, + module, key, (scripture ? scripture : "")); - g_string_append(str,buf); + g_string_append(str, buf); g_free(buf); g_free(scripture); } - -void gui_set_plain_text_item (GString * str, - const gchar * description, - const gchar * module, - const gchar * key, - gboolean with_scripture) +void gui_set_plain_text_item(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, gboolean with_scripture) { - gchar *mod_tmp = NULL; gchar *scripture = NULL; gchar *buf = NULL; if (with_scripture) { + gchar *mod_tmp = NULL; gint modtype; if (strlen(module) < 2) @@ -143,29 +128,24 @@ else mod_tmp = g_strdup(module); - if (((modtype = main_get_mod_type(mod_tmp)) == TEXT_TYPE) || - (modtype == COMMENTARY_TYPE)) - scripture = main_get_striptext (mod_tmp, (gchar*) key); + if (((modtype = main_get_mod_type(mod_tmp)) == TEXT_TYPE) || (modtype == COMMENTARY_TYPE)) + scripture = + main_get_striptext(mod_tmp, (gchar *)key); if (mod_tmp) g_free(mod_tmp); - } - else - scripture = g_strdup (""); + } else + scripture = g_strdup(""); buf = g_strdup_printf("\t%s\n\t\t%s %s\n\t\t%s\n\n", - description, - module, - key, - (scripture?scripture:"")); - + description, + module, key, (scripture ? scripture : "")); - g_string_append(str,buf); + g_string_append(str, buf); g_free(buf); g_free(scripture); } - static gboolean _save_verselist_2_xml(BK_EXPORT *data) { xmlNodePtr root_node = NULL; @@ -174,63 +154,56 @@ //xmlAttrPtr root_attr; gchar filename[256]; GString *name = g_string_new(NULL); - GString *str = g_string_new (""); - RESULTS *list_item; - + GString *str = g_string_new(""); sprintf(filename, "%s.xml", data->filename); - root_doc = xmlNewDoc((const xmlChar *) "1.0"); + root_doc = xmlNewDoc((const xmlChar *)"1.0"); if (root_doc != NULL) { - root_node = xmlNewNode(NULL, (const xmlChar *) - "SwordBookmarks"); + root_node = xmlNewNode(NULL, (const xmlChar *)"SwordBookmarks"); //root_attr = - xmlNewProp(root_node, (const xmlChar *)"syntaxVersion", - (const xmlChar *) "1"); + xmlNewProp(root_node, (const xmlChar *)"syntaxVersion", + (const xmlChar *)"1"); xmlDocSetRootElement(root_doc, root_node); } if (is_search_result) - g_string_printf(name, _("Search result: %s"), settings.searchText); + g_string_printf(name, _("Search result: %s"), + settings.searchText); else g_string_printf(name, _("Verse List")); cur_node = xml_add_folder_to_parent(root_node, name->str); /* Verse List or Search result: */ while (data->verses) { - list_item = (RESULTS *) data->verses->data; + RESULTS *list_item = (RESULTS *)data->verses->data; g_string_printf(str, "%s, %s", list_item->key, - list_item->module); + list_item->module); - xml_add_bookmark_to_parent (cur_node, - str->str, // bookmark description - list_item->key, // module key - list_item->module, // module name - main_get_module_description(list_item->module)); // module description + xml_add_bookmark_to_parent(cur_node, str->str, // bookmark description + list_item->key, // module key + list_item->module, // module name + main_get_module_description(list_item->module)); // module description data->verses = g_list_next(data->verses); } - xmlSaveFormatFile(filename, root_doc,1); + xmlSaveFormatFile(filename, root_doc, 1); xmlFreeDoc(root_doc); return 1; } - static gboolean _save_verselist_2_html(BK_EXPORT *data) { - gchar filename[256]; - gchar *buf; GString *name = g_string_new(NULL); - GString *str = g_string_new (""); - GString *des = g_string_new (""); - RESULTS *list_item; - void (*catenate)(GString * str, - const gchar * description, - const gchar * module, - const gchar * key, + GString *str = g_string_new(""); + GString *des = g_string_new(""); + void (*catenate)(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, gboolean with_scripture) = NULL; switch (data->type) { @@ -246,60 +219,65 @@ if (data->verselist == ADV_SEARCH_RESULTS_EXPORT) { - main_export_current_adv_search (str, (data->type == HTML), data->with_scripture); + main_export_current_adv_search(str, (data->type == HTML), + data->with_scripture); } else { + gchar *buf; if (is_search_result) - g_string_printf(name, _("Search result: %s"), settings.searchText); + g_string_printf(name, _("Search result: %s"), + settings.searchText); else g_string_printf(name, _("Verse List")); - switch (data->type) { case HTML: - buf = g_strdup_printf("
      %s

      ",name->str); + buf = + g_strdup_printf("
        %s

        ", + name->str); break; case PLAIN: - buf = g_strdup_printf("%s\n\n",name->str); + buf = g_strdup_printf("%s\n\n", name->str); break; default: - buf = g_strdup_printf("bogus data type, cannot happen"); + buf = + g_strdup_printf("bogus data type, cannot happen"); break; } - g_string_append(str,buf); - g_string_free(name,1); + g_string_append(str, buf); + g_string_free(name, 1); g_free(buf); - while (data->verses) { - list_item = (RESULTS *) data->verses->data; - g_string_printf(des, "%s, %s", list_item->key, list_item->module); + RESULTS *list_item = (RESULTS *)data->verses->data; + g_string_printf(des, "%s, %s", list_item->key, + list_item->module); - (*catenate)(str, des->str, list_item->module, list_item->key, data->with_scripture); + (*catenate)(str, des->str, list_item->module, + list_item->key, data->with_scripture); data->verses = g_list_next(data->verses); } - g_string_free(des,1); + g_string_free(des, 1); } switch (data->type) { - case HTML: - g_string_append(str,"
      "); + case HTML: + g_string_append(str, "
    "); break; - case PLAIN: - g_string_append(str,"\n"); + case PLAIN: + g_string_append(str, "\n"); break; } /* not sure how well this will work with windows */ - if (!g_file_set_contents (filename, str->str, str->len, NULL)) + if (!g_file_set_contents(filename, str->str, str->len, NULL)) XI_warning(("Unable to save %s", filename)); - g_string_free(str,1); + g_string_free(str, 1); return 1; } - static void _export_verselist(BK_EXPORT *data) { switch (data->type) { @@ -313,7 +291,6 @@ } } - /****************************************************************************** * Name * _parse_treeview_html @@ -329,9 +306,8 @@ * Return value * void */ -static -void _parse_treeview (GString *str, GtkTreeIter * tree_parent, - GtkTreeStore *model, BK_EXPORT *data) +static void _parse_treeview(GString *str, GtkTreeIter *tree_parent, + GtkTreeStore *model, BK_EXPORT *data) { GtkTreeIter child; gchar *caption = NULL; @@ -340,10 +316,10 @@ gchar *mod_desc = NULL; gchar *description = NULL; gchar *buf = NULL; - void (*catenate)(GString * str, - const gchar * description, - const gchar * module, - const gchar * key, + void (*catenate)(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, gboolean with_scripture) = NULL; switch (data->type) { @@ -356,31 +332,32 @@ } gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child, - tree_parent); + tree_parent); do { gtk_tree_model_get(GTK_TREE_MODEL(model), &child, 2, &caption, 3, &key, 4, &module, - 5, &mod_desc, - 6, &description, - -1); + 5, &mod_desc, 6, &description, -1); if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &child)) { switch (data->type) { case HTML: - buf = g_strdup_printf("
      %s",caption); + buf = + g_strdup_printf("
        %s", + caption); break; case PLAIN: - buf = g_strdup_printf("%s\n\n",caption); + buf = g_strdup_printf("%s\n\n", caption); break; } - g_string_append(str,buf); + g_string_append(str, buf); g_free(buf); _parse_treeview(str, &child, model, data); } if (key) { - (*catenate)(str, description, module, key, data->with_scripture); + (*catenate)(str, description, module, key, + data->with_scripture); } else { switch (data->type) { case HTML: @@ -390,7 +367,7 @@ buf = g_strdup_printf(" "); break; } - g_string_append(str,buf); + g_string_append(str, buf); g_free(buf); } @@ -402,7 +379,6 @@ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &child)); } - /****************************************************************************** * Name * save_iter_to_xml @@ -419,43 +395,40 @@ * void */ -static void save_iter_to_xml(GtkTreeIter * iter, BK_EXPORT *data) +static void save_iter_to_xml(GtkTreeIter *iter, BK_EXPORT *data) { xmlNodePtr root_node = NULL; xmlNodePtr cur_node = NULL; xmlDocPtr root_doc; -// xmlAttrPtr root_attr; + // xmlAttrPtr root_attr; gchar *caption = NULL; gchar filename[256]; GtkTreeModel *tm; - if (data->verselist == VERSE_LIST_EXPORT) tm = GTK_TREE_MODEL(model_verselist); else tm = GTK_TREE_MODEL(model); - gtk_tree_model_get(tm, iter, - 2, &caption, -1); + gtk_tree_model_get(tm, iter, 2, &caption, -1); sprintf(filename, "%s.xml", data->filename); - root_doc = xmlNewDoc((const xmlChar *) "1.0"); + root_doc = xmlNewDoc((const xmlChar *)"1.0"); if (root_doc != NULL) { - root_node = xmlNewNode(NULL, (const xmlChar *) - "SwordBookmarks"); + root_node = xmlNewNode(NULL, (const xmlChar *)"SwordBookmarks"); //root_attr = - xmlNewProp(root_node, (const xmlChar *)"syntaxVersion", - (const xmlChar *) "1"); + xmlNewProp(root_node, (const xmlChar *)"syntaxVersion", + (const xmlChar *)"1"); xmlDocSetRootElement(root_doc, root_node); } gtk_tree_model_get(tm, iter, 2, &caption, -1); - if (gtk_tree_model_iter_has_child(tm,iter)) { - cur_node = xml_add_folder_to_parent(root_node, caption); - utilities_parse_treeview(cur_node, iter, tm); - } + if (gtk_tree_model_iter_has_child(tm, iter)) { + cur_node = xml_add_folder_to_parent(root_node, caption); + utilities_parse_treeview(cur_node, iter, tm); + } g_free(caption); - xmlSaveFormatFile(filename, root_doc,1); + xmlSaveFormatFile(filename, root_doc, 1); xmlFreeDoc(root_doc); bookmarks_changed = FALSE; @@ -477,14 +450,13 @@ * void */ -static void _save_iter(GtkTreeIter * iter, BK_EXPORT *data) +static void _save_iter(GtkTreeIter *iter, BK_EXPORT *data) { gchar *caption = NULL; gchar filename[256]; GString *str = g_string_new(NULL); - gtk_tree_model_get(GTK_TREE_MODEL(model), iter, - 2, &caption, -1); + gtk_tree_model_get(GTK_TREE_MODEL(model), iter, 2, &caption, -1); switch (data->type) { case HTML: sprintf(filename, "%s.html", data->filename); @@ -494,42 +466,42 @@ break; } - gtk_tree_model_get(GTK_TREE_MODEL(model), iter, - 2, &caption, -1); - if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model),iter)) { - switch (data->type) { - case HTML: - g_string_printf(str, "
          %s

          ", caption); - break; - case PLAIN: - g_string_printf(str, "%s\n\n\n", caption); - break; - } - - _parse_treeview (str, iter, model, data); + gtk_tree_model_get(GTK_TREE_MODEL(model), iter, 2, &caption, -1); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), iter)) { + switch (data->type) { + case HTML: + g_string_printf(str, + "
            %s

            ", + caption); + break; + case PLAIN: + g_string_printf(str, "%s\n\n\n", caption); + break; } + _parse_treeview(str, iter, model, data); + } + g_free(caption); switch (data->type) { case HTML: - g_string_append(str,"
          "); + g_string_append(str, "
        "); break; case PLAIN: - g_string_append(str,"\n"); + g_string_append(str, "\n"); break; } /* not sure how well this will work with windows */ - if (!g_file_set_contents (filename, str->str, str->len, NULL)) + if (!g_file_set_contents(filename, str->str, str->len, NULL)) XI_warning(("Unable to save %s", filename)); - g_string_free(str,1); + g_string_free(str, 1); } - static void export_2_bookmarks(BK_EXPORT *data) { - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; GtkTreeView *tree; @@ -547,7 +519,7 @@ static void export_2_html(BK_EXPORT *data) { - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; gchar buf[256]; @@ -556,23 +528,20 @@ return; sprintf(buf, "%s.html", data->filename); _save_iter(&selected, data); - } static void export_2_text(BK_EXPORT *data) { - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; selection = gtk_tree_view_get_selection(bookmark_tree); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; _save_iter(&selected, data); - } - -static void _export (BK_EXPORT *data) +static void _export(BK_EXPORT *data) { switch (data->type) { case BOOKMARKS: @@ -584,14 +553,12 @@ case PLAIN: export_2_text(data); break; - } } - -static void setup_filechooserwidget (GtkFileChooser * chooser) +static void setup_filechooserwidget(GtkFileChooser *chooser) { - GtkTreeSelection* selection; + GtkTreeSelection *selection; GtkTreeIter selected; gchar *caption = NULL; @@ -599,62 +566,60 @@ if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, - 2, &caption, -1); - gtk_file_chooser_set_current_name (chooser, caption); + 2, &caption, -1); + gtk_file_chooser_set_current_name(chooser, caption); g_free(caption); } - G_MODULE_EXPORT void -checkbutton_include_text_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data) +checkbutton_include_text_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data) { - data->with_scripture = gtk_toggle_button_get_active (togglebutton); + data->with_scripture = gtk_toggle_button_get_active(togglebutton); } G_MODULE_EXPORT void -radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data) +radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data) { - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { data->type = BOOKMARKS; - gtk_widget_set_sensitive (data->cb_scripture,FALSE); + gtk_widget_set_sensitive(data->cb_scripture, FALSE); } } G_MODULE_EXPORT void -radiobutton_html_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data) +radiobutton_html_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data) { - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { data->type = HTML; - gtk_widget_set_sensitive (data->cb_scripture,TRUE); + gtk_widget_set_sensitive(data->cb_scripture, TRUE); } } - G_MODULE_EXPORT void -radiobutton_plain_text_toggled_cb(GtkToggleButton * togglebutton, - BK_EXPORT * data) +radiobutton_plain_text_toggled_cb(GtkToggleButton *togglebutton, + BK_EXPORT *data) { - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { data->type = PLAIN; - gtk_widget_set_sensitive (data->cb_scripture,TRUE); + gtk_widget_set_sensitive(data->cb_scripture, TRUE); } } - G_MODULE_EXPORT -void dialog_export_bookmarks_response_cb ( GtkDialog * dialog, - gint response_id, - BK_EXPORT * data) +void dialog_export_bookmarks_response_cb(GtkDialog *dialog, + gint response_id, + BK_EXPORT *data) { switch (response_id) { case GTK_RESPONSE_CANCEL: break; case GTK_RESPONSE_OK: - data->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->filechooserwidget)); + data->filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->filechooserwidget)); if (data->verselist) _export_verselist(data); else @@ -668,22 +633,22 @@ } G_MODULE_EXPORT -gboolean dialog_vbox1_key_press_event_cb (GtkWidget * widget, - GdkEventKey * event, - gpointer user_data) +gboolean dialog_vbox1_key_press_event_cb(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) { return TRUE; } -void gui_export_bookmarks_dialog(gint export_type, GList * verses) +void gui_export_bookmarks_dialog(gint export_type, GList *verses) { - GtkBuilder *builder; + GtkBuilder *builder; gchar *gbuilder_file; GtkWidget *dialog; GString *name = g_string_new(NULL); - BK_EXPORT *ex_data = g_new0(BK_EXPORT,1); + BK_EXPORT *ex_data = g_new0(BK_EXPORT, 1); ex_data->filename = NULL; ex_data->type = BOOKMARKS; @@ -692,48 +657,57 @@ if (ex_data->verselist == VERSE_LIST_EXPORT) { ex_data->verses = verses; g_string_printf(name, "%s", _("VerseList")); - } - else if (ex_data->verselist == SEARCH_RESULTS_EXPORT || - ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) { + } else if (ex_data->verselist == SEARCH_RESULTS_EXPORT || + ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) { ex_data->verses = verses; g_string_printf(name, "%s", _("SearchResults")); } - builder = gtk_builder_new (); - gbuilder_file = gui_general_user_file ("xi-export-bookmarks.glade", FALSE); - gtk_builder_add_from_file (builder, gbuilder_file, NULL); - - dialog = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_export_bookmarks")); - ex_data->rb_bookmarks = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_xiphos_bookmarks")); - ex_data->rb_html = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_html")); - ex_data->rb_plain = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_plain_text")); - ex_data->cb_scripture = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton_include_text")); - ex_data->filechooserwidget = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserwidget")); + builder = gtk_builder_new(); + gbuilder_file = + gui_general_user_file("xi-export-bookmarks.glade", FALSE); + gtk_builder_add_from_file(builder, gbuilder_file, NULL); + + dialog = + GTK_WIDGET(gtk_builder_get_object(builder, "dialog_export_bookmarks")); + ex_data->rb_bookmarks = + GTK_WIDGET(gtk_builder_get_object(builder, "radiobutton_xiphos_bookmarks")); + ex_data->rb_html = + GTK_WIDGET(gtk_builder_get_object(builder, "radiobutton_html")); + ex_data->rb_plain = + GTK_WIDGET(gtk_builder_get_object(builder, "radiobutton_plain_text")); + ex_data->cb_scripture = + GTK_WIDGET(gtk_builder_get_object(builder, "checkbutton_include_text")); + ex_data->filechooserwidget = + GTK_WIDGET(gtk_builder_get_object(builder, "filechooserwidget")); if (ex_data->verselist) { - gtk_file_chooser_set_current_name ((GtkFileChooser *) ex_data->filechooserwidget, name->str); - g_string_free(name,1); - } - else - setup_filechooserwidget ((GtkFileChooser *) ex_data->filechooserwidget); + gtk_file_chooser_set_current_name((GtkFileChooser *) + ex_data->filechooserwidget, + name->str); + g_string_free(name, 1); + } else + setup_filechooserwidget((GtkFileChooser *) + ex_data->filechooserwidget); - gtk_widget_set_sensitive (ex_data->cb_scripture,FALSE); + gtk_widget_set_sensitive(ex_data->cb_scripture, FALSE); - gtk_builder_connect_signals (builder,ex_data); + gtk_builder_connect_signals(builder, ex_data); if (ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) { - gtk_widget_set_sensitive (ex_data->rb_bookmarks,FALSE); - gtk_toggle_button_set_active ((GtkToggleButton *)ex_data->rb_html, - TRUE); + gtk_widget_set_sensitive(ex_data->rb_bookmarks, FALSE); + gtk_toggle_button_set_active((GtkToggleButton *) + ex_data->rb_html, + TRUE); } - if (ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) { - gtk_widget_set_sensitive (ex_data->rb_bookmarks,FALSE); - gtk_toggle_button_set_active ((GtkToggleButton *)ex_data->rb_html, - TRUE); + gtk_widget_set_sensitive(ex_data->rb_bookmarks, FALSE); + gtk_toggle_button_set_active((GtkToggleButton *) + ex_data->rb_html, + TRUE); } - g_object_unref (G_OBJECT (builder)); - gtk_widget_show (dialog); + g_object_unref(G_OBJECT(builder)); + gtk_widget_show(dialog); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/export_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/export_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/export_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/export_dialog.c 2015-04-30 00:36:37.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_dialog.c - * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,14 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include #endif #include #ifndef USE_GTKBUILDER - #include +#include #endif #include @@ -34,7 +33,6 @@ #include "gui/dialog.h" #include "gui/utilities.h" - #include "main/export_passage.h" #include "main/settings.h" #include "main/sword.h" @@ -47,9 +45,9 @@ static GtkWidget *dialog; static gchar *filename; - typedef struct _export_dialog EXPORT_DIALOG; -struct _export_dialog { +struct _export_dialog +{ GtkWidget *rb_copy; GtkWidget *rb_export; GtkWidget *rb_book; @@ -78,8 +76,7 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - -1, -1, -1, -1, -1, -1 -}; + -1, -1, -1, -1, -1, -1}; /****************************************************************************** * Name @@ -99,27 +96,25 @@ * void */ -static -void on_filechooserdialog_response(GtkDialog * fdialog, - gint response_id, - GtkFileChooser * filesel) +static void on_filechooserdialog_response(GtkDialog *fdialog, + gint response_id, + GtkFileChooser *filesel) { switch (response_id) { case GTK_RESPONSE_ACCEPT: - edata.filename = g_strdup(gtk_file_chooser_get_filename(filesel)); + edata.filename = + g_strdup(gtk_file_chooser_get_filename(filesel)); main_export_content(edata, d.format); break; case GTK_RESPONSE_CANCEL: break; - } gtk_widget_destroy(GTK_WIDGET(fdialog)); } - /****************************************************************************** * Name * _get_export_filename @@ -146,28 +141,32 @@ filename = NULL; #ifndef USE_GTKBUILDER - glade_file = gui_general_user_file("export-dialog" UI_SUFFIX, FALSE); + glade_file = + gui_general_user_file("export-dialog" UI_SUFFIX, FALSE); g_return_if_fail(glade_file != NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); #endif - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - fdialog = gtk_file_chooser_dialog_new ("Save Export File", - NULL, - GTK_FILE_CHOOSER_ACTION_SAVE, + fdialog = gtk_file_chooser_dialog_new("Save Export File", + NULL, + GTK_FILE_CHOOSER_ACTION_SAVE, #ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Save", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, -#endif - NULL); + "_Cancel", + GTK_RESPONSE_CANCEL, "_Save", + GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, + GTK_RESPONSE_ACCEPT, +#endif + NULL); #else gxml = glade_xml_new(glade_file, "filechooserdialog1", NULL); - fdialog = glade_xml_get_widget (gxml, "filechooserdialog1"); + fdialog = glade_xml_get_widget(gxml, "filechooserdialog1"); #endif g_signal_connect(fdialog, "response", @@ -175,31 +174,39 @@ (GtkFileChooser *)fdialog); #ifdef USE_GTKBUILDER - gtk_dialog_run (GTK_DIALOG (fdialog)); + gtk_dialog_run(GTK_DIALOG(fdialog)); #endif } static void _save_state_buttons(void) { - gchar value[10];/* set export-copy.xml */ - gchar *file = g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); - + gchar value[10]; /* set export-copy.xml */ + gchar *file = + g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); + if (xml_load_copy_export_file((const xmlChar *)file)) { - sprintf(value, "%d", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_plain))); - xml_export_set_value("Copy_Export", "dialog", "plaintext", value); - sprintf(value, "%d", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_versenum))); - xml_export_set_value("Copy_Export", "dialog", "verse_numbers",value); - sprintf(value, "%d", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_reference_last))); - xml_export_set_value("Copy_Export", "dialog", "reference_last",value); + sprintf(value, "%d", + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_plain))); + xml_export_set_value("Copy_Export", "dialog", "plaintext", + value); + sprintf(value, "%d", + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_versenum))); + xml_export_set_value("Copy_Export", "dialog", + "verse_numbers", value); + sprintf(value, "%d", + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_reference_last))); + xml_export_set_value("Copy_Export", "dialog", + "reference_last", value); //sprintf(value, "%d", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.))); //xml_export_set_value("Copy_Export", "dialog", "",value ); - sprintf(value, "%d", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_version))); - xml_export_set_value("Copy_Export", "dialog", "version",value ); + sprintf(value, "%d", + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_version))); + xml_export_set_value("Copy_Export", "dialog", "version", + value); xml_save_export_doc(file); xml_free_export_doc(); - } - if(file) + if (file) g_free(file); } @@ -221,9 +228,9 @@ * void */ -void on_dialog_export_passage_response(GtkDialog * dialog, - gint response_id, - gpointer user_data) +void on_dialog_export_passage_response(GtkDialog *dialog, + gint response_id, + gpointer user_data) { switch (response_id) { case GTK_RESPONSE_CANCEL: @@ -236,21 +243,19 @@ d.format = 0; edata.passage_type = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_book)) ? BOOK - : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_chapter)) ? CHAPTER - : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_verse)) ? VERSE - : VERSE_RANGE; + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_book)) ? BOOK : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_chapter)) ? CHAPTER + : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.rb_verse)) ? VERSE : VERSE_RANGE; - edata.verse_num = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_versenum)); - edata.reference_last = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_reference_last)); + edata.verse_num = + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_versenum)); + edata.reference_last = + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d.cb_reference_last)); if (edata.passage_type == VERSE_RANGE) { edata.start_verse = - gtk_spin_button_get_value_as_int ( - GTK_SPIN_BUTTON (d.sb_start_verse)); + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(d.sb_start_verse)); edata.end_verse = - gtk_spin_button_get_value_as_int ( - GTK_SPIN_BUTTON (d.sb_end_verse)); + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(d.sb_end_verse)); if (edata.end_verse < edata.start_verse) { int swap; swap = edata.end_verse; @@ -258,7 +263,7 @@ edata.start_verse = swap; } } else { - edata.start_verse = 0 ; + edata.start_verse = 0; edata.end_verse = 0; } _save_state_buttons(); @@ -273,7 +278,6 @@ } } - /****************************************************************************** * Name * _check_for_distribution_license @@ -292,73 +296,66 @@ * gint */ -#define OP_NAME "Warned about License for Export" +#define OP_NAME "Warned about License for Export" -gint _check_for_distribution_license(gchar * mod_name) +gint _check_for_distribution_license(gchar *mod_name) { gchar *distributionlicense; gchar *conf_file; conf_file = g_strdup_printf("%s/" DOTSWORD "/mods.d/%s.conf", settings.homedir, - g_utf8_strdown(mod_name, - -1)); + g_utf8_strdown(mod_name, -1)); - if (g_file_test(conf_file,G_FILE_TEST_EXISTS)) - distributionlicense = get_conf_file_item( - conf_file, + if (g_file_test(conf_file, G_FILE_TEST_EXISTS)) + distributionlicense = get_conf_file_item(conf_file, mod_name, "DistributionLicense"); else - distributionlicense = main_get_mod_config_entry( - mod_name, - "DistributionLicense"); + distributionlicense = main_get_mod_config_entry(mod_name, + "DistributionLicense"); g_free(conf_file); - XI_message(("DistributionLicense: %s",distributionlicense)); + XI_message(("DistributionLicense: %s", distributionlicense)); if (!distributionlicense || (distributionlicense && - g_strstr_len(distributionlicense, - strlen(distributionlicense), - "Copyright"))) { + g_strstr_len(distributionlicense, + strlen(distributionlicense), + "Copyright"))) { if (main_get_one_option(mod_name, OP_NAME) == 0) { gui_generic_warning(_("Please check copyright before exporting!")); main_save_module_options(mod_name, OP_NAME, 1); } - + return 1; } return 0; } - -static -void on_rb_multi_verse_toggled (GtkToggleButton *togglebutton, - gpointer user_data) +static void on_rb_multi_verse_toggled(GtkToggleButton *togglebutton, + gpointer user_data) { gint state = gtk_toggle_button_get_active(togglebutton); gtk_widget_set_sensitive(d.sb_start_verse, state); gtk_widget_set_sensitive(d.sb_end_verse, state); } -static -void on_cb_version_toggled (GtkToggleButton *togglebutton, - gpointer user_data) +static void on_cb_version_toggled(GtkToggleButton *togglebutton, + gpointer user_data) { - if(gtk_toggle_button_get_active(togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) edata.version = TRUE; else - edata.version = FALSE; + edata.version = FALSE; } -static -void on_reference_last_toggled (GtkToggleButton *togglebutton, - gpointer user_data) +static void on_reference_last_toggled(GtkToggleButton *togglebutton, + gpointer user_data) { - if(gtk_toggle_button_get_active(togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) edata.reference_last = TRUE; else - edata.reference_last = FALSE; + edata.reference_last = FALSE; } /****************************************************************************** @@ -377,76 +374,108 @@ * void */ -static -void _load_data(gchar * filename) -{ - gchar *buf; - gchar *file = g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); - +static void _load_data(gchar *filename) +{ + gchar *file = + g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); + if (xml_load_copy_export_file((const xmlChar *)filename)) { + gchar *buf; /* html */ - edata.bookheader = xml_get_copy_export_value("book", "header"); - edata.chapterheader_book = xml_get_copy_export_value("book", "chapterheader"); - edata.versenumber = xml_get_copy_export_value("versenumber", "format"); - edata.chapterheader_chapter = xml_get_copy_export_value("chapter", "header"); - edata.verselayout_single_verse_ref_last = xml_get_copy_export_value("singleverse", "last"); - edata.verselayout_single_verse_ref_first = xml_get_copy_export_value("singleverse", "first"); - edata.verse_range_ref_first = xml_get_copy_export_value("verserange", "first"); - edata.verse_range_ref_last = xml_get_copy_export_value("verserange", "last"); - edata.verse_range_verse = xml_get_copy_export_value("verserange", "verse"); + edata.bookheader = + xml_get_copy_export_value("book", "header"); + edata.chapterheader_book = + xml_get_copy_export_value("book", "chapterheader"); + edata.versenumber = + xml_get_copy_export_value("versenumber", "format"); + edata.chapterheader_chapter = + xml_get_copy_export_value("chapter", "header"); + edata.verselayout_single_verse_ref_last = + xml_get_copy_export_value("singleverse", "last"); + edata.verselayout_single_verse_ref_first = + xml_get_copy_export_value("singleverse", "first"); + edata.verse_range_ref_first = + xml_get_copy_export_value("verserange", "first"); + edata.verse_range_ref_last = + xml_get_copy_export_value("verserange", "last"); + edata.verse_range_verse = + xml_get_copy_export_value("verserange", "verse"); - if( edata.verse_range_verse == NULL) { + if (edata.verse_range_verse == NULL) { xml_add_new_item_to_export_doc_section("verserange", "verse", " %s%s"); - edata.verse_range_verse = xml_get_copy_export_value("verserange", "verse"); + edata.verse_range_verse = + xml_get_copy_export_value("verserange", + "verse"); xml_save_export_doc(file); } /* plain text */ - - edata.plain_bookheader = xml_get_copy_export_value("book", "plain_header"); - edata.plain_chapterheader_book = xml_get_copy_export_value("book", "plain_chapterheader"); - edata.plain_versenumber = xml_get_copy_export_value("versenumber", "plain_format"); - edata.plain_chapterheader_chapter = xml_get_copy_export_value("chapter", "plain_header"); - edata.plain_verselayout_single_verse_ref_last = xml_get_copy_export_value("singleverse", "plain_last"); - edata.plain_verselayout_single_verse_ref_first = xml_get_copy_export_value("singleverse", "plain_first"); - edata.plain_verse_range_ref_last = xml_get_copy_export_value("verserange", "plain_last"); - edata.plain_verse_range_ref_first = xml_get_copy_export_value("verserange", "plain_first"); - - if ((buf = xml_get_copy_export_value("dialog", "plaintext"))) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_plain), atoi(buf)); + + edata.plain_bookheader = + xml_get_copy_export_value("book", "plain_header"); + edata.plain_chapterheader_book = + xml_get_copy_export_value("book", + "plain_chapterheader"); + edata.plain_versenumber = + xml_get_copy_export_value("versenumber", + "plain_format"); + edata.plain_chapterheader_chapter = + xml_get_copy_export_value("chapter", "plain_header"); + edata.plain_verselayout_single_verse_ref_last = + xml_get_copy_export_value("singleverse", "plain_last"); + edata.plain_verselayout_single_verse_ref_first = + xml_get_copy_export_value("singleverse", + "plain_first"); + edata.plain_verse_range_ref_last = + xml_get_copy_export_value("verserange", "plain_last"); + edata.plain_verse_range_ref_first = + xml_get_copy_export_value("verserange", "plain_first"); + + if ((buf = + xml_get_copy_export_value("dialog", "plaintext"))) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_plain), + atoi(buf)); g_free(buf); } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_plain), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_plain), TRUE); } - - if ((buf = xml_get_copy_export_value("dialog", "verse_numbers"))) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_versenum), atoi(buf)); + + if ((buf = + xml_get_copy_export_value("dialog", + "verse_numbers"))) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_versenum), + atoi(buf)); g_free(buf); } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_versenum), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_versenum), + TRUE); } - - - if ((buf = xml_get_copy_export_value("dialog", "reference_last"))) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_reference_last), atoi(buf)); + + if ((buf = + xml_get_copy_export_value("dialog", + "reference_last"))) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_reference_last), + atoi(buf)); g_free(buf); } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_reference_last), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_reference_last), + TRUE); } - + if ((buf = xml_get_copy_export_value("dialog", "version"))) { edata.version = atoi(buf); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_version), edata.version); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_version), + edata.version); g_free(buf); - } else { + } else { edata.version = 0; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_version), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.cb_version), TRUE); } - + xml_free_export_doc(); - if(file) + if (file) g_free(file); } } @@ -478,20 +507,22 @@ gdouble max; char *ref; - gchar *glade_file = gui_general_user_file("export-dialog" UI_SUFFIX, FALSE); + gchar *glade_file = + gui_general_user_file("export-dialog" UI_SUFFIX, FALSE); g_return_if_fail(glade_file != NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - dist_license = _check_for_distribution_license(settings.MainWindowModule); + dist_license = + _check_for_distribution_license(settings.MainWindowModule); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); + gxml = gtk_builder_new(); gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "dialog_export_passage", NULL); #endif - + dialog = UI_GET_ITEM(gxml, "dialog_export_passage"); d.rb_book = UI_GET_ITEM(gxml, "radiobutton1"); @@ -512,34 +543,36 @@ d.cb_version = UI_GET_ITEM(gxml, "check_include_version"); /* set export-copy.xml */ - datafile = g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); - /* check for datafile */ - #ifdef HAVE_GTK_224 + datafile = + g_strdup_printf("%s/export-copy.xml", settings.gSwordDir); +/* check for datafile */ +#ifdef HAVE_GTK_224 if (g_access(datafile, F_OK) == -1) { - #else +#else if (g_access(datafile, 0) == -1) { - #endif +#endif xml_create_copy_export_file(datafile); } _load_data(datafile); - if(datafile) + if (datafile) g_free(datafile); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_copy), TRUE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_multi_verse), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d.rb_multi_verse), + TRUE); g_signal_connect(dialog, "response", - G_CALLBACK(on_dialog_export_passage_response), NULL); + G_CALLBACK(on_dialog_export_passage_response), + NULL); max = main_get_max_verses(settings.MainWindowModule); - gtk_spin_button_set_range(GTK_SPIN_BUTTON (d.sb_start_verse), - 1, max); - gtk_spin_button_set_range(GTK_SPIN_BUTTON (d.sb_end_verse), + gtk_spin_button_set_range(GTK_SPIN_BUTTON(d.sb_start_verse), 1, max); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(d.sb_end_verse), 1, max); curVerse = main_get_current_verse(settings.MainWindowModule); - gtk_spin_button_set_value(GTK_SPIN_BUTTON (d.sb_start_verse), + gtk_spin_button_set_value(GTK_SPIN_BUTTON(d.sb_start_verse), curVerse); - gtk_spin_button_set_value(GTK_SPIN_BUTTON (d.sb_end_verse), + gtk_spin_button_set_value(GTK_SPIN_BUTTON(d.sb_end_verse), curVerse); gtk_widget_set_sensitive(d.sb_start_verse, FALSE); gtk_widget_set_sensitive(d.sb_end_verse, FALSE); @@ -552,24 +585,22 @@ if (dist_license) { gtk_widget_show(d.warning_label); - gtk_widget_hide(d.rb_book); + gtk_widget_show(d.rb_book); /* formerly hide */ } else { gtk_widget_hide(d.warning_label); gtk_widget_show(d.rb_book); } - gtk_label_set_text (GTK_LABEL(d.lb_version), settings.MainWindowModule); + gtk_label_set_text(GTK_LABEL(d.lb_version), + settings.MainWindowModule); ref = (char *)main_getText(settings.currentverse); - gtk_label_set_text (GTK_LABEL(d.lb_key), ref); + gtk_label_set_text(GTK_LABEL(d.lb_key), ref); g_free(ref); - g_signal_connect ((gpointer) d.rb_multi_verse, "toggled", - G_CALLBACK (on_rb_multi_verse_toggled), - NULL); - g_signal_connect ((gpointer) d.cb_version, "toggled", - G_CALLBACK (on_cb_version_toggled), - NULL); - g_signal_connect ((gpointer) d.cb_reference_last, "toggled", - G_CALLBACK (on_reference_last_toggled), - NULL); + g_signal_connect((gpointer)d.rb_multi_verse, "toggled", + G_CALLBACK(on_rb_multi_verse_toggled), NULL); + g_signal_connect((gpointer)d.cb_version, "toggled", + G_CALLBACK(on_cb_version_toggled), NULL); + g_signal_connect((gpointer)d.cb_reference_last, "toggled", + G_CALLBACK(on_reference_last_toggled), NULL); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/find_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/find_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/find_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/find_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * find_dialog.c * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -33,7 +33,8 @@ typedef struct _find_dialog FIND_DIALOG; -struct _find_dialog { +struct _find_dialog +{ GtkWidget *dialog; GtkWidget *htmlwidget; GtkWidget *entry; @@ -48,7 +49,6 @@ static FIND_DIALOG *dialog; - /****************************************************************************** * Name * dialog_destroy @@ -65,14 +65,13 @@ * void */ -static void dialog_destroy(GObject * object, gpointer data) +static void dialog_destroy(GObject *object, gpointer data) { g_free(dialog); dialog = NULL; XI_print(("\nall done\n")); } - /****************************************************************************** * Name * find_clicked @@ -89,15 +88,14 @@ * void */ -static void find_clicked(GtkButton * button, FIND_DIALOG * d) +static void find_clicked(GtkButton *button, FIND_DIALOG *d) { - gchar *text = (gchar*)gtk_entry_get_text(GTK_ENTRY(d->entry)); + gchar *text = (gchar *)gtk_entry_get_text(GTK_ENTRY(d->entry)); sprintf(settings.findText, "%s", text); XIPHOS_HTML_FIND((void *)d->htmlwidget, text); } - /****************************************************************************** * Name * next_clicked @@ -114,13 +112,12 @@ * void */ -static void next_clicked(GtkButton * button, FIND_DIALOG * d) +static void next_clicked(GtkButton *button, FIND_DIALOG *d) { XIPHOS_HTML_FIND_AGAIN((void *)d->htmlwidget, 1); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(d->backward), 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d->backward), 0); } - /****************************************************************************** * Name * close_clicked @@ -137,12 +134,11 @@ * void */ -static void close_clicked(GtkButton * button, FIND_DIALOG * d) +static void close_clicked(GtkButton *button, FIND_DIALOG *d) { gtk_widget_destroy(d->dialog); } - /****************************************************************************** * Name * create_find_dialog @@ -159,7 +155,7 @@ * void */ -static void create_find_dialog(GtkWidget * htmlwidget) +static void create_find_dialog(GtkWidget *htmlwidget) { GtkWidget *dialog_vbox29; GtkWidget *vbox45; @@ -177,32 +173,31 @@ //sprintf(title, "%s - %s", settings.program_title, _("Find")); - dialog = g_new(FIND_DIALOG, 1); /* must be freed */ + dialog = g_new(FIND_DIALOG, 1); /* must be freed */ dialog->regular = FALSE; dialog->htmlwidget = htmlwidget; - dialog->dialog = gtk_dialog_new(); g_object_set_data(G_OBJECT(dialog->dialog), "dialog->dialog", dialog->dialog); gtk_window_set_title(GTK_WINDOW(dialog->dialog), _("Find")); //GTK_WINDOW(dialog->dialog)->type = GTK_WINDOW_TOPLEVEL; /*gtk_window_set_policy(GTK_WINDOW(dialog->dialog), TRUE, TRUE, - FALSE);*/ - gtk_container_set_border_width (GTK_CONTAINER (dialog->dialog), 6); - gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE); + FALSE); */ + gtk_container_set_border_width(GTK_CONTAINER(dialog->dialog), 6); + gtk_window_set_resizable(GTK_WINDOW(dialog->dialog), FALSE); #ifndef USE_GTK_3 - gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE); + gtk_dialog_set_has_separator(GTK_DIALOG(dialog->dialog), FALSE); #endif - dialog_vbox29 = gtk_dialog_get_content_area (GTK_DIALOG(dialog->dialog)); + dialog_vbox29 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog->dialog)); g_object_set_data(G_OBJECT(dialog->dialog), "dialog_vbox29", dialog_vbox29); gtk_widget_show(dialog_vbox29); UI_VBOX(vbox45, FALSE, 12); gtk_widget_show(vbox45); - gtk_box_pack_start(GTK_BOX(dialog_vbox29), vbox45, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(dialog_vbox29), vbox45, TRUE, TRUE, 0); label180 = gtk_label_new(_("Enter Word or Phrase")); gtk_widget_show(label180); @@ -223,40 +218,42 @@ gtk_widget_show(dialog->backward); gtk_box_pack_start(GTK_BOX(hbox66), dialog->backward, FALSE, FALSE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (dialog->backward), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->backward), FALSE); - dialog_action_area29 = gtk_dialog_get_action_area (GTK_DIALOG(dialog->dialog)); + dialog_action_area29 = +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog->dialog)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog->dialog)); +#endif g_object_set_data(G_OBJECT(dialog->dialog), - "dialog_action_area29", - dialog_action_area29); + "dialog_action_area29", dialog_action_area29); gtk_widget_show(dialog_action_area29); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area29), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area29), 10); #ifdef USE_GTK_3 - hbuttonbox8 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox8 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else - hbuttonbox8 = gtk_hbutton_box_new(); + hbuttonbox8 = gtk_hbutton_box_new(); #endif gtk_widget_show(hbuttonbox8); gtk_box_pack_start(GTK_BOX(dialog_action_area29), hbuttonbox8, TRUE, TRUE, 0); - dialog->find = + dialog->find = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON); -#else - gtk_button_new_from_stock(GTK_STOCK_FIND); //gtk_button_new_with_label(_("Find")); -#endif + gtk_button_new_from_icon_name("edit-find", + GTK_ICON_SIZE_BUTTON); +#else + gtk_button_new_from_stock(GTK_STOCK_FIND); //gtk_button_new_with_label(_("Find")); +#endif gtk_widget_show(dialog->find); gtk_container_add(GTK_CONTAINER(hbuttonbox8), dialog->find); dialog->next = gtk_button_new(); gtk_widget_show(dialog->next); gtk_container_add(GTK_CONTAINER(hbuttonbox8), dialog->next); - //GTK_WIDGET_SET_FLAGS(dialog->next, GTK_CAN_DEFAULT); +//GTK_WIDGET_SET_FLAGS(dialog->next, GTK_CAN_DEFAULT); #ifndef HAVE_GTK_310 alignment = gtk_alignment_new(0.5, 0.5, 0, 0); @@ -272,11 +269,11 @@ image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON); -#else + gtk_image_new_from_icon_name("edit-find", + GTK_ICON_SIZE_BUTTON); +#else gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON); -#endif +#endif gtk_widget_show(image); gtk_box_pack_start(GTK_BOX(hbox5), image, FALSE, FALSE, 0); @@ -285,32 +282,28 @@ gtk_box_pack_start(GTK_BOX(hbox5), label12, FALSE, FALSE, 0); gtk_label_set_justify(GTK_LABEL(label12), GTK_JUSTIFY_LEFT); - dialog->close = + dialog->close = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("window-close", - GTK_ICON_SIZE_BUTTON ); -#else - gtk_button_new_from_stock(GTK_STOCK_CLOSE); //gtk_button_new_with_label(_("Close")); -#endif + // Don't use an icon with GTK3 + gtk_button_new_with_label(_("Close")); +#else + gtk_button_new_from_stock(GTK_STOCK_CLOSE); +#endif gtk_widget_show(dialog->close); gtk_container_add(GTK_CONTAINER(hbuttonbox8), dialog->close); //GTK_WIDGET_SET_FLAGS(dialog->close, GTK_CAN_DEFAULT); - gtk_widget_set_can_default (dialog->find, 1); - - - + gtk_widget_set_can_default(dialog->find, 1); g_signal_connect(G_OBJECT(dialog->dialog), "destroy", - G_CALLBACK(dialog_destroy), dialog); + G_CALLBACK(dialog_destroy), dialog); g_signal_connect(G_OBJECT(dialog->find), "clicked", - G_CALLBACK(find_clicked), dialog); + G_CALLBACK(find_clicked), dialog); g_signal_connect(G_OBJECT(dialog->next), "clicked", - G_CALLBACK(next_clicked), dialog); + G_CALLBACK(next_clicked), dialog); g_signal_connect(G_OBJECT(dialog->close), "clicked", - G_CALLBACK(close_clicked), dialog); + G_CALLBACK(close_clicked), dialog); } - /****************************************************************************** * Name * find_dialog @@ -327,13 +320,13 @@ * void */ -static void find_dialog(GtkWidget * htmlwidget, const gchar * title) +static void find_dialog(GtkWidget *htmlwidget, const gchar *title) { if (dialog) { //gtk_window_set_title(GTK_WINDOW(dialog->dialog), title); dialog->htmlwidget = htmlwidget; gtk_widget_show(GTK_WIDGET(dialog->dialog)); - gdk_window_raise(gtk_widget_get_window (GTK_WIDGET(dialog->dialog))); + gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(dialog->dialog))); } else { create_find_dialog(htmlwidget); //gtk_window_set_title(GTK_WINDOW(dialog->dialog), title); @@ -341,7 +334,6 @@ } } - /****************************************************************************** * Name * gui_find_dlg @@ -359,8 +351,8 @@ * void */ -void gui_find_dlg(GtkWidget * htmlwidget, gchar * mod_name, - gboolean regular, gchar * text) +void gui_find_dlg(GtkWidget *htmlwidget, gchar *mod_name, + gboolean regular, gchar *text) { gchar buf[256]; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/font_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/font_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/font_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/font_dialog.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * font_dialog.c - dialog to set module font * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -43,7 +43,7 @@ static GtkWidget *button_ok; static gboolean new_font_set = FALSE; static const char *new_gdk_font; -static MOD_FONT * mf; +static MOD_FONT *mf; /****************************************************************************** * Name @@ -61,7 +61,7 @@ * void */ -static gchar *get_html_font_name(gchar * fontname) +static gchar *get_html_font_name(gchar *fontname) { gchar buf[80]; gint len, i = 0; @@ -94,15 +94,17 @@ * void */ -static void ok_clicked(GtkButton * button, gpointer data) +static void ok_clicked(GtkButton *button, gpointer data) { static gchar *file = NULL; gchar *new_font = NULL; gchar *font_name = NULL; - XI_message(("ok_clicked: %s", (new_gdk_font ? new_gdk_font : "-none-"))); + XI_message(("ok_clicked: %s", + (new_gdk_font ? new_gdk_font : "-none-"))); if (file == NULL) - file = g_strdup_printf("%s/fonts.conf", settings.gSwordDir); + file = + g_strdup_printf("%s/fonts.conf", settings.gSwordDir); if (!mf->no_font) { if (new_font_set) { @@ -119,15 +121,17 @@ new_gdk_font = "none"; } - mf->new_font_size = gtk_entry_get_text(GTK_ENTRY(combo_entry_size)); + mf->new_font_size = + gtk_entry_get_text(GTK_ENTRY(combo_entry_size)); save_conf_file_item(file, mf->mod_name, "Font", mf->new_font); - save_conf_file_item(file, mf->mod_name, "Fontsize", mf->new_font_size); + save_conf_file_item(file, mf->mod_name, "Fontsize", + mf->new_font_size); //evidently new_gdk_font is never set on Windows - XI_message (("\nFont: %s\nFontsize: %s\n", - (mf->new_font ? mf->new_font : "-none-"), - (mf->new_font_size ? mf->new_font_size : "-none-"))); + XI_message(("\nFont: %s\nFontsize: %s\n", + (mf->new_font ? mf->new_font : "-none-"), + (mf->new_font_size ? mf->new_font_size : "-none-"))); gtk_widget_destroy(dlg); if (font_name) @@ -136,7 +140,6 @@ g_free(new_font); } - /****************************************************************************** * Name * cancel_clicked @@ -153,12 +156,11 @@ * void */ -static void cancel_clicked(GtkButton * button, gpointer data) +static void cancel_clicked(GtkButton *button, gpointer data) { gtk_widget_destroy(dlg); } - /****************************************************************************** * Name * dialog_de"gui/stroy @@ -175,16 +177,14 @@ * void */ -static void dialog_destroy(GObject * object, gpointer data) +static void dialog_destroy(GObject *object, gpointer data) { free_font(mf); mf = NULL; new_font_set = 0; gtk_main_quit(); - } - /****************************************************************************** * Name * font_set @@ -205,18 +205,15 @@ * void */ -static void font_set(GtkFontButton * button, - gchar * arg1, gpointer data) +static void font_set(GtkFontButton *button, gchar *arg1, gpointer data) { - new_gdk_font = gtk_font_button_get_font_name (button); - XI_message (("%s", new_gdk_font)); + new_gdk_font = gtk_font_button_get_font_name(button); + XI_message(("%s", new_gdk_font)); new_font_set = 1; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON - (checkbutton_no_font), FALSE); - gtk_widget_set_sensitive (button_ok, TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton_no_font), FALSE); + gtk_widget_set_sensitive(button_ok, TRUE); } - /****************************************************************************** * Name * no_font_toggled @@ -234,14 +231,12 @@ * void */ -static void no_font_toggled(GtkToggleButton * togglebutton, - gpointer data) +static void no_font_toggled(GtkToggleButton *togglebutton, gpointer data) { - mf->no_font = gtk_toggle_button_get_active (togglebutton); + mf->no_font = gtk_toggle_button_get_active(togglebutton); gtk_widget_set_sensitive(button_ok, TRUE); } - /****************************************************************************** * Name * size_changed @@ -258,12 +253,11 @@ * void */ -static void size_changed(GtkEditable * editable, gpointer user_data) +static void size_changed(GtkEditable *editable, gpointer user_data) { gtk_widget_set_sensitive(button_ok, TRUE); } - /****************************************************************************** * Name * create_dialog_mod_font @@ -297,23 +291,22 @@ dialog_mod_font = gtk_dialog_new(); g_object_set_data(G_OBJECT(dialog_mod_font), - "dialog_mod_font", dialog_mod_font); + "dialog_mod_font", dialog_mod_font); gtk_window_set_title(GTK_WINDOW(dialog_mod_font), _("Set Module Font")); - //GTK_WINDOW(dialog_mod_font)->type = GTK_WINDOW_TOPLEVEL; //FIXME: - gtk_window_set_default_size(GTK_WINDOW(dialog_mod_font), 301, - 164); + //GTK_WINDOW(dialog_mod_font)->type = GTK_WINDOW_TOPLEVEL; //FIXME: + gtk_window_set_default_size(GTK_WINDOW(dialog_mod_font), 301, 164); gtk_window_set_resizable(GTK_WINDOW(dialog_mod_font), TRUE); - dialog_vbox21 = gtk_dialog_get_content_area (GTK_DIALOG(dialog_mod_font)); - g_object_set_data(G_OBJECT(dialog_mod_font), - "dialog_vbox21", dialog_vbox21); + dialog_vbox21 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_mod_font)); + g_object_set_data(G_OBJECT(dialog_mod_font), "dialog_vbox21", + dialog_vbox21); gtk_widget_show(dialog_vbox21); UI_VBOX(vbox56, FALSE, 0); gtk_widget_show(vbox56); - gtk_box_pack_start(GTK_BOX(dialog_vbox21), vbox56, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(dialog_vbox21), vbox56, TRUE, TRUE, 0); UI_HBOX(hbox67, FALSE, 0); gtk_widget_show(hbox67); @@ -321,13 +314,12 @@ pixmap6 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("gtk-select-font", - GTK_ICON_SIZE_DND); -#else - + gtk_image_new_from_icon_name("gtk-select-font", + GTK_ICON_SIZE_DND); +#else gtk_image_new_from_stock(GTK_STOCK_SELECT_FONT, GTK_ICON_SIZE_DND); -#endif +#endif gtk_widget_show(pixmap6); gtk_box_pack_start(GTK_BOX(hbox67), pixmap6, TRUE, TRUE, 0); @@ -348,71 +340,80 @@ gtk_box_pack_start(GTK_BOX(vbox57), label_current_font, FALSE, FALSE, 0); - UI_HBOX(hbox_picker, FALSE, 6); gtk_widget_show(hbox_picker); - gtk_box_pack_start(GTK_BOX(vbox56), hbox_picker, FALSE, FALSE, - 0); + gtk_box_pack_start(GTK_BOX(vbox56), hbox_picker, FALSE, FALSE, 0); - font_button = gtk_font_button_new (); + font_button = gtk_font_button_new(); gtk_widget_show(font_button); gtk_box_pack_start(GTK_BOX(hbox_picker), font_button, FALSE, FALSE, 0); gtk_widget_set_size_request(font_button, 240, -1); - gtk_font_button_set_show_size ((GtkFontButton *)font_button, FALSE); + gtk_font_button_set_show_size((GtkFontButton *)font_button, + FALSE); #ifdef USE_GTK_3 - combo_size = gtk_combo_box_text_new_with_entry (); + combo_size = gtk_combo_box_text_new_with_entry(); gtk_widget_show(combo_size); gtk_box_pack_start(GTK_BOX(hbox_picker), combo_size, TRUE, TRUE, 0); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_size), "+5"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "+4"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "+3"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "+2"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "+1"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "+0"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "-1"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "-2"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (combo_size), "-3"); - combo_entry_size = gtk_bin_get_child (GTK_BIN (combo_size)); - gtk_entry_set_text(GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_size))), _("+0")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+5"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+4"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+3"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+2"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+1"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "+0"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "-1"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "-2"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_size), + "-3"); + combo_entry_size = gtk_bin_get_child(GTK_BIN(combo_size)); + gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_size))), + _("+0")); #else - combo_size = gtk_combo_box_entry_new_text (); + combo_size = gtk_combo_box_entry_new_text(); gtk_widget_show(combo_size); gtk_box_pack_start(GTK_BOX(hbox_picker), combo_size, TRUE, TRUE, 0); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+5"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+4"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+3"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+2"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+1"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "+0"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "-1"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "-2"); - gtk_combo_box_append_text(GTK_COMBO_BOX (combo_size), "-3"); - combo_entry_size = (GTK_WIDGET (GTK_BIN (combo_size) -> child)); - gtk_entry_set_text(GTK_ENTRY (GTK_BIN (combo_size) -> child), _("+0")); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+5"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+4"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+3"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+2"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+1"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "+0"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "-1"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "-2"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_size), "-3"); + combo_entry_size = (GTK_WIDGET(GTK_BIN(combo_size)->child)); + gtk_entry_set_text(GTK_ENTRY(GTK_BIN(combo_size)->child), _("+0")); #endif checkbutton_no_font = - gtk_check_button_new_with_label(_ - ("Use the default font for this module")); + gtk_check_button_new_with_label(_("Use the default font for this module")); gtk_widget_show(checkbutton_no_font); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (checkbutton_no_font), - mf->no_font); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton_no_font), mf->no_font); gtk_box_pack_start(GTK_BOX(vbox56), checkbutton_no_font, FALSE, FALSE, 0); - dialog_action_area21 = gtk_dialog_get_action_area (GTK_DIALOG(dialog_mod_font)); + dialog_action_area21 = +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_mod_font)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_mod_font)); +#endif g_object_set_data(G_OBJECT(dialog_mod_font), - "dialog_action_area21", - dialog_action_area21); + "dialog_action_area21", dialog_action_area21); gtk_widget_show(dialog_action_area21); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area21), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area21), 10); #ifdef USE_GTK_3 - hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox1 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else hbuttonbox1 = gtk_hbutton_box_new(); #endif @@ -422,25 +423,25 @@ gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_EDGE); - button_cancel = + button_cancel = #ifdef HAVE_GTK_310 - gtk_button_new_with_label ("Cancel"); -#else - gtk_button_new_from_stock(GTK_STOCK_CANCEL); -#endif + gtk_button_new_with_label("Cancel"); +#else + gtk_button_new_from_stock(GTK_STOCK_CANCEL); +#endif gtk_widget_show(button_cancel); gtk_container_add(GTK_CONTAINER(hbuttonbox1), button_cancel); - gtk_widget_set_can_default (button_cancel, 1); - button_ok = + gtk_widget_set_can_default(button_cancel, 1); + button_ok = #ifdef HAVE_GTK_310 - gtk_button_new_with_label ("OK"); -#else - gtk_button_new_from_stock(GTK_STOCK_OK); -#endif - + gtk_button_new_with_label("OK"); +#else + gtk_button_new_from_stock(GTK_STOCK_OK); +#endif + gtk_widget_show(button_ok); gtk_container_add(GTK_CONTAINER(hbuttonbox1), button_ok); - gtk_widget_set_can_default (button_ok, 1); + gtk_widget_set_can_default(button_ok, 1); g_signal_connect(G_OBJECT(dialog_mod_font), "destroy", G_CALLBACK(dialog_destroy), mf); @@ -456,10 +457,8 @@ G_CALLBACK(size_changed), NULL); return dialog_mod_font; - } - /****************************************************************************** * Name * gui_set_module_font @@ -476,24 +475,23 @@ * void */ -void gui_set_module_font(gchar * mod_name) +void gui_set_module_font(gchar *mod_name) { - gchar *str; - mf = get_font(mod_name); if (!strncmp(mf->old_font, "none", 4)) mf->no_font = 1; - dlg = create_dialog_mod_font (); + dlg = create_dialog_mod_font(); gtk_widget_show(dlg); gtk_label_set_text(GTK_LABEL(label_mod), mf->mod_name); gtk_label_set_text(GTK_LABEL(label_current_font), mf->old_font); if (mf->old_font) { - str = g_strdup_printf("%s, 12", mf->old_font); - gtk_font_button_set_font_name ((GtkFontButton *)font_button, - str); + gchar *str = g_strdup_printf("%s, 12", mf->old_font); + gtk_font_button_set_font_name((GtkFontButton *) + font_button, + str); g_free(str); } if (mf->old_font_size) { diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/gbs.c xiphos-4.0.4+dfsg1/src/gnome2/gbs.c --- xiphos-4.0.0+dfsg1/src/gnome2/gbs.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/gbs.c 2015-02-21 02:22:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs.c - generic book support - the gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -60,7 +60,6 @@ //static void create_menu(GdkEventButton * event); - /****************************************************************************** * Name * gui_set_gbs_frame_label @@ -82,10 +81,12 @@ /* * set label to module name */ - gtk_label_set_text (GTK_LABEL(widgets.label_comm),mod_name); + gtk_label_set_text(GTK_LABEL(widgets.label_comm), mod_name); } #endif /* 0 */ +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_set_book_page_and_key @@ -102,12 +103,14 @@ * void */ -void gui_set_book_mod_and_key(gchar * mod_name, gchar * key) +void gui_set_book_mod_and_key(gchar *mod_name, gchar *key) { main_display_book(mod_name, key); } +#endif - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * @@ -124,20 +127,18 @@ * void */ -void gui_update_gbs_global_ops(gchar * option, gboolean choice) +void gui_update_gbs_global_ops(gchar *option, gboolean choice) { /*save_module_options(cur_t->mod_name, option, - choice);*/ + choice); */ //gbs_display(cur_g, tree_level); } - +#endif static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { - gui_menu_popup (html, settings.book_mod, NULL); + gui_menu_popup(html, settings.book_mod, NULL); } /****************************************************************************** @@ -170,20 +171,19 @@ scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(box), scrolledwindow, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - widgets.html_book = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, BOOK_TYPE)); + widgets.html_book = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, BOOK_TYPE)); gtk_widget_show(widgets.html_book); gtk_container_add(GTK_CONTAINER(scrolledwindow), - widgets.html_book); + widgets.html_book); g_signal_connect((gpointer)widgets.html_book, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), NULL); return box; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/gbs_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/gbs_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/gbs_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/gbs_dialog.c 2015-02-21 02:22:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs_dialog.c - dialog for displaying a gbs module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,8 +59,6 @@ static GtkTreeModel *model; //static gint tree_level; - - /****************************************************************************** * Name * dialog_destroy @@ -77,15 +75,13 @@ * void */ -static void dialog_destroy(GObject *object, - DIALOG_DATA *dlg) +static void dialog_destroy(GObject *object, DIALOG_DATA *dlg) { if (!dialog_freed) main_free_on_destroy(dlg); dialog_freed = FALSE; } - /****************************************************************************** * Name * dialog_url @@ -169,7 +165,7 @@ */ static void tree_selection_changed(GtkTreeSelection *selection, - DIALOG_DATA *g) + DIALOG_DATA *g) { GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g->tree)); @@ -177,72 +173,61 @@ main_dialogs_tree_selection_changed(model, selection, TRUE, g); } -static GtkTreeModel *create_model (void) +static GtkTreeModel *create_model(void) { GtkTreeStore *model; /* create tree store */ - model = gtk_tree_store_new (N_COLUMNS, - GDK_TYPE_PIXBUF, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); + model = gtk_tree_store_new(N_COLUMNS, + GDK_TYPE_PIXBUF, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); return GTK_TREE_MODEL(model); } static void add_columns(GtkTreeView *tree) { GtkTreeViewColumn *column; -// GtkTreeViewColumn *column2; + // GtkTreeViewColumn *column2; GtkCellRenderer *renderer; - column = gtk_tree_view_column_new (); - - renderer = GTK_CELL_RENDERER (gtk_cell_renderer_pixbuf_new ()); - gtk_tree_view_column_pack_start (column, renderer, FALSE); - gtk_tree_view_column_set_attributes - (column, renderer, - "pixbuf", COL_OPEN_PIXBUF, - "pixbuf-expander-open", COL_OPEN_PIXBUF, - "pixbuf-expander-closed", COL_CLOSED_PIXBUF, - NULL); - + column = gtk_tree_view_column_new(); - - renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ()); - gtk_tree_view_column_pack_start (column, renderer, TRUE); - gtk_tree_view_column_set_attributes (column, renderer, - "text", COL_TITLE, - NULL); - gtk_tree_view_append_column (tree, column); - - - column = gtk_tree_view_column_new (); - renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ()); - gtk_tree_view_column_pack_start (column, renderer, TRUE); - gtk_tree_view_column_set_attributes (column, renderer, - "text", COL_BOOK, - NULL); - gtk_tree_view_append_column (tree, column); - gtk_tree_view_column_set_visible(column,FALSE); - - column = gtk_tree_view_column_new (); - renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ()); - gtk_tree_view_column_pack_start (column, renderer, TRUE); - gtk_tree_view_column_set_attributes (column, renderer, - "text", COL_OFFSET, - NULL); - gtk_tree_view_append_column (tree, column); - gtk_tree_view_column_set_visible(column,FALSE); + renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); + gtk_tree_view_column_pack_start(column, renderer, FALSE); + gtk_tree_view_column_set_attributes(column, renderer, + "pixbuf", COL_OPEN_PIXBUF, + "pixbuf-expander-open", COL_OPEN_PIXBUF, + "pixbuf-expander-closed", COL_CLOSED_PIXBUF, NULL); + + renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, + "text", COL_TITLE, NULL); + gtk_tree_view_append_column(tree, column); + + column = gtk_tree_view_column_new(); + renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, + "text", COL_BOOK, NULL); + gtk_tree_view_append_column(tree, column); + gtk_tree_view_column_set_visible(column, FALSE); + + column = gtk_tree_view_column_new(); + renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, + "text", COL_OFFSET, NULL); + gtk_tree_view_append_column(tree, column); + gtk_tree_view_column_set_visible(column, FALSE); } static void -_popupmenu_requested_cb (XiphosHtml *html, - gchar *uri, - DIALOG_DATA *d) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, DIALOG_DATA *d) { - gui_menu_popup (html, cur_dlg->mod_name, cur_dlg); + gui_menu_popup(html, cur_dlg->mod_name, cur_dlg); } /****************************************************************************** @@ -287,29 +272,26 @@ hpaned = UI_HPANE(); gtk_widget_show(hpaned); - gtk_box_pack_start(GTK_BOX(vbox_dialog), hpaned, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(vbox_dialog), hpaned, TRUE, TRUE, 0); //gtk_container_add(GTK_CONTAINER(frame_gbs), hpaned); //gtk_paned_set_position(GTK_PANED(hpaned), 190); scrolledwindow_ctree = gtk_scrolled_window_new(NULL, NULL); //gtk_widget_show(scrolledwindow_ctree); gtk_paned_pack1(GTK_PANED(hpaned), scrolledwindow_ctree, FALSE, - TRUE); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow_ctree), + TRUE); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_ctree), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow_ctree, - settings.shadow_type); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow_ctree, + settings.shadow_type); model = create_model(); dlg->tree = gtk_tree_view_new_with_model(model); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(dlg->tree), - FALSE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(dlg->tree), FALSE); gtk_widget_show(dlg->tree); - gtk_container_add(GTK_CONTAINER(scrolledwindow_ctree), - dlg->tree); + gtk_container_add(GTK_CONTAINER(scrolledwindow_ctree), dlg->tree); add_columns(GTK_TREE_VIEW(dlg->tree)); selection = @@ -317,37 +299,39 @@ scrolledwindow_html = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow_html); - gtk_paned_pack2(GTK_PANED(hpaned), scrolledwindow_html, FALSE, TRUE); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow_html), + gtk_paned_pack2(GTK_PANED(hpaned), scrolledwindow_html, FALSE, + TRUE); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_html), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow_html, - settings.shadow_type); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow_html, + settings.shadow_type); - dlg->html = GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA*) dlg),TRUE,DIALOG_BOOK_TYPE)); + dlg->html = + GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA *)dlg), TRUE, DIALOG_BOOK_TYPE)); gtk_container_add(GTK_CONTAINER(scrolledwindow_html), dlg->html); gtk_widget_show(dlg->html); g_signal_connect((gpointer)dlg->html, - "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - (DIALOG_DATA*)dlg); + "popupmenu_requested", + G_CALLBACK(_popupmenu_requested_cb), + (DIALOG_DATA *)dlg); g_signal_connect(selection, "changed", G_CALLBACK(tree_selection_changed), - (DIALOG_DATA *) dlg); + (DIALOG_DATA *)dlg); dlg->statusbar = gtk_statusbar_new(); gtk_widget_show(dlg->statusbar); gtk_box_pack_start(GTK_BOX(vbox_dialog), dlg->statusbar, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(dlg->dialog), "destroy", - G_CALLBACK(dialog_destroy), - (DIALOG_DATA *) dlg); - cur_dlg = dlg; + G_CALLBACK(dialog_destroy), (DIALOG_DATA *)dlg); + cur_dlg = dlg; } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_close_gbs_dialog @@ -364,12 +348,13 @@ * void */ -void gui_close_gbs_dialog(DIALOG_DATA * dlg) +void gui_close_gbs_dialog(DIALOG_DATA *dlg) { if (dlg->dialog) { dialog_freed = FALSE; gtk_widget_destroy(dlg->dialog); } } +#endif //****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/gui.c xiphos-4.0.4+dfsg1/src/gnome2/gui.c --- xiphos-4.0.0+dfsg1/src/gnome2/gui.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/gui.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gui.c - The heart of the gui. * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -39,32 +39,34 @@ #ifdef HAVE_DBUS #include "gui/ipc.h" -static IpcObject* ipc; +static IpcObject *ipc; #endif void gui_init(int argc, char *argv[]) { static int gui_init_done = FALSE; - if (gui_init_done) return; + if (gui_init_done) + return; gui_init_done = TRUE; #ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); #endif #ifdef WIN32 - gchar *locale_dir = g_win32_get_package_installation_directory_of_module(NULL); + gchar *locale_dir = + g_win32_get_package_installation_directory_of_module(NULL); locale_dir = g_strconcat(locale_dir, "\0", NULL); - locale_dir = g_build_filename (locale_dir, "share", "locale", NULL); + locale_dir = g_build_filename(locale_dir, "share", "locale", NULL); bindtextdomain(GETTEXT_PACKAGE, locale_dir); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - g_free (locale_dir); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); + g_free(locale_dir); #endif if (!gtk_init_with_args(&argc, &argv, NULL, NULL, NULL, NULL)) { - exit(1); + exit(1); }; #ifndef WIN32 gconf_setup(); @@ -79,7 +81,6 @@ gtk_main(); } - /****************************************************************************** * Name * gconf_setup @@ -102,23 +103,21 @@ /* we don't ask any more, because there's no good reason not to take over. */ char *gconf_keys[GS_GCONF_MAX][2] = { - { "/desktop/gnome/url-handlers/bible/command", "xiphos-nav \"%s\"" }, - { "/desktop/gnome/url-handlers/bible/enabled", (char *) 1 }, - { "/desktop/gnome/url-handlers/bible/needs_terminal", (char *) 0 }, - { "/desktop/gnome/url-handlers/sword/command", "xiphos-nav \"%s\"" }, - { "/desktop/gnome/url-handlers/sword/enabled", (char *) 1 }, - { "/desktop/gnome/url-handlers/sword/needs_terminal", (char *) 0 } -}; + {"/desktop/gnome/url-handlers/bible/command", "xiphos-nav \"%s\""}, + {"/desktop/gnome/url-handlers/bible/enabled", (char *)1}, + {"/desktop/gnome/url-handlers/bible/needs_terminal", (char *)0}, + {"/desktop/gnome/url-handlers/sword/command", "xiphos-nav \"%s\""}, + {"/desktop/gnome/url-handlers/sword/enabled", (char *)1}, + {"/desktop/gnome/url-handlers/sword/needs_terminal", (char *)0}}; #ifndef WIN32 void gconf_setup() { - int i; gchar *str; - GConfClient* client = gconf_client_get_default(); + GConfClient *client = gconf_client_get_default(); if (client == NULL) - return; /* we're not running under GConf */ + return; /* we're not running under GConf */ /* * This is deliberately somewhat simple-minded, at least for now. @@ -128,24 +127,18 @@ * We must fix broken keys. */ if ((((str = gconf_client_get_string(client, gconf_keys[0][0], - NULL)) == NULL) || - (strncmp(str, "xiphos ", 7) == 0)) - ) { + NULL)) == NULL) || + (strncmp(str, "xiphos ", 7) == 0))) { /* * Mechanical as can be, one after another. */ + int i; for (i = 0; i < GS_GCONF_MAX; ++i) { - (((i % 3) == 0) /* contrived hack */ - ? gconf_client_set_string - (client, - gconf_keys[i][0], - gconf_keys[i][1], - NULL) - : gconf_client_set_bool - (client, - gconf_keys[i][0], - (gconf_keys[i][1] ? TRUE : FALSE), - NULL)); + (((i % 3) == 0) /* contrived hack */ + ? gconf_client_set_string(client, gconf_keys[i][0], gconf_keys[i][1], NULL) + : gconf_client_set_bool(client, + gconf_keys[i][0], + (gconf_keys[i][1] ? TRUE : FALSE), NULL)); } } } @@ -166,26 +159,20 @@ /* GIVE US THE CRASHES, PLEASE! MYSTERY BUGS ARE EVIL! glibc.helpfulness-- */ -gchar* -XI_g_strdup_printf(const char *filename, - int linenumber, - const gchar *format, - ...) +gchar *XI_g_strdup_printf(const char *filename, + int linenumber, const gchar *format, ...) { - gchar *buffer, *next, *s; + gchar *buffer, *s; va_list args; va_start(args, format); - for (s = strchr(format, '%'); s; s = strchr(++s, '%')) - { - next = va_arg(args, gchar*); - if ((next == (gchar*) NULL) && (*(s+1) == 's')) - { - gchar *msg = g_strdup_printf - ("%s\n%s\n\n%s:%d \"%s\"", - _("BUG! Xiphos is about to crash due to a \"STRDUP\" error."), - _("Please report this error to the Xiphos team with:"), - filename, linenumber, format); + for (s = strchr(format, '%'); s; s = strchr(++s, '%')) { + gchar *next = va_arg(args, gchar *); + if ((next == (gchar *)NULL) && (*(s + 1) == 's')) { + gchar *msg = g_strdup_printf("%s\n%s\n\n%s:%d \"%s\"", + _("BUG! Xiphos is about to crash due to a \"STRDUP\" error."), + _("Please report this error to the Xiphos team with:"), + filename, linenumber, format); gui_generic_warning_modal(msg); g_free(msg); abort(); @@ -194,33 +181,28 @@ va_end(args); /* real g_strdup_printf content */ - va_start (args, format); - buffer = g_strdup_vprintf (format, args); - va_end (args); + va_start(args, format); + buffer = g_strdup_vprintf(format, args); + va_end(args); return buffer; } void XI_g_string_printf(const char *filename, int linenumber, - GString *string, - const gchar *format, - ...) + GString *string, const gchar *format, ...) { - gchar *next, *s; + gchar *s; va_list args; va_start(args, format); - for (s = strchr(format, '%'); s; s = strchr(++s, '%')) - { - next = va_arg(args, gchar*); - if ((next == (gchar*) NULL) && (*(s+1) == 's')) - { - gchar *msg = g_strdup_printf - ("%s\n%s\n\n%s:%d \"%s\"", - _("BUG! Xiphos is about to crash due to a \"STRING\" error."), - _("Please report this error to the Xiphos team with:"), - filename, linenumber, format); + for (s = strchr(format, '%'); s; s = strchr(++s, '%')) { + gchar *next = va_arg(args, gchar *); + if ((next == (gchar *)NULL) && (*(s + 1) == 's')) { + gchar *msg = g_strdup_printf("%s\n%s\n\n%s:%d \"%s\"", + _("BUG! Xiphos is about to crash due to a \"STRING\" error."), + _("Please report this error to the Xiphos team with:"), + filename, linenumber, format); gui_generic_warning_modal(msg); g_free(msg); abort(); @@ -229,10 +211,10 @@ va_end(args); /* real g_string_printf content */ - g_string_truncate (string, 0); - va_start (args, format); - g_string_append_vprintf (string, format, args); - va_end (args); + g_string_truncate(string, 0); + va_start(args, format); + g_string_append_vprintf(string, format, args); + va_end(args); } #endif /* DEBUG */ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/ipc.c xiphos-4.0.4+dfsg1/src/gnome2/ipc.c --- xiphos-4.0.0+dfsg1/src/gnome2/ipc.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/ipc.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * ipc.c - Interprocess Communication - dbus integration * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -38,29 +38,30 @@ G_DEFINE_TYPE(IpcObject, ipc_object, G_TYPE_OBJECT) - -gboolean ipc_object_set_current_reference(IpcObject* obj, - gchar* reference, - GError** error); -gboolean ipc_object_get_current_reference(IpcObject* obj, - gchar** reference, - GError** error); -gboolean ipc_object_get_next_search_reference(IpcObject* obj, - gchar** reference, - GError** error); +gboolean ipc_object_set_current_reference(IpcObject *obj, + gchar *reference, + GError **error); +gboolean ipc_object_get_current_reference(IpcObject *obj, + gchar **reference, + GError **error); +gboolean ipc_object_get_next_search_reference(IpcObject *obj, + gchar **reference, + GError **error); #include "ipc-interface.h" #include "main/url.hh" static IpcObject *main_ipc_obj; -static void ipc_object_init(IpcObject* obj) { +static void ipc_object_init(IpcObject *obj) +{ g_assert(obj != NULL); obj->references = NULL; obj->current_ref = NULL; } -static void ipc_object_class_init(IpcObjectClass* klass) { +static void ipc_object_class_init(IpcObjectClass *klass) +{ /** * IpcObject::search_performed_signal: @@ -73,16 +74,14 @@ * Since: 3.2 */ klass->signals[SEARCH_PERFORMED] = - g_signal_new ("search-performed-signal", - G_OBJECT_CLASS_TYPE(klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - ipc_marshal_VOID__STRING_INT, - G_TYPE_NONE, - 1, - G_TYPE_STRING); + g_signal_new("search-performed-signal", + G_OBJECT_CLASS_TYPE(klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + ipc_marshal_VOID__STRING_INT, + G_TYPE_NONE, 1, G_TYPE_STRING); /** * IpcObject::navigation_signal: * @reference: the new reference @@ -94,16 +93,14 @@ * Since: 3.2 */ klass->signals[NAVIGATION] = - g_signal_new ("navigation-signal", - G_OBJECT_CLASS_TYPE(klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, - G_TYPE_STRING); + g_signal_new("navigation-signal", + G_OBJECT_CLASS_TYPE(klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); dbus_g_object_type_install_info(IPC_TYPE_OBJECT, &dbus_glib_ipc_object_object_info); @@ -121,22 +118,18 @@ * * Since: 3.2 */ -gboolean ipc_object_search_performed(IpcObject* obj, - const gchar* search_term, - const int* hits, - GError **error) - { - - IpcObjectClass* klass = IPC_OBJECT_GET_CLASS(obj); - - GString *s = g_string_new (""); - g_string_printf(s, "%d", *hits); - - g_signal_emit(obj, - klass->signals[SEARCH_PERFORMED], - 0, - s->str, - hits); +gboolean ipc_object_search_performed(IpcObject *obj, + const gchar *search_term, + const int *hits, GError **error) +{ + + IpcObjectClass *klass = IPC_OBJECT_GET_CLASS(obj); + + GString *s = g_string_new(""); + g_string_printf(s, "%d", *hits); + + g_signal_emit(obj, + klass->signals[SEARCH_PERFORMED], 0, s->str, hits); return FALSE; } @@ -152,18 +145,15 @@ * Since: 3.2 */ -gboolean ipc_object_navigation_signal (IpcObject* obj, - const gchar* reference, - GError** error) +gboolean ipc_object_navigation_signal(IpcObject *obj, + const gchar *reference, + GError **error) { obj->current_ref = g_strdup(reference); - IpcObjectClass* klass = IPC_OBJECT_GET_CLASS(obj); + IpcObjectClass *klass = IPC_OBJECT_GET_CLASS(obj); - g_signal_emit(obj, - klass->signals[NAVIGATION], - 0, - reference); + g_signal_emit(obj, klass->signals[NAVIGATION], 0, reference); return FALSE; } @@ -179,12 +169,12 @@ * Since: 3.2 */ -gboolean ipc_object_get_next_search_reference(IpcObject* obj, - gchar** reference, - GError** error) +gboolean ipc_object_get_next_search_reference(IpcObject *obj, + gchar **reference, + GError **error) { if (obj->references) - *reference = g_strdup((gchar*)obj->references->data); + *reference = g_strdup((gchar *)obj->references->data); else *reference = g_strdup("XIPHOS_SEARCH_END"); @@ -203,16 +193,16 @@ * * Since: 3.2 */ -gboolean ipc_object_set_current_reference(IpcObject* obj, - gchar* reference, - GError** error) +gboolean ipc_object_set_current_reference(IpcObject *obj, + gchar *reference, + GError **error) { //easy route - main_url_handler((const gchar*)reference, TRUE); + main_url_handler((const gchar *)reference, TRUE); //it should be done like this, probably /* g_signal_emit(obj, - "navigate-requested", - reference); */ + "navigate-requested", + reference); */ return TRUE; } @@ -227,9 +217,9 @@ * * Since: 3.2 */ -gboolean ipc_object_get_current_reference(IpcObject* obj, - gchar** reference, - GError** error) +gboolean ipc_object_get_current_reference(IpcObject *obj, + gchar **reference, + GError **error) { *reference = g_strdup(obj->current_ref); return TRUE; @@ -244,13 +234,13 @@ * * Since: 3.2 */ -IpcObject* ipc_init_dbus_connection(IpcObject* obj) +IpcObject *ipc_init_dbus_connection(IpcObject *obj) { - DBusGConnection* bus = NULL; - DBusGProxy* busProxy = NULL; + DBusGConnection *bus = NULL; + DBusGProxy *busProxy = NULL; obj = NULL; guint result; - GError* error = NULL; + GError *error = NULL; bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) @@ -271,9 +261,7 @@ G_TYPE_UINT, 0, G_TYPE_INVALID, - G_TYPE_UINT, - &result, - G_TYPE_INVALID)) { + G_TYPE_UINT, &result, G_TYPE_INVALID)) { return NULL; } @@ -298,9 +286,7 @@ * * Since: 3.2 */ -IpcObject* ipc_get_main_ipc(void) +IpcObject *ipc_get_main_ipc(void) { return main_ipc_obj; } - - diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/main_menu.c xiphos-4.0.4+dfsg1/src/gnome2/main_menu.c --- xiphos-4.0.0+dfsg1/src/gnome2/main_menu.c 2014-12-24 03:04:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/main_menu.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_menu.c - creation of and call backs for xiphos main menu * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,17 +27,16 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #include "editor/editor.h" #else #include "editor/slib-editor.h" #endif - #include "gui/about_xiphos.h" #include "gui/about_sword.h" #include "gui/about_modules.h" @@ -92,28 +91,35 @@ * void */ G_MODULE_EXPORT void -on_help_contents_activate(GtkMenuItem * menuitem, gpointer user_data) +on_help_contents_activate(GtkMenuItem *menuitem, gpointer user_data) { - GError *error = NULL; #ifdef WIN32 const char *lang = g_getenv("LANG"); - gchar *help_file = g_win32_get_package_installation_directory_of_module(NULL); + gchar *help_file = + g_win32_get_package_installation_directory_of_module(NULL); help_file = g_strconcat(help_file, "\0", NULL); if (!strncmp(lang, "fr", 2)) - help_file = g_build_filename(help_file, "share", "help", "xiphos_fr.chm", NULL); + help_file = + g_build_filename(help_file, "share", "help", + "xiphos_fr.chm", NULL); else if (!strncmp(lang, "fa", 2)) - help_file = g_build_filename(help_file, "share", "help", "xiphos_fa.chm", NULL); + help_file = + g_build_filename(help_file, "share", "help", + "xiphos_fa.chm", NULL); else - help_file = g_build_filename(help_file, "share", "help", "xiphos.chm", NULL); + help_file = + g_build_filename(help_file, "share", "help", + "xiphos.chm", NULL); xiphos_open_default(help_file); g_free(help_file); #else - gtk_show_uri (NULL, "ghelp:xiphos", gtk_get_current_event_time(), &error); + GError *error = NULL; + gtk_show_uri(NULL, "ghelp:xiphos", gtk_get_current_event_time(), + &error); if (error != NULL) { XI_warning(("%s", error->message)); g_error_free(error); } - #endif /* WIN32 */ } @@ -134,12 +140,11 @@ * void */ G_MODULE_EXPORT void -on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data) +on_mailing_list_activate(GtkMenuItem *menuitem, gpointer user_data) { xiphos_open_default("https://lists.sourceforge.net/lists/listinfo/gnomesword-users/"); } - /****************************************************************************** * Name * on_live_chat_activate @@ -157,7 +162,7 @@ * void */ G_MODULE_EXPORT void -on_live_chat_activate(GtkMenuItem * menuitem, gpointer user_data) +on_live_chat_activate(GtkMenuItem *menuitem, gpointer user_data) { gchar *user = g_strdup_printf("%s", g_get_user_name()), *s, *url; gchar version[] = VERSION; @@ -184,9 +189,9 @@ for (s = strchr(user, ' '); s; s = strchr(s, ' ')) *s = '_'; - url = g_strdup_printf( - "http://webchat.freenode.net/?nick=%s|%c%s&channels=xiphos&prompt=1", - user, platform, version); + url = + g_strdup_printf("http://webchat.freenode.net/?nick=%s|%c%s&channels=xiphos&prompt=1", + user, platform, version); xiphos_open_default(url); g_free(url); g_free(user); @@ -209,12 +214,11 @@ * void */ G_MODULE_EXPORT void -on_report_bug_activate(GtkMenuItem * menuitem, gpointer user_data) +on_report_bug_activate(GtkMenuItem *menuitem, gpointer user_data) { xiphos_open_default(PACKAGE_BUGREPORT); } - /****************************************************************************** * Name * on_about_the_sword_project_activate @@ -232,7 +236,8 @@ * void */ G_MODULE_EXPORT void -on_about_the_sword_project_activate(GtkMenuItem * menuitem, gpointer user_data) +on_about_the_sword_project_activate(GtkMenuItem *menuitem, + gpointer user_data) { GtkWidget *dlg; @@ -257,7 +262,7 @@ * void */ G_MODULE_EXPORT void -on_about_translation_activate(GtkMenuItem * menuitem, gpointer user_data) +on_about_translation_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *dlg; @@ -282,7 +287,7 @@ * void */ G_MODULE_EXPORT void -on_daily_devotion_activate(GtkMenuItem * menuitem, gpointer user_data) +on_daily_devotion_activate(GtkMenuItem *menuitem, gpointer user_data) { main_display_devotional(); } @@ -303,7 +308,7 @@ * void */ G_MODULE_EXPORT void -on_preferences_activate(GtkMenuItem * menuitem, gpointer user_data) +on_preferences_activate(GtkMenuItem *menuitem, gpointer user_data) { gui_setup_preferences_dialog(); } @@ -323,11 +328,12 @@ * Return value * void */ -G_MODULE_EXPORT void on_search_activate(GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_search_activate(GtkMenuItem *menuitem, + gpointer user_data) { if (!settings.showshortcutbar) gui_sidebar_showhide(); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar),2); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), 2); } /****************************************************************************** @@ -346,9 +352,9 @@ * void */ G_MODULE_EXPORT void -on_linked_tabs_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_linked_tabs_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - settings.linkedtabs = gtk_check_menu_item_get_active (menuitem); + settings.linkedtabs = gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "pinnedtabs", (settings.linkedtabs ? "1" : "0")); if (settings.showparatab) @@ -371,9 +377,9 @@ * void */ G_MODULE_EXPORT void -on_read_aloud_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_read_aloud_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - settings.readaloud = gtk_check_menu_item_get_active (menuitem); + settings.readaloud = gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "readaloud", (settings.readaloud ? "1" : "0")); if (settings.readaloud) @@ -396,9 +402,10 @@ * void */ G_MODULE_EXPORT void -on_show_verse_numbers_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_show_verse_numbers_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - settings.showversenum = gtk_check_menu_item_get_active (menuitem); + settings.showversenum = gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "showversenum", (settings.showversenum ? "1" : "0")); main_display_commentary(NULL, settings.currentverse); @@ -421,9 +428,9 @@ * void */ G_MODULE_EXPORT void -on_versehighlight_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_versehighlight_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - settings.versehighlight = gtk_check_menu_item_get_active (menuitem); + settings.versehighlight = gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "versehighlight", (settings.versehighlight ? "1" : "0")); main_display_bible(NULL, settings.currentverse); @@ -445,24 +452,24 @@ * void */ G_MODULE_EXPORT void -gui_parallel_tab_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +gui_parallel_tab_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - if (!settings.browsing) return; - if (!settings.showparatab && !gtk_check_menu_item_get_active (menuitem)) { + if (!settings.browsing) + return; + if (!settings.showparatab && !gtk_check_menu_item_get_active(menuitem)) { xml_set_value("Xiphos", "misc", "showparatab", "0"); return; } - settings.showparatab = gtk_check_menu_item_get_active (menuitem); + settings.showparatab = gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "showparatab", (settings.showparatab ? "1" : "0")); if (settings.showparatab) { gui_open_parallel_view_in_new_tab(); gui_force_parallel_tab_sync(); } else - gui_close_passage_tab (gtk_notebook_page_num ( - GTK_NOTEBOOK (widgets.notebook_main), - widgets.parallel_tab)); + gui_close_passage_tab(gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + widgets.parallel_tab)); } /****************************************************************************** @@ -481,9 +488,10 @@ * void */ G_MODULE_EXPORT void -on_side_preview_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_side_preview_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - settings.show_previewer_in_sidebar = gtk_check_menu_item_get_active (menuitem); + settings.show_previewer_in_sidebar = + gtk_check_menu_item_get_active(menuitem); xml_set_value("Xiphos", "misc", "show_side_preview", (settings.show_previewer_in_sidebar ? "1" : "0")); gui_show_previewer_in_sidebar(settings.show_previewer_in_sidebar); @@ -507,7 +515,7 @@ * void */ G_MODULE_EXPORT void -on_quit_activate(GtkMenuItem * menuitem, gpointer user_data) +on_quit_activate(GtkMenuItem *menuitem, gpointer user_data) { /* discover main window internal geometry before we go. */ final_pane_sizes(); @@ -534,7 +542,6 @@ exit(0); } - /****************************************************************************** * Name * on_about_xiphos_activate @@ -552,7 +559,7 @@ * void */ G_MODULE_EXPORT void -on_about_xiphos_activate(GtkMenuItem * menuitem, gpointer user_data) +on_about_xiphos_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *AboutBox; @@ -560,7 +567,6 @@ gtk_widget_show(AboutBox); } - /****************************************************************************** * Name * on_save_session_activate @@ -577,12 +583,12 @@ * void */ G_MODULE_EXPORT void -on_save_session_activate(GtkMenuItem * menuitem, gpointer user_data) +on_save_session_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *dialog; gchar *tabs_dir; - tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir); + tabs_dir = g_strdup_printf("%s/tabs/", settings.gSwordDir); if (g_access(tabs_dir, F_OK) == -1) { if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) { @@ -591,33 +597,36 @@ } } - dialog = gtk_file_chooser_dialog_new ("Save Session", - NULL, - GTK_FILE_CHOOSER_ACTION_SAVE, + dialog = gtk_file_chooser_dialog_new("Save Session", + NULL, + GTK_FILE_CHOOSER_ACTION_SAVE, #ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Save", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, -#endif - NULL); - - gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog, tabs_dir); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - char *filename; + "_Cancel", + GTK_RESPONSE_CANCEL, "_Save", + GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, + GTK_RESPONSE_ACCEPT, +#endif + NULL); + + gtk_file_chooser_set_current_folder((GtkFileChooser *)dialog, + tabs_dir); + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); filename = g_path_get_basename(filename); gui_save_tabs(filename); - g_free (filename); + g_free(filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); } - /****************************************************************************** * Name * redisplay_to_realign @@ -632,8 +641,7 @@ * Return value * void */ -void -redisplay_to_realign() +void redisplay_to_realign() { static int realign_busy = FALSE; int save_comm_show = settings.comm_showing; @@ -651,8 +659,7 @@ settings.currentverse); main_url_handler(url, TRUE); g_free(url); - if (settings.DictWindowModule - && *settings.DictWindowModule /* not empty */ + if (settings.DictWindowModule && *settings.DictWindowModule /* not empty */ && settings.dictkey) { url = g_strdup_printf("sword://%s/%s", settings.DictWindowModule, @@ -660,8 +667,7 @@ main_url_handler(url, TRUE); g_free(url); } - if (settings.book_mod - && *settings.book_mod /* not empty */ + if (settings.book_mod && *settings.book_mod /* not empty */ && settings.book_key) { url = g_strdup_printf("sword://%s/%s", settings.book_mod, @@ -693,12 +699,12 @@ * void */ G_MODULE_EXPORT void -on_open_session_activate(GtkMenuItem * menuitem, gpointer user_data) +on_open_session_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *dialog; gchar *tabs_dir; - tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir); + tabs_dir = g_strdup_printf("%s/tabs/", settings.gSwordDir); if (g_access(tabs_dir, F_OK) == -1) { if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) { @@ -707,32 +713,36 @@ } } - dialog = gtk_file_chooser_dialog_new ("Open Session", - NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, + dialog = gtk_file_chooser_dialog_new("Open Session", + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, #ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_Open", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, -#endif - NULL); - - gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog, tabs_dir); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - char *filename; + "_Cancel", + GTK_RESPONSE_CANCEL, "_Open", + GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, + GTK_RESPONSE_ACCEPT, +#endif + NULL); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gtk_file_chooser_set_current_folder((GtkFileChooser *)dialog, + tabs_dir); + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + char *filename; + + filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); filename = g_path_get_basename(filename); gui_close_all_tabs(); gui_load_tabs(filename); redisplay_to_realign(); - g_free (filename); + g_free(filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); } /****************************************************************************** @@ -751,21 +761,20 @@ * void */ G_MODULE_EXPORT void -on_show_bible_text_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_show_bible_text_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - gui_show_hide_texts(gtk_check_menu_item_get_active (menuitem)); + gui_show_hide_texts(gtk_check_menu_item_get_active(menuitem)); redisplay_to_realign(); } - G_MODULE_EXPORT void -on_preview_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_preview_activate(GtkCheckMenuItem *menuitem, gpointer user_data) { - gui_show_hide_preview(gtk_check_menu_item_get_active (menuitem)); + gui_show_hide_preview(gtk_check_menu_item_get_active(menuitem)); redisplay_to_realign(); } - /****************************************************************************** * Name * on_show_commentary_activate @@ -783,13 +792,13 @@ * void */ G_MODULE_EXPORT void -on_show_commentary_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_show_commentary_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - gui_show_hide_comms(gtk_check_menu_item_get_active (menuitem)); + gui_show_hide_comms(gtk_check_menu_item_get_active(menuitem)); redisplay_to_realign(); } - /****************************************************************************** * Name * on_show_dictionary_lexicon_activate @@ -806,13 +815,13 @@ * void */ G_MODULE_EXPORT void -on_show_dictionary_lexicon_activate(GtkCheckMenuItem * menuitem, gpointer user_data) +on_show_dictionary_lexicon_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - gui_show_hide_dicts(gtk_check_menu_item_get_active (menuitem)); + gui_show_hide_dicts(gtk_check_menu_item_get_active(menuitem)); redisplay_to_realign(); } - /****************************************************************************** * Name * on_module_manager_activate @@ -829,7 +838,7 @@ * void */ G_MODULE_EXPORT void -on_module_manager_activate(GtkMenuItem * menuitem, gpointer user_data) +on_module_manager_activate(GtkMenuItem *menuitem, gpointer user_data) { gui_open_mod_mgr(); } @@ -851,34 +860,31 @@ * void */ G_MODULE_EXPORT void -on_open_studypad_activate(GtkMenuItem * menuitem, gpointer user_data) +on_open_studypad_activate(GtkMenuItem *menuitem, gpointer user_data) { editor_create_new(settings.studypadfilename, NULL, FALSE); //create_window (); } - G_MODULE_EXPORT void -on_advanced_search_activate(GtkMenuItem * menuitem, gpointer user_data) +on_advanced_search_activate(GtkMenuItem *menuitem, gpointer user_data) { - main_open_search_dialog (); + main_open_search_dialog(); } - G_MODULE_EXPORT void -on_attach_detach_sidebar_activate(GtkMenuItem *menuitem, gpointer user_data) +on_attach_detach_sidebar_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gui_attach_detach_sidebar (); + gui_attach_detach_sidebar(); } - G_MODULE_EXPORT void on_sidebar_showhide_activate(GtkMenuItem *menuitem, gpointer user_data) { - gui_sidebar_showhide (); + gui_sidebar_showhide(); } - GtkWidget *gui_create_main_menu(void) { #ifdef USE_GTKBUILDER @@ -886,76 +892,72 @@ #else GladeXML *gxml; #endif - gchar *glade_file = gui_general_user_file ("xi-menus" UI_SUFFIX, FALSE); - g_return_val_if_fail (glade_file != NULL, NULL); + gchar *glade_file = + gui_general_user_file("xi-menus" UI_SUFFIX, FALSE); + g_return_val_if_fail(glade_file != NULL, NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_main", NULL); + gxml = glade_xml_new(glade_file, "menu_main", NULL); #endif - g_free (glade_file); - g_return_val_if_fail (gxml != NULL, NULL); - + g_free(glade_file); + g_return_val_if_fail(gxml != NULL, NULL); + GtkWidget *menu = UI_GET_ITEM(gxml, "menu_main"); widgets.viewtexts_item = UI_GET_ITEM(gxml, "show_bible_text"); widgets.viewpreview_item = UI_GET_ITEM(gxml, "preview"); widgets.viewcomms_item = UI_GET_ITEM(gxml, "commentary"); - widgets.viewdicts_item = UI_GET_ITEM(gxml, "show_dictionary_lexicon"); + widgets.viewdicts_item = + UI_GET_ITEM(gxml, "show_dictionary_lexicon"); widgets.linkedtabs_item = UI_GET_ITEM(gxml, "link_tabs"); widgets.readaloud_item = UI_GET_ITEM(gxml, "read_aloud"); - widgets.showversenum_item = UI_GET_ITEM(gxml, "show_verse_numbers"); - widgets.versehighlight_item = UI_GET_ITEM(gxml, "highlight_current_verse"); - widgets.parallel_tab_item = UI_GET_ITEM(gxml, "show_parallel_view_in_a_tab"); - widgets.side_preview_item = UI_GET_ITEM(gxml, "show_previewer_in_sidebar"); + widgets.showversenum_item = + UI_GET_ITEM(gxml, "show_verse_numbers"); + widgets.versehighlight_item = + UI_GET_ITEM(gxml, "highlight_current_verse"); + widgets.parallel_tab_item = + UI_GET_ITEM(gxml, "show_parallel_view_in_a_tab"); + widgets.side_preview_item = + UI_GET_ITEM(gxml, "show_previewer_in_sidebar"); widgets.new_journal_item = UI_GET_ITEM(gxml, "newjournal"); /* map tab's show state into view menu. */ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewtexts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), settings.showtexts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewcomms_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), settings.showcomms); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewdicts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), settings.showdicts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewpreview_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewpreview_item), settings.showpreview); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.parallel_tab_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.parallel_tab_item), settings.showparatab); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.side_preview_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.side_preview_item), settings.show_previewer_in_sidebar); /* update other status toys */ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.linkedtabs_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.linkedtabs_item), settings.linkedtabs); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.readaloud_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.readaloud_item), settings.readaloud); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.showversenum_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.showversenum_item), settings.showversenum); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.versehighlight_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.versehighlight_item), settings.versehighlight); - /* connect signals and data */ -#ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ +/* connect signals and data */ +#ifdef USE_GTKBUILDER + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif //set up global function to handle all link buttons -// gtk_link_button_set_uri_hook (link_uri_hook, NULL, NULL); + // gtk_link_button_set_uri_hook (link_uri_hook, NULL, NULL); if (settings.prayerlist) gtk_widget_show(widgets.new_journal_item); diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/main_window.c xiphos-4.0.4+dfsg1/src/gnome2/main_window.c --- xiphos-4.0.0+dfsg1/src/gnome2/main_window.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/main_window.c 2015-08-30 16:29:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_window.c - main window gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,7 +69,6 @@ WIDGETS widgets; - extern gboolean shift_key_pressed; static GtkWidget *nav_toolbar; @@ -108,10 +107,9 @@ xml_set_value("Xiphos", "misc", "showtexts", "1"); } /*if (main_window_created) - gui_set_bible_comm_layout();*/ + gui_set_bible_comm_layout(); */ } - /****************************************************************************** * Name * gui_show_hide_preview @@ -135,7 +133,7 @@ if (choice == FALSE) { if (main_window_created) gtk_widget_hide(widgets.box_side_preview); - gtk_widget_hide(widgets.vbox_previewer); + gtk_widget_hide(widgets.vbox_previewer); xml_set_value("Xiphos", "misc", "showpreview", "0"); } else { if (main_window_created) { @@ -149,7 +147,6 @@ } } - /****************************************************************************** * Name * gui_show_hide_comms @@ -184,7 +181,6 @@ gui_set_bible_comm_layout(); } - /****************************************************************************** * Name * gui_show_hide_dicts @@ -219,7 +215,6 @@ gui_set_bible_comm_layout(); } - /****************************************************************************** * Name * gui_set_bible_comm_layout @@ -239,56 +234,50 @@ void gui_set_bible_comm_layout(void) { gtk_paned_set_position(GTK_PANED(widgets.hpaned), - settings.biblepane_width); + settings.biblepane_width); gtk_paned_set_position(GTK_PANED(widgets.vpaned), - settings.biblepane_height); + settings.biblepane_height); gtk_paned_set_position(GTK_PANED(widgets.vpaned2), - settings.commpane_height); + settings.commpane_height); - if ((settings.showcomms == TRUE) || (settings.showdicts == TRUE)) { + if ((settings.showcomms == TRUE) || (settings.showdicts == TRUE)) { gtk_widget_show(widgets.vpaned2); } gtk_paned_set_position(GTK_PANED(widgets.hpaned), (settings.showtexts - ? settings.biblepane_width - : 0)); + ? settings.biblepane_width + : 0)); gtk_paned_set_position(GTK_PANED(widgets.vpaned2), (settings.showcomms - ? settings.commpane_height - : 0)); + ? settings.commpane_height + : 0)); gtk_paned_set_position(GTK_PANED(widgets.vpaned2), (settings.showdicts - ? settings.commpane_height - : settings.gs_height)); + ? settings.commpane_height + : settings.gs_height)); - if ((settings.showcomms == FALSE) && (settings.showdicts == FALSE)) { + if ((settings.showcomms == FALSE) && (settings.showdicts == FALSE)) { gtk_widget_hide(widgets.vpaned2); - gtk_paned_set_position(GTK_PANED - (widgets.hpaned), + gtk_paned_set_position(GTK_PANED(widgets.hpaned), settings.gs_width); } - if ((settings.showcomms == TRUE) - || (settings.showdicts == TRUE)) { - gtk_paned_set_position(GTK_PANED - (widgets.hpaned), + if ((settings.showcomms == TRUE) || (settings.showdicts == TRUE)) { + gtk_paned_set_position(GTK_PANED(widgets.hpaned), settings.biblepane_width); } - if (((settings.showcomms == FALSE) && (settings.showtexts == FALSE)) || - ((settings.comm_showing == FALSE) && (settings.showtexts == FALSE))) + if (((settings.showcomms == FALSE) && (settings.showtexts == FALSE)) || ((settings.comm_showing == FALSE) && (settings.showtexts == FALSE))) gtk_widget_hide(nav_toolbar); else gtk_widget_show(nav_toolbar); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), (settings.comm_showing ? 0 : 1)); - } - /****************************************************************************** * Name * gui_change_window_title @@ -305,7 +294,7 @@ * void */ -void gui_change_window_title(gchar * module_name) +void gui_change_window_title(gchar *module_name) { gchar *title; @@ -313,19 +302,16 @@ /* borrowed from tabbed_browser.c:pick_tab_label() */ /* echo the current tab's module (full name) in title bar */ if (cur_passage_tab->showtexts || cur_passage_tab->comm_showing) { - title = (cur_passage_tab->showtexts - ? cur_passage_tab->text_mod - : (cur_passage_tab->commentary_mod - ? cur_passage_tab->commentary_mod - : "[no commentary]")); + title = + (cur_passage_tab->showtexts ? cur_passage_tab->text_mod : (cur_passage_tab->commentary_mod ? cur_passage_tab->commentary_mod : "[no commentary]")); } else { title = (cur_passage_tab->showcomms - ? (cur_passage_tab->book_mod - ? cur_passage_tab->book_mod - : "[no book]") - : (cur_passage_tab->dictlex_mod - ? cur_passage_tab->dictlex_mod - : "[no dict]")); + ? (cur_passage_tab->book_mod + ? cur_passage_tab->book_mod + : "[no book]") + : (cur_passage_tab->dictlex_mod + ? cur_passage_tab->dictlex_mod + : "[no dict]")); } } else title = module_name; @@ -335,17 +321,17 @@ */ title = g_strdup(main_get_module_description(title)); if (!title) - title = g_strdup(main_get_module_description(settings.MainWindowModule)); - title = g_strdup_printf("%s - %s", (title ? title : "[no title]"), - settings.program_title); + title = + g_strdup(main_get_module_description(settings.MainWindowModule)); + title = + g_strdup_printf("%s - %s", (title ? title : "[no title]"), + settings.program_title); gtk_window_set_title(GTK_WINDOW(widgets.app), title); g_free(title); } - -static gboolean delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +static gboolean delete_event(GtkWidget *widget, + GdkEvent *event, gpointer user_data) { on_quit_activate(NULL, NULL); return TRUE; @@ -368,8 +354,8 @@ * gboolean */ -static gboolean epaned_button_release_event(GtkWidget * widget, - GdkEventButton * event, +static gboolean epaned_button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { gint panesize; @@ -378,25 +364,25 @@ panesize = gtk_paned_get_position(GTK_PANED(widget)); if (panesize > 15) { - if (!strcmp((gchar *) user_data, "epaned")) { + if (!strcmp((gchar *)user_data, "epaned")) { settings.sidebar_width = panesize; sprintf(layout, "%d", settings.sidebar_width); xml_set_value("Xiphos", "layout", "shortcutbar", layout); } - if (!strcmp((gchar *) user_data, "vpaned")) { + if (!strcmp((gchar *)user_data, "vpaned")) { settings.biblepane_height = panesize; sprintf(layout, "%d", settings.biblepane_height); xml_set_value("Xiphos", "layout", "bibleheight", layout); } - if (!strcmp((gchar *) user_data, "vpaned2")) { + if (!strcmp((gchar *)user_data, "vpaned2")) { settings.commpane_height = panesize; sprintf(layout, "%d", settings.commpane_height); xml_set_value("Xiphos", "layout", "commentaryheight", layout); } - if (!strcmp((gchar *) user_data, "hpaned1")) { + if (!strcmp((gchar *)user_data, "hpaned1")) { settings.biblepane_width = panesize; sprintf(layout, "%d", settings.biblepane_width); xml_set_value("Xiphos", "layout", @@ -407,7 +393,6 @@ return TRUE; } - /****************************************************************************** * Name * final_pane_sizes @@ -428,10 +413,14 @@ void final_pane_sizes() { - epaned_button_release_event(GTK_WIDGET(widgets.epaned), NULL, (gchar *) "epaned"); - epaned_button_release_event(GTK_WIDGET(widgets.vpaned), NULL, (gchar *) "vpaned"); - epaned_button_release_event(GTK_WIDGET(widgets.vpaned2),NULL, (gchar *) "vpaned2"); - epaned_button_release_event(GTK_WIDGET(widgets.hpaned), NULL, (gchar *) "hpaned1"); + epaned_button_release_event(GTK_WIDGET(widgets.epaned), NULL, + (gchar *)"epaned"); + epaned_button_release_event(GTK_WIDGET(widgets.vpaned), NULL, + (gchar *)"vpaned"); + epaned_button_release_event(GTK_WIDGET(widgets.vpaned2), NULL, + (gchar *)"vpaned2"); + epaned_button_release_event(GTK_WIDGET(widgets.hpaned), NULL, + (gchar *)"hpaned1"); } /****************************************************************************** @@ -452,21 +441,26 @@ * gboolean */ -static gboolean on_configure_event(GtkWidget * widget, - GdkEventConfigure * event, +static gboolean on_configure_event(GtkWidget *widget, + GdkEventConfigure *event, gpointer user_data) { gchar layout[80]; gint x; gint y; - gdk_window_get_root_origin(gtk_widget_get_window (widgets.app), &x, &y); + gdk_window_get_root_origin(gtk_widget_get_window(widgets.app), &x, &y); settings.gs_width = event->width; settings.gs_height = event->height; settings.app_x = x; settings.app_y = y; +#ifdef HAVE_GTK_312 + sprintf(layout, "%d", gtk_window_is_maximized(GTK_WINDOW(widgets.app))); + xml_set_value("Xiphos", "layout", "maximized", layout); +#endif + sprintf(layout, "%d", settings.gs_width); xml_set_value("Xiphos", "layout", "width", layout); @@ -483,8 +477,9 @@ return FALSE; } -static void on_notebook_bible_parallel_switch_page(GtkNotebook * notebook, - gint page_num, GList **tl) +static void on_notebook_bible_parallel_switch_page(GtkNotebook *notebook, + gint page_num, + GList **tl) { #if 0 if (page_num == 0) @@ -495,12 +490,12 @@ } #ifdef USE_GTK_3 -static void on_notebook_comm_book_switch_page(GtkNotebook * notebook, +static void on_notebook_comm_book_switch_page(GtkNotebook *notebook, gpointer arg, gint page_num, GList **tl) #else -static void on_notebook_comm_book_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, +static void on_notebook_comm_book_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, gint page_num, GList **tl) #endif { @@ -532,22 +527,20 @@ settings.comm_showing, settings.showtexts, settings.showpreview, - settings.showcomms, - settings.showdicts); + settings.showcomms, settings.showdicts); if (settings.comm_showing) - main_display_commentary(settings.CommWindowModule, settings.currentverse); + main_display_commentary(settings.CommWindowModule, + settings.currentverse); else if (settings.book_mod && *settings.book_mod) { url = g_strdup_printf("sword://%s/%ld", settings.book_mod, - settings.book_offset); + settings.book_offset); main_url_handler(url, TRUE); g_free(url); } gui_set_tab_label(settings.currentverse, TRUE); } - -static void -new_base_font_size(gboolean up) +static void new_base_font_size(gboolean up) { if (up) { settings.base_font_size++; @@ -561,38 +554,36 @@ if (settings.base_font_size_str) g_free(settings.base_font_size_str); - settings.base_font_size_str = g_strdup_printf("%+d", settings.base_font_size); + settings.base_font_size_str = + g_strdup_printf("%+d", settings.base_font_size); xml_set_value("Xiphos", "fontsize", "basefontsize", settings.base_font_size_str); redisplay_to_realign(); } - /* temporary shorthand for too-common use */ -#define sM settings.MainWindowModule -#define sC settings.CommWindowModule -#define sD settings.DictWindowModule -#define sB settings.book_mod -#define sV settings.currentverse +#define sM settings.MainWindowModule +#define sC settings.CommWindowModule +#define sD settings.DictWindowModule +#define sB settings.book_mod +#define sV settings.currentverse -static -void kbd_toggle_option(gboolean cond, gchar *option) +static void kbd_toggle_option(gboolean cond, gchar *option) { gchar *msg; if (cond) { - int opt = !main_get_one_option(sM, option); // negate. + int opt = !main_get_one_option(sM, option); // negate. main_save_module_options(sM, option, opt); gchar *url = g_strdup_printf("sword://%s/%s", sM, sV); main_url_handler(url, TRUE); g_free(url); - msg = g_strdup_printf("%s %s", option, (opt ? "on" : "off")); + msg = + g_strdup_printf("%s %s", option, (opt ? "on" : "off")); gui_set_statusbar(msg); g_free(msg); - } - else - { + } else { msg = g_strdup_printf(_("Module has no support for %s."), option); gui_generic_warning(msg); @@ -600,31 +591,33 @@ } } -static -gboolean on_vbox1_key_press_event(GtkWidget * widget, GdkEventKey * event, - gpointer user_data) +static gboolean on_vbox1_key_press_event(GtkWidget *widget, GdkEventKey *event, + gpointer user_data) { /* these are the mods we actually use for global keys, we always only check for these set */ - guint state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK ); + guint state = + event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | + GDK_MOD1_MASK | GDK_MOD4_MASK); switch (event->keyval) { - case XK_Shift_L: /* shift keys - we need this for locking strongs (and */ - case XK_Shift_R: /* other stuff) while moving mouse to previewer */ + case XK_Shift_L: /* shift keys - we need this for locking strongs (and */ + case XK_Shift_R: /* other stuff) while moving mouse to previewer */ shift_key_pressed = TRUE; - /* no break? hm... */ + /* no break? hm... */ case XK_a: case XK_A: - if (state == GDK_MOD1_MASK) { // Alt-A annotation + if (state == GDK_MOD1_MASK) { // Alt-A annotation gui_mark_verse_dialog(sM, sV); - } - else if (state == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) - on_biblesync_kbd(3); // BSP audience + } else if (state == + (GDK_CONTROL_MASK | GDK_MOD1_MASK | + GDK_SHIFT_MASK)) + on_biblesync_kbd(3); // BSP audience break; case XK_b: case XK_B: - if (state == GDK_MOD1_MASK) { // Alt-B bookmark + if (state == GDK_MOD1_MASK) { // Alt-B bookmark gchar *label = g_strdup_printf("%s, %s", sV, sM); gui_bookmark_dialog(label, sM, sV); g_free(label); @@ -633,15 +626,16 @@ case XK_c: case XK_C: - if (state == GDK_MOD1_MASK) { // Alt-C commentary pane + if (state == GDK_MOD1_MASK) { // Alt-C commentary pane gtk_widget_grab_focus(navbar_versekey.lookup_entry); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book),0); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), + 0); } break; case XK_d: case XK_D: - if (state == GDK_MOD1_MASK) // Alt-D dictionary entry + if (state == GDK_MOD1_MASK) // Alt-D dictionary entry gtk_widget_grab_focus(widgets.entry_dict); break; @@ -663,139 +657,132 @@ gui_find_dlg(widgets.html_dict, sD, FALSE, NULL); } else - gui_generic_warning(_("Xiphos: No windows.")); + gui_generic_warning(_("Xiphos: No windows.")); } break; case XK_g: case XK_G: - if (state == GDK_MOD1_MASK) { // Alt-G genbook entry - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book),1); + if (state == GDK_MOD1_MASK) { // Alt-G genbook entry + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), + 1); gtk_widget_grab_focus(navbar_book.lookup_entry); } break; case XK_j: - if (state == 0) // J "next verse" + if (state == 0) // J "next verse" access_on_down_eventbox_button_release_event(VERSE_BUTTON); break; case XK_k: - if (state == 0) // K "previous verse" + if (state == 0) // K "previous verse" access_on_up_eventbox_button_release_event(VERSE_BUTTON); break; case XK_l: case XK_L: - if (state == GDK_CONTROL_MASK) // Ctrl-L verse entry + if (state == GDK_CONTROL_MASK) // Ctrl-L verse entry gtk_widget_grab_focus(navbar_versekey.lookup_entry); break; case XK_m: case XK_M: - if (state == GDK_MOD1_MASK) // Alt-M morph + if (state == GDK_MOD1_MASK) // Alt-M morph { - kbd_toggle_option - ((main_check_for_global_option(sM, "GBFMorph") || - main_check_for_global_option(sM, "ThMLMorph") || - main_check_for_global_option(sM, "OSISMorph")), - "Morphological Tags"); + kbd_toggle_option((main_check_for_global_option(sM, "GBFMorph") || main_check_for_global_option(sM, + "ThMLMorph") || + main_check_for_global_option(sM, + "OSISMorph")), + "Morphological Tags"); } break; case XK_n: case XK_N: - if (state == GDK_CONTROL_MASK) // Ctrl-N verse - access_on_down_eventbox_button_release_event - (VERSE_BUTTON); - else if (state == 0) // n chapter - access_on_down_eventbox_button_release_event - (CHAPTER_BUTTON); + if (state == GDK_CONTROL_MASK) // Ctrl-N verse + access_on_down_eventbox_button_release_event(VERSE_BUTTON); + else if (state == 0) // n chapter + access_on_down_eventbox_button_release_event(CHAPTER_BUTTON); else if (state == GDK_SHIFT_MASK) // N book - access_on_down_eventbox_button_release_event - (BOOK_BUTTON); - else if (state == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) - { // BSP transient navigate - if (biblesync_active_xmit_allowed()) - { - biblesync_prep_and_xmit(sM, sV); - gui_set_statusbar(_("BibleSync: Current navigation sent.")); - } - else - { - gui_generic_warning(_("BibleSync: Not speaking.")); - } + access_on_down_eventbox_button_release_event(BOOK_BUTTON); + else if (state == (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK)) { // BSP transient navigate + if (biblesync_active_xmit_allowed()) { + biblesync_prep_and_xmit(sM, sV); + gui_set_statusbar(_("BibleSync: Current navigation sent.")); + } else { + gui_generic_warning(_("BibleSync: Not speaking.")); + } } break; case XK_o: case XK_O: - if (state == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) - on_biblesync_kbd(0); // BSP off + if (state == + (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK)) + on_biblesync_kbd(0); // BSP off break; case XK_p: case XK_P: - if (state == GDK_CONTROL_MASK) // Ctrl-P verse - access_on_up_eventbox_button_release_event - (VERSE_BUTTON); - else if (state == 0) // p chapter - access_on_up_eventbox_button_release_event - (CHAPTER_BUTTON); + if (state == GDK_CONTROL_MASK) // Ctrl-P verse + access_on_up_eventbox_button_release_event(VERSE_BUTTON); + else if (state == 0) // p chapter + access_on_up_eventbox_button_release_event(CHAPTER_BUTTON); else if (state == GDK_SHIFT_MASK) // P book - access_on_up_eventbox_button_release_event - (BOOK_BUTTON); + access_on_up_eventbox_button_release_event(BOOK_BUTTON); else if (state == GDK_MOD1_MASK) // Alt-P parallel detach on_undockInt_activate(NULL); - else if (state == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) - on_biblesync_kbd(1); // BSP personal + else if (state == + (GDK_CONTROL_MASK | GDK_MOD1_MASK | + GDK_SHIFT_MASK)) + on_biblesync_kbd(1); // BSP personal break; case XK_q: case XK_Q: - if (state == GDK_CONTROL_MASK) // Ctrl-Q quit - delete_event (NULL, NULL, NULL); + if (state == GDK_CONTROL_MASK) // Ctrl-Q quit + delete_event(NULL, NULL, NULL); break; case XK_r: case XK_R: - if (state == GDK_MOD1_MASK) // Alt-R red words + if (state == GDK_MOD1_MASK) // Alt-R red words { - kbd_toggle_option - (((main_check_for_global_option(sM, "GBFRedLetterWords")) || - (main_check_for_global_option(sM, "OSISRedLetterWords"))), - "Words of Christ in Red"); + kbd_toggle_option(((main_check_for_global_option(sM, "GBFRedLetterWords")) || + (main_check_for_global_option(sM, "OSISRedLetterWords"))), + "Words of Christ in Red"); } break; case XK_s: case XK_S: - if (state == GDK_MOD1_MASK) // Alt-S strong's + if (state == GDK_MOD1_MASK) // Alt-S strong's { - kbd_toggle_option - (((main_check_for_global_option(sM, "GBFStrongs")) || - (main_check_for_global_option(sM, "ThMLStrongs")) || - (main_check_for_global_option(sM, "OSISStrongs"))), - "Strong's Numbers"); - } - else if (state == (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) - on_biblesync_kbd(2); // BSP speaker + kbd_toggle_option(((main_check_for_global_option(sM, "GBFStrongs")) || + (main_check_for_global_option(sM, "ThMLStrongs")) || + (main_check_for_global_option(sM, "OSISStrongs"))), + "Strong's Numbers"); + } else if (state == + (GDK_CONTROL_MASK | GDK_MOD1_MASK | + GDK_SHIFT_MASK)) + on_biblesync_kbd(2); // BSP speaker break; case XK_t: case XK_T: - if (state == GDK_CONTROL_MASK) // open a new tab + if (state == GDK_CONTROL_MASK) // open a new tab on_notebook_main_new_tab_clicked(NULL, NULL); break; case XK_z: case XK_Z: - if (state == GDK_MOD1_MASK) // Alt-Z open personal commentary + if (state == GDK_MOD1_MASK) // Alt-Z open personal commentary access_to_edit_percomm(); break; - case XK_plus : // Ctrl-Plus Increase base font size - if (state == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) + case XK_plus: // Ctrl-Plus Increase base font size + if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) new_base_font_size(TRUE); break; case XK_minus: // Ctrl-Minus Decrease base font size @@ -809,12 +796,18 @@ } break; - // ctrl-DIGIT [1-9] selects DIGIT-th tab. - case XK_1: case XK_2: case XK_3: - case XK_4: case XK_5: case XK_6: - case XK_7: case XK_8: case XK_9: + // ctrl-DIGIT [1-9] selects DIGIT-th tab. + case XK_1: + case XK_2: + case XK_3: + case XK_4: + case XK_5: + case XK_6: + case XK_7: + case XK_8: + case XK_9: if (state == GDK_CONTROL_MASK) - gui_select_nth_tab((event->keyval - XK_0) - 1); /* 0-based list */ + gui_select_nth_tab((event->keyval - XK_0) - 1); /* 0-based list */ case XK_F1: // F1 help if (state == 0) @@ -828,38 +821,35 @@ if (state == 0) main_open_search_dialog(); else if (state == GDK_CONTROL_MASK) - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets. - notebook_sidebar), 2); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), + 2); break; case XK_F4: // F4 module manager if (state == 0) - on_module_manager_activate (NULL, NULL); + on_module_manager_activate(NULL, NULL); else if (state == GDK_CONTROL_MASK) - gui_close_passage_tab(gtk_notebook_page_num - (GTK_NOTEBOOK(widgets.notebook_main), - ((PASSAGE_TAB_INFO*)cur_passage_tab)-> - page_widget)); + gui_close_passage_tab(gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + ((PASSAGE_TAB_INFO *) + cur_passage_tab)->page_widget)); break; case XK_F10: // Shift-F10 bible module right click if (state == GDK_SHIFT_MASK) gui_menu_popup(NULL, sM, NULL); - /* FIXME: needs the html widget as first pram */ + /* FIXME: needs the html widget as first pram */ break; } - XI_message(("on_vbox1_key_press_event\nkeycode: %d, keysym: %0x, state: %d", - event->hardware_keycode, event->keyval, state)); + XI_message(("on_vbox1_key_press_event\nkeycode: %d, keysym: %0x, state: %d", event->hardware_keycode, event->keyval, state)); return FALSE; } -static -gboolean on_vbox1_key_release_event(GtkWidget * widget, - GdkEventKey * event, - gpointer user_data) +static gboolean on_vbox1_key_release_event(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) { - switch (event->keyval) { - case XK_Shift_L: - case XK_Shift_R: - shift_key_pressed = FALSE; + switch (event->keyval) { + case XK_Shift_L: + case XK_Shift_R: + shift_key_pressed = FALSE; break; } return FALSE; @@ -891,14 +881,14 @@ GtkWidget *label; GtkWidget *scrolledwindow; GtkWidget *box_book; - GdkPixbuf* pixbuf; + GdkPixbuf *pixbuf; /* - GTK_SHADOW_NONE - GTK_SHADOW_IN - GTK_SHADOW_OUT - GTK_SHADOW_ETCHED_IN - GTK_SHADOW_ETCHED_OUT - */ + GTK_SHADOW_NONE + GTK_SHADOW_IN + GTK_SHADOW_OUT + GTK_SHADOW_ETCHED_IN + GTK_SHADOW_ETCHED_OUT + */ settings.shadow_type = GTK_SHADOW_IN; XI_print(("%s xiphos-%s\n", "Starting", VERSION)); @@ -907,24 +897,25 @@ widgets.studypad_dialog = NULL; widgets.app = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (widgets.app), _("Xiphos - Bible Study Software")); + gtk_window_set_title(GTK_WINDOW(widgets.app), + _("Xiphos - Bible Study Software")); g_object_set_data(G_OBJECT(widgets.app), "widgets.app", widgets.app); gtk_widget_set_size_request(widgets.app, 680, 425); - gtk_widget_set_can_focus (widgets.app, 1); + gtk_widget_set_can_focus(widgets.app, 1); gtk_window_set_resizable(GTK_WINDOW(widgets.app), TRUE); imagename = image_locator("gs2-48x48.png"); - pixbuf = gdk_pixbuf_new_from_file (imagename, NULL); + pixbuf = gdk_pixbuf_new_from_file(imagename, NULL); g_free(imagename); - gtk_window_set_icon (GTK_WINDOW(widgets.app), pixbuf); + gtk_window_set_icon(GTK_WINDOW(widgets.app), pixbuf); UI_VBOX(vbox_gs, FALSE, 0); gtk_widget_show(vbox_gs); - gtk_container_add (GTK_CONTAINER (widgets.app), vbox_gs); + gtk_container_add(GTK_CONTAINER(widgets.app), vbox_gs); - menu = gui_create_main_menu (); + menu = gui_create_main_menu(); gtk_box_pack_start(GTK_BOX(vbox_gs), menu, FALSE, TRUE, 0); @@ -932,17 +923,24 @@ gtk_widget_show(hbox25); gtk_box_pack_start(GTK_BOX(vbox_gs), hbox25, TRUE, TRUE, 0); -/**widgets.epaned********/ + /**widgets.epaned********/ widgets.epaned = UI_HPANE(); gtk_widget_show(widgets.epaned); - gtk_container_set_border_width (GTK_CONTAINER (widgets.epaned), 4); +#ifdef HAVE_GTK_314 + gtk_container_set_border_width(GTK_CONTAINER(widgets.epaned), 0); +#else + gtk_container_set_border_width(GTK_CONTAINER(widgets.epaned), 4); +#endif gtk_box_pack_start(GTK_BOX(hbox25), widgets.epaned, TRUE, TRUE, 0); UI_VBOX(widgets.vboxMain, FALSE, 0); gtk_widget_show(widgets.vboxMain); - gtk_paned_pack2(GTK_PANED(widgets.epaned), widgets.vboxMain, - TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(widgets.epaned), widgets.vboxMain, TRUE, TRUE); +#ifdef HAVE_GTK_314 + gtk_container_set_border_width(GTK_CONTAINER(widgets.vboxMain), 0); +#else gtk_container_set_border_width(GTK_CONTAINER(widgets.vboxMain), 2); +#endif /* * notebook to have separate passages opened at once @@ -952,35 +950,41 @@ UI_HBOX(widgets.hboxtb, FALSE, 0); if (settings.browsing) gtk_widget_show(widgets.hboxtb); - gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.hboxtb, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.hboxtb, + FALSE, FALSE, 0); widgets.button_new_tab = gtk_button_new(); //don't show button here in case !settings.browsing - tab_button_icon = + tab_button_icon = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("list-add", - GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_image_new_from_icon_name("tab-new-symbolic", + GTK_ICON_SIZE_SMALL_TOOLBAR); #else - gtk_image_new_from_stock(GTK_STOCK_ADD, - GTK_ICON_SIZE_SMALL_TOOLBAR); -#endif + gtk_image_new_from_stock(GTK_STOCK_ADD, + GTK_ICON_SIZE_SMALL_TOOLBAR); +#endif gtk_widget_show(tab_button_icon); - gtk_container_add(GTK_CONTAINER(widgets.button_new_tab), tab_button_icon); - gtk_button_set_relief(GTK_BUTTON(widgets.button_new_tab), GTK_RELIEF_NONE); - gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.button_new_tab, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(widgets.button_new_tab, _("Open a new tab")); + gtk_container_add(GTK_CONTAINER(widgets.button_new_tab), + tab_button_icon); + gtk_button_set_relief(GTK_BUTTON(widgets.button_new_tab), + GTK_RELIEF_NONE); + gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.button_new_tab, + FALSE, FALSE, 0); + gtk_widget_set_tooltip_text(widgets.button_new_tab, + _("Open a new tab")); widgets.notebook_main = gtk_notebook_new(); gtk_widget_show(widgets.notebook_main); gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.notebook_main, TRUE, TRUE, 0); gtk_widget_set_size_request(widgets.notebook_main, -1, 25); - gtk_notebook_set_scrollable (GTK_NOTEBOOK(widgets.notebook_main), - TRUE); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(widgets.notebook_main), + TRUE); gtk_notebook_popup_enable(GTK_NOTEBOOK(widgets.notebook_main)); - gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_main), FALSE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_main), + FALSE); /* main passage tabbed notebook end */ UI_VBOX(widgets.page, FALSE, 0); @@ -997,23 +1001,26 @@ * end nav toolbar */ -/**widgets.hpaned********/ + /**widgets.hpaned********/ widgets.hpaned = UI_HPANE(); gtk_widget_show(widgets.hpaned); - gtk_box_pack_start(GTK_BOX(widgets.page), widgets.hpaned, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(widgets.page), widgets.hpaned, TRUE, + TRUE, 0); -/**widgets.vpaned********/ + /**widgets.vpaned********/ widgets.vpaned = UI_VPANE(); gtk_widget_show(widgets.vpaned); gtk_widget_set_size_request(widgets.vpaned, 50, -1); - gtk_paned_pack1(GTK_PANED(widgets.hpaned), widgets.vpaned, TRUE, FALSE); + gtk_paned_pack1(GTK_PANED(widgets.hpaned), widgets.vpaned, TRUE, + FALSE); widgets.vpaned2 = UI_VPANE(); gtk_widget_show(widgets.vpaned2); gtk_widget_set_size_request(widgets.vpaned2, 50, -1); - gtk_paned_pack2(GTK_PANED(widgets.hpaned), widgets.vpaned2, TRUE, FALSE); + gtk_paned_pack2(GTK_PANED(widgets.hpaned), widgets.vpaned2, TRUE, + FALSE); -/**widgets.hpaned********/ + /**widgets.hpaned********/ UI_VBOX(widgets.vbox_text, FALSE, 0); gtk_widget_show(widgets.vbox_text); gtk_paned_pack1(GTK_PANED(widgets.vpaned), @@ -1025,23 +1032,19 @@ widgets.notebook_bible_parallel = gtk_notebook_new(); gtk_widget_show(widgets.notebook_bible_parallel); gtk_box_pack_start(GTK_BOX(widgets.vbox_text), - widgets.notebook_bible_parallel, TRUE, - TRUE, 0); - gtk_notebook_set_tab_pos( - GTK_NOTEBOOK(widgets.notebook_bible_parallel), + widgets.notebook_bible_parallel, TRUE, TRUE, 0); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_bible_parallel), GTK_POS_BOTTOM); - gtk_notebook_set_show_tabs( - GTK_NOTEBOOK(widgets.notebook_bible_parallel), TRUE); - gtk_notebook_set_show_border( - GTK_NOTEBOOK(widgets.notebook_bible_parallel), FALSE); - gtk_container_set_border_width ( - GTK_CONTAINER (widgets.notebook_bible_parallel), 1); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + TRUE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + FALSE); + gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_bible_parallel), + 1); g_signal_connect(G_OBJECT(widgets.notebook_bible_parallel), - "change-current-page", - G_CALLBACK - (on_notebook_bible_parallel_switch_page), - NULL); + "change-current-page", + G_CALLBACK(on_notebook_bible_parallel_switch_page), NULL); /* * text notebook */ @@ -1053,10 +1056,8 @@ label = gtk_label_new(_("Standard View")); gtk_widget_show(label); gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - gtk_notebook_get_nth_page - (GTK_NOTEBOOK - (widgets.notebook_bible_parallel), - 0), + gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + 0), label); /* @@ -1064,25 +1065,25 @@ */ UI_VBOX(widgets.vbox_previewer, FALSE, 0); gtk_widget_show(widgets.vbox_previewer); - gtk_container_set_border_width (GTK_CONTAINER (widgets.vbox_previewer), 1); - gtk_paned_pack2(GTK_PANED(widgets.vpaned), widgets.vbox_previewer, TRUE, TRUE); + gtk_container_set_border_width(GTK_CONTAINER(widgets.vbox_previewer), 1); + gtk_paned_pack2(GTK_PANED(widgets.vpaned), widgets.vbox_previewer, + TRUE, TRUE); gtk_container_set_border_width(GTK_CONTAINER(widgets.vbox_previewer), 2); scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), scrolledwindow, TRUE, TRUE, - 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), scrolledwindow, + TRUE, TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); - widgets.html_previewer_text - = GTK_WIDGET ( XIPHOS_HTML_NEW( NULL, FALSE, VIEWER_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_previewer_text); + widgets.html_previewer_text = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, VIEWER_TYPE)); + gtk_container_add(GTK_CONTAINER(scrolledwindow), + widgets.html_previewer_text); gtk_widget_show(widgets.html_previewer_text); @@ -1094,46 +1095,40 @@ gtk_paned_pack1(GTK_PANED(widgets.vpaned2), widgets.notebook_comm_book, TRUE, TRUE); - gtk_container_set_border_width (GTK_CONTAINER (widgets.notebook_comm_book), 1); + gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_comm_book), 1); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_comm_book), - GTK_POS_BOTTOM); - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets. - notebook_comm_book), TRUE); - gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets. - notebook_comm_book), FALSE); + GTK_POS_BOTTOM); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_comm_book), TRUE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_comm_book), FALSE); /* * commentary pane */ widgets.box_comm = gui_create_commentary_pane(); - gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), + gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), widgets.box_comm); label = gtk_label_new(_("Commentary View")); gtk_widget_show(label); gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), - gtk_notebook_get_nth_page - (GTK_NOTEBOOK - (widgets.notebook_comm_book), - 0), + gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), + 0), label); /* * book pane */ box_book = gui_create_book_pane(); - gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), + gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), box_book); label = gtk_label_new(_("Book View")); gtk_widget_show(label); gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), - gtk_notebook_get_nth_page - (GTK_NOTEBOOK - (widgets.notebook_comm_book), - 1), + gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), + 1), label); /* @@ -1146,65 +1141,59 @@ * end dict/lex */ - widgets.appbar = gtk_statusbar_new (); + widgets.appbar = gtk_statusbar_new(); + + if (settings.statusbar) { + gtk_widget_show(widgets.appbar); + } - gtk_widget_show(widgets.appbar); #ifndef USE_GTK_3 - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(widgets.appbar), - TRUE); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(widgets.appbar), + TRUE); #endif - gtk_box_pack_start(GTK_BOX(vbox_gs), widgets.appbar, FALSE, TRUE, 0); - gui_set_statusbar (_("Welcome to Xiphos")); + gtk_box_pack_start(GTK_BOX(vbox_gs), widgets.appbar, FALSE, TRUE, + 0); + gui_set_statusbar(_("Welcome to Xiphos")); - g_signal_connect ((gpointer) vbox_gs, "key_press_event", - G_CALLBACK (on_vbox1_key_press_event), - NULL); - g_signal_connect ((gpointer) vbox_gs, "key_release_event", - G_CALLBACK (on_vbox1_key_release_event), - NULL); + g_signal_connect((gpointer)vbox_gs, "key_press_event", + G_CALLBACK(on_vbox1_key_press_event), NULL); + g_signal_connect((gpointer)vbox_gs, "key_release_event", + G_CALLBACK(on_vbox1_key_release_event), NULL); g_signal_connect(G_OBJECT(widgets.notebook_comm_book), - "switch_page", - G_CALLBACK - (on_notebook_comm_book_switch_page), - NULL); + "switch_page", + G_CALLBACK(on_notebook_comm_book_switch_page), NULL); g_signal_connect(G_OBJECT(widgets.app), "delete_event", - G_CALLBACK(delete_event), NULL); + G_CALLBACK(delete_event), NULL); - g_signal_connect((gpointer) widgets.app, + g_signal_connect((gpointer)widgets.app, "configure_event", G_CALLBACK(on_configure_event), NULL); g_signal_connect(G_OBJECT(widgets.epaned), - "button_release_event", - G_CALLBACK - (epaned_button_release_event), - (gchar *) "epaned"); + "button_release_event", + G_CALLBACK(epaned_button_release_event), + (gchar *)"epaned"); g_signal_connect(G_OBJECT(widgets.vpaned), - "button_release_event", - G_CALLBACK - (epaned_button_release_event), - (gchar *) "vpaned"); + "button_release_event", + G_CALLBACK(epaned_button_release_event), + (gchar *)"vpaned"); g_signal_connect(G_OBJECT(widgets.vpaned2), - "button_release_event", - G_CALLBACK - (epaned_button_release_event), - (gchar *) "vpaned2"); + "button_release_event", + G_CALLBACK(epaned_button_release_event), + (gchar *)"vpaned2"); g_signal_connect(G_OBJECT(widgets.hpaned), - "button_release_event", - G_CALLBACK - (epaned_button_release_event), - (gchar *) "hpaned1"); + "button_release_event", + G_CALLBACK(epaned_button_release_event), + (gchar *)"hpaned1"); gtk_widget_grab_focus(navbar_versekey.lookup_entry); gtk_window_set_default_size((GtkWindow *)widgets.app, - settings.gs_width, - settings.gs_height); + settings.gs_width, settings.gs_height); main_window_created = TRUE; } - /****************************************************************************** * Name * gui_show_main_window diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/menu_popup.c xiphos-4.0.4+dfsg1/src/gnome2/menu_popup.c --- xiphos-4.0.0+dfsg1/src/gnome2/menu_popup.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/menu_popup.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * menu_popup.c - main window panes and dialogs popup menus * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,9 +24,9 @@ #endif #include - + #ifndef USE_GTKBUILDER - #include +#include #endif #include @@ -37,7 +37,6 @@ #include "xiphos_html/xiphos_html.h" - #include "gui/menu_popup.h" #include "gui/cipher_key_dialog.h" #include "gui/dialog.h" @@ -66,12 +65,10 @@ #include "gui/debug_glib_null.h" - static gchar *menu_mod_name = NULL; -static DIALOG_DATA * dialog = NULL; +static DIALOG_DATA *dialog = NULL; static int is_dialog = 0; - /****************************************************************************** * Name * @@ -88,29 +85,28 @@ * */ -gint _get_type_mod_list (void) +gint _get_type_mod_list(void) { - switch (main_get_mod_type(menu_mod_name)) { - case TEXT_TYPE: - return TEXT_DESC_LIST; - break; - case COMMENTARY_TYPE: - case PERCOM_TYPE: - return COMM_DESC_LIST; - break; - case DICTIONARY_TYPE: - return DICT_DESC_LIST; - break; - case BOOK_TYPE: - return GBS_DESC_LIST; - break; - default: - return -1; - break; + switch (main_get_mod_type(menu_mod_name)) { + case TEXT_TYPE: + return TEXT_DESC_LIST; + break; + case COMMENTARY_TYPE: + case PERCOM_TYPE: + return COMM_DESC_LIST; + break; + case DICTIONARY_TYPE: + return DICT_DESC_LIST; + break; + case BOOK_TYPE: + return GBS_DESC_LIST; + break; + default: + return -1; + break; } } - /****************************************************************************** * Name * @@ -127,30 +123,30 @@ * */ -gchar * _get_key (gchar * mod_name) +gchar *_get_key(gchar *mod_name) { - gchar *key = NULL; + gchar *key = NULL; - if (is_dialog) return g_strdup (dialog->key); + if (is_dialog) + return g_strdup(dialog->key); switch (main_get_mod_type(mod_name)) { - case TEXT_TYPE: - case COMMENTARY_TYPE: - case PERCOM_TYPE: - key = g_strdup (settings.currentverse); - break; - case DICTIONARY_TYPE: - key = g_strdup (settings.dictkey); - break; - case BOOK_TYPE: - case PRAYERLIST_TYPE: - key = g_strdup (settings.book_key); - break; + case TEXT_TYPE: + case COMMENTARY_TYPE: + case PERCOM_TYPE: + key = g_strdup(settings.currentverse); + break; + case DICTIONARY_TYPE: + key = g_strdup(settings.dictkey); + break; + case BOOK_TYPE: + case PRAYERLIST_TYPE: + key = g_strdup(settings.book_key); + break; } - return key; + return key; } - /****************************************************************************** * Name * @@ -167,11 +163,11 @@ * */ -GtkWidget * _get_html (void) +GtkWidget *_get_html(void) { - if (is_dialog) + if (is_dialog) return dialog->html; - else + else switch (main_get_mod_type(menu_mod_name)) { case TEXT_TYPE: return widgets.html_text; @@ -188,10 +184,9 @@ return widgets.html_book; break; } - return NULL; + return NULL; } - /****************************************************************************** * Name * _global_option_main_pane @@ -209,32 +204,31 @@ * void */ -static -void _global_option_main_pane(GtkMenuItem * menuitem, const gchar * option) +static void _global_option_main_pane(GtkMenuItem *menuitem, const gchar *option) { gchar *key = _get_key(menu_mod_name); - gchar *mod = (gchar*) (is_dialog ? dialog->mod_name : menu_mod_name); - XI_message(("module option = %s",option)); - if (key) { - gchar *url = g_strdup_printf ("sword://%s/%s", + gchar *mod = + (gchar *)(is_dialog ? dialog->mod_name : menu_mod_name); + XI_message(("module option = %s", option)); + if (key) { + gchar *url = g_strdup_printf("sword://%s/%s", mod, key); - main_save_module_options (mod, (gchar*) option, - gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))); + main_save_module_options(mod, (gchar *)option, + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))); if (is_dialog) { /* show the change */ main_dialogs_url_handler(dialog, url, TRUE); } else { /* show the change */ - main_url_handler (url, TRUE); + main_url_handler(url, TRUE); } - g_free (url); - g_free (key); + g_free(url); + g_free(key); } } - /****************************************************************************** * Name * @@ -251,22 +245,23 @@ * */ -static void on_edit_percomm_activate (GtkMenuItem * menuitem, gpointer user_data) +static void on_edit_percomm_activate(GtkMenuItem *menuitem, + gpointer user_data) { gchar *key; - if (is_dialog) + if (is_dialog) key = g_strdup(dialog->key); - else - key = _get_key(menu_mod_name); - if (key ) { - XI_message(("\n\npercomm key: %s\n\n",key)); - editor_create_new((gchar *)user_data, (gchar *) key, NOTE_EDITOR); - g_free (key); - } + else + key = _get_key(menu_mod_name); + if (key) { + XI_message(("\n\npercomm key: %s\n\n", key)); + editor_create_new((gchar *)user_data, (gchar *)key, + NOTE_EDITOR); + g_free(key); + } } - /****************************************************************************** * Name * @@ -283,20 +278,14 @@ * */ -static void on_edit_prayerlist_activate (GtkMenuItem * menuitem, gpointer user_data) +static void on_edit_prayerlist_activate(GtkMenuItem *menuitem, + gpointer user_data) { - XI_message(("settings.book_key: %s",(char*)(is_dialog ? - dialog->key : - settings.book_key))); + XI_message(("settings.book_key: %s", (char *)(is_dialog ? dialog->key : settings.book_key))); editor_create_new((gchar *)user_data, - (gchar*) (is_dialog ? - dialog->key : - settings.book_key), - BOOK_EDITOR); - + (gchar *)(is_dialog ? dialog->key : settings.book_key), BOOK_EDITOR); } - /****************************************************************************** * Name * @@ -313,14 +302,12 @@ * */ -G_MODULE_EXPORT void on_popup_about_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_popup_about_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gui_display_about_module_dialog((is_dialog ? - dialog->mod_name : - menu_mod_name)); + gui_display_about_module_dialog((is_dialog ? dialog->mod_name : menu_mod_name)); } - /****************************************************************************** * Name * @@ -337,26 +324,24 @@ * */ -G_MODULE_EXPORT void on_popup_bookmark_activate (GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_popup_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data) { gchar *key; - if (is_dialog) return; + if (is_dialog) + return; - if ((key = _get_key(menu_mod_name))) { + if ((key = _get_key(menu_mod_name))) { gchar *label = g_strdup_printf("%s, %s", key, menu_mod_name); - gui_bookmark_dialog(label, - menu_mod_name, - key); - g_free (label); - g_free (key); + gui_bookmark_dialog(label, menu_mod_name, key); + g_free(label); + g_free(key); } } - /****************************************************************************** * Name * @@ -373,15 +358,16 @@ * */ -G_MODULE_EXPORT void on_popup_export_passage_activate (GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_popup_export_passage_activate(GtkMenuItem * + menuitem, + gpointer user_data) { - if (is_dialog) return; + if (is_dialog) + return; gui_export_dialog(); } - /****************************************************************************** * Name * @@ -398,19 +384,18 @@ * */ -G_MODULE_EXPORT void on_popup_print_activate(GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_popup_print_activate(GtkMenuItem *menuitem, + gpointer user_data) { /* there is some weirdness here, from having eliminated gtkhtml3. * we must understand why this is an interesting conditional. */ if (is_dialog) { - XIPHOS_HTML_PRINT_DOCUMENT ((XiphosHtml*) user_data); + XIPHOS_HTML_PRINT_DOCUMENT((XiphosHtml *)user_data); } else { - XIPHOS_HTML_PRINT_DOCUMENT ((XiphosHtml*) user_data); + XIPHOS_HTML_PRINT_DOCUMENT((XiphosHtml *)user_data); } } - /****************************************************************************** * Name * @@ -427,13 +412,12 @@ * */ -G_MODULE_EXPORT void on_close_activate (GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_close_activate(GtkMenuItem *menuitem, + gpointer user_data) { /* FIXME */ } - /****************************************************************************** * Name * @@ -450,18 +434,17 @@ * */ -G_MODULE_EXPORT void on_popup_copy_activate (GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_popup_copy_activate(GtkMenuItem *menuitem, + gpointer user_data) { /* ditto above comment re: printing */ if (is_dialog) { XIPHOS_HTML_COPY_SELECTION(dialog->html); } else { - XIPHOS_HTML_COPY_SELECTION(_get_html ()); + XIPHOS_HTML_COPY_SELECTION(_get_html()); } } - /****************************************************************************** * Name * @@ -478,16 +461,15 @@ * */ -G_MODULE_EXPORT void on_popup_find_activate (GtkMenuItem *menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_popup_find_activate(GtkMenuItem *menuitem, + gpointer user_data) { - if (is_dialog) - gui_find_dlg (dialog->html, dialog->mod_name, FALSE, NULL); - else - gui_find_dlg (_get_html (), menu_mod_name, FALSE, NULL); + if (is_dialog) + gui_find_dlg(dialog->html, dialog->mod_name, FALSE, NULL); + else + gui_find_dlg(_get_html(), menu_mod_name, FALSE, NULL); } - /****************************************************************************** * Name * @@ -504,7 +486,8 @@ * */ -G_MODULE_EXPORT void on_popup_font_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_popup_font_activate(GtkMenuItem *menuitem, + gpointer user_data) { if (is_dialog) { gchar *url = g_strdup_printf("sword://%s/%s", @@ -515,21 +498,20 @@ main_dialogs_url_handler(dialog, url, TRUE); g_free(url); } else { - gchar *key = _get_key(menu_mod_name); - if (key) { + gchar *key = _get_key(menu_mod_name); + if (key) { gchar *url = g_strdup_printf("sword://%s/%s", menu_mod_name, key); - gui_set_module_font (menu_mod_name); + gui_set_module_font(menu_mod_name); /* show the change */ - main_url_handler (url, TRUE); - g_free (url); - g_free (key); - } + main_url_handler(url, TRUE); + g_free(url); + g_free(key); + } } } - /****************************************************************************** * Name * @@ -546,29 +528,31 @@ * */ -G_MODULE_EXPORT void on_verse_per_line_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_verse_per_line_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { gchar *file = g_strdup_printf("%s/modops.conf", settings.gSwordDir); - + gchar *url = g_strdup_printf("sword://%s/%s", (is_dialog ? dialog->mod_name : settings.MainWindowModule), (is_dialog ? dialog->key : settings.currentverse)); - - save_conf_file_item(file, (is_dialog - ? dialog->mod_name - : settings.MainWindowModule), - "style", - (gtk_check_menu_item_get_active (menuitem) - ? "verse" - : "paragraph")); + save_conf_file_item(file, (is_dialog + ? dialog->mod_name + : settings.MainWindowModule), + "style", + (gtk_check_menu_item_get_active(menuitem) + ? "verse" + : "paragraph")); if (settings.havebible) { - if (is_dialog) { - /* show the change */ + if (is_dialog) { + /* show the change */ main_dialogs_url_handler(dialog, url, TRUE); - } else { - settings.versestyle = gtk_check_menu_item_get_active (menuitem); + } else { + settings.versestyle = + gtk_check_menu_item_get_active(menuitem); main_url_handler(url, TRUE); } } @@ -576,7 +560,6 @@ g_free(file); } - /****************************************************************************** * Name * @@ -593,13 +576,13 @@ * */ -G_MODULE_EXPORT void on_words_of_christ_in_red_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_words_of_christ_in_red_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, - "Words of Christ in Red"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Words of Christ in Red"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -616,12 +599,13 @@ * */ -G_MODULE_EXPORT void on_strong_s_numbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_strong_s_numbers_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Strong's Numbers"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Strong's Numbers"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -638,12 +622,13 @@ * */ -G_MODULE_EXPORT void on_morphological_tags_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_morphological_tags_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Morphological Tags"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Morphological Tags"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -660,12 +645,12 @@ * */ -G_MODULE_EXPORT void on_footnotes_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_footnotes_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Footnotes"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Footnotes"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -682,12 +667,12 @@ * */ -G_MODULE_EXPORT void on_greek_accents_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_greek_accents_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Greek Accents"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Greek Accents"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -704,12 +689,12 @@ * */ -G_MODULE_EXPORT void on_lemmas_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_lemmas_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Lemmas"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Lemmas"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -726,13 +711,13 @@ * */ -G_MODULE_EXPORT void on_scripture_cross_references_activate (GtkCheckMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void +on_scripture_cross_references_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Cross-references"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Cross-references"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -749,13 +734,13 @@ * */ -G_MODULE_EXPORT void on_hebrew_vowel_points_activate (GtkCheckMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_hebrew_vowel_points_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Hebrew Vowel Points"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Hebrew Vowel Points"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -772,13 +757,13 @@ * */ -G_MODULE_EXPORT void on_hebrew_cantillation_activate (GtkCheckMenuItem * menuitem, - gpointer user_data) +G_MODULE_EXPORT void on_hebrew_cantillation_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Hebrew Cantillation"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Hebrew Cantillation"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -795,12 +780,12 @@ * */ -G_MODULE_EXPORT void on_headings_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_headings_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Headings"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Headings"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -817,9 +802,11 @@ * */ -G_MODULE_EXPORT void on_transliteration_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_transliteration_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Transliteration"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Transliteration"); /* string not seen by user */ } /****************************************************************************** @@ -838,12 +825,13 @@ * */ -G_MODULE_EXPORT void on_commentary_by_chapter_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_commentary_by_chapter_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Commentary by Chapter"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Commentary by Chapter"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -860,12 +848,12 @@ * */ -G_MODULE_EXPORT void on_doublespace_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_doublespace_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Doublespace"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Doublespace"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -882,12 +870,13 @@ * */ -G_MODULE_EXPORT void on_xrefnotenumbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_xrefnotenumbers_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "XrefNoteNumbers"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "XrefNoteNumbers"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -904,11 +893,33 @@ * */ -G_MODULE_EXPORT void on_xlit_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_xlit_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Transliterated Forms"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Transliterated Forms"); /* string not seen by user */ } +/****************************************************************************** + * Name + * + * + * Synopsis + * #include "gui/menu_popup.h" + * + * + * + * Description + * + * + * Return value + * + */ + +G_MODULE_EXPORT void on_enumerated_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) +{ + _global_option_main_pane((GtkMenuItem *)menuitem, "Enumerations"); /* string not seen by user */ +} /****************************************************************************** * Name @@ -926,11 +937,33 @@ * */ -G_MODULE_EXPORT void on_enumerated_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_glosses_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Enumerations"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Glosses"); /* string not seen by user */ } +/****************************************************************************** + * Name + * + * + * Synopsis + * #include "gui/menu_popup.h" + * + * + * + * Description + * + * + * Return value + * + */ + +G_MODULE_EXPORT void on_morphseg_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) +{ + _global_option_main_pane((GtkMenuItem *)menuitem, "Morpheme Segmentation"); /* string not seen by user */ +} /****************************************************************************** * Name @@ -948,7 +981,9 @@ * */ -G_MODULE_EXPORT void on_primary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_primary_reading_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { gchar *key = NULL; @@ -956,21 +991,20 @@ reading_selector(dialog->mod_name, dialog->key, dialog, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(0)); } else { if ((key = _get_key(menu_mod_name))) { reading_selector(menu_mod_name, key, NULL, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(0)); - g_free (key); + g_free(key); } } } - /****************************************************************************** * Name * @@ -987,29 +1021,30 @@ * */ -G_MODULE_EXPORT void on_secondary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_secondary_reading_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - gchar *key = NULL; + gchar *key = NULL; if (is_dialog) { reading_selector(dialog->mod_name, dialog->key, dialog, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(1)); } else { if ((key = _get_key(menu_mod_name))) { reading_selector(menu_mod_name, key, NULL, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(1)); - g_free (key); + g_free(key); } } } - /****************************************************************************** * Name * @@ -1026,30 +1061,29 @@ * */ -G_MODULE_EXPORT void on_all_readings_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_all_readings_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - gchar *key = NULL; + gchar *key = NULL; if (is_dialog) { reading_selector(dialog->mod_name, dialog->key, dialog, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(2)); } else { if ((key = _get_key(menu_mod_name))) { reading_selector(menu_mod_name, key, NULL, - (GtkMenuItem*)menuitem, + (GtkMenuItem *)menuitem, GINT_TO_POINTER(2)); - g_free (key); + g_free(key); } } - } - /****************************************************************************** * Name * @@ -1066,12 +1100,12 @@ * */ -G_MODULE_EXPORT void on_image_content_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_image_content_activate(GtkCheckMenuItem *menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Image Content"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Image Content"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -1088,12 +1122,13 @@ * */ -G_MODULE_EXPORT void on_respect_font_faces_activate (GtkCheckMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_respect_font_faces_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data) { - _global_option_main_pane((GtkMenuItem*)menuitem, "Respect Font Faces"); /* string not seen by user */ + _global_option_main_pane((GtkMenuItem *)menuitem, "Respect Font Faces"); /* string not seen by user */ } - /****************************************************************************** * Name * @@ -1110,13 +1145,14 @@ * */ -G_MODULE_EXPORT void on_unlock_this_module_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_unlock_this_module_activate(GtkMenuItem *menuitem, + gpointer user_data) { - if (is_dialog) return; + if (is_dialog) + return; main_check_unlock(menu_mod_name, FALSE); } - /****************************************************************************** * Name * @@ -1133,15 +1169,16 @@ * */ -G_MODULE_EXPORT void on_display_book_heading_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_display_book_heading_activate(GtkMenuItem * + menuitem, + gpointer user_data) { if (is_dialog) - main_dialogs_book_heading (dialog); + main_dialogs_book_heading(dialog); else - main_book_heading (menu_mod_name); + main_book_heading(menu_mod_name); } - /****************************************************************************** * Name * @@ -1158,15 +1195,17 @@ * */ -G_MODULE_EXPORT void on_display_chapter_heading_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_display_chapter_heading_activate(GtkMenuItem * + menuitem, + gpointer + user_data) { if (is_dialog) - main_dialogs_chapter_heading (dialog); + main_dialogs_chapter_heading(dialog); else - main_chapter_heading (menu_mod_name); + main_chapter_heading(menu_mod_name); } - /****************************************************************************** * Name * @@ -1183,15 +1222,17 @@ * */ -G_MODULE_EXPORT void on_use_current_dictionary_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_use_current_dictionary_activate(GtkMenuItem * + menuitem, + gpointer user_data) { XIPHOS_HTML_COPY_SELECTION(_get_html()); - gtk_editable_select_region((GtkEditable *)widgets.entry_dict,0,-1); + gtk_editable_select_region((GtkEditable *)widgets.entry_dict, 0, + -1); gtk_editable_paste_clipboard((GtkEditable *)widgets.entry_dict); gtk_widget_activate(widgets.entry_dict); } - /****************************************************************************** * Name * on_lookup_google_activate @@ -1206,27 +1247,29 @@ * void */ -G_MODULE_EXPORT void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_lookup_google_activate(GtkMenuItem *menuitem, + gpointer user_data) { - gchar *dict_key, *showstr; + gchar *dict_key; XIPHOS_HTML_COPY_SELECTION(_get_html()); - gtk_editable_select_region((GtkEditable *)widgets.entry_dict,0,-1); + gtk_editable_select_region((GtkEditable *)widgets.entry_dict, 0, + -1); gtk_editable_paste_clipboard((GtkEditable *)widgets.entry_dict); - dict_key = g_strdup(gtk_editable_get_chars( - (GtkEditable *)widgets.entry_dict,0,-1)); + dict_key = + g_strdup(gtk_editable_get_chars((GtkEditable *)widgets.entry_dict, 0, -1)); if ((dict_key == NULL) || (*dict_key == '\0')) { gui_generic_warning("No selection made"); } else { - showstr = g_strconcat("http://www.biblemap.org/#", dict_key, NULL); - xiphos_open_default (showstr); + gchar *showstr = + g_strconcat("http://www.biblemap.org/#", dict_key, NULL); + xiphos_open_default(showstr); g_free(showstr); } g_free(dict_key); } - /****************************************************************************** * Name * @@ -1243,9 +1286,11 @@ * */ -G_MODULE_EXPORT void on_rename_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_rename_perscomm_activate(GtkMenuItem *menuitem, + gpointer user_data) { - if (is_dialog) return; + if (is_dialog) + return; #if defined(WIN32) gui_generic_warning(_("Renaming is not available in Windows.\n\n" @@ -1282,41 +1327,40 @@ for (s = info->text1; *s; ++s) { if (!isalnum(*s) && (*s != '_')) { - gui_generic_warning_modal - (_("Module names must contain [A-Za-z0-9_] only.")); + gui_generic_warning_modal(_("Module names must contain [A-Za-z0-9_] only.")); goto out1; } } if (main_is_module(info->text1)) { - gui_generic_warning_modal - (_("Xiphos already knows a module by that name.")); + gui_generic_warning_modal(_("Xiphos already knows a module by that name.")); goto out1; } sworddir = g_strdup_printf("%s/" DOTSWORD, settings.homedir); - modsdir = g_strdup_printf("%s/mods.d", sworddir); + modsdir = g_strdup_printf("%s/mods.d", sworddir); conf_old = main_get_mod_config_file(settings.CommWindowModule, sworddir); - conf_new = g_strdup(info->text1); // dirname is lowercase. + conf_new = g_strdup(info->text1); // dirname is lowercase. for (s = conf_new; *s; ++s) if (isupper(*s)) *s = tolower(*s); datapath_old = - main_get_mod_config_entry(settings.CommWindowModule, "DataPath"); + main_get_mod_config_entry(settings.CommWindowModule, + "DataPath"); datapath_new = g_strdup(datapath_old); if ((s = strstr(datapath_new, "rawfiles/")) == NULL) { - gui_generic_warning_modal("Malformed datapath in old configuration!"); - goto out2; + gui_generic_warning_modal("Malformed datapath in old configuration!"); + goto out2; } - *(s+9) = '\0'; // skip past "rawfiles/". + *(s + 9) = '\0'; // skip past "rawfiles/". s = g_strdup_printf("%s%s", datapath_new, conf_new); - g_free(datapath_new); // out with the old... - datapath_new = s; // ..and in with the new. + g_free(datapath_new); // out with the old... + datapath_new = s; // ..and in with the new. // move old data directory to new. if ((g_chdir(sworddir) != 0) || @@ -1324,11 +1368,11 @@ gui_generic_warning_modal("Failed to rename directory."); goto out2; } - // manufacture new .conf from old. g_string_printf(workstr, "( cd \"%s\" && sed -e '/^\\[/s|^.*$|[%s]|' -e '/^DataPath=/s|rawfiles/.*$|rawfiles/%s/|' < \"%s\" > \"%s.conf\" ) 2>&1", - modsdir, info->text1, conf_new, conf_old, conf_new); + modsdir, info->text1, conf_new, conf_old, + conf_new); if ((result = popen(workstr->str, "r")) == NULL) { g_string_printf(workstr, _("Failed to create new configuration:\n%s"), @@ -1343,7 +1387,7 @@ _("Configuration build error:\n\n")); g_string_append(workstr, output); gui_generic_warning_modal(workstr->str); - goto out2; // necessary? advisable? + goto out2; // necessary? advisable? } pclose(result); } @@ -1363,7 +1407,7 @@ out2: g_free(conf_new); - g_free((char*)conf_old); + g_free((char *)conf_old); g_free(datapath_old); g_free(datapath_new); g_free(modsdir); @@ -1375,7 +1419,6 @@ #endif /* !WIN32 */ } - /****************************************************************************** * Name * @@ -1392,12 +1435,12 @@ * */ -G_MODULE_EXPORT void on_dump_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_dump_perscomm_activate(GtkMenuItem *menuitem, + gpointer user_data) { - main_sidebar_perscomm_dump (); + main_sidebar_perscomm_dump(); } - /****************************************************************************** * Name * on_read_selection_aloud_activate @@ -1412,18 +1455,20 @@ * void */ -G_MODULE_EXPORT void on_read_selection_aloud_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_read_selection_aloud_activate(GtkMenuItem * + menuitem, + gpointer user_data) { gchar *dict_key; int len; GtkWidget *html_widget = _get_html(); XIPHOS_HTML_COPY_SELECTION(html_widget); - gtk_editable_select_region((GtkEditable *)widgets.entry_dict,0,-1); + gtk_editable_select_region((GtkEditable *)widgets.entry_dict, 0, + -1); gtk_editable_paste_clipboard((GtkEditable *)widgets.entry_dict); dict_key = - g_strdup(gtk_editable_get_chars( - (GtkEditable *)widgets.entry_dict,0,-1)); + g_strdup(gtk_editable_get_chars((GtkEditable *)widgets.entry_dict, 0, -1)); len = (dict_key ? strlen(dict_key) : 0); if (dict_key && len && *dict_key) { @@ -1447,13 +1492,15 @@ * void */ -G_MODULE_EXPORT void on_mark_verse_activate (GtkMenuItem * menuitem, gpointer user_data) +G_MODULE_EXPORT void on_mark_verse_activate(GtkMenuItem *menuitem, + gpointer user_data) { gchar *key; - if (is_dialog) return; + if (is_dialog) + return; - if ((key = _get_key(menu_mod_name))) { + if ((key = _get_key(menu_mod_name))) { gui_mark_verse_dialog(menu_mod_name, key); g_free(key); } @@ -1480,181 +1527,219 @@ #else G_MODULE_EXPORT void _add_and_check_global_opts(GladeXML *gxml, #endif - const gchar * mod_name, - GtkWidget * submenu, - DIALOG_DATA * d) + const gchar *mod_name, + GtkWidget *submenu, + DIALOG_DATA *d) { - GtkWidget * item; + GtkWidget *item; GLOBAL_OPS *ops = NULL; - gint modtype = main_get_mod_type((gchar*) (is_dialog ? d->mod_name : mod_name)); + gint modtype = + main_get_mod_type((gchar *)(is_dialog ? d->mod_name : mod_name)); - ops = main_new_globals((gchar*) mod_name); + ops = main_new_globals((gchar *)mod_name); item = UI_GET_ITEM(gxml, "verse_per_line"); if (mod_name && (modtype == TEXT_TYPE)) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), - ops->verse_per_line); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->verse_per_line); } item = UI_GET_ITEM(gxml, "words_of_christ_in_red"); - if ((main_check_for_global_option ((gchar*) mod_name, "GBFRedLetterWords")) || - (main_check_for_global_option ((gchar*) mod_name, "OSISRedLetterWords"))) { + if ((main_check_for_global_option((gchar *)mod_name, "GBFRedLetterWords")) || + (main_check_for_global_option((gchar *)mod_name, "OSISRedLetterWords"))) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->words_in_red); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->words_in_red); } item = UI_GET_ITEM(gxml, "strongs_numbers"); - if ((main_check_for_global_option((gchar*) mod_name, "GBFStrongs")) || - (main_check_for_global_option((gchar*) mod_name, "ThMLStrongs")) || - (main_check_for_global_option((gchar*) mod_name, "OSISStrongs"))) { + if ((main_check_for_global_option((gchar *)mod_name, "GBFStrongs")) || + (main_check_for_global_option((gchar *)mod_name, "ThMLStrongs")) || + (main_check_for_global_option((gchar *)mod_name, "OSISStrongs"))) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->strongs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->strongs); } item = UI_GET_ITEM(gxml, "morphological_tags"); - if (main_check_for_global_option((gchar*) mod_name, "GBFMorph") || - main_check_for_global_option((gchar*) mod_name, "ThMLMorph") || - main_check_for_global_option((gchar*) mod_name, "OSISMorph")) { + if (main_check_for_global_option((gchar *)mod_name, "GBFMorph") || + main_check_for_global_option((gchar *)mod_name, "ThMLMorph") || main_check_for_global_option((gchar *)mod_name, + "OSISMorph")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->morphs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->morphs); } item = UI_GET_ITEM(gxml, "footnotes"); - if (main_check_for_global_option((gchar*) mod_name, "GBFFootnotes") || - main_check_for_global_option((gchar*) mod_name, "ThMLFootnotes") || - main_check_for_global_option((gchar*) mod_name, "OSISFootnotes")) { + if (main_check_for_global_option((gchar *)mod_name, "GBFFootnotes") || main_check_for_global_option((gchar *)mod_name, + "ThMLFootnotes") || + main_check_for_global_option((gchar *)mod_name, + "OSISFootnotes")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->footnotes); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->footnotes); } item = UI_GET_ITEM(gxml, "greek_accents"); - if (main_check_for_global_option((gchar*) mod_name, "UTF8GreekAccents")) { + if (main_check_for_global_option((gchar *)mod_name, "UTF8GreekAccents")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->greekaccents); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->greekaccents); } - item = UI_GET_ITEM(gxml, "lemmas"); + item = UI_GET_ITEM(gxml, "lemmas"); - if (main_check_for_global_option((gchar*) mod_name, "ThMLLemma") || - main_check_for_global_option((gchar*) mod_name, "OSISLemma")) { + if (main_check_for_global_option((gchar *)mod_name, "ThMLLemma") || main_check_for_global_option((gchar *)mod_name, + "OSISLemma")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->lemmas); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->lemmas); } - item = UI_GET_ITEM(gxml, "cross-references"); + item = UI_GET_ITEM(gxml, "cross-references"); - if (main_check_for_global_option((gchar*) mod_name, "ThMLScripref") || - main_check_for_global_option((gchar*) mod_name, "OSISScripref")) { + if (main_check_for_global_option((gchar *)mod_name, "ThMLScripref") || main_check_for_global_option((gchar *)mod_name, + "OSISScripref")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->scripturerefs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->scripturerefs); } - item = UI_GET_ITEM(gxml, "hebrew_vowel_points"); + item = UI_GET_ITEM(gxml, "hebrew_vowel_points"); - if (main_check_for_global_option((gchar*) mod_name, "UTF8HebrewPoints")) { + if (main_check_for_global_option((gchar *)mod_name, "UTF8HebrewPoints")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->hebrewpoints); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->hebrewpoints); } item = UI_GET_ITEM(gxml, "hebrew_cantillation"); - if (main_check_for_global_option ((gchar*) mod_name, "UTF8Cantillation")) { - gtk_widget_show (item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->hebrewcant); + if (main_check_for_global_option((gchar *)mod_name, "UTF8Cantillation")) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->hebrewcant); } item = UI_GET_ITEM(gxml, "headings"); - if (main_check_for_global_option ((gchar*) mod_name, "ThMLHeadings") || - main_check_for_global_option ((gchar*) mod_name, "OSISHeadings")) { - gtk_widget_show (item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->headings); + if (main_check_for_global_option((gchar *)mod_name, "ThMLHeadings") || main_check_for_global_option((gchar *)mod_name, + "OSISHeadings")) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->headings); } item = UI_GET_ITEM(gxml, "transliteration"); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->transliteration); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->transliteration); item = UI_GET_ITEM(gxml, "variants"); - if (main_check_for_global_option ((gchar*) mod_name, "ThMLVariants") || - main_check_for_global_option ((gchar*) mod_name, "OSISVariants")) { - gtk_widget_show (item); - + if (main_check_for_global_option((gchar *)mod_name, "ThMLVariants") || main_check_for_global_option((gchar *)mod_name, + "OSISVariants")) { + gtk_widget_show(item); + item = UI_GET_ITEM(gxml, "primary_reading"); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->variants_primary); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->variants_primary); item = UI_GET_ITEM(gxml, "secondary_reading"); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->variants_secondary); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->variants_secondary); item = UI_GET_ITEM(gxml, "all_readings"); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->variants_all); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->variants_all); + } + + item = UI_GET_ITEM(gxml, "xlit"); + + if (main_check_for_global_option((gchar *)mod_name, "OSISXlit")) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->xlit); } - item = UI_GET_ITEM(gxml, "xlit"); + item = UI_GET_ITEM(gxml, "enumerated"); - if (main_check_for_global_option((gchar*) mod_name, "OSISXlit")) { + if (main_check_for_global_option((gchar *)mod_name, "OSISEnum")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->xlit); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->enumerated); } - item = UI_GET_ITEM(gxml, "enumerated"); + item = UI_GET_ITEM(gxml, "glosses"); - if (main_check_for_global_option((gchar*) mod_name, "OSISEnum")) { + if (main_check_for_global_option((gchar *)mod_name, "OSISGlosses") || main_check_for_global_option((gchar *)mod_name, + "OSISRuby")) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), ops->enumerated); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->glosses); + } + + item = UI_GET_ITEM(gxml, "morphseg"); + + if (main_check_for_global_option((gchar *)mod_name, "OSISMorphSegmentation")) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->morphseg); } item = UI_GET_ITEM(gxml, "image_content"); if (ops->image_content != -1) { - gtk_widget_show (item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->image_content); + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->image_content); } item = UI_GET_ITEM(gxml, "respect_font_faces"); if (ops->respect_font_faces != -1) { gtk_widget_show(item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->respect_font_faces); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->respect_font_faces); } item = UI_GET_ITEM(gxml, "commentary_by_chapter"); - if ((modtype == COMMENTARY_TYPE) || (modtype == PERCOM_TYPE)) { - gtk_widget_show (item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->commentary_by_chapter); + if ((modtype == COMMENTARY_TYPE) || (modtype == PERCOM_TYPE)) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->commentary_by_chapter); } item = UI_GET_ITEM(gxml, "doublespace"); #ifdef USE_GTK_3 - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (item), ops->doublespace); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->doublespace); #else - GTK_CHECK_MENU_ITEM (item)->active = ops->doublespace; + GTK_CHECK_MENU_ITEM(item)->active = ops->doublespace; #endif item = UI_GET_ITEM(gxml, "xrefnotenumbers"); - if ((ops->scripturerefs - && - (main_check_for_global_option((gchar*) mod_name, "ThMLScripref") || - main_check_for_global_option((gchar*) mod_name, "OSISScripref"))) - || - (ops->footnotes - && - (main_check_for_global_option((gchar*) mod_name, "ThMLFootnotes") || - main_check_for_global_option((gchar*) mod_name, "OSISFootnotes") || - main_check_for_global_option((gchar*) mod_name, "GBFFootnotes")))) { - gtk_widget_show (item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ops->xrefnotenumbers); + if ((ops->scripturerefs && + (main_check_for_global_option((gchar *)mod_name, "ThMLScripref") || main_check_for_global_option((gchar *)mod_name, + "OSISScripref"))) || + (ops->footnotes && + (main_check_for_global_option((gchar *)mod_name, "ThMLFootnotes") || main_check_for_global_option((gchar *)mod_name, + "OSISFootnotes") || + main_check_for_global_option((gchar *)mod_name, + "GBFFootnotes")))) { + gtk_widget_show(item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + ops->xrefnotenumbers); } else { - gtk_widget_hide (item); + gtk_widget_hide(item); } g_free(ops); @@ -1679,24 +1764,21 @@ static void on_view_mod_activate(GtkMenuItem *menuitem, gpointer user_data) { - if (is_dialog) return; + if (is_dialog) + return; - gchar *module_name = main_module_name_from_description ((gchar *)user_data); - gchar *url = NULL; - gchar *key = NULL; + gchar *module_name = main_module_name_from_description((gchar *)user_data); + gchar *key; if (module_name && (key = _get_key(menu_mod_name))) { - url = g_strdup_printf ("sword://%s/%s", - module_name, - key); - main_url_handler (url, TRUE); - g_free (url); - g_free (module_name); - g_free (key); + gchar *url = g_strdup_printf("sword://%s/%s", module_name, key); + main_url_handler(url, TRUE); + g_free(url); } + g_free(module_name); + g_free(key); } - /****************************************************************************** * Name * gui_lookup_bibletext_selection @@ -1715,32 +1797,32 @@ */ static void _lookup_selection(GtkMenuItem *menuitem, - gchar *dict_mod_description) + gchar *dict_mod_description) { gchar *dict_key = NULL; gchar *mod_name = NULL; - GtkWidget *html = _get_html (); + GtkWidget *html = _get_html(); - if (!html) return; - mod_name = main_module_name_from_description (dict_mod_description); + if (!html) + return; + mod_name = main_module_name_from_description(dict_mod_description); XIPHOS_HTML_COPY_SELECTION(html); - gtk_editable_select_region ((GtkEditable *)widgets.entry_dict,0,-1); - gtk_editable_paste_clipboard ((GtkEditable *)widgets.entry_dict); - gtk_widget_activate (widgets.entry_dict); + gtk_editable_select_region((GtkEditable *)widgets.entry_dict, 0, + -1); + gtk_editable_paste_clipboard((GtkEditable *)widgets.entry_dict); + gtk_widget_activate(widgets.entry_dict); dict_key = - g_strdup(gtk_editable_get_chars ( - (GtkEditable *)widgets.entry_dict,0,-1)); + g_strdup(gtk_editable_get_chars((GtkEditable *)widgets.entry_dict, 0, -1)); if (dict_key && mod_name) { - main_display_dictionary (mod_name, dict_key); + main_display_dictionary(mod_name, dict_key); } if (dict_key) - g_free (dict_key); + g_free(dict_key); if (mod_name) - g_free (mod_name); + g_free(mod_name); } - /****************************************************************************** * Name * _create_popup_menu @@ -1757,8 +1839,8 @@ * GtkWidget* */ -static -GtkWidget * _create_popup_menu (XiphosHtml *html, const gchar * mod_name, DIALOG_DATA * d) +static GtkWidget *_create_popup_menu(XiphosHtml *html, const gchar *mod_name, + DIALOG_DATA *d) { gchar *glade_file; #ifdef USE_GTKBUILDER @@ -1766,83 +1848,92 @@ #else GladeXML *gxml; #endif - const gchar *mname = (is_dialog ? d->mod_name : mod_name); - XI_message(("_create_popup_menu mod_name:%s",mod_name)); + const gchar *mname = (is_dialog ? d->mod_name : mod_name); + XI_message(("_create_popup_menu mod_name:%s", mod_name)); if (!mname || !*mname) return NULL; #ifdef USE_GTKBUILDER - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_popup", NULL); + gxml = glade_xml_new(glade_file, "menu_popup", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); - GtkWidget *menu = UI_GET_ITEM(gxml, "menu_popup"); - GtkWidget *bookmark = UI_GET_ITEM(gxml, "bookmark"); - GtkWidget *open = UI_GET_ITEM(gxml, "open_module2"); - GtkWidget *export_ = UI_GET_ITEM(gxml, "export_passage"); - GtkWidget *close = UI_GET_ITEM(gxml, "close"); - GtkWidget *note = UI_GET_ITEM(gxml, "note"); - GtkWidget *mark_verse = UI_GET_ITEM(gxml, "mark_verse"); - GtkWidget *open_edit = UI_GET_ITEM(gxml, "open_in_editor"); - GtkWidget *mod_opt_sub = UI_GET_ITEM(gxml, "module_options1_menu"); - GtkWidget *lookup = UI_GET_ITEM(gxml, "lookup_selection1"); - GtkWidget *lookup_sub = UI_GET_ITEM(gxml, "lookup_selection1_menu"); - GtkWidget *unlock = UI_GET_ITEM(gxml, "unlock_this_module"); - GtkWidget *book_heading = UI_GET_ITEM(gxml, "display_book_heading"); - GtkWidget *chapter_heading = UI_GET_ITEM(gxml, "display_chapter_heading"); - GtkWidget *rename_percomm = UI_GET_ITEM(gxml, "rename_perscomm"); - GtkWidget *dump_percomm = UI_GET_ITEM(gxml, "dump_perscomm"); - - GtkWidget *open_sub = gtk_menu_new (); - GtkWidget *note_sub = gtk_menu_new (); - - gtk_widget_hide (unlock); - gtk_widget_hide (book_heading); - gtk_widget_hide (export_); - gtk_widget_hide (chapter_heading); - gtk_widget_hide (rename_percomm); - gtk_widget_hide (dump_percomm); - gtk_widget_hide (note); - gtk_widget_hide (open_edit); - gtk_widget_hide (mark_verse); - gtk_widget_hide (close); /* FIXME: hide until connected to dialog close */ - - if (is_dialog) { - gtk_widget_hide (open); - gtk_widget_hide (bookmark); - gtk_widget_hide (export_); + GtkWidget *menu = UI_GET_ITEM(gxml, "menu_popup"); + GtkWidget *bookmark = UI_GET_ITEM(gxml, "bookmark"); + GtkWidget *open = UI_GET_ITEM(gxml, "open_module2"); + GtkWidget *export_ = UI_GET_ITEM(gxml, "export_passage"); + GtkWidget *close = UI_GET_ITEM(gxml, "close"); + GtkWidget *note = UI_GET_ITEM(gxml, "note"); + GtkWidget *mark_verse = UI_GET_ITEM(gxml, "mark_verse"); + GtkWidget *open_edit = UI_GET_ITEM(gxml, "open_in_editor"); + GtkWidget *mod_opt_sub = UI_GET_ITEM(gxml, "module_options1_menu"); + GtkWidget *lookup = UI_GET_ITEM(gxml, "lookup_selection1"); + GtkWidget *lookup_sub = + UI_GET_ITEM(gxml, "lookup_selection1_menu"); + GtkWidget *unlock = UI_GET_ITEM(gxml, "unlock_this_module"); + GtkWidget *book_heading = + UI_GET_ITEM(gxml, "display_book_heading"); + GtkWidget *chapter_heading = + UI_GET_ITEM(gxml, "display_chapter_heading"); + GtkWidget *rename_percomm = UI_GET_ITEM(gxml, "rename_perscomm"); + GtkWidget *dump_percomm = UI_GET_ITEM(gxml, "dump_perscomm"); + + GtkWidget *open_sub = gtk_menu_new(); + GtkWidget *note_sub = gtk_menu_new(); + + gtk_widget_hide(unlock); + gtk_widget_hide(book_heading); + gtk_widget_hide(export_); + gtk_widget_hide(chapter_heading); + gtk_widget_hide(rename_percomm); + gtk_widget_hide(dump_percomm); + gtk_widget_hide(note); + gtk_widget_hide(open_edit); + gtk_widget_hide(mark_verse); + gtk_widget_hide(close); /* FIXME: hide until connected to dialog close */ + + if (is_dialog) { + gtk_widget_hide(open); + gtk_widget_hide(bookmark); + gtk_widget_hide(export_); } else { - gtk_widget_hide (close); - gtk_menu_item_set_submenu (GTK_MENU_ITEM(open), - open_sub); - gui_add_mods_2_gtk_menu (_get_type_mod_list (), open_sub, - (GCallback) on_view_mod_activate); + gtk_widget_hide(close); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(open), open_sub); + gui_add_mods_2_gtk_menu(_get_type_mod_list(), open_sub, + (GCallback)on_view_mod_activate); /* unlock from main window only */ - if (main_has_cipher_tag((gchar*) mod_name)) + if (main_has_cipher_tag((gchar *)mod_name)) gtk_widget_show(unlock); } - switch (main_get_mod_type((gchar*) mname)) { + switch (main_get_mod_type((gchar *)mname)) { case TEXT_TYPE: - gtk_widget_show (export_); - if (is_dialog) break; + gtk_widget_show(export_); + if (is_dialog) + break; gtk_widget_show(note); gtk_widget_show(mark_verse); - gtk_menu_item_set_submenu (GTK_MENU_ITEM(note), note_sub); - gui_add_mods_2_gtk_menu (PERCOMM_LIST, note_sub, - (GCallback) on_edit_percomm_activate); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(note), note_sub); + gui_add_mods_2_gtk_menu(PERCOMM_LIST, note_sub, (GCallback) + on_edit_percomm_activate); break; case COMMENTARY_TYPE: @@ -1853,14 +1944,14 @@ case PERCOM_TYPE: gtk_widget_show(export_); - gtk_widget_show (open_edit); - g_signal_connect (G_OBJECT(open_edit), - "activate", - G_CALLBACK (on_edit_percomm_activate), - (gchar*) (is_dialog ? d->mod_name : mod_name)); + gtk_widget_show(open_edit); + g_signal_connect(G_OBJECT(open_edit), + "activate", + G_CALLBACK(on_edit_percomm_activate), + (gchar *)(is_dialog ? d->mod_name : mod_name)); - gtk_widget_show (rename_percomm); - gtk_widget_show (dump_percomm); + gtk_widget_show(rename_percomm); + gtk_widget_show(dump_percomm); break; case DICTIONARY_TYPE: @@ -1870,33 +1961,30 @@ break; case PRAYERLIST_TYPE: - gtk_widget_show (open_edit); - g_signal_connect (G_OBJECT(open_edit), - "activate", - G_CALLBACK (on_edit_prayerlist_activate), - (gchar*) (is_dialog ? d->mod_name : mod_name)); + gtk_widget_show(open_edit); + g_signal_connect(G_OBJECT(open_edit), + "activate", + G_CALLBACK(on_edit_prayerlist_activate), + (gchar *)(is_dialog ? d->mod_name : mod_name)); break; } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (lookup), - lookup_sub); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup), lookup_sub); - gui_add_mods_2_gtk_menu (DICT_DESC_LIST, lookup_sub, - (GCallback) _lookup_selection); + gui_add_mods_2_gtk_menu(DICT_DESC_LIST, lookup_sub, + (GCallback)_lookup_selection); /* = glade_xml_get_widget (gxml, ""); */ - _add_and_check_global_opts (gxml, - (char*)(is_dialog ? d->mod_name : mod_name), - mod_opt_sub, - d); - /* connect signals and data */ -#ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, html); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, html);*/ + _add_and_check_global_opts(gxml, + (char *)(is_dialog ? d->mod_name : mod_name), mod_opt_sub, d); +/* connect signals and data */ +#ifdef USE_GTKBUILDER + gtk_builder_connect_signals(gxml, html); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, html); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, html); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + html); #endif return menu; @@ -1920,25 +2008,26 @@ * void */ -void gui_menu_popup (XiphosHtml *html, const gchar * mod_name, DIALOG_DATA * d) +void gui_menu_popup(XiphosHtml *html, const gchar *mod_name, + DIALOG_DATA *d) { GtkWidget *menu; if (d) { dialog = d; menu_mod_name = NULL; //(gchar*) mod_name; - is_dialog = TRUE; + is_dialog = TRUE; } else if (mod_name) { - menu_mod_name = (gchar*) mod_name; + menu_mod_name = (gchar *)mod_name; dialog = NULL; - is_dialog = FALSE; + is_dialog = FALSE; } else return; - menu = _create_popup_menu (html, mod_name, d); + menu = _create_popup_menu(html, mod_name, d); if (menu) - gtk_menu_popup ((GtkMenu*)menu, NULL, NULL, NULL, NULL, 2, - gtk_get_current_event_time()); + gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 2, + gtk_get_current_event_time()); else gui_generic_warning(_("No module in this pane.")); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/mod_mgr.c xiphos-4.0.4+dfsg1/src/gnome2/mod_mgr.c --- xiphos-4.0.0+dfsg1/src/gnome2/mod_mgr.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/mod_mgr.c 2015-08-20 01:28:42.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gnome2/mod_mgr.c * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,10 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - - #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -35,7 +33,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/mod_mgr.h" @@ -51,7 +49,9 @@ #include "main/sidebar.h" #include "main/sword.h" #include "main/xml.h" + #include "main/modulecache.hh" +#include "backend/module_manager.hh" #include "gui/debug_glib_null.h" @@ -60,25 +60,27 @@ /****************************************************************************** * defines */ -#define XI_GENERAL_INTRO \ -_("Overview of the Module Manager.\n\nThis is Xiphos' mechanism to get new and updated content.\nIf you have never been here before, please take a moment to look it over.\n\nModules come from different repositories. Module Sources: Add/Remove will show you what repositories are currently known.\n\nModule Sources: Choose is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set Install Source and Install Destination, then click Refresh.\n\nModules: Install/Update is for selecting and obtaining modules after choosing source and destination.\n\nModules: Maintenance is for archive and index creation.\n\nSee section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n") +#define XI_GENERAL_INTRO \ + _("Overview of the Module Manager.\n\nThis is Xiphos' mechanism to get new and updated content.\nIf you have never been here before, please take a moment to look it over.\n\nModules come from different repositories. Module Sources: Add/Remove will show you what repositories are currently known.\n\nModule Sources: Choose is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set Install Source and Install Destination, then click Refresh.\n\nModules: Install/Update is for selecting and obtaining modules after choosing source and destination.\n\nModules: Maintenance is for archive and index creation.\n\nSee section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n") -#define XI_FIRST_INSTALL \ -_("Welcome to Xiphos.\n\nThere are no Bibles installed. In order to initialize, Xiphos needs at least one Bible module. To facilitate this, the Module Manager has been opened so that you may install one or more Bibles, either from a local module set (cdrom, flash drive) or over the network from CrossWire Bible Society. Please refer to these step-by-step instructions, and to the general module manager overview that has also been opened.\n\nFor local install:\n- In Module Sources: Add/Remove, add a new local folder name where modules can be found.\n (This is where folders exist named mods.d and modules.)\n- In Module Sources: Choose, click the \"Local\" button, and select your folder from the pulldown.\n\nFor network install from CrossWire:\n- In Module Sources: Choose, click the \"Remote\" button and select CrossWire from the pulldown.\n- Click the \"Refresh\" button at the bottom.\n\nIn either case:\n- In Modules: Install/Update, select Bibles and other modules of your preference.\n- Click \"Install\".\n- Close the Module Manager when you are done.\n\nWarning: If you live in a persecuted country, use with care.\n\nBoth this step-by-step instruction dialog and the general introduction dialog may be closed at any time.") +#define XI_FIRST_INSTALL \ + _("Welcome to Xiphos.\n\nThere are no Bibles installed. In order to initialize, Xiphos needs at least one Bible module. To facilitate this, the Module Manager has been opened so that you may install one or more Bibles, either from a local module set (cdrom, flash drive) or over the network from CrossWire Bible Society. Please refer to these step-by-step instructions, and to the general module manager overview that has also been opened.\n\nFor local install:\n- In Module Sources: Add/Remove, add a new local folder name where modules can be found.\n (This is where folders exist named mods.d and modules.)\n- In Module Sources: Choose, click the \"Local\" button, and select your folder from the pulldown.\n\nFor network install from CrossWire:\n- In Module Sources: Choose, click the \"Remote\" button and select CrossWire from the pulldown.\n- Click the \"Refresh\" button at the bottom.\n\nIn either case:\n- In Modules: Install/Update, select Bibles and other modules of your preference.\n- Click \"Install\".\n- Close the Module Manager when you are done.\n\nWarning: If you live in a persecuted country, use with care.\n\nBoth this step-by-step instruction dialog and the general introduction dialog may be closed at any time.") #define GTK_RESPONSE_REFRESH 301 -#define GTK_RESPONSE_REMOVE 302 +#define GTK_RESPONSE_REMOVE 302 #define GTK_RESPONSE_INSTALL 303 #define GTK_RESPONSE_ARCHIVE 304 #define GTK_RESPONSE_FASTMOD 305 #define GTK_RESPONSE_DELFAST 306 #define GTK_RESPONSE_SOURCES 307 -#define GTK_RESPONSE_INTRO 308 +#define GTK_RESPONSE_INTRO 308 +#define GTK_RESPONSE_OBSOLETE 309 /* see these codes' use in ui/module-manager.glade. */ /* activity codes */ enum { - REMOVE = 0, + ALL_MODULES = -1, /* for obsolescence search-&-destroy */ + REMOVE = 0, INSTALL = 1, ARCHIVE = 2, FASTMOD = 3, @@ -87,9 +89,9 @@ /* dialog & progress bar phrases */ enum { - PHRASE_INQUIRY = 0, - PHRASE_PREPARE = 1, - PHRASE_DOING = 2, + PHRASE_INQUIRY = 0, + PHRASE_PREPARE = 1, + PHRASE_DOING = 2, PHRASE_COMPLETE = 3, }; @@ -138,6 +140,7 @@ static GtkWidget *button_arch; static GtkWidget *button_idx; static GtkWidget *button_delidx; +static GtkWidget *button_obsolete; static GtkWidget *button_load_sources; static GtkWidget *button_intro; static GtkWidget *label_home; @@ -179,42 +182,32 @@ GladeXML *gxml; #endif -static void load_module_tree(GtkTreeView * treeview, gboolean install); +static void load_module_tree(GtkTreeView *treeview, gboolean install); static void set_controls_to_last_use(void); static int load_source_treeviews(void); /* indexed by REMOVE/INSTALL/ARCHIVE/FASTMOD/DELFAST and PHRASE_* */ char *verbs[5][4] = { - { - N_("Remove these modules?"), - N_("Preparing to remove"), - N_("Removing"), - N_("Remove") - }, - { - N_("Install these modules?"), - N_("Preparing to install"), - N_("Installing"), - N_("Install") - }, - { - N_("Archive these modules?"), - N_("Preparing to archive"), - N_("Archiving"), - N_("Archive") - }, - { - N_("Build fast-search index for these\nmodules (may take minutes/module)?"), - N_("Preparing to index"), - N_("Indexing"), - N_("Index") - }, - { - N_("Delete fast-search index for these modules?"), - N_("Preparing to delete index"), - N_("Deleting index"), - N_("Deletion") - }, + {N_("Remove these modules?"), + N_("Preparing to remove"), + N_("Removing"), + N_("Remove")}, + {N_("Install these modules?"), + N_("Preparing to install"), + N_("Installing"), + N_("Install")}, + {N_("Archive these modules?"), + N_("Preparing to archive"), + N_("Archiving"), + N_("Archive")}, + {N_("Build fast-search index for these\nmodules (may take minutes/module)?"), + N_("Preparing to index"), + N_("Indexing"), + N_("Index")}, + {N_("Delete fast-search index for these modules?"), + N_("Preparing to delete index"), + N_("Deleting index"), + N_("Deletion")}, }; /****************************************************************************** @@ -236,18 +229,18 @@ * gboolean */ -static gboolean on_modmgr_configure_event(GtkWidget * widget, - GdkEventConfigure * event, - gpointer user_data) +static gboolean on_modmgr_configure_event(GtkWidget *widget, + GdkEventConfigure *event, + gpointer user_data) { gchar layout[10]; gint x; gint y; - gdk_window_get_root_origin( - GDK_WINDOW(gtk_widget_get_window (dialog_modmgr)), &x, &y); + gdk_window_get_root_origin(GDK_WINDOW(gtk_widget_get_window(dialog_modmgr)), + &x, &y); - settings.modmgr_width = event->width; + settings.modmgr_width = event->width; settings.modmgr_height = event->height; settings.modmgr_x = x; settings.modmgr_y = y; @@ -268,13 +261,11 @@ return FALSE; } -static -gboolean query_tooltip (GtkWidget *widget, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - gpointer user_data) +static gboolean query_tooltip(GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, gpointer user_data) { GtkTreeModel *model; GtkTreePath *path; @@ -283,22 +274,20 @@ gchar *about; gchar *version; gchar *desc; - GString *str = g_string_new (NULL); + GString *str = g_string_new(NULL); GString *text = g_string_new(NULL); GString *description = g_string_new(NULL); - if (!gtk_tree_view_get_tooltip_context ((GtkTreeView *)widget, - &x, - &y, - keyboard_mode, - &model, - &path, - &iter)) { + if (!gtk_tree_view_get_tooltip_context((GtkTreeView *)widget, + &x, + &y, + keyboard_mode, + &model, &path, &iter)) { return FALSE; } - if (gtk_tree_model_iter_has_child (model ,&iter)) { - gtk_tree_path_free (path); + if (gtk_tree_model_iter_has_child(model, &iter)) { + gtk_tree_path_free(path); return FALSE; } @@ -306,44 +295,42 @@ if (!desc) return FALSE; gtk_tree_model_get(model, &iter, COLUMN_ABOUT, &about, -1); - gtk_tree_model_get(model, &iter, COLUMN_AVAILABLE_VERSION, &version, -1); + gtk_tree_model_get(model, &iter, COLUMN_AVAILABLE_VERSION, + &version, -1); if (about) - g_strdelimit (about, "&", '+'); + g_strdelimit(about, "&", '+'); g_string_printf(description, "%s\n%s %s\n\n", desc, (version) ? "Sword module version" : "", (version) ? version : ""); - about_module_display(str, - ((about && *about) - ? about - : _("The module has no About information.")), + about_module_display(str, ((about && *about) + ? about + : _("The module has no About information.")), TRUE); - text = g_string_append_len(text, description->str, description->len); + text = + g_string_append_len(text, description->str, description->len); text = g_string_append_len(text, str->str, str->len); if (text->len > 1200) { - text = g_string_truncate (text, 1200); - text = g_string_append_len(text, " ...", strlen (" ...")); + text = g_string_truncate(text, 1200); + text = g_string_append_len(text, " ...", strlen(" ...")); } pixbuf = pixbuf_finder("sword3.png", 0, NULL); - gtk_tooltip_set_icon (tooltip, pixbuf); - gtk_tooltip_set_text (tooltip, text->str); + gtk_tooltip_set_icon(tooltip, pixbuf); + gtk_tooltip_set_text(tooltip, text->str); gtk_tree_view_set_tooltip_cell((GtkTreeView *)widget, - tooltip, - path, - NULL, - NULL); - gtk_tree_path_free (path); - g_free (about); - g_free (desc); - g_free (version); - g_string_free (str, TRUE); - g_string_free (text, TRUE); - g_string_free (description, TRUE); + tooltip, path, NULL, NULL); + gtk_tree_path_free(path); + g_free(about); + g_free(desc); + g_free(version); + g_string_free(str, TRUE); + g_string_free(text, TRUE); + g_string_free(description, TRUE); return TRUE; } @@ -363,73 +350,81 @@ * void */ -static void -create_pixbufs(void) +static void create_pixbufs(void) { -#ifdef USE_GTK_3 +#ifdef USE_GTK_3 #ifdef HAVE_GTK_310 - GtkIconTheme *icon_theme = - gtk_icon_theme_get_default (); - - INSTALLED = gtk_icon_theme_load_icon (icon_theme, - "_Apply", - GTK_ICON_SIZE_MENU, - GTK_ICON_LOOKUP_FORCE_SIZE, - NULL); - - FASTICON = pixbuf_finder("indexed-16.png", 0, NULL); - - NO_INDEX = gtk_icon_theme_load_icon (icon_theme, - "_Cancel", - GTK_ICON_SIZE_MENU, - GTK_ICON_LOOKUP_FORCE_SIZE, - NULL); - - LOCKED = pixbuf_finder("epiphany-secure.png", 0, NULL); - - REFRESH = gtk_icon_theme_load_icon (icon_theme, - "view-refresh", - GTK_ICON_SIZE_MENU, - GTK_ICON_LOOKUP_FORCE_SIZE, - NULL); - - BLANK = gtk_icon_theme_load_icon (icon_theme, - "gnome-stock-blank", // FIXME: - GTK_ICON_SIZE_MENU, - GTK_ICON_LOOKUP_FORCE_SIZE, - NULL); + GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); + + INSTALLED = gtk_icon_theme_load_icon(icon_theme, +#ifdef HAVE_GTK_312 + "emblem-ok-symbolic", +#else + "_Apply", +#endif + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); + + FASTICON = gtk_icon_theme_load_icon(icon_theme, + "edit-find-symbolic", + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); + + NO_INDEX = gtk_icon_theme_load_icon(icon_theme, + "_Cancel", + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); + + LOCKED = gtk_icon_theme_load_icon(icon_theme, + "changes-prevent-symbolic", + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); + + REFRESH = gtk_icon_theme_load_icon(icon_theme, + "view-refresh-symbolic", + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); + + BLANK = gtk_icon_theme_load_icon(icon_theme, "gnome-stock-blank", // FIXME: + 16, + GTK_ICON_LOOKUP_FORCE_SIZE, NULL); #else INSTALLED = gtk_widget_render_icon_pixbuf(dialog_modmgr, - GTK_STOCK_APPLY, - GTK_ICON_SIZE_MENU); - FASTICON = pixbuf_finder("indexed-16.png", 0, NULL); - NO_INDEX = gtk_widget_render_icon_pixbuf(dialog_modmgr, - GTK_STOCK_CANCEL, - GTK_ICON_SIZE_MENU); - LOCKED = pixbuf_finder("epiphany-secure.png", 0, NULL); - REFRESH = gtk_widget_render_icon_pixbuf(dialog_modmgr, - GTK_STOCK_REFRESH, - GTK_ICON_SIZE_MENU); - BLANK = gtk_widget_render_icon_pixbuf(dialog_modmgr, - "gnome-stock-blank", - GTK_ICON_SIZE_MENU); -#endif + GTK_STOCK_APPLY, + GTK_ICON_SIZE_MENU); + FASTICON = pixbuf_finder("indexed-16.png", 0, NULL); + NO_INDEX = gtk_widget_render_icon_pixbuf(dialog_modmgr, + GTK_STOCK_CANCEL, + GTK_ICON_SIZE_MENU); + LOCKED = pixbuf_finder("epiphany-secure.png", 0, NULL); + REFRESH = gtk_widget_render_icon_pixbuf(dialog_modmgr, + GTK_STOCK_REFRESH, + GTK_ICON_SIZE_MENU); + BLANK = gtk_widget_render_icon_pixbuf(dialog_modmgr, + "gnome-stock-blank", + GTK_ICON_SIZE_MENU); +#endif #else INSTALLED = gtk_widget_render_icon(dialog_modmgr, GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU, NULL); - FASTICON = pixbuf_finder("indexed-16.png", 0, NULL); - NO_INDEX = gtk_widget_render_icon(dialog_modmgr, - GTK_STOCK_CANCEL, - GTK_ICON_SIZE_MENU, NULL); - LOCKED = pixbuf_finder("epiphany-secure.png", 0, NULL); - REFRESH = gtk_widget_render_icon(dialog_modmgr, - GTK_STOCK_REFRESH, - GTK_ICON_SIZE_MENU, NULL); - BLANK = gtk_widget_render_icon(dialog_modmgr, - "gnome-stock-blank", - GTK_ICON_SIZE_MENU, NULL); + FASTICON = pixbuf_finder("indexed-16.png", 0, NULL); + NO_INDEX = gtk_widget_render_icon(dialog_modmgr, + GTK_STOCK_CANCEL, + GTK_ICON_SIZE_MENU, NULL); + LOCKED = pixbuf_finder("epiphany-secure.png", 0, NULL); + REFRESH = gtk_widget_render_icon(dialog_modmgr, + GTK_STOCK_REFRESH, + GTK_ICON_SIZE_MENU, NULL); + BLANK = gtk_widget_render_icon(dialog_modmgr, + "gnome-stock-blank", + GTK_ICON_SIZE_MENU, NULL); #endif } @@ -449,25 +444,23 @@ * GtkTreeModel * */ -static GtkTreeModel * -create_model(void) +static GtkTreeModel *create_model(void) { GtkTreeStore *store; /* create list store */ - store = gtk_tree_store_new(NUM_COLUMNS, - G_TYPE_STRING, /* module name */ - GDK_TYPE_PIXBUF, /* installed */ - G_TYPE_BOOLEAN, /* checkbox */ - G_TYPE_STRING, /* installed verssion */ - GDK_TYPE_PIXBUF, /* fastready */ - GDK_TYPE_PIXBUF, /* locked */ - G_TYPE_STRING, /* about */ - GDK_TYPE_PIXBUF, /* refresh */ - G_TYPE_STRING, /* available version */ - G_TYPE_STRING, /* size */ - G_TYPE_STRING, /* description */ - G_TYPE_BOOLEAN); /* visibility */ + store = gtk_tree_store_new(NUM_COLUMNS, G_TYPE_STRING, /* module name */ + GDK_TYPE_PIXBUF, /* installed */ + G_TYPE_BOOLEAN, /* checkbox */ + G_TYPE_STRING, /* installed verssion */ + GDK_TYPE_PIXBUF, /* fastready */ + GDK_TYPE_PIXBUF, /* locked */ + G_TYPE_STRING, /* about */ + GDK_TYPE_PIXBUF, /* refresh */ + G_TYPE_STRING, /* available version */ + G_TYPE_STRING, /* size */ + G_TYPE_STRING, /* description */ + G_TYPE_BOOLEAN); /* visibility */ return GTK_TREE_MODEL(store); } @@ -490,10 +483,9 @@ static void fixed_toggled(GtkCellRendererToggle *cell, - gchar *path_str, - gpointer data) + gchar *path_str, gpointer data) { - GtkTreeView *treeview = (GtkTreeView *) data; + GtkTreeView *treeview = (GtkTreeView *)data; GtkTreeModel *model = gtk_tree_view_get_model(treeview); GtkTreeIter iter; GtkTreePath *path = gtk_tree_path_new_from_string(path_str); @@ -529,9 +521,7 @@ * void */ -static void -add_columns(GtkTreeView * treeview, - gboolean remove) +static void add_columns(GtkTreeView *treeview, gboolean remove) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -540,34 +530,36 @@ /* -- column for sword module name -- */ renderer = gtk_cell_renderer_text_new(); column = - gtk_tree_view_column_new_with_attributes(_("Module Name"), renderer, - "text", COLUMN_NAME, - NULL); - /* fixed sizing (200 pixels) */ + gtk_tree_view_column_new_with_attributes(_("Module Name"), + renderer, "text", + COLUMN_NAME, NULL); + /* fixed sizing (200 pixels) */ gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN - (column), 200); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 275); gtk_tree_view_append_column(treeview, column); /* -- installed -- */ column = gtk_tree_view_column_new(); - image = + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name("gtk-apply", - GTK_ICON_SIZE_MENU); + (remove + ? gtk_image_new_from_icon_name("", + GTK_ICON_SIZE_MENU) + : gtk_image_new_from_icon_name("emblem-ok-symbolic", + GTK_ICON_SIZE_MENU)); #else - (remove + (remove ? gtk_image_new_from_stock("gnome-stock-blank", GTK_ICON_SIZE_MENU) : gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU)); -#endif +#endif gtk_widget_show(image); gtk_widget_set_tooltip_text(image, (remove - ? "" - : _("A checkmark means this module is already installed"))); + ? "" + : _("A checkmark means this module is already installed"))); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_set_widget(column, image); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -581,22 +573,21 @@ g_signal_connect(renderer, "toggled", G_CALLBACK(fixed_toggled), treeview); - column = gtk_tree_view_column_new(); - image = + column = gtk_tree_view_column_new(); + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("list-add", + gtk_image_new_from_icon_name("list-add-symbolic", GTK_ICON_SIZE_MENU); #else - gtk_image_new_from_stock((remove - ? "gtk-yes" //GTK_STOCK_REMOVE - : GTK_STOCK_ADD), - GTK_ICON_SIZE_MENU); -#endif + gtk_image_new_from_stock((remove ? "gtk-yes" //GTK_STOCK_REMOVE + : GTK_STOCK_ADD), + GTK_ICON_SIZE_MENU); +#endif gtk_widget_show(image); gtk_widget_set_tooltip_text(image, (remove - ? _("Click the box to work on this module") - : _("Click the box to select this module for install/update"))); + ? _("Click the box to work on this module") + : _("Click the box to select this module for install/update"))); gtk_tree_view_column_set_widget(column, image); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, @@ -605,11 +596,10 @@ "visible", COLUMN_VISIBLE, NULL); - /* fixed sizing (25 pixels) */ + /* fixed sizing (25 pixels) */ gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN - (column), 25); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); gtk_tree_view_append_column(treeview, column); /* -- installed version -- */ @@ -623,38 +613,49 @@ /* -- fast index ready -- */ column = gtk_tree_view_column_new(); +#ifdef HAVE_GTK_310 + image = + gtk_image_new_from_icon_name("edit-find-symbolic", + GTK_ICON_SIZE_MENU); +#else image = pixmap_finder("indexed-16.png"); +#endif gtk_widget_show(image); - gtk_widget_set_tooltip_text(image, _("The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)")); + gtk_widget_set_tooltip_text(image, + _("The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)")); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_set_widget(column, image); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, "pixbuf", COLUMN_FASTREADY, NULL); - /* fixed sizing (25 pixels) */ + /* fixed sizing (25 pixels) */ gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN - (column), 27); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 27); gtk_tree_view_append_column(treeview, column); /* -- locked -- */ column = gtk_tree_view_column_new(); +#ifdef HAVE_GTK_310 + image = + gtk_image_new_from_icon_name("changes-prevent-symbolic", + GTK_ICON_SIZE_MENU); +#else image = pixmap_finder("epiphany-secure.png"); +#endif gtk_widget_show(image); - gtk_widget_set_tooltip_text(image, _("The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner")); + gtk_widget_set_tooltip_text(image, + _("The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner")); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_set_widget(column, image); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, - "pixbuf", COLUMN_LOCKED, - NULL); - /* fixed sizing (25 pixels) */ + "pixbuf", COLUMN_LOCKED, NULL); + /* fixed sizing (25 pixels) */ gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN - (column), 25); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); gtk_tree_view_append_column(treeview, column); /* -- About content (invisible) -- */ @@ -665,28 +666,26 @@ NULL); /* column not shown */ gtk_tree_view_column_set_visible(column, FALSE); - /* fixed sizing (2 pixels) */ + /* fixed sizing (2 pixels) */ gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN - (column), 2); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 2); gtk_tree_view_append_column(treeview, column); if (remove) - return; /* no more fields needed */ + return; /* no more fields needed */ /* -- refresh/update -- */ column = gtk_tree_view_column_new(); - image = + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name - ("view-refresh", GTK_ICON_SIZE_MENU); + gtk_image_new_from_icon_name("view-refresh-symbolic", GTK_ICON_SIZE_MENU); #else - gtk_image_new_from_stock - (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU); -#endif + gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU); +#endif gtk_widget_show(image); - gtk_widget_set_tooltip_text(image, _("The refresh icon means the Installed module is older than the newer Available module: You should update the module")); + gtk_widget_set_tooltip_text(image, + _("The refresh icon means the Installed module is older than the newer Available module: You should update the module")); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_set_widget(column, image); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -718,13 +717,11 @@ column = gtk_tree_view_column_new_with_attributes(_("Description"), renderer, "text", - COLUMN_DESC, - NULL); + COLUMN_DESC, NULL); gtk_tree_view_append_column(treeview, column); } -static void -setup_treeview_install(GtkTreeView * install) +static void setup_treeview_install(GtkTreeView *install) { GtkTreeModel *model; model = create_model(); @@ -733,11 +730,10 @@ add_columns(install, FALSE); } -static void -setup_treeview_maintenance(GtkTreeView * maintenance) +static void setup_treeview_maintenance(GtkTreeView *maintenance) { GtkTreeModel *model; - model = create_model(); + model = create_model(); gtk_tree_view_set_model(maintenance, NULL); gtk_tree_view_set_model(maintenance, model); add_columns(maintenance, TRUE); @@ -759,12 +755,11 @@ * gboolean */ -static gboolean mod_mgr_check_for_file(const gchar * filename) +static gboolean mod_mgr_check_for_file(const gchar *filename) { return g_file_test(filename, G_FILE_TEST_EXISTS); } - /****************************************************************************** * Name * remove_install_modules @@ -781,16 +776,14 @@ * void */ -#define ZIP_DIR DOTSWORD "/zip" +#define ZIP_DIR DOTSWORD "/zip" -static void -remove_install_modules(GList * modules, - int activity) +static void remove_install_modules(GList *modules, int activity) { GList *tmp; gchar *buf; const gchar *new_dest = NULL; - gint failed = 1; + gint result = 1; GString *mods; gchar *dialog_text = NULL; gchar *preserved_cipherkey = NULL; @@ -801,32 +794,30 @@ mods = g_string_new(""); tmp = modules; while (tmp) { - buf = (gchar *) tmp->data; + buf = (gchar *)tmp->data; if (buf[0] == '*') ++buf; - if (*(mods->str)) // not the first + if (*(mods->str)) // not the first mods = g_string_append(mods, ", "); mods = g_string_append(mods, buf); tmp = g_list_next(tmp); } - dialog_text = g_strdup_printf("%s\n\n%s", - gettext (verbs[activity][PHRASE_INQUIRY]), mods->str); + dialog_text = + g_strdup_printf("%s\n\n%s", + gettext(verbs[activity][PHRASE_INQUIRY]), + mods->str); if (!gui_yes_no_dialog(dialog_text, NULL)) { - tmp = modules; /* free list data */ - while (tmp) { - g_free((gchar*)tmp->data); - tmp = g_list_next(tmp); - } - g_list_free(modules); + g_list_free_full(modules, g_free); g_free(dialog_text); return; } g_free(dialog_text); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), - gettext (verbs[activity][PHRASE_PREPARE])); + gettext(verbs[activity] + [PHRASE_PREPARE])); gtk_widget_show(progressbar_refresh); gtk_widget_queue_draw(dialog_modmgr); gtk_widget_hide(button_close); @@ -836,17 +827,29 @@ gtk_widget_hide(button_arch); gtk_widget_hide(button_idx); gtk_widget_hide(button_delidx); + gtk_widget_hide(button_obsolete); gtk_widget_hide(button_load_sources); gtk_widget_show(button_cancel); tmp = modules; while (tmp) { - buf = (gchar *) tmp->data; - current_mod = buf; + char *module_name, *s; + + buf = (gchar *)tmp->data; + + /* for "Abbreviation (Real)", we must */ + /* get the real name for internal use. */ + if ((s = strchr(buf, '(')) != NULL) { + module_name = g_strdup(s + 1); + *(strchr(module_name, ')')) = '\0'; + } else + module_name = g_strdup(buf); /* no abbreviation */ + + current_mod = module_name; g_string_printf(mods, "%s: %s", - gettext(verbs[activity][PHRASE_DOING]), buf); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR - (progressbar_refresh), + gettext(verbs[activity][PHRASE_DOING]), + buf); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), mods->str); sync_windows(); @@ -859,44 +862,47 @@ XI_print(("archive %s in %s\n", buf, (destination - ? destination - : settings.path_to_mods))); - dir = g_strdup_printf("%s/%s", settings.homedir, ZIP_DIR); - if ((g_access(dir, F_OK) == -1) && - (g_mkdir(dir, S_IRWXU) != 0)) { + ? destination + : settings.path_to_mods))); + dir = + g_strdup_printf("%s/%s", settings.homedir, + ZIP_DIR); + if ((g_access(dir, F_OK) == -1) && (g_mkdir(dir, S_IRWXU) != 0)) { char msg[300]; sprintf(msg, _("`mkdir %s' failed:\n%s."), dir, strerror(errno)); g_free(dir); gui_generic_warning(msg); + g_free(module_name); return; } - zipfile = g_strdup_printf("%s/%s.zip", dir, buf); - datapath = main_get_mod_config_entry(buf, "DataPath"); + zipfile = + g_strdup_printf("%s/%s.zip", dir, module_name); + datapath = + main_get_mod_config_entry(module_name, + "DataPath"); // for modules whose DataPath ends in .../xyz/abc // where abc is the file prefix (abc.dat, abc.idx, &c) // we have to detect this and eliminate the end. if (g_access(datapath, F_OK) == -1) - *(strrchr(datapath, '/')) = '\0'; + *(strrchr(datapath, '/')) = '\0'; // lastly, if the end char is '/', remove it or // it becomes a problem when analyzing path length. dlen = strlen(datapath); - if (datapath[dlen-1] == '/') - datapath[dlen-1] = '\0'; - - conf_file = main_get_mod_config_file - (buf, (destination - ? destination - : settings.path_to_mods)); + if (datapath[dlen - 1] == '/') + datapath[dlen - 1] = '\0'; + + conf_file = main_get_mod_config_file(module_name, (destination + ? destination + : settings.path_to_mods)); g_remove(zipfile); xiphos_create_archive(conf_file, datapath, zipfile, - destination ? - destination : settings.path_to_mods); - g_string_append(cmd, buf); + destination ? destination : settings.path_to_mods); + g_string_append(cmd, module_name); g_string_append(cmd, _(" archived in: \n")); g_string_append(cmd, zipfile); gui_generic_warning(cmd->str); @@ -905,80 +911,95 @@ g_free(zipfile); g_free(dir); g_string_free(cmd, TRUE); - failed = 0; + result = 0; } - if ((activity == REMOVE) || // just delete it - (!first_time_user && // don't trip on "no modules". - (activity == INSTALL) && - main_is_module(buf))) { // delete before re-install - XI_print(("remove %s from %s\n", buf, + if ((activity == REMOVE) || // just delete it + (!first_time_user && // don't trip on "no modules". + (activity == INSTALL) && main_is_module(module_name))) { // delete before re-install + XI_print(("remove %s from %s\n", module_name, (destination - ? destination - : settings.path_to_mods))); + ? destination + : settings.path_to_mods))); /* hang onto the old key, if available. */ preserved_cipherkey = - main_get_mod_config_entry(buf, "CipherKey"); + main_get_mod_config_entry(module_name, + "CipherKey"); if (preserved_cipherkey && (*preserved_cipherkey == '\0')) { /* present but empty -> nothingness */ g_free(preserved_cipherkey); preserved_cipherkey = NULL; } - failed = mod_mgr_uninstall(destination, buf); - if (failed == -1) { - //mod_mgr_shut_down(); + result = + mod_mgr_uninstall(destination, module_name); + if (result == -1) { if (destination) { new_dest = NULL; } else { - new_dest = gtk_label_get_text - (GTK_LABEL(label_home)); - XI_warning(("%s",new_dest)); + new_dest = gtk_label_get_text(GTK_LABEL(label_home)); } XI_print(("removing %s from %s\n", - buf, + module_name, (new_dest - ? new_dest - : settings.path_to_mods))); - failed = - mod_mgr_uninstall(new_dest, buf); + ? new_dest + : settings.path_to_mods))); + result = + mod_mgr_uninstall(new_dest, + module_name); } - // annihilate cache of removed module. - ModuleCacheErase((const char *)buf); + ModuleCacheErase((const char *)module_name); } if (activity == INSTALL) { XI_print(("install %s, source=%s\n", buf, source)); - failed = ((local) - ? mod_mgr_local_install_module(destination, source, buf) - : mod_mgr_remote_install(destination, source, buf)); + result = ((local) + ? mod_mgr_local_install_module(destination, + source, + module_name) + : mod_mgr_remote_install(destination, + source, + module_name)); + + /* do gtk refresh, to make sure last messages display */ + sync_windows(); /* try to re-use a saved key. */ - if ((failed != -1) && preserved_cipherkey) { - main_save_module_key(buf, preserved_cipherkey); - XI_print(("re-use key %s\n", preserved_cipherkey)); + if ((result != -1) && preserved_cipherkey) { + main_save_module_key(module_name, + preserved_cipherkey); + XI_print(("re-use key %s\n", + preserved_cipherkey)); } + + /* ask to eliminate old/dead/obsolete modules. */ + if (result != -1) + delete_obsolete(module_name, NULL); } if (activity == FASTMOD) { XI_print(("index %s\n", buf)); #if 0 // why did we ever preclude indexing these? - if (main_get_mod_config_entry(buf, "GSType")) - gui_generic_warning - (_("Journals and prayer lists cannot be indexed.")); + if (main_get_mod_config_entry + (module_name, "GSType")) + gui_generic_warning(_("Journals and prayer lists cannot be indexed.")); else #endif - failed = ((main_module_mgr_index_mod(buf)) - ? 0 : 1); + result = + ((main_module_mgr_index_mod(module_name)) + ? 0 + : 1); } if (activity == DELFAST) { XI_print(("deleting index %s\n", buf)); - failed = ((main_module_mgr_delete_index_mod(buf)) - ? 0 : 1); + result = + ((main_module_mgr_delete_index_mod(module_name)) + ? 0 + : 1); } if (preserved_cipherkey) { @@ -986,6 +1007,7 @@ preserved_cipherkey = NULL; } + g_free(module_name); g_free(tmp->data); tmp = g_list_next(tmp); } @@ -993,43 +1015,47 @@ have_changes = TRUE; g_list_free(modules); - if (failed) { + if (result) { g_string_printf(mods, _("%s failed"), gettext(verbs[activity][PHRASE_COMPLETE])); } else { g_string_printf(mods, "%s", _("Finished")); } - if (!failed && + + if (!result && ((activity == REMOVE) || - (activity == FASTMOD) || - (activity == DELFAST))) + (activity == FASTMOD) || (activity == DELFAST))) { load_module_tree(GTK_TREE_VIEW(treeview2), 0); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), mods->str); + } + + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), + mods->str); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); g_string_free(mods, TRUE); gtk_widget_hide(button_cancel); gtk_widget_show(button_close); switch (current_page) { - case 3: - gtk_widget_show(button_refresh); - gtk_widget_show(button_install); - gtk_widget_hide(button_arch); - gtk_widget_hide(button_idx); - gtk_widget_hide(button_delidx); - gtk_widget_hide(button_load_sources); + case 3: + gtk_widget_show(button_refresh); + gtk_widget_show(button_install); + gtk_widget_hide(button_arch); + gtk_widget_hide(button_idx); + gtk_widget_hide(button_delidx); + gtk_widget_hide(button_obsolete); + gtk_widget_hide(button_load_sources); break; - case 4: - gtk_widget_show(button_remove); - gtk_widget_show(button_arch); - gtk_widget_show(button_idx); - gtk_widget_show(button_delidx); - gtk_widget_hide(button_load_sources); + case 4: + gtk_widget_show(button_remove); + gtk_widget_show(button_arch); + gtk_widget_show(button_idx); + gtk_widget_show(button_delidx); + gtk_widget_show(button_obsolete); + gtk_widget_hide(button_load_sources); break; } sync_windows(); } - /****************************************************************************** * Name * parse_treeview @@ -1046,10 +1072,9 @@ * GList * */ -static GList * -parse_treeview(GList *list, - GtkTreeModel *model, - GtkTreeIter *tree_parent) +static GList *parse_treeview(GList *list, + GtkTreeModel *model, + GtkTreeIter *tree_parent, int activity) { GtkTreeIter child; gchar *name = NULL; @@ -1061,12 +1086,20 @@ gtk_tree_model_get(model, &child, COLUMN_FIXED, &fixed, COLUMN_NAME, &name, -1); - if (gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &child)) { - list = parse_treeview(list, model, &child); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &child)) { + list = + parse_treeview(list, model, &child, activity); } else { - if (fixed) { - list = g_list_append(list, (gchar *) name); + /* handle the abbreviated case, "abbrev (real)". */ + char *n, *s = strchr(name, '('); + if (s) { + n = g_strdup(s + 1); + *(strchr(n, ')')) = '\0'; + } + if (fixed || (activity == ALL_MODULES)) { + list = + g_list_append(list, (s ? n : (gchar *) + name)); } } } while (gtk_tree_model_iter_next(model, &child)); @@ -1074,7 +1107,6 @@ return list; } - /****************************************************************************** * Name * get_list_mods_to_remove_install @@ -1085,14 +1117,13 @@ * void get_list_mods_to_remove_install(void) * * Description - * + * return a GList of modules, either all or those checked. * * Return value * void */ -static GList * -get_list_mods_to_remove_install(int activity) +static GList *get_list_mods_to_remove_install(int activity) { GList *retval = NULL; GtkTreeIter root; @@ -1100,13 +1131,10 @@ gchar *name; gboolean fixed; if (activity == INSTALL) - model = - gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); + model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); else - model = - gtk_tree_view_get_model(GTK_TREE_VIEW(treeview2)); - if (!gtk_tree_model_get_iter_first - (GTK_TREE_MODEL(model), &root)) + model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview2)); + if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &root)) return retval; do { @@ -1114,19 +1142,19 @@ COLUMN_FIXED, &fixed, COLUMN_NAME, &name, -1); if (gtk_tree_model_iter_has_child(model, &root)) { - retval = parse_treeview(retval, model, &root); + retval = + parse_treeview(retval, model, &root, activity); } else { - if (fixed) { - retval = g_list_append(retval, (gchar *)name); + if (fixed || (activity == ALL_MODULES)) { + retval = + g_list_append(retval, (gchar *)name); } - } } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &root)); return retval; } - /****************************************************************************** * Name * add_module_to_language_folder @@ -1145,11 +1173,10 @@ */ static void -add_module_to_language_folder(GtkTreeView * tree, +add_module_to_language_folder(GtkTreeView *tree, GtkTreeModel *model, GtkTreeIter iter, - MOD_MGR *info, - gboolean checkmark) + MOD_MGR *info, gboolean checkmark) { GtkTreeIter iter_iter; GtkTreeIter child_iter; @@ -1160,11 +1187,11 @@ GdkPixbuf *locked; GdkPixbuf *refresh; const gchar *description = NULL; -// GtkTooltip *tooltip; + // GtkTooltip *tooltip; /* Check language */ const gchar *buf = info->language; - if (!g_utf8_validate(buf,-1,NULL)) + if (!g_utf8_validate(buf, -1, NULL)) info->language = _("Unknown"); if (!g_unichar_isalnum(g_utf8_get_char(buf)) || (info->language == NULL)) info->language = _("Unknown"); @@ -1177,20 +1204,22 @@ gchar *str_data; /*gtk_tooltip_set_markup ( tooltip, - "a little
        tooltip");*/ + "a little
        tooltip"); */ gtk_tree_model_get(model, &iter_iter, COLUMN_NAME, &str_data, -1); if (!strcmp(info->language, str_data)) { - installed = ((info->installed) ? INSTALLED : BLANK); + installed = + ((info->installed) ? INSTALLED : BLANK); - locked = ((info->locked) ? LOCKED : BLANK); + locked = ((info->locked) ? LOCKED : BLANK); if ((info->installed && (!info->old_version && info->new_version && strcmp(info->new_version, " "))) || ((info->old_version && !info->new_version)) || ((info->old_version && info->new_version && - strcmp(info->new_version, info->old_version) > 0))) + strcmp(info->new_version, + info->old_version) > 0))) refresh = REFRESH; else refresh = BLANK; @@ -1207,9 +1236,18 @@ gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter_iter); - gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, - COLUMN_NAME, info->name, - COLUMN_INSTALLED, + + gchar *caption; + if (info->abbreviation) + caption = g_strdup_printf("%s (%s)", + info->abbreviation, + info->name); + else + caption = g_strdup(info->name); + + gtk_tree_store_set(GTK_TREE_STORE(model), + &child_iter, COLUMN_NAME, + caption, COLUMN_INSTALLED, (checkmark ? installed : BLANK), COLUMN_FIXED, FALSE, COLUMN_INSTALLED_VERSION, @@ -1221,9 +1259,10 @@ COLUMN_AVAILABLE_VERSION, info->new_version, COLUMN_INSTALLSIZE, - info->installsize, - COLUMN_DESC, description, - COLUMN_VISIBLE, TRUE, -1); + info->installsize, COLUMN_DESC, + description, COLUMN_VISIBLE, + TRUE, -1); + g_free(caption); g_free(str_data); return; } @@ -1232,7 +1271,6 @@ } } - /****************************************************************************** * Name * language_add_folders @@ -1251,30 +1289,26 @@ */ static void -language_add_folders(GtkTreeModel * model, - GtkTreeIter iter, - gchar ** languages) +language_add_folders(GtkTreeModel *model, + GtkTreeIter iter, gchar **languages) { GtkTreeIter iter_iter; GtkTreeIter child_iter; int j; - (void) gtk_tree_model_iter_children(model, &iter_iter, &iter); + (void)gtk_tree_model_iter_children(model, &iter_iter, &iter); for (j = 0; languages[j]; ++j) { - gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter); - gtk_tree_store_set(GTK_TREE_STORE(model), - &child_iter, - COLUMN_VISIBLE, - FALSE, - COLUMN_NAME, + gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, + &iter); + gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, + COLUMN_VISIBLE, FALSE, COLUMN_NAME, ((g_utf8_validate(languages[j], -1, NULL)) - ? languages[j] - : _("Unknown")), + ? languages[j] + : _("Unknown")), -1); } } - /****************************************************************************** * Name * add_language_folder @@ -1294,8 +1328,7 @@ static void add_language_folder(GtkTreeModel *model, - GtkTreeIter iter, - const gchar *language) + GtkTreeIter iter, const gchar *language) { GtkTreeIter iter_iter; GtkTreeIter child_iter; @@ -1303,7 +1336,7 @@ /* Check language */ const gchar *buf = language; - if (!g_utf8_validate(buf,-1,NULL)) + if (!g_utf8_validate(buf, -1, NULL)) language = _("Unknown"); if (!g_unichar_isalnum(g_utf8_get_char(buf)) || (language == NULL)) language = _("Unknown"); @@ -1314,10 +1347,7 @@ gchar *str_data; gtk_tree_model_get(model, - &iter_iter, - COLUMN_NAME, - &str_data, - -1); + &iter_iter, COLUMN_NAME, &str_data, -1); if (!g_utf8_collate(g_utf8_casefold(language, -1), g_utf8_casefold(str_data, -1))) { @@ -1329,18 +1359,14 @@ } gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter); gtk_tree_store_set(GTK_TREE_STORE(model), - &child_iter, - COLUMN_VISIBLE, - FALSE, - COLUMN_NAME, - language, - -1); + &child_iter, + COLUMN_VISIBLE, + FALSE, COLUMN_NAME, language, -1); } static gboolean -on_modules_list_button_release(GtkWidget * widget, - GdkEventButton * event, - gpointer data) +on_modules_list_button_release(GtkWidget *widget, + GdkEventButton *event, gpointer data) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -1357,7 +1383,7 @@ * happens too soon. */ static GTimer *t = NULL; - static gdouble el = -1.0; /* sentinel */ + static gdouble el = -1.0; /* sentinel */ if (!t) t = g_timer_new(); @@ -1370,25 +1396,23 @@ } /* end of anti-bobble control. */ - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(data)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); - if (!gtk_tree_selection_get_selected (selection, &model, &selected)) + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return FALSE; - if (!gtk_tree_model_iter_has_child (model ,&selected)) + if (!gtk_tree_model_iter_has_child(model, &selected)) return FALSE; - path = gtk_tree_model_get_path (model, &selected); - if (gtk_tree_view_row_expanded (GTK_TREE_VIEW(data), path)) - gtk_tree_view_collapse_row ( GTK_TREE_VIEW(data), path ); - else - gtk_tree_view_expand_row ( GTK_TREE_VIEW(data), path, FALSE ); - gtk_tree_path_free ( path ); + path = gtk_tree_model_get_path(model, &selected); + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(data), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(data), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(data), path, FALSE); + gtk_tree_path_free(path); return FALSE; } - - /****************************************************************************** * Name * load_module_tree @@ -1405,13 +1429,10 @@ * void */ -static void -load_module_tree(GtkTreeView * treeview, - gboolean install) +static void load_module_tree(GtkTreeView *treeview, gboolean install) { GtkTreeStore *store; GtkTreeIter repository_name; - gchar *repository_identifier; GtkTreeIter category_type; GtkTreeIter category_avail; GtkTreeIter text; @@ -1429,13 +1450,12 @@ GtkTreeIter prayerlist; GList *tmp = NULL; GList *tmp2 = NULL; - MOD_MGR *info; if (install) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(radiobutton_source))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton_source))) { local = TRUE; source = - gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child (GTK_BIN(combo_entry1)))); + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_entry1)))); // must find the directory attached to the name. // they may (and normally will) be the same, @@ -1448,13 +1468,13 @@ if (!strcmp(source, mms->caption)) source = g_strdup(mms->directory); - g_free((gchar*)mms->type); - g_free((gchar*)mms->caption); - g_free((gchar*)mms->source); - g_free((gchar*)mms->directory); - g_free((gchar*)mms->user); - g_free((gchar*)mms->pass); - g_free((gchar*)mms->uid); + g_free((gchar *)mms->type); + g_free((gchar *)mms->caption); + g_free((gchar *)mms->source); + g_free((gchar *)mms->directory); + g_free((gchar *)mms->user); + g_free((gchar *)mms->pass); + g_free((gchar *)mms->uid); g_free(mms); tmp = g_list_next(tmp); } @@ -1465,12 +1485,14 @@ } else { local = FALSE; source = - gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child (GTK_BIN(combo_entry2)))); + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_entry2)))); tmp = mod_mgr_remote_list_modules(source); } } else { // we are doing maintenance on all modules. - tmp = mod_mgr_list_local_modules(settings.path_to_mods, TRUE); + tmp = + mod_mgr_list_local_modules(settings.path_to_mods, + TRUE); // true -> we must have all modules available, incl. ~/.sword content. } @@ -1485,14 +1507,14 @@ /* note the repository that is active */ if ((local == FALSE) && (remote_source == NULL)) { #ifdef USE_GTK_3 - remote_source = g_strdup(gtk_combo_box_text_get_active_text( - GTK_COMBO_BOX_TEXT(combo_entry2))); -#else - remote_source = g_strdup(gtk_combo_box_get_active_text( - GTK_COMBO_BOX(combo_entry2))); + remote_source = + g_strdup(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_entry2))); +#else + remote_source = + g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_entry2))); #endif } - repository_identifier = + gchar *repository_identifier = g_strdup_printf(_("Repository:\n%s"), (local ? source : remote_source)); gtk_tree_store_append(store, &repository_name, NULL); @@ -1501,7 +1523,8 @@ g_free(repository_identifier); gtk_tree_store_append(store, &separator, NULL); - gtk_tree_store_set(store, &separator, 0, "------------------------", -1); + gtk_tree_store_set(store, &separator, 0, + "------------------------", -1); gtk_tree_store_append(store, &category_type, NULL); gtk_tree_store_set(store, &category_type, 0, @@ -1526,7 +1549,8 @@ /* add Devotionals folder */ gtk_tree_store_append(store, &devotional, NULL); - gtk_tree_store_set(store, &devotional, 0, _("Daily Devotionals"), -1); + gtk_tree_store_set(store, &devotional, 0, _("Daily Devotionals"), + -1); /* add Books folder */ gtk_tree_store_append(store, &book, NULL); @@ -1546,24 +1570,26 @@ if (install && !first_time_user) { gtk_tree_store_append(store, &separator, NULL); - gtk_tree_store_set(store, &separator, 0, "------------------------", -1); + gtk_tree_store_set(store, &separator, 0, + "------------------------", -1); gtk_tree_store_append(store, &category_avail, NULL); gtk_tree_store_set(store, &category_avail, 0, _("Categorized by\nAvailability"), -1); - /* add Updates folder */ gtk_tree_store_append(store, &update, NULL); gtk_tree_store_set(store, &update, 0, _("Updates"), -1); /* add Uninstalled folder */ gtk_tree_store_append(store, &uninstalled, NULL); - gtk_tree_store_set(store, &uninstalled, 0, _("Uninstalled"), -1); + gtk_tree_store_set(store, &uninstalled, 0, + _("Uninstalled"), -1); } else { if (settings.prayerlist) { gtk_tree_store_append(store, &prayerlist, NULL); - gtk_tree_store_set(store, &prayerlist, 0, _("Prayer List/Journal"), -1); + gtk_tree_store_set(store, &prayerlist, 0, + _("Prayer List/Journal"), -1); } } @@ -1576,99 +1602,83 @@ tmp2 = tmp; while (tmp2) { - info = (MOD_MGR *) tmp2->data; + MOD_MGR *info = (MOD_MGR *)tmp2->data; if (install && !first_time_user) { // special lists: updated and uninstalled modules. if (!info->installed) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), uninstalled, - info, install); - } else if ((!info->old_version && info->new_version && - strcmp(info->new_version, " ")) || - (info->old_version && !info->new_version) || - (info->old_version && info->new_version && - strcmp(info->new_version, info->old_version) > 0)) { + GTK_TREE_MODEL(store), + uninstalled, + info, + install); + } else if ((!info->old_version && info->new_version && strcmp(info->new_version, " ")) || (info->old_version && !info->new_version) || (info->old_version && info->new_version && strcmp(info->new_version, info->old_version) > 0)) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), update, - info, install); + GTK_TREE_MODEL(store), + update, info, + install); } } - // see comment on similar code in src/main/sidebar.cc. if (info->is_cult) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), cult, + GTK_TREE_MODEL(store), cult, info, install); - } - else if (info->type[0] == 'B') { + } else if (info->type[0] == 'B') { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), text, + GTK_TREE_MODEL(store), text, info, install); - } - else if (info->type[0] == 'C') { + } else if (info->type[0] == 'C') { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), commentary, + GTK_TREE_MODEL(store), commentary, info, install); - } - else if (info->is_maps) { + } else if (info->is_maps) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), map, + GTK_TREE_MODEL(store), map, info, install); - } - else if (info->is_images) { + } else if (info->is_images) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), image, + GTK_TREE_MODEL(store), image, info, install); - } - else if (info->is_devotional) { + } else if (info->is_devotional) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), devotional, + GTK_TREE_MODEL(store), devotional, info, install); - } - else if (info->is_glossary) { + } else if (info->is_glossary) { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), glossary, + GTK_TREE_MODEL(store), glossary, info, install); - } - else if (info->type[0] == 'L') { + } else if (info->type[0] == 'L') { add_module_to_language_folder(treeview, - GTK_TREE_MODEL - (store), dictionary, + GTK_TREE_MODEL(store), dictionary, info, install); - } - else if (info->type[0] == 'G') { + } else if (info->type[0] == 'G') { gchar *gstype; if (first_time_user || - ((gstype = main_get_mod_config_entry(info->name, "GSType")) - == NULL) || + ((gstype = + main_get_mod_config_entry(info->name, + "GSType")) == NULL) || strcmp(gstype, "PrayerList")) { - add_module_to_language_folder - (treeview,GTK_TREE_MODEL(store), book, info, install); + add_module_to_language_folder(treeview, GTK_TREE_MODEL(store), book, + info, install); } else if (settings.prayerlist) { - add_language_folder - (GTK_TREE_MODEL(store), prayerlist, info->language); - add_module_to_language_folder - (treeview,GTK_TREE_MODEL(store), prayerlist, info, install); + add_language_folder(GTK_TREE_MODEL(store), prayerlist, + info->language); + add_module_to_language_folder(treeview, + GTK_TREE_MODEL(store), + prayerlist, + info, + install); } - } - else { + } else { XI_warning(("mod `%s' unknown type `%s'", info->name, info->type)); } g_free(info->name); g_free(info->about); + g_free(info->abbreviation); g_free(info->type); g_free(info->new_version); g_free(info->old_version); @@ -1680,14 +1690,11 @@ gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(store)); - g_signal_connect_after((gpointer) treeview, - "button_release_event", - G_CALLBACK - (on_modules_list_button_release), treeview); - + g_signal_connect_after((gpointer)treeview, + "button_release_event", + G_CALLBACK(on_modules_list_button_release), treeview); } - /****************************************************************************** * Name * remove_install_wrapper @@ -1704,12 +1711,12 @@ * void */ -static void -remove_install_wrapper(int activity) +static void remove_install_wrapper(int activity) { GList *modules = NULL; - if (working) return; + if (working) + return; working = TRUE; modules = get_list_mods_to_remove_install(activity); @@ -1742,41 +1749,44 @@ * void */ -static void -response_refresh(void) +static void response_refresh(void) { - gint failed; + gint result; gchar *buf; - if (working) return; + if (working) + return; working = TRUE; if (remote_source == NULL) #ifdef USE_GTK_3 - remote_source = g_strdup(gtk_combo_box_text_get_active_text( - GTK_COMBO_BOX_TEXT(combo_entry2))); -#else - remote_source = g_strdup(gtk_combo_box_get_active_text( - GTK_COMBO_BOX(combo_entry2))); + remote_source = + g_strdup(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_entry2))); +#else + remote_source = + g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_entry2))); #endif - buf = g_strdup_printf("%s: %s", _("Refreshing from remote source"), remote_source); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), buf); + buf = + g_strdup_printf("%s: %s", _("Refreshing from remote source"), + remote_source); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), + buf); g_free(buf); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); gtk_widget_show(progressbar_refresh); sync_windows(); - failed = mod_mgr_refresh_remote_source(remote_source); + result = mod_mgr_refresh_remote_source(remote_source); - if (failed) { - gtk_progress_bar_set_text( - GTK_PROGRESS_BAR(progressbar_refresh), _("Remote source not found")); + if (result) { + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), + _("Remote source not found")); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); + } else { + load_module_tree(GTK_TREE_VIEW(treeview), TRUE); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), + _("Finished")); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); - working = FALSE; - return; } - load_module_tree(GTK_TREE_VIEW(treeview), TRUE); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), _("Finished")); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); working = FALSE; } @@ -1797,8 +1807,7 @@ * void */ -static void -check_sync_repos(void) +static void check_sync_repos(void) { GList *tmp = mod_mgr_list_remote_sources(); /* @@ -1807,9 +1816,12 @@ if (g_list_length(tmp) <= 1) { char index[10]; mod_mgr_init_config_extras(); - settings.mod_mgr_remote_source_index = load_source_treeviews(); - g_snprintf(index, 10, "%d", settings.mod_mgr_remote_source_index); - xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", index); + settings.mod_mgr_remote_source_index = + load_source_treeviews(); + g_snprintf(index, 10, "%d", + settings.mod_mgr_remote_source_index); + xml_set_value("Xiphos", "modmgr", + "mod_mgr_remote_source_index", index); set_controls_to_last_use(); } g_list_free(tmp); @@ -1831,8 +1843,7 @@ * void */ -static void -add_columns_to_first(GtkTreeView * treeview) +static void add_columns_to_first(GtkTreeView *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1845,7 +1856,6 @@ gtk_tree_view_append_column(treeview, column); } - /****************************************************************************** * Name * add_columns_to_remote_treeview @@ -1862,8 +1872,7 @@ * void */ -static void -add_columns_to_remote_treeview(GtkTreeView * treeview) +static void add_columns_to_remote_treeview(GtkTreeView *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1879,16 +1888,14 @@ column = gtk_tree_view_column_new_with_attributes(_("Caption"), renderer, "text", - COLUMN_CAPTION, - NULL); + COLUMN_CAPTION, NULL); gtk_tree_view_append_column(treeview, column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Source"), renderer, "text", - COLUMN_SOURCE, - NULL); + COLUMN_SOURCE, NULL); gtk_tree_view_append_column(treeview, column); renderer = gtk_cell_renderer_text_new(); @@ -1903,29 +1910,25 @@ column = gtk_tree_view_column_new_with_attributes(_("User"), renderer, "text", - COLUMN_USER, - NULL); + COLUMN_USER, NULL); gtk_tree_view_append_column(treeview, column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Password"), renderer, "text", - COLUMN_PASS, - NULL); + COLUMN_PASS, NULL); gtk_tree_view_append_column(treeview, column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("UID"), renderer, "text", - COLUMN_UID, - NULL); + COLUMN_UID, NULL); gtk_tree_view_append_column(treeview, column); } -static GtkTreeModel * -create_model_to_first(void) +static GtkTreeModel *create_model_to_first(void) { GtkTreeStore *model; GtkTreeIter iter; @@ -1937,26 +1940,24 @@ gtk_tree_store_set(model, &iter, 0, _("Module Sources"), -1); gtk_tree_store_append(model, &child_iter, &iter); - gtk_tree_store_set(model, &child_iter, 0, _("Add/Remove"), 1, 1, -1); + gtk_tree_store_set(model, &child_iter, 0, _("Add/Remove"), 1, 1, + -1); gtk_tree_store_append(model, &child_iter, &iter); gtk_tree_store_set(model, &child_iter, 0, _("Choose"), 1, 2, -1); - gtk_tree_store_append(model, &iter, NULL); gtk_tree_store_set(model, &iter, 0, _("Modules"), -1); gtk_tree_store_append(model, &child_iter, &iter); - gtk_tree_store_set(model, &child_iter, 0, _("Install/Update"), 1, 3, -1); + gtk_tree_store_set(model, &child_iter, 0, _("Install/Update"), 1, + 3, -1); gtk_tree_store_append(model, &child_iter, &iter); - gtk_tree_store_set(model, &child_iter, 0, _("Maintenance"), 1, 4, -1); + gtk_tree_store_set(model, &child_iter, 0, _("Maintenance"), 1, 4, + -1); return GTK_TREE_MODEL(model); } - - - -static GtkTreeModel * -create_remote_source_treeview_model(void) +static GtkTreeModel *create_remote_source_treeview_model(void) { GtkListStore *store; @@ -1967,13 +1968,11 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); + G_TYPE_STRING, G_TYPE_STRING); return GTK_TREE_MODEL(store); } - /****************************************************************************** * Name * load_source_treeviews @@ -1989,56 +1988,53 @@ * int */ -static int -load_source_treeviews(void) +static int load_source_treeviews(void) { - int crosswire_index = 1 /* guess */, crosswire_tracker = 0 /* start */; + int crosswire_index = 1 /* guess */, crosswire_tracker = + 0 /* start */; GList *tmp = NULL; GList *tmp2 = NULL; GtkTreeIter iter; GtkTreeIter combo_iter; MOD_MGR_SOURCE *mms; GtkTreeModel *remote_model = - gtk_tree_view_get_model(GTK_TREE_VIEW(treeview_remote)); + gtk_tree_view_get_model(GTK_TREE_VIEW(treeview_remote)); GtkTreeModel *local_model = - gtk_tree_view_get_model(GTK_TREE_VIEW(treeview_local)); - GtkTreeModel* module_box_local = - gtk_combo_box_get_model(GTK_COMBO_BOX(combo_entry1)); - GtkTreeModel* module_box_remote = - gtk_combo_box_get_model(GTK_COMBO_BOX(combo_entry2)); + gtk_tree_view_get_model(GTK_TREE_VIEW(treeview_local)); + GtkTreeModel *module_box_local = + gtk_combo_box_get_model(GTK_COMBO_BOX(combo_entry1)); + GtkTreeModel *module_box_remote = + gtk_combo_box_get_model(GTK_COMBO_BOX(combo_entry2)); /* remote */ gtk_list_store_clear(GTK_LIST_STORE(remote_model)); gtk_list_store_clear(GTK_LIST_STORE(module_box_remote)); tmp = tmp2 = mod_mgr_list_remote_sources(); while (tmp) { - mms = (MOD_MGR_SOURCE *) tmp->data; + mms = (MOD_MGR_SOURCE *)tmp->data; if (!strcmp(mms->caption, "CrossWire")) crosswire_index = crosswire_tracker; - gtk_list_store_append(GTK_LIST_STORE(remote_model), - &iter); + gtk_list_store_append(GTK_LIST_STORE(remote_model), &iter); gtk_list_store_set(GTK_LIST_STORE(remote_model), &iter, - COLUMN_TYPE, mms->type, - COLUMN_CAPTION, mms->caption, - COLUMN_SOURCE, mms->source, + COLUMN_TYPE, mms->type, + COLUMN_CAPTION, mms->caption, + COLUMN_SOURCE, mms->source, COLUMN_DIRECTORY, mms->directory, - COLUMN_USER, mms->user, - COLUMN_PASS, mms->pass, - COLUMN_UID, mms->uid, - -1); - gtk_list_store_append(GTK_LIST_STORE(module_box_remote), &combo_iter); + COLUMN_USER, mms->user, + COLUMN_PASS, mms->pass, + COLUMN_UID, mms->uid, -1); + gtk_list_store_append(GTK_LIST_STORE(module_box_remote), + &combo_iter); gtk_list_store_set(GTK_LIST_STORE(module_box_remote), - &combo_iter, - 0, - (gchar*)mms->caption, - -1); - g_free((gchar*)mms->type); - g_free((gchar*)mms->caption); - g_free((gchar*)mms->source); - g_free((gchar*)mms->directory); - g_free((gchar*)mms->user); - g_free((gchar*)mms->pass); - g_free((gchar*)mms->uid); + &combo_iter, 0, (gchar *)mms->caption, + -1); + g_free((gchar *)mms->type); + g_free((gchar *)mms->caption); + g_free((gchar *)mms->source); + g_free((gchar *)mms->directory); + g_free((gchar *)mms->user); + g_free((gchar *)mms->pass); + g_free((gchar *)mms->uid); g_free(mms); tmp = g_list_next(tmp); crosswire_tracker++; @@ -2051,31 +2047,24 @@ gtk_list_store_clear(GTK_LIST_STORE(module_box_local)); tmp = tmp2 = mod_mgr_list_local_sources(); while (tmp) { - mms = (MOD_MGR_SOURCE *) tmp->data; - gtk_list_store_append(GTK_LIST_STORE(local_model), - &iter); - gtk_list_store_set(GTK_LIST_STORE(local_model), &iter, - COLUMN_TYPE, mms->type, - COLUMN_CAPTION, mms->caption, - COLUMN_SOURCE, " ", // mms->source - eh. + mms = (MOD_MGR_SOURCE *)tmp->data; + gtk_list_store_append(GTK_LIST_STORE(local_model), &iter); + gtk_list_store_set(GTK_LIST_STORE(local_model), &iter, COLUMN_TYPE, mms->type, COLUMN_CAPTION, mms->caption, COLUMN_SOURCE, " ", // mms->source - eh. COLUMN_DIRECTORY, mms->directory, - COLUMN_USER, "", - COLUMN_PASS, "", - COLUMN_UID, "", - -1); - gtk_list_store_append(GTK_LIST_STORE(module_box_local), &combo_iter); + COLUMN_USER, "", + COLUMN_PASS, "", COLUMN_UID, "", -1); + gtk_list_store_append(GTK_LIST_STORE(module_box_local), + &combo_iter); gtk_list_store_set(GTK_LIST_STORE(module_box_local), - &combo_iter, - 0, - (gchar*)mms->caption, - -1); - g_free((gchar*)mms->type); - g_free((gchar*)mms->caption); - g_free((gchar*)mms->source); - g_free((gchar*)mms->directory); - g_free((gchar*)mms->user); - g_free((gchar*)mms->pass); - g_free((gchar*)mms->uid); + &combo_iter, 0, (gchar *)mms->caption, + -1); + g_free((gchar *)mms->type); + g_free((gchar *)mms->caption); + g_free((gchar *)mms->source); + g_free((gchar *)mms->directory); + g_free((gchar *)mms->user); + g_free((gchar *)mms->pass); + g_free((gchar *)mms->uid); g_free(mms); tmp = g_list_next(tmp); } @@ -2085,7 +2074,6 @@ return crosswire_index; } - /****************************************************************************** * Name * clear_and_hide_progress_bar @@ -2102,15 +2090,14 @@ * void */ -void -clear_and_hide_progress_bar(void) +void clear_and_hide_progress_bar(void) { - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), ""); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh),0); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), + ""); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_refresh), 0); gtk_widget_hide(progressbar_refresh); } - /****************************************************************************** * Name * on_notebook1_switch_page @@ -2131,19 +2118,15 @@ #ifdef USE_GTK_3 void -on_notebook1_switch_page(GtkNotebook * notebook, - gpointer arg, - guint page_num, - gpointer user_data) +on_notebook1_switch_page(GtkNotebook *notebook, + gpointer arg, guint page_num, gpointer user_data) #else void -on_notebook1_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, - guint page_num, - gpointer user_data) +on_notebook1_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, + guint page_num, gpointer user_data) #endif { - gchar *str; #ifndef USE_GTK_3 GdkCursor *cursor; GdkDisplay *display; @@ -2182,13 +2165,14 @@ break; case 3: if (!have_configs) { - str = g_strdup_printf("%s\n\n%s", - _("Please Refresh"), - _("Your module list is not up to date!")); + gchar *str = + g_strdup_printf("%s\n\n%s", + _("Please Refresh"), + _("Your module list is not up to date!")); gui_generic_warning(str); g_free(str); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(radiobutton_dest))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton_dest))) { destination = gtk_label_get_text(GTK_LABEL(label_home)); } else { @@ -2200,7 +2184,7 @@ load_module_tree(GTK_TREE_VIEW(treeview), TRUE); break; case 4: - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(radiobutton_dest))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton_dest))) { destination = gtk_label_get_text(GTK_LABEL(label_home)); } else { @@ -2225,7 +2209,6 @@ #endif } - /****************************************************************************** * Name * on_radiobutton2_toggled @@ -2244,19 +2227,18 @@ */ void -on_radiobutton2_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_radiobutton2_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { gtk_widget_show(button_refresh); if (remote_source) - g_free(remote_source); + g_free(remote_source); #ifdef USE_GTK_3 - remote_source = g_strdup(gtk_combo_box_text_get_active_text( - GTK_COMBO_BOX_TEXT(combo_entry2))); -#else - remote_source = g_strdup(gtk_combo_box_get_active_text( - GTK_COMBO_BOX(combo_entry2))); + remote_source = + g_strdup(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_entry2))); +#else + remote_source = + g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_entry2))); #endif xml_set_value("Xiphos", "modmgr", "mod_mgr_source", "1"); @@ -2265,18 +2247,18 @@ gtk_widget_hide(progressbar_refresh); xml_set_value("Xiphos", "modmgr", "mod_mgr_source", "0"); } - settings.mod_mgr_source = gtk_toggle_button_get_active (togglebutton); + settings.mod_mgr_source = + gtk_toggle_button_get_active(togglebutton); xml_save_settings_doc(settings.fnconfigure); } - void -on_radiobutton4_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_radiobutton4_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "modmgr", "mod_mgr_source", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.mod_mgr_source = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.mod_mgr_source = + gtk_toggle_button_get_active(togglebutton); xml_save_settings_doc(settings.fnconfigure); } @@ -2296,8 +2278,7 @@ * void */ -void -save_sources(void) +void save_sources(void) { gchar *type = NULL; gchar *caption = NULL; @@ -2324,25 +2305,24 @@ COLUMN_DIRECTORY, &directory, COLUMN_USER, &user, COLUMN_PASS, &pass, - COLUMN_UID, &uid, - -1); + COLUMN_UID, &uid, -1); - if(strcasecmp(type,"HTTP") == 0) + if (strcasecmp(type, "HTTP") == 0) mod_mgr_add_source("HTTPSource", - type, caption, source, directory, - user, pass, uid); - else if(strcasecmp(type,"HTTPS") == 0) + type, caption, source, + directory, user, pass, uid); + else if (strcasecmp(type, "HTTPS") == 0) mod_mgr_add_source("HTTPSSource", - type, caption, source, directory, - user, pass, uid); - else if(strcasecmp(type,"SFTP") == 0) + type, caption, source, + directory, user, pass, uid); + else if (strcasecmp(type, "SFTP") == 0) mod_mgr_add_source("SFTPSource", - type, caption, source, directory, - user, pass, uid); + type, caption, source, + directory, user, pass, uid); else mod_mgr_add_source("FTPSource", - type, caption, source, directory, - user, pass, uid); + type, caption, source, + directory, user, pass, uid); g_free(type); g_free(caption); g_free(source); @@ -2362,8 +2342,7 @@ COLUMN_DIRECTORY, &directory, COLUMN_USER, &user, COLUMN_PASS, &pass, - COLUMN_UID, &uid, - -1); + COLUMN_UID, &uid, -1); mod_mgr_add_source("DIRSource", type, caption, "[local]", directory, @@ -2382,7 +2361,6 @@ load_source_treeviews(); } - /****************************************************************************** * Name * create_fileselection_local_source @@ -2399,31 +2377,31 @@ * void */ -static void -create_fileselection_local_source(void) +static void create_fileselection_local_source(void) { GtkWidget *dialog; - gchar *filename; GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview_local)); dialog = - gtk_file_chooser_dialog_new ("Open File", - NULL, - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + gtk_file_chooser_dialog_new("Open File", + NULL, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, #ifdef HAVE_GTK_310 - "_Cancel", GTK_RESPONSE_CANCEL, - "_OK", GTK_RESPONSE_ACCEPT, -#else - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, -#endif - NULL); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - XI_message(("%s",filename)); + "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, +#else + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, +#endif + NULL); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + gchar *filename = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + XI_message(("%s", filename)); gtk_list_store_append(GTK_LIST_STORE(model), &iter); gtk_list_store_set(GTK_LIST_STORE(model), &iter, COLUMN_TYPE, "DIR", @@ -2431,16 +2409,13 @@ COLUMN_SOURCE, "[local]", COLUMN_DIRECTORY, filename, COLUMN_USER, "", - COLUMN_PASS, "", - COLUMN_UID, "", - -1); + COLUMN_PASS, "", COLUMN_UID, "", -1); save_sources(); - g_free (filename); + g_free(filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); } - /****************************************************************************** * Name * on_dialog_destroy @@ -2460,18 +2435,18 @@ * void */ -static void -on_dialog_destroy(GObject * object, gpointer user_data) +static void on_dialog_destroy(GObject *object, gpointer user_data) { GList *tmp; gchar *str; - if (working) return; + if (working) + return; working = TRUE; XI_message(("on_destroy")); if (remote_source) { - g_free(remote_source); + g_free(remote_source); remote_source = NULL; } @@ -2506,41 +2481,41 @@ */ if (!main_is_module(settings.MainWindowModule)) { if ((tmp = get_list(TEXT_LIST))) - main_display_bible((char *)tmp->data, settings.currentverse); + main_display_bible((char *)tmp->data, + settings.currentverse); else { /* Zero Bibles is just not workable in Xiphos. */ - gui_generic_warning_modal - (_("You have uninstalled your last Bible.\n" - "Xiphos requires at least one.")); + gui_generic_warning_modal(_("You have uninstalled your last Bible.\n" + "Xiphos requires at least one.")); main_shutdown_list(); gui_open_mod_mgr_initial_run(); main_init_lists(); if (settings.havebible == 0) { - gui_generic_warning_modal - (_("There are still no Bibles installed.\n" - "Xiphos cannot continue without one.")); + gui_generic_warning_modal(_("There are still no Bibles installed.\n" + "Xiphos cannot continue without one.")); exit(1); } } } if (!main_is_module(settings.CommWindowModule)) { if ((tmp = get_list(COMM_LIST))) - main_display_commentary((char *)tmp->data, settings.currentverse); + main_display_commentary((char *)tmp->data, + settings.currentverse); } if (!main_is_module(settings.DictWindowModule)) { if ((tmp = get_list(DICT_LIST))) - main_display_dictionary((char *)tmp->data, settings.dictkey); + main_display_dictionary((char *)tmp->data, + settings.dictkey); } if (!main_is_module(settings.book_mod)) { if ((tmp = get_list(GBS_LIST))) - main_display_book((char *)tmp->data, "/"); /* blank key */ + main_display_book((char *)tmp->data, "/"); /* blank key */ } settings.display_modmgr = 0; xml_set_value("Xiphos", "layout", "modmgropen", "0"); } - /****************************************************************************** * Name * response_close @@ -2557,92 +2532,203 @@ * void */ -static void -response_close(void) +static void response_close(void) { gtk_widget_destroy(GTK_WIDGET(dialog_modmgr)); on_dialog_destroy(NULL, NULL); } - /* * click callbacks, most using a wrapper. */ -void -on_refresh_clicked(GtkButton * button, gpointer user_data) +void on_refresh_clicked(GtkButton *button, gpointer user_data) { response_refresh(); } -void -on_install_clicked(GtkButton * button, gpointer user_data) +void on_install_clicked(GtkButton *button, gpointer user_data) { remove_install_wrapper(INSTALL); } -void -on_remove_clicked(GtkButton * button, gpointer user_data) +void on_remove_clicked(GtkButton *button, gpointer user_data) { remove_install_wrapper(REMOVE); } -void -on_archive_clicked(GtkButton * button, gpointer user_data) +void on_archive_clicked(GtkButton *button, gpointer user_data) { remove_install_wrapper(ARCHIVE); } -void -on_index_clicked(GtkButton * button, gpointer user_data) +void on_index_clicked(GtkButton *button, gpointer user_data) { remove_install_wrapper(FASTMOD); } -void -on_delete_index_clicked(GtkButton * button, gpointer user_data) +void on_delete_index_clicked(GtkButton *button, gpointer user_data) { remove_install_wrapper(DELFAST); } -void -on_load_sources_clicked(GtkButton * button, gpointer user_data) +/****************************************************************************** + * Name + * delete_obsolete + * + * Synopsis + * #include "gui/mod_mgr.h" + * + * void delete_obsolete(char *module) + * + * Description + * look for "Obsoletes=OldModule" and ask to get rid of it. + * + * Return value + * void + */ + +void delete_obsolete(char *module, int *counter) +{ + char *obsolete = + backend_mod_mgr_get_config_entry(module, "Obsoletes"); + + if (obsolete && main_is_module(obsolete)) { + if (counter) + (*counter)++; + + /* targeting coordinates acquired. */ + char *mod_display_name, *obs_display_name, *question; + const char *mod_abbrev = + main_get_abbreviation((const char *)module); + const char *obs_abbrev = + main_get_abbreviation((const char *)obsolete); + + if (mod_abbrev) + mod_display_name = + g_strdup_printf("%s (%s)", mod_abbrev, module); + else + mod_display_name = g_strdup(module); + + if (obs_abbrev) + obs_display_name = + g_strdup_printf("%s (%s)", obs_abbrev, + obsolete); + else + obs_display_name = g_strdup(obsolete); + + question = g_strdup_printf(_("%s obsoletes %s.\n" + "Would you like to delete %s?\n" + "Beware: This cannot be undone."), + mod_display_name, + obs_display_name, + (obs_abbrev ? obs_abbrev : obsolete)); + if (gui_yes_no_dialog(question, NULL)) { + /* lay the axe at the root. */ + if (mod_mgr_uninstall(destination, obsolete) == -1) { + mod_mgr_uninstall((destination + ? NULL + : gtk_label_get_text(GTK_LABEL(label_home))), + obsolete); + } + } + + g_free(question); + g_free(mod_display_name); + g_free(obs_display_name); + + ModuleCacheErase((const char *)obsolete); + } +} + +/****************************************************************************** + * Name + * on_scan_obsolete + * + * Synopsis + * #include "gui/mod_mgr.h" + * + * void on_scan_obsolete(GtkButton * button, gpointer user_data) + * + * Description + * scan all modules to try to eliminate obsolescences. + * + * Return value + * void + */ + +void on_scan_obsolete(GtkButton *button, gpointer user_data) +{ + GList *modules = NULL; + int counter = 0; + + if (working) + return; + working = TRUE; + + modules = get_list_mods_to_remove_install(ALL_MODULES); + + /* + * walk the module list to find + * those that obsolete something else. + * verify each first, because previous + * obsolescences may delete some farther down. + */ + GList *tmp = modules; + while (tmp) { + if (main_is_module((gchar *)tmp->data)) + delete_obsolete((gchar *)tmp->data, &counter); + tmp = g_list_next(tmp); + } + g_list_free_full(modules, g_free); + + if (counter == 0) + gui_generic_warning(_("No obsolete modules were found.")); + else { + mod_mgr_shut_down(); + mod_mgr_init(destination, FALSE, TRUE); + load_module_tree(GTK_TREE_VIEW(treeview2), 0); + } + + working = FALSE; + return; +} + +void on_cancel_clicked(GtkButton *button, gpointer user_data) +{ + mod_mgr_terminate(); + sync_windows(); +} + +void on_load_sources_clicked(GtkButton *button, gpointer user_data) { if (mod_mgr_init_config_extras() == 0) { /* not quite identical to check_sync_repos(). */ char index[10]; gui_generic_warning(_("Standard remote sources have been loaded.")); - settings.mod_mgr_remote_source_index = load_source_treeviews(); - g_snprintf(index, 10, "%d", settings.mod_mgr_remote_source_index); - xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", index); + settings.mod_mgr_remote_source_index = + load_source_treeviews(); + g_snprintf(index, 10, "%d", + settings.mod_mgr_remote_source_index); + xml_set_value("Xiphos", "modmgr", + "mod_mgr_remote_source_index", index); set_controls_to_last_use(); } else gui_generic_warning(_("Could not load standard sources from CrossWire.")); } -void -on_mod_mgr_intro_clicked(GtkButton * button, gpointer user_data) +void on_mod_mgr_intro_clicked(GtkButton *button, gpointer user_data) { GtkWidget *dialog; - dialog = gtk_message_dialog_new_with_markup - (NULL, /* no need for a parent window */ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - (user_data ? XI_FIRST_INSTALL : XI_GENERAL_INTRO)); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + dialog = gtk_message_dialog_new_with_markup(NULL, /* no need for a parent window */ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + (user_data ? XI_FIRST_INSTALL : XI_GENERAL_INTRO)); + g_signal_connect_swapped(dialog, "response", + G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show(dialog); } -void -on_cancel_clicked(GtkButton * button, gpointer user_data) -{ - mod_mgr_terminate(); - sync_windows(); -} - - /****************************************************************************** * Name * on_mod_mgr_response @@ -2660,9 +2746,8 @@ */ void -on_mod_mgr_response(GtkDialog * dialog, - gint response_id, - gpointer user_data) +on_mod_mgr_response(GtkDialog *dialog, + gint response_id, gpointer user_data) { switch (response_id) { case GTK_RESPONSE_CANCEL: @@ -2696,10 +2781,12 @@ case GTK_RESPONSE_INTRO: on_mod_mgr_intro_clicked(NULL, NULL); break; + case GTK_RESPONSE_OBSOLETE: + on_scan_obsolete(NULL, NULL); + break; } } - /****************************************************************************** * Name * on_button_add_local_clicked @@ -2716,19 +2803,15 @@ * void */ -void -on_button_add_local_clicked(GtkButton * button, - gpointer user_data) +void on_button_add_local_clicked(GtkButton *button, gpointer user_data) { - if (!working) - { + if (!working) { working = TRUE; create_fileselection_local_source(); working = FALSE; } } - /****************************************************************************** * Name * on_button_remove_local_clicked @@ -2745,11 +2828,9 @@ * void */ -void -on_button_remove_local_clicked(GtkButton * button, - gpointer user_data) +void on_button_remove_local_clicked(GtkButton *button, gpointer user_data) { -// gchar *name_string; + // gchar *name_string; GtkTreeSelection *selection; GtkTreeIter selected; gchar *caption = NULL; @@ -2762,15 +2843,15 @@ gchar *str; GtkTreeModel *model; - if (working) return; + if (working) + return; working = TRUE; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview_local)); - if (!gtk_tree_selection_get_selected - (selection, &model, &selected)){ - working = FALSE; - return; + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) { + working = FALSE; + return; } gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, COLUMN_TYPE, &type, @@ -2778,23 +2859,22 @@ COLUMN_SOURCE, &source, COLUMN_DIRECTORY, &directory, COLUMN_USER, &user, - COLUMN_PASS, &pass, - COLUMN_UID, &uid, - -1); + COLUMN_PASS, &pass, COLUMN_UID, &uid, -1); //name_string = caption; - str = g_strdup_printf("%s\n\n%s|%s|%s|%s", - _("Remove the selected source"), - caption, type, source, directory); - - if (gui_yes_no_dialog(str, -#ifdef HAVE_GTK_310 - "dialog-warning" + str = + g_strdup_printf("%s\n\n%s|%s|%s|%s", + _("Remove the selected source"), caption, type, source, + directory); + + if (gui_yes_no_dialog(str, +#ifdef HAVE_GTK_310 + "dialog-warning" #else - GTK_STOCK_DIALOG_WARNING -#endif - )) { - + GTK_STOCK_DIALOG_WARNING +#endif + )) { + gtk_list_store_remove(GTK_LIST_STORE(model), &selected); save_sources(); } @@ -2810,7 +2890,6 @@ working = FALSE; } - /****************************************************************************** * Name * on_button_add_remote_clicked @@ -2827,9 +2906,7 @@ * void */ -void -on_button_add_remote_clicked(GtkButton * button, - gpointer user_data) +void on_button_add_remote_clicked(GtkButton *button, gpointer user_data) { gint test; GS_DIALOG *dialog; @@ -2839,12 +2916,14 @@ gboolean name_conflict = FALSE; MOD_MGR_SOURCE *mms; - if (working) return; + if (working) + return; working = TRUE; str = g_string_new(NULL); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2),TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2), + TRUE); gtk_widget_hide(button_refresh); GtkTreeModel *model = @@ -2853,12 +2932,12 @@ "%s", _("Enter a remote source")); dialog = gui_new_dialog(); - dialog->stock_icon = + dialog->stock_icon = #ifdef HAVE_GTK_310 - "dialog-information"; + "dialog-information"; #else - GTK_STOCK_DIALOG_INFO; -#endif + GTK_STOCK_DIALOG_INFO; +#endif dialog->label_top = str->str; dialog->label1 = _("Caption:"); dialog->label2 = _("Type:"); @@ -2887,21 +2966,20 @@ } for (tmp = tmp2 = mod_mgr_list_remote_sources(); - tmp; - tmp = g_list_next(tmp)) { - mms = (MOD_MGR_SOURCE *) tmp->data; + tmp; tmp = g_list_next(tmp)) { + mms = (MOD_MGR_SOURCE *)tmp->data; if (!strcmp(mms->caption, dialog->text1)) { /* this can happen at most once */ gui_generic_warning_modal(_("A source by that name already exists.")); name_conflict = TRUE; } - g_free((gchar*)mms->type); - g_free((gchar*)mms->caption); - g_free((gchar*)mms->source); - g_free((gchar*)mms->directory); - g_free((gchar*)mms->user); - g_free((gchar*)mms->pass); - g_free((gchar*)mms->uid); + g_free((gchar *)mms->type); + g_free((gchar *)mms->caption); + g_free((gchar *)mms->source); + g_free((gchar *)mms->directory); + g_free((gchar *)mms->user); + g_free((gchar *)mms->pass); + g_free((gchar *)mms->uid); g_free(mms); } g_list_free(tmp2); @@ -2916,47 +2994,46 @@ * flensing, trepanation, and hari-kari all apply. */ gchar *uid = g_strdup_printf("%d%02d%02d%02d%02d%02d", - local->tm_year+1900, - local->tm_mon+1, local->tm_mday, + local->tm_year + 1900, + local->tm_mon + 1, + local->tm_mday, local->tm_hour, local->tm_min, local->tm_sec); gtk_list_store_append(GTK_LIST_STORE(model), &iter); gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COLUMN_TYPE, dialog->text2, - COLUMN_CAPTION, dialog->text1, - COLUMN_SOURCE, dialog->text3, + COLUMN_TYPE, dialog->text2, + COLUMN_CAPTION, dialog->text1, + COLUMN_SOURCE, dialog->text3, COLUMN_DIRECTORY, dialog->text4, - COLUMN_USER, dialog->text5, - COLUMN_PASS, dialog->text6, - COLUMN_UID, uid, - -1); + COLUMN_USER, dialog->text5, + COLUMN_PASS, dialog->text6, + COLUMN_UID, uid, -1); g_free(uid); save_sources(); /* set the new item's index as active */ for (test = 0, tmp = tmp2 = mod_mgr_list_remote_sources(); - tmp; - tmp = g_list_next(tmp), ++test) { - mms = (MOD_MGR_SOURCE *) tmp->data; + tmp; tmp = g_list_next(tmp), ++test) { + mms = (MOD_MGR_SOURCE *)tmp->data; if (!strcmp(mms->caption, dialog->text1)) { - gtk_combo_box_set_active( - GTK_COMBO_BOX(combo_entry2), test); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_entry2), + test); } - g_free((gchar*)mms->type); - g_free((gchar*)mms->caption); - g_free((gchar*)mms->source); - g_free((gchar*)mms->directory); - g_free((gchar*)mms->user); - g_free((gchar*)mms->pass); - g_free((gchar*)mms->uid); + g_free((gchar *)mms->type); + g_free((gchar *)mms->caption); + g_free((gchar *)mms->source); + g_free((gchar *)mms->directory); + g_free((gchar *)mms->user); + g_free((gchar *)mms->pass); + g_free((gchar *)mms->uid); g_free(mms); } g_list_free(tmp2); } if (remote_source) - g_free(remote_source); + g_free(remote_source); remote_source = g_strdup(dialog->text1); g_free(dialog->text1); @@ -2978,7 +3055,6 @@ working = FALSE; } - /****************************************************************************** * Name * on_button_remove_remote_clicked @@ -2996,8 +3072,7 @@ */ void -on_button_remove_remote_clicked(GtkButton * button, - gpointer user_data) +on_button_remove_remote_clicked(GtkButton *button, gpointer user_data) { gint test; GS_DIALOG *yes_no_dialog; @@ -3014,16 +3089,16 @@ GtkTreeModel *model; GString *str; - if (working) return; + if (working) + return; working = TRUE; str = g_string_new(NULL); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview_remote)); - if (!gtk_tree_selection_get_selected - (selection, &model, &selected)){ - working = FALSE; + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) { + working = FALSE; return; } gtk_tree_model_get(model, &selected, @@ -3032,18 +3107,16 @@ COLUMN_SOURCE, &source, COLUMN_DIRECTORY, &directory, COLUMN_USER, &user, - COLUMN_PASS, &pass, - COLUMN_UID, &uid, - -1); + COLUMN_PASS, &pass, COLUMN_UID, &uid, -1); //name_string = caption; yes_no_dialog = gui_new_dialog(); - yes_no_dialog->stock_icon = + yes_no_dialog->stock_icon = #ifdef HAVE_GTK_310 - "dialog-warning"; + "dialog-warning"; #else - GTK_STOCK_DIALOG_WARNING; -#endif + GTK_STOCK_DIALOG_WARNING; +#endif yes_no_dialog->title = _("Delete a remote source"); g_string_printf(str, "%s\n\n%s|%s|%s|%s", @@ -3072,7 +3145,6 @@ working = FALSE; } - /****************************************************************************** * Name * on_treeview1_button_release_event @@ -3093,8 +3165,8 @@ */ gboolean -on_treeview1_button_release_event(GtkWidget * widget, - GdkEventButton * event, +on_treeview1_button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkTreeSelection *selection = NULL; @@ -3102,7 +3174,8 @@ gint sel; GtkTreeModel *model; - if (working) return 0; + if (working) + return 0; working = TRUE; model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview1)); @@ -3111,10 +3184,8 @@ if (gtk_tree_selection_get_selected(selection, NULL, &selected)) { gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, 1, &sel, -1); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected)) { - gtk_notebook_set_current_page(GTK_NOTEBOOK - (notebook1), sel); + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected)) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook1), sel); switch (sel) { case 1: gtk_widget_hide(button_refresh); @@ -3123,13 +3194,14 @@ gtk_widget_hide(button_arch); gtk_widget_hide(button_idx); gtk_widget_hide(button_delidx); + gtk_widget_hide(button_obsolete); if (first_time_user) gtk_widget_hide(button_load_sources); else gtk_widget_show(button_load_sources); break; case 2: - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(radiobutton2))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton2))) gtk_widget_show(button_refresh); else gtk_widget_hide(button_refresh); @@ -3138,10 +3210,11 @@ gtk_widget_hide(button_arch); gtk_widget_hide(button_idx); gtk_widget_hide(button_delidx); + gtk_widget_hide(button_obsolete); gtk_widget_hide(button_load_sources); break; case 3: - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(radiobutton2))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton2))) gtk_widget_show(button_refresh); else gtk_widget_hide(button_refresh); @@ -3150,6 +3223,7 @@ gtk_widget_hide(button_arch); gtk_widget_hide(button_idx); gtk_widget_hide(button_delidx); + gtk_widget_hide(button_obsolete); gtk_widget_hide(button_load_sources); break; case 4: @@ -3157,12 +3231,12 @@ gtk_widget_show(button_arch); gtk_widget_show(button_idx); gtk_widget_show(button_delidx); + gtk_widget_show(button_obsolete); gtk_widget_hide(button_load_sources); gtk_widget_hide(button_refresh); gtk_widget_hide(button_install); break; } - } } @@ -3170,9 +3244,7 @@ return FALSE; } - -static void -setup_treeview_main(GtkTreeView * tree_view) +static void setup_treeview_main(GtkTreeView *tree_view) { GtkTreeModel *model; @@ -3182,11 +3254,12 @@ gtk_tree_view_expand_all(tree_view); g_signal_connect(tree_view, "button_release_event", - G_CALLBACK(on_treeview1_button_release_event), NULL); + G_CALLBACK(on_treeview1_button_release_event), + NULL); } static void -setup_treeviews_local_remote(GtkTreeView * local, GtkTreeView * remote) +setup_treeviews_local_remote(GtkTreeView *local, GtkTreeView *remote) { GtkTreeModel *model; @@ -3198,52 +3271,65 @@ add_columns_to_remote_treeview(remote); } - -static void -set_combobox(GtkComboBox * combo) +static void set_combobox(GtkComboBox *combo) { GtkListStore *store; store = gtk_list_store_new(1, G_TYPE_STRING); gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store)); #ifdef USE_GTK_3 - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX(combo), 0); + gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo), 0); #else gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); #endif } - -static void -setup_dialog_action_area(GtkDialog * dialog) +static void setup_dialog_action_area(GtkDialog *dialog) { - GtkWidget *dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); + GtkWidget *dialog_action_area1 = +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog)); +#endif - gtk_widget_show (dialog_action_area1); - gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); + gtk_widget_show(dialog_action_area1); + gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), + GTK_BUTTONBOX_END); /* * response buttons */ - g_signal_connect(button_close, "clicked", G_CALLBACK(response_close), NULL); - g_signal_connect(button_refresh, "clicked", G_CALLBACK(on_refresh_clicked), NULL); - g_signal_connect(button_install, "clicked", G_CALLBACK(on_install_clicked), NULL); - g_signal_connect(button_remove, "clicked", G_CALLBACK(on_remove_clicked), NULL); - g_signal_connect(button_arch, "clicked", G_CALLBACK(on_archive_clicked), NULL); - g_signal_connect(button_idx, "clicked", G_CALLBACK(on_index_clicked), NULL); - g_signal_connect(button_delidx, "clicked", G_CALLBACK(on_delete_index_clicked), NULL); - g_signal_connect(button_load_sources, "clicked", G_CALLBACK(on_load_sources_clicked), NULL); - g_signal_connect(button_intro, "clicked", G_CALLBACK(on_mod_mgr_intro_clicked), NULL); - g_signal_connect(button_cancel, "clicked", G_CALLBACK(on_cancel_clicked), NULL); + g_signal_connect(button_close, "clicked", + G_CALLBACK(response_close), NULL); + g_signal_connect(button_refresh, "clicked", + G_CALLBACK(on_refresh_clicked), NULL); + g_signal_connect(button_install, "clicked", + G_CALLBACK(on_install_clicked), NULL); + g_signal_connect(button_remove, "clicked", + G_CALLBACK(on_remove_clicked), NULL); + g_signal_connect(button_arch, "clicked", + G_CALLBACK(on_archive_clicked), NULL); + g_signal_connect(button_idx, "clicked", + G_CALLBACK(on_index_clicked), NULL); + g_signal_connect(button_delidx, "clicked", + G_CALLBACK(on_delete_index_clicked), NULL); + g_signal_connect(button_obsolete, "clicked", + G_CALLBACK(on_scan_obsolete), NULL); + g_signal_connect(button_load_sources, "clicked", + G_CALLBACK(on_load_sources_clicked), NULL); + g_signal_connect(button_intro, "clicked", + G_CALLBACK(on_mod_mgr_intro_clicked), NULL); + g_signal_connect(button_cancel, "clicked", + G_CALLBACK(on_cancel_clicked), NULL); gtk_widget_show(button_close); on_mod_mgr_intro_clicked(NULL, NULL); sync_windows(); - on_mod_mgr_intro_clicked(NULL, (gpointer) 1); + on_mod_mgr_intro_clicked(NULL, (gpointer)1); } -static void -set_controls_to_last_use(void) +static void set_controls_to_last_use(void) { /* local or remote source */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2), @@ -3259,8 +3345,7 @@ settings.mod_mgr_destination); } -static void -setup_ui_labels() +static void setup_ui_labels() { gchar *str; @@ -3283,8 +3368,8 @@ if (g_access(settings.path_to_mods, W_OK) == -1) { XI_print(("%s is write protected\n", (settings.path_to_mods - ? settings.path_to_mods - : ""))); + ? settings.path_to_mods + : ""))); gtk_widget_set_sensitive(label_system, FALSE); gtk_widget_set_sensitive(radiobutton4, FALSE); } else { @@ -3295,14 +3380,14 @@ load_source_treeviews(); } - static void on_comboboxentry_local_changed(GtkComboBox *combobox, gpointer user_data) { - gint index = gtk_combo_box_get_active (GTK_COMBO_BOX(combo_entry1)); + gint index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_entry1)); settings.mod_mgr_local_source_index = index; - gchar *index_str = g_strdup_printf("%d",index); - xml_set_value("Xiphos", "modmgr", "mod_mgr_local_source_index", index_str); + gchar *index_str = g_strdup_printf("%d", index); + xml_set_value("Xiphos", "modmgr", "mod_mgr_local_source_index", + index_str); xml_save_settings_doc(settings.fnconfigure); g_free(index_str); } @@ -3310,40 +3395,41 @@ static void on_comboboxentry_remote_changed(GtkComboBox *combobox, gpointer user_data) { - gint index = gtk_combo_box_get_active (GTK_COMBO_BOX(combo_entry2)); + gint index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_entry2)); settings.mod_mgr_remote_source_index = index; - gchar *index_str = g_strdup_printf("%d",index); - XI_message(("index = %d index_str = %s",index,index_str)); - xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", index_str); + gchar *index_str = g_strdup_printf("%d", index); + XI_message(("index = %d index_str = %s", index, index_str)); + xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", + index_str); xml_save_settings_doc(settings.fnconfigure); g_free(index_str); if (remote_source) g_free(remote_source); - remote_source = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child (GTK_BIN(combobox))))); + remote_source = + g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combobox))))); } -static GtkWidget * -create_module_manager_dialog(gboolean first_run) +static GtkWidget *create_module_manager_dialog(gboolean first_run) { - gchar *glade_file = gui_general_user_file ("module-manager" UI_SUFFIX, FALSE); + gchar *glade_file = + gui_general_user_file("module-manager" UI_SUFFIX, FALSE); g_return_val_if_fail((glade_file != NULL), NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); #ifdef USE_GTKBUILDER gchar *ids[] = {"dialog", NULL}; - gxml = gtk_builder_new (); - gtk_builder_add_objects_from_file (gxml, glade_file, ids, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_objects_from_file(gxml, glade_file, ids, NULL); #else - gxml = glade_xml_new (glade_file, "dialog", NULL); + gxml = glade_xml_new(glade_file, "dialog", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); dialog_modmgr = UI_GET_ITEM(gxml, "dialog"); gtk_window_resize(GTK_WINDOW(dialog_modmgr), - settings.modmgr_width, - settings.modmgr_height); + settings.modmgr_width, settings.modmgr_height); /* response buttons */ button_close = UI_GET_ITEM(gxml, "button_close"); @@ -3354,23 +3440,24 @@ button_arch = UI_GET_ITEM(gxml, "button_archive"); button_idx = UI_GET_ITEM(gxml, "button_index"); button_delidx = UI_GET_ITEM(gxml, "button_delete_index"); + button_obsolete = UI_GET_ITEM(gxml, "button_scan_obsolete"); button_load_sources = UI_GET_ITEM(gxml, "button_load_sources"); button_intro = UI_GET_ITEM(gxml, "button_view_intro"); - gtk_widget_set_can_default (button_close, 1); + gtk_widget_set_can_default(button_close, 1); g_signal_connect(dialog_modmgr, "destroy", G_CALLBACK(on_dialog_destroy), NULL); if (first_run) - setup_dialog_action_area(GTK_DIALOG (dialog_modmgr)); + setup_dialog_action_area(GTK_DIALOG(dialog_modmgr)); else g_signal_connect(dialog_modmgr, "response", G_CALLBACK(on_mod_mgr_response), NULL); /* progress bars */ - progressbar_refresh = UI_GET_ITEM(gxml, "progressbar1"); + progressbar_refresh = UI_GET_ITEM(gxml, "progressbar1"); #ifdef USE_GTKBUILDER - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR(progressbar_refresh),TRUE); + gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progressbar_refresh), TRUE); #endif /* treeviews */ @@ -3379,22 +3466,21 @@ treeview_local = UI_GET_ITEM(gxml, "treeview2"); treeview_remote = UI_GET_ITEM(gxml, "treeview3"); - setup_treeviews_local_remote(GTK_TREE_VIEW(treeview_local), GTK_TREE_VIEW(treeview_remote)); + setup_treeviews_local_remote(GTK_TREE_VIEW(treeview_local), + GTK_TREE_VIEW(treeview_remote)); treeview = UI_GET_ITEM(gxml, "treeview4"); treeview2 = UI_GET_ITEM(gxml, "treeview5"); setup_treeview_install(GTK_TREE_VIEW(treeview)); setup_treeview_maintenance(GTK_TREE_VIEW(treeview2)); - gtk_widget_set_has_tooltip (treeview, TRUE); - g_signal_connect((gpointer) treeview, - "query-tooltip", - G_CALLBACK(query_tooltip), NULL); - - gtk_widget_set_has_tooltip (treeview2, TRUE); - g_signal_connect((gpointer) treeview2, - "query-tooltip", - G_CALLBACK(query_tooltip), NULL); + gtk_widget_set_has_tooltip(treeview, TRUE); + g_signal_connect((gpointer)treeview, + "query-tooltip", G_CALLBACK(query_tooltip), NULL); + + gtk_widget_set_has_tooltip(treeview2, TRUE); + g_signal_connect((gpointer)treeview2, + "query-tooltip", G_CALLBACK(query_tooltip), NULL); /* notebook */ notebook1 = UI_GET_ITEM(gxml, "notebook1"); @@ -3418,7 +3504,8 @@ g_signal_connect(button_add_remote, "clicked", G_CALLBACK(on_button_add_remote_clicked), NULL); g_signal_connect(button_remove_remote, "clicked", - G_CALLBACK(on_button_remove_remote_clicked), NULL); + G_CALLBACK(on_button_remove_remote_clicked), + NULL); /* combo box entrys */ combo_entry1 = UI_GET_ITEM(gxml, "comboboxentry1"); @@ -3428,9 +3515,9 @@ /* radio buttons */ radiobutton_source = UI_GET_ITEM(gxml, "radiobutton1"); /* local */ - radiobutton2 = UI_GET_ITEM(gxml, "radiobutton2"); /* remote */ - radiobutton_dest = UI_GET_ITEM(gxml, "radiobutton3"); /* homedir */ - radiobutton4 = UI_GET_ITEM(gxml, "radiobutton4"); /* homedir */ + radiobutton2 = UI_GET_ITEM(gxml, "radiobutton2"); /* remote */ + radiobutton_dest = UI_GET_ITEM(gxml, "radiobutton3"); /* homedir */ + radiobutton4 = UI_GET_ITEM(gxml, "radiobutton4"); /* homedir */ setup_ui_labels(); set_controls_to_last_use(); @@ -3438,18 +3525,17 @@ G_CALLBACK(on_radiobutton2_toggled), NULL); g_signal_connect(radiobutton4, "toggled", G_CALLBACK(on_radiobutton4_toggled), NULL); - g_signal_connect ((gpointer) combo_entry1, "changed", - G_CALLBACK (on_comboboxentry_local_changed), - NULL); - g_signal_connect ((gpointer) combo_entry2, "changed", - G_CALLBACK (on_comboboxentry_remote_changed), - NULL); + g_signal_connect((gpointer)combo_entry1, "changed", + G_CALLBACK(on_comboboxentry_local_changed), NULL); + g_signal_connect((gpointer)combo_entry2, "changed", + G_CALLBACK(on_comboboxentry_remote_changed), + NULL); if (first_run) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2),TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2), TRUE); gtk_widget_hide(button_refresh); - g_signal_connect((gpointer) dialog_modmgr, + g_signal_connect((gpointer)dialog_modmgr, "configure_event", G_CALLBACK(on_modmgr_configure_event), NULL); @@ -3468,11 +3554,11 @@ if ((settings.modmgr_y < 0) || (settings.modmgr_y > 2000)) settings.modmgr_y = 40; - gtk_window_move(GTK_WINDOW(dialog_modmgr),settings.modmgr_x,settings.modmgr_y); + gtk_window_move(GTK_WINDOW(dialog_modmgr), settings.modmgr_x, + settings.modmgr_y); return dialog_modmgr; } - /****************************************************************************** * Name * gui_open_mod_mgr @@ -3497,10 +3583,9 @@ set_window_icon(GTK_WINDOW(dlg)); is_running = TRUE; } else - gdk_window_raise(gtk_widget_get_window (GTK_WIDGET(dialog_modmgr))); + gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(dialog_modmgr))); } - /****************************************************************************** * Name * gui_open_mod_mgr_initial_run @@ -3546,18 +3631,16 @@ */ void gui_update_install_status(glong total, glong done, - const gchar * message) + const gchar *message) { gchar *buf; buf = g_strdup_printf("%s: %s", - (current_mod ? current_mod : _("[no module]")), - message); - gui_set_progressbar_text(progressbar_refresh,buf); + (current_mod ? current_mod : _("[no module]")), message); + gui_set_progressbar_text(progressbar_refresh, buf); g_free(buf); } - /****************************************************************************** * Name * gui_update_install_progressbar diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_book.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_book.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_book.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_book.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.c - navigation bar for genbook modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -35,7 +35,6 @@ NAVBAR_BOOK navbar_book; - /****************************************************************************** * Name * menu_deactivate_callback @@ -52,16 +51,17 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -80,60 +80,58 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; *push_in = FALSE; } -static gboolean lookup_entry_press_callback(GtkWidget * widget, - GdkEventKey * event, - gpointer user_data) +static gboolean lookup_entry_press_callback(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) { if (!settings.havebook) return FALSE; /* this does not work on my system - hope I'm not messing things up for others - 104 is the enter key on the number pad - switch (event->hardware_keycode) { - case 98: - gtk_button_clicked(GTK_BUTTON(navbar_book.button_up)); - return TRUE; - break; - case 104: - gtk_button_clicked(GTK_BUTTON(navbar_book.button_down)); - return TRUE; - break; - case 100: - gtk_button_clicked(GTK_BUTTON(navbar_book.button_left)); - return TRUE; - break; - case 102: - gtk_button_clicked(GTK_BUTTON(navbar_book.button_right)); - return TRUE; - break; - } - */ - XI_message(("lookup_entry_press_callback\nkeycode: %d",event->hardware_keycode)); + switch (event->hardware_keycode) { + case 98: + gtk_button_clicked(GTK_BUTTON(navbar_book.button_up)); + return TRUE; + break; + case 104: + gtk_button_clicked(GTK_BUTTON(navbar_book.button_down)); + return TRUE; + break; + case 100: + gtk_button_clicked(GTK_BUTTON(navbar_book.button_left)); + return TRUE; + break; + case 102: + gtk_button_clicked(GTK_BUTTON(navbar_book.button_right)); + return TRUE; + break; + } + */ + XI_message(("lookup_entry_press_callback\nkeycode: %d", + event->hardware_keycode)); return FALSE; - - } /****************************************************************************** @@ -155,8 +153,8 @@ * gboolean */ -static gboolean select_button_press_callback(GtkWidget * widget, - GdkEventButton * event, +static gboolean select_button_press_callback(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkWidget *menu; @@ -168,7 +166,8 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -177,7 +176,6 @@ return FALSE; } - /****************************************************************************** * Name * on_button_parent_clicked @@ -194,15 +192,13 @@ * void */ -static -void on_button_parent_clicked(GtkButton * button, gpointer user_data) +static void on_button_parent_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_parent(); } - /****************************************************************************** * Name * on_button_child_clicked @@ -219,15 +215,13 @@ * void */ -static -void on_button_child_clicked(GtkButton * button, gpointer user_data) +static void on_button_child_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_first_child(); } - /****************************************************************************** * Name * on_button_prev_clicked @@ -244,15 +238,13 @@ * void */ -static -void on_button_prev_clicked(GtkButton * button, gpointer user_data) +static void on_button_prev_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_prev(); } - /****************************************************************************** * Name * on_button_next_clicked @@ -269,16 +261,13 @@ * void */ -static -void on_button_next_clicked(GtkButton * button, gpointer user_data) +static void on_button_next_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_next(); } - - /****************************************************************************** * Name * on_entry_activate @@ -296,15 +285,14 @@ * void */ -void on_entry_activate (GtkEntry *entry, gpointer user_data) +void on_entry_activate(GtkEntry *entry, gpointer user_data) { - const gchar* entry_buf = NULL; + const gchar *entry_buf = NULL; - entry_buf = gtk_entry_get_text (entry); - main_navbar_book_entry_activate (entry_buf); + entry_buf = gtk_entry_get_text(entry); + main_navbar_book_entry_activate(entry_buf); } - /****************************************************************************** * Name * gui_navbar_book_new @@ -349,16 +337,13 @@ gtk_widget_show(navbar_book.button_list); gtk_box_pack_start(GTK_BOX(hbox1), navbar_book.button_list, FALSE, FALSE, 0); - //gtk_button_set_relief (GTK_BUTTON (navbar_book.button_list), GTK_RELIEF_NONE); -#ifdef HAVE_GTK_310 - { - gchar *arrow_path = image_locator("arrow_down_box.png"); - arrow1 = gtk_image_new_from_file(arrow_path); - g_free(arrow_path); - } +#ifdef HAVE_GTK_314 + arrow1 = + gtk_image_new_from_icon_name("open-menu-symbolic", + GTK_ICON_SIZE_BUTTON); #else - arrow1 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); + arrow1 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); #endif gtk_widget_show(arrow1); gtk_container_add(GTK_CONTAINER(navbar_book.button_list), arrow1); @@ -368,21 +353,19 @@ gtk_box_pack_start(GTK_BOX(hbox1), navbar_book.button_left, FALSE, FALSE, 0); gtk_widget_set_tooltip_text(navbar_book.button_left, - _("Go outward, to the section containing this one")); + _("Go outward, to the section containing this one")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_left), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_left), FALSE); - image1 = + image1 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name - ("go-previous", GTK_ICON_SIZE_BUTTON); + gtk_image_new_from_icon_name("go-previous-symbolic", GTK_ICON_SIZE_BUTTON); #else - gtk_image_new_from_stock - (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON); -#endif + gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image1); gtk_container_add(GTK_CONTAINER(navbar_book.button_left), image1); @@ -390,20 +373,19 @@ gtk_widget_show(navbar_book.button_up); gtk_box_pack_start(GTK_BOX(hbox1), navbar_book.button_up, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(navbar_book.button_up, _("Go to previous item")); + gtk_widget_set_tooltip_text(navbar_book.button_up, + _("Go to previous item")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_up), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_up), FALSE); - image1 = + image1 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name - ("go-up", GTK_ICON_SIZE_BUTTON); + gtk_image_new_from_icon_name("go-up-symbolic", GTK_ICON_SIZE_BUTTON); #else - gtk_image_new_from_stock - (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); -#endif + gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image1); gtk_container_add(GTK_CONTAINER(navbar_book.button_up), image1); @@ -411,21 +393,20 @@ gtk_widget_show(navbar_book.button_down); gtk_box_pack_start(GTK_BOX(hbox1), navbar_book.button_down, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(navbar_book.button_down, _("Go to next item")); + gtk_widget_set_tooltip_text(navbar_book.button_down, + _("Go to next item")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_down), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_down), FALSE); - image2 = + image2 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name - ("go-down", GTK_ICON_SIZE_BUTTON); + gtk_image_new_from_icon_name("go-down-symbolic", GTK_ICON_SIZE_BUTTON); #else - gtk_image_new_from_stock - (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON); -#endif - + gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON); +#endif + gtk_widget_show(image2); gtk_container_add(GTK_CONTAINER(navbar_book.button_down), image2); @@ -433,39 +414,37 @@ gtk_widget_show(navbar_book.button_right); gtk_box_pack_start(GTK_BOX(hbox1), navbar_book.button_right, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(navbar_book.button_right, _("Go inward, to the first subsection")); + gtk_widget_set_tooltip_text(navbar_book.button_right, + _("Go inward, to the first subsection")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_right), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_right), FALSE); - image1 = + image1 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name - ("go-next", GTK_ICON_SIZE_BUTTON); + gtk_image_new_from_icon_name("go-next-symbolic", GTK_ICON_SIZE_BUTTON); #else - gtk_image_new_from_stock - (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); -#endif + gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image1); gtk_container_add(GTK_CONTAINER(navbar_book.button_right), image1); - g_signal_connect((gpointer) navbar_book.lookup_entry, - "activate", - G_CALLBACK(on_entry_activate), NULL); - g_signal_connect((gpointer) navbar_book.button_up, "clicked", + g_signal_connect((gpointer)navbar_book.lookup_entry, + "activate", G_CALLBACK(on_entry_activate), NULL); + g_signal_connect((gpointer)navbar_book.button_up, "clicked", G_CALLBACK(on_button_prev_clicked), NULL); - g_signal_connect((gpointer) navbar_book.button_down, "clicked", + g_signal_connect((gpointer)navbar_book.button_down, "clicked", G_CALLBACK(on_button_next_clicked), NULL); - g_signal_connect((gpointer) navbar_book.button_left, "clicked", + g_signal_connect((gpointer)navbar_book.button_left, "clicked", G_CALLBACK(on_button_parent_clicked), NULL); - g_signal_connect((gpointer) navbar_book.button_right, "clicked", + g_signal_connect((gpointer)navbar_book.button_right, "clicked", G_CALLBACK(on_button_child_clicked), NULL); - g_signal_connect((gpointer) navbar_book.button_list, + g_signal_connect((gpointer)navbar_book.button_list, "button_press_event", G_CALLBACK(select_button_press_callback), NULL); - g_signal_connect((gpointer) navbar_book.lookup_entry, + g_signal_connect((gpointer)navbar_book.lookup_entry, "key_press_event", G_CALLBACK(lookup_entry_press_callback), NULL); return vbox1; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_book_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_book_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_book_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_book_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.c - navigation bar for genbook dialog modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -34,8 +34,6 @@ #include "main/navbar_book_dialog.h" #include "main/settings.h" - - /****************************************************************************** * Name * menu_deactivate_callback @@ -52,16 +50,17 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -80,27 +79,25 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; - *push_in = FALSE; } @@ -123,8 +120,8 @@ * gboolean */ -static gboolean select_button_press_callback(GtkWidget * widget, - GdkEventButton * event, +static gboolean select_button_press_callback(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkWidget *menu; @@ -136,7 +133,8 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -145,7 +143,6 @@ return FALSE; } - /****************************************************************************** * Name * on_button_parent_clicked @@ -162,15 +159,13 @@ * void */ -static -void on_button_parent_clicked(GtkButton * button, gpointer user_data) +static void on_button_parent_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_dialog_parent(user_data); } - /****************************************************************************** * Name * on_button_child_clicked @@ -187,15 +182,13 @@ * void */ -static -void on_button_child_clicked(GtkButton * button, gpointer user_data) +static void on_button_child_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_dialog_first_child(user_data); } - /****************************************************************************** * Name * on_button_prev_clicked @@ -212,15 +205,13 @@ * void */ -static -void on_button_prev_clicked(GtkButton * button, gpointer user_data) +static void on_button_prev_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_dialog_prev(user_data); } - /****************************************************************************** * Name * on_button_next_clicked @@ -237,15 +228,13 @@ * void */ -static -void on_button_next_clicked(GtkButton * button, gpointer user_data) +static void on_button_next_clicked(GtkButton *button, gpointer user_data) { if (!settings.havebook) return; main_navbar_book_dialog_next(user_data); } - /****************************************************************************** * Name * gui_navbar_book_dialog_new @@ -262,7 +251,7 @@ * GtkWidget * */ -GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA * d) +GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d) { GtkWidget *vbox1; GtkWidget *hbox1; @@ -279,18 +268,16 @@ d->navbar_book.lookup_entry = gtk_entry_new(); gtk_widget_show(d->navbar_book.lookup_entry); - gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.lookup_entry, TRUE, - TRUE, 0); - gtk_editable_set_editable(GTK_EDITABLE(d->navbar_book.lookup_entry), - FALSE); - gtk_entry_set_invisible_char(GTK_ENTRY(d->navbar_book.lookup_entry), - 9679); + gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.lookup_entry, + TRUE, TRUE, 0); + gtk_editable_set_editable(GTK_EDITABLE(d->navbar_book.lookup_entry), FALSE); + gtk_entry_set_invisible_char(GTK_ENTRY(d->navbar_book.lookup_entry), 9679); d->navbar_book.button_list = gtk_toggle_button_new(); gtk_widget_show(d->navbar_book.button_list); - gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_list, FALSE, - FALSE, 0); - //gtk_button_set_relief (GTK_BUTTON (d->navbar_book.button_list), GTK_RELIEF_NONE); + gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_list, + FALSE, FALSE, 0); +//gtk_button_set_relief (GTK_BUTTON (d->navbar_book.button_list), GTK_RELIEF_NONE); #ifdef HAVE_GTK_310 { @@ -302,98 +289,102 @@ arrow1 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); #endif gtk_widget_show(arrow1); - gtk_container_add(GTK_CONTAINER(d->navbar_book.button_list), arrow1); + gtk_container_add(GTK_CONTAINER(d->navbar_book.button_list), + arrow1); d->navbar_book.button_left = gtk_button_new(); gtk_widget_show(d->navbar_book.button_left); - gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_left, FALSE, - FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_left, + FALSE, FALSE, 0); gtk_widget_set_tooltip_text(d->navbar_book.button_left, - _("Go outward, to the section containing this one")); + _("Go outward, to the section containing this one")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_left), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_left), - FALSE); + gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_left), FALSE); #ifdef HAVE_GTK_310 - image1 = gtk_image_new_from_icon_name ("go-previous", - GTK_ICON_SIZE_BUTTON); -#else + image1 = gtk_image_new_from_icon_name("go-previous", + GTK_ICON_SIZE_BUTTON); +#else image1 = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, - GTK_ICON_SIZE_BUTTON); -#endif + GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image1); - gtk_container_add(GTK_CONTAINER(d->navbar_book.button_left), image1); + gtk_container_add(GTK_CONTAINER(d->navbar_book.button_left), + image1); d->navbar_book.button_up = gtk_button_new(); gtk_widget_show(d->navbar_book.button_up); gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_up, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(d->navbar_book.button_up, _("Go to previous item")); + gtk_widget_set_tooltip_text(d->navbar_book.button_up, + _("Go to previous item")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_up), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_up), FALSE); #ifdef HAVE_GTK_310 - image1 = gtk_image_new_from_icon_name ("go-up", - GTK_ICON_SIZE_BUTTON); + image1 = gtk_image_new_from_icon_name("go-up", + GTK_ICON_SIZE_BUTTON); #else image1 = gtk_image_new_from_stock(GTK_STOCK_GO_UP, - GTK_ICON_SIZE_BUTTON); -#endif + GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image1); gtk_container_add(GTK_CONTAINER(d->navbar_book.button_up), image1); d->navbar_book.button_down = gtk_button_new(); gtk_widget_show(d->navbar_book.button_down); - gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_down, FALSE, - FALSE, 0); - gtk_widget_set_tooltip_text(d->navbar_book.button_down, _("Go to next item")); + gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_down, + FALSE, FALSE, 0); + gtk_widget_set_tooltip_text(d->navbar_book.button_down, + _("Go to next item")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_down), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_down), - FALSE); - image2 = + gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_down), FALSE); + image2 = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name ("go-down", - GTK_ICON_SIZE_BUTTON); -#else - gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, - GTK_ICON_SIZE_BUTTON); -#endif + gtk_image_new_from_icon_name("go-down", GTK_ICON_SIZE_BUTTON); +#else + gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, + GTK_ICON_SIZE_BUTTON); +#endif gtk_widget_show(image2); - gtk_container_add(GTK_CONTAINER(d->navbar_book.button_down), image2); + gtk_container_add(GTK_CONTAINER(d->navbar_book.button_down), + image2); d->navbar_book.button_right = gtk_button_new(); gtk_widget_show(d->navbar_book.button_right); - gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_right, FALSE, - FALSE, 0); - gtk_widget_set_tooltip_text(d->navbar_book.button_right, _("Go inward, to the first subsection")); + gtk_box_pack_start(GTK_BOX(hbox1), d->navbar_book.button_right, + FALSE, FALSE, 0); + gtk_widget_set_tooltip_text(d->navbar_book.button_right, + _("Go inward, to the first subsection")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_right), GTK_RELIEF_NONE); gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_right), FALSE); #ifdef HAVE_GTK_310 - image1 = gtk_image_new_from_icon_name ("go-next", - GTK_ICON_SIZE_BUTTON); -#else + image1 = gtk_image_new_from_icon_name("go-next", + GTK_ICON_SIZE_BUTTON); +#else image1 = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); -#endif +#endif gtk_widget_show(image1); - gtk_container_add(GTK_CONTAINER(d->navbar_book.button_right), image1); + gtk_container_add(GTK_CONTAINER(d->navbar_book.button_right), + image1); - g_signal_connect((gpointer) d->navbar_book.button_up, "clicked", + g_signal_connect((gpointer)d->navbar_book.button_up, "clicked", G_CALLBACK(on_button_prev_clicked), d); - g_signal_connect((gpointer) d->navbar_book.button_down, "clicked", + g_signal_connect((gpointer)d->navbar_book.button_down, "clicked", G_CALLBACK(on_button_next_clicked), d); - g_signal_connect((gpointer) d->navbar_book.button_left, "clicked", + g_signal_connect((gpointer)d->navbar_book.button_left, "clicked", G_CALLBACK(on_button_parent_clicked), d); - g_signal_connect((gpointer) d->navbar_book.button_right, "clicked", + g_signal_connect((gpointer)d->navbar_book.button_right, "clicked", G_CALLBACK(on_button_child_clicked), d); - g_signal_connect((gpointer) d->navbar_book.button_list, + g_signal_connect((gpointer)d->navbar_book.button_list, "button_press_event", G_CALLBACK(select_button_press_callback), d); return vbox1; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_verse.c - navigation bar for versekey modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "editor/slib-editor.h" @@ -35,7 +35,6 @@ #include "gui/tabbed_browser.h" #include "gui/utilities.h" - #include "main/module_dialogs.h" #include "main/navbar_versekey.h" #include "main/settings.h" @@ -49,8 +48,6 @@ extern PASSAGE_TAB_INFO *cur_passage_tab; - - /****************************************************************************** * Name * menu_deactivate_callback @@ -67,16 +64,17 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -95,32 +93,28 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; - *push_in = FALSE; } - /****************************************************************************** * Name * select_button_press_callback @@ -140,8 +134,8 @@ * gboolean */ -static gboolean select_button_press_callback(GtkWidget * widget, - GdkEventButton * event, +static gboolean select_button_press_callback(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkWidget *menu; @@ -153,19 +147,16 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - gtk_menu_popup(GTK_MENU(menu), - NULL, - NULL, - menu_position_under, - widget, event->button, + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, + menu_position_under, widget, event->button, event->time); return TRUE; } return FALSE; } - /****************************************************************************** * Name * select_button_press_callback @@ -185,9 +176,9 @@ * gboolean */ -static gboolean select_book_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_book_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkWidget *menu; @@ -198,17 +189,18 @@ guint32 time_add; #endif - g_get_current_time( &start_time ); -// XI_message(("Start time is: %d sec %d mil", start_time.tv_sec, start_time.tv_usec)); + g_get_current_time(&start_time); + // XI_message(("Start time is: %d sec %d mil", start_time.tv_sec, start_time.tv_usec)); menu = main_versekey_drop_down_book_menu(navbar_versekey, NB_MAIN, - NULL,NULL); + NULL, NULL); - g_get_current_time( &end_time ); -// XI_message(("End time is: %d sec %d mil", end_time.tv_sec, end_time.tv_usec)); + g_get_current_time(&end_time); +// XI_message(("End time is: %d sec %d mil", end_time.tv_sec, end_time.tv_usec)); #ifdef WIN32 - time_diff = ((end_time.tv_sec - start_time.tv_sec) * 1000000) + (end_time.tv_usec - start_time.tv_usec); - time_add = 0; + time_diff = + ((end_time.tv_sec - start_time.tv_sec) * 1000000) + + (end_time.tv_usec - start_time.tv_usec); //if (time_diff > 10000) time_add = (guint32)(time_diff / 1000); #endif @@ -218,21 +210,20 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, - menu_position_under,widget, event->button, + menu_position_under, widget, event->button, #ifdef WIN32 event->time + time_add); #else - event->time); + event->time); #endif return TRUE; } return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -252,21 +243,24 @@ * gboolean */ -static gboolean select_chapter_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_chapter_button_press_callback(GtkWidget *widget, + GdkEventButton * + event, + gpointer user_data) { GtkWidget *menu; - menu = main_versekey_drop_down_chapter_menu(navbar_versekey, NB_MAIN, - NULL,NULL); + menu = + main_versekey_drop_down_chapter_menu(navbar_versekey, NB_MAIN, + NULL, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -275,8 +269,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -296,21 +288,22 @@ * gboolean */ -static gboolean select_verse_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_verse_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkWidget *menu; menu = main_versekey_drop_down_verse_menu(navbar_versekey, NB_MAIN, - NULL,NULL); + NULL, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -319,7 +312,6 @@ return FALSE; } - /****************************************************************************** * Name * on_button_history_next_clicked @@ -336,13 +328,11 @@ * void */ -static -void on_button_history_next_clicked(GtkButton * button, gpointer user_data) +static void on_button_history_next_clicked(GtkButton *button, gpointer user_data) { main_navigate_tab_history(1); } - /****************************************************************************** * Name * on_button_history_back_clicked @@ -359,8 +349,7 @@ * void */ -static -void on_button_history_back_clicked(GtkButton * button, gpointer user_data) +static void on_button_history_back_clicked(GtkButton *button, gpointer user_data) { main_navigate_tab_history(0); } @@ -381,7 +370,7 @@ * void */ -static void on_entry_activate(GtkEntry * entry, gpointer user_data) +static void on_entry_activate(GtkEntry *entry, gpointer user_data) { char *rawtext; const gchar *gkey, *buf = gtk_entry_get_text(entry); @@ -389,43 +378,46 @@ if (buf == NULL) return; /* handle potential subsection anchor */ - if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ - (settings.special_anchor = strchr(buf, '!'))) /* osisref */ + if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ + (settings.special_anchor = strchr(buf, '!'))) /* osisref */ *settings.special_anchor = '\0'; - rawtext = main_get_raw_text(navbar_versekey.module_name->str, (gchar*)buf); - if (!rawtext || (rawtext && (strlen(rawtext) < 2))){ + rawtext = + main_get_raw_text(navbar_versekey.module_name->str, + (gchar *)buf); + if (!rawtext || (rawtext && (strlen(rawtext) < 2))) { gtk_entry_set_text(entry, navbar_versekey.key->str); g_free(rawtext); return; } - gkey = main_get_valid_key(settings.MainWindowModule, (gchar*)buf); + gkey = + main_get_valid_key(settings.MainWindowModule, (gchar *)buf); // we got a valid key. but was it really a valid key within v11n? // for future use in determining whether to show normal navbar content. - navbar_versekey.valid_key = main_is_Bible_key(settings.MainWindowModule, gkey); + navbar_versekey.valid_key = + main_is_Bible_key(settings.MainWindowModule, gkey); if (settings.special_anchor) - *settings.special_anchor = '#'; /* put it back. */ + *settings.special_anchor = '#'; /* put it back. */ if (gkey == NULL) return; - gchar *url = g_strdup_printf("sword:///%s%s", gkey, (settings.special_anchor - ? settings.special_anchor - : "")); + gchar *url = g_strdup_printf("sword:///%s%s", gkey, + (settings.special_anchor ? settings.special_anchor : "")); - navbar_versekey.module_name = g_string_assign(navbar_versekey.module_name, - settings.MainWindowModule); + navbar_versekey.module_name = + g_string_assign(navbar_versekey.module_name, + settings.MainWindowModule); main_navbar_versekey_set(navbar_versekey, gkey); main_url_handler(url, TRUE); if (url) g_free(url); if (gkey) - g_free((gchar*)gkey); + g_free((gchar *)gkey); } - /****************************************************************************** * Name * on_button_verse_menu_verse_scroll_event @@ -444,17 +436,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_verse_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_verse_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { - main_navbar_versekey_spin_verse(navbar_versekey, event->scroll.direction); + main_navbar_versekey_spin_verse(navbar_versekey, + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_chapter_scroll_event @@ -473,18 +463,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { main_navbar_versekey_spin_chapter(navbar_versekey, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_book_scroll_event @@ -503,17 +490,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_book_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_book_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { main_navbar_versekey_spin_book(navbar_versekey, - event->scroll.direction); + event->scroll.direction); return FALSE; } - /****************************************************************************** * Name * on_up_enter_notify_event @@ -532,28 +517,27 @@ * gboolean */ -static -gboolean on_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_book_up); - gtk_widget_show(navbar_versekey.arrow_book_up_box); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_chapter_up); - gtk_widget_show(navbar_versekey.arrow_chapter_up_box); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_verse_up); - gtk_widget_show(navbar_versekey.arrow_verse_up_box); + case BOOK_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_book_up); + gtk_widget_show(navbar_versekey.arrow_book_up_box); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_chapter_up); + gtk_widget_show(navbar_versekey.arrow_chapter_up_box); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_verse_up); + gtk_widget_show(navbar_versekey.arrow_verse_up_box); break; } return FALSE; } - /****************************************************************************** * Name * on_down_enter_notify_event @@ -572,28 +556,27 @@ * gboolean */ -static -gboolean on_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_book_down); - gtk_widget_show(navbar_versekey.arrow_book_down_box); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_chapter_down); - gtk_widget_show(navbar_versekey.arrow_chapter_down_box); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_verse_down); - gtk_widget_show(navbar_versekey.arrow_verse_down_box); + case BOOK_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_book_down); + gtk_widget_show(navbar_versekey.arrow_book_down_box); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_chapter_down); + gtk_widget_show(navbar_versekey.arrow_chapter_down_box); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_verse_down); + gtk_widget_show(navbar_versekey.arrow_verse_down_box); break; } return FALSE; } - /****************************************************************************** * Name * on_up_leave_notify_event @@ -612,28 +595,27 @@ * gboolean */ -static -gboolean on_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_book_up_box); - gtk_widget_show(navbar_versekey.arrow_book_up); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_chapter_up_box); - gtk_widget_show(navbar_versekey.arrow_chapter_up); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_verse_up_box); - gtk_widget_show(navbar_versekey.arrow_verse_up); + case BOOK_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_book_up_box); + gtk_widget_show(navbar_versekey.arrow_book_up); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_chapter_up_box); + gtk_widget_show(navbar_versekey.arrow_chapter_up); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_verse_up_box); + gtk_widget_show(navbar_versekey.arrow_verse_up); break; } return FALSE; } - /****************************************************************************** * Name * on_down_leave_notify_event @@ -652,28 +634,27 @@ * gboolean */ -static -gboolean on_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_book_down_box); - gtk_widget_show(navbar_versekey.arrow_book_down); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_chapter_down_box); - gtk_widget_show(navbar_versekey.arrow_chapter_down); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_versekey.arrow_verse_down_box); - gtk_widget_show(navbar_versekey.arrow_verse_down); + case BOOK_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_book_down_box); + gtk_widget_show(navbar_versekey.arrow_book_down); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_chapter_down_box); + gtk_widget_show(navbar_versekey.arrow_chapter_down); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_versekey.arrow_verse_down_box); + gtk_widget_show(navbar_versekey.arrow_verse_down); break; } return FALSE; } - /****************************************************************************** * Name * on_up_eventbox_button_release_event @@ -692,26 +673,24 @@ * gboolean */ -static -gboolean on_up_eventbox_button_release_event (GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean on_up_eventbox_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - main_navbar_versekey_spin_book(navbar_versekey,0); + case BOOK_BUTTON: + main_navbar_versekey_spin_book(navbar_versekey, 0); break; - case CHAPTER_BUTTON: - main_navbar_versekey_spin_chapter(navbar_versekey,0); + case CHAPTER_BUTTON: + main_navbar_versekey_spin_chapter(navbar_versekey, 0); break; - case VERSE_BUTTON: - main_navbar_versekey_spin_verse(navbar_versekey,0); + case VERSE_BUTTON: + main_navbar_versekey_spin_verse(navbar_versekey, 0); break; } return FALSE; } - /****************************************************************************** * Name * on_down_eventbox_button_release_event @@ -730,20 +709,19 @@ * gboolean */ -static -gboolean on_down_eventbox_button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean on_down_eventbox_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - main_navbar_versekey_spin_book(navbar_versekey,1); + case BOOK_BUTTON: + main_navbar_versekey_spin_book(navbar_versekey, 1); break; - case CHAPTER_BUTTON: - main_navbar_versekey_spin_chapter(navbar_versekey,1); + case CHAPTER_BUTTON: + main_navbar_versekey_spin_chapter(navbar_versekey, 1); break; - case VERSE_BUTTON: - main_navbar_versekey_spin_verse(navbar_versekey,1); + case VERSE_BUTTON: + main_navbar_versekey_spin_verse(navbar_versekey, 1); break; } return FALSE; @@ -767,8 +745,7 @@ gboolean access_on_up_eventbox_button_release_event(gint element) { - return on_up_eventbox_button_release_event - (NULL, NULL, GINT_TO_POINTER(element)); + return on_up_eventbox_button_release_event(NULL, NULL, GINT_TO_POINTER(element)); } /****************************************************************************** @@ -789,8 +766,7 @@ gboolean access_on_down_eventbox_button_release_event(gint element) { - return on_down_eventbox_button_release_event - (NULL, NULL, GINT_TO_POINTER(element)); + return on_down_eventbox_button_release_event(NULL, NULL, GINT_TO_POINTER(element)); } /****************************************************************************** @@ -809,118 +785,123 @@ * void */ -static -void _connect_signals(NAVBAR_VERSEKEY navbar) +static void _connect_signals(NAVBAR_VERSEKEY navbar) { - g_signal_connect((gpointer) navbar.lookup_entry, - "activate", G_CALLBACK(on_entry_activate), - NULL); - g_signal_connect((gpointer) navbar.button_book_up, + g_signal_connect((gpointer)navbar.lookup_entry, + "activate", G_CALLBACK(on_entry_activate), NULL); + g_signal_connect((gpointer)navbar.button_book_up, "button_release_event", - G_CALLBACK(on_up_eventbox_button_release_event), + G_CALLBACK(on_up_eventbox_button_release_event), GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect((gpointer) navbar.button_book_down, + g_signal_connect((gpointer)navbar.button_book_down, "button_release_event", - G_CALLBACK(on_down_eventbox_button_release_event), + G_CALLBACK(on_down_eventbox_button_release_event), GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect((gpointer) navbar.button_chapter_up, + g_signal_connect((gpointer)navbar.button_chapter_up, "button_release_event", - G_CALLBACK(on_up_eventbox_button_release_event), - GINT_TO_POINTER(CHAPTER_BUTTON) ); - g_signal_connect((gpointer) navbar.button_chapter_down, + G_CALLBACK(on_up_eventbox_button_release_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_down, "button_release_event", - G_CALLBACK(on_down_eventbox_button_release_event), - GINT_TO_POINTER(CHAPTER_BUTTON) ); - g_signal_connect((gpointer) navbar.button_verse_up, + G_CALLBACK(on_down_eventbox_button_release_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_up, "button_release_event", G_CALLBACK(on_up_eventbox_button_release_event), - GINT_TO_POINTER(VERSE_BUTTON) ); - g_signal_connect((gpointer) navbar.button_verse_down, + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_down, "button_release_event", G_CALLBACK(on_down_eventbox_button_release_event), - GINT_TO_POINTER(VERSE_BUTTON) ); + GINT_TO_POINTER(VERSE_BUTTON)); /* */ - g_signal_connect ((gpointer) navbar.button_book_up, - "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect ((gpointer) navbar.button_book_up, - "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - - g_signal_connect ((gpointer)navbar.button_book_down , - "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect ((gpointer)navbar.button_book_down , - "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); - /* */ - g_signal_connect ((gpointer) navbar.button_chapter_up, "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - g_signal_connect ((gpointer)navbar.button_chapter_up , "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - - g_signal_connect ((gpointer) navbar.button_chapter_down, "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - g_signal_connect ((gpointer)navbar.button_chapter_down , "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); /* */ - g_signal_connect ((gpointer) navbar.button_verse_up, "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - g_signal_connect ((gpointer)navbar.button_verse_up , "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - - g_signal_connect ((gpointer) navbar.button_verse_down, "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - g_signal_connect ((gpointer)navbar.button_verse_down , "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + + g_signal_connect((gpointer)navbar.button_chapter_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); - g_signal_connect((gpointer) navbar.button_history_back, - "clicked", G_CALLBACK(on_button_history_back_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_history_next, - "clicked", G_CALLBACK(on_button_history_next_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_history_menu, + /* */ + g_signal_connect((gpointer)navbar.button_verse_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + + g_signal_connect((gpointer)navbar.button_verse_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + + g_signal_connect((gpointer)navbar.button_history_back, + "clicked", + G_CALLBACK(on_button_history_back_clicked), NULL); + g_signal_connect((gpointer)navbar.button_history_next, "clicked", + G_CALLBACK(on_button_history_next_clicked), NULL); + g_signal_connect((gpointer)navbar.button_history_menu, "button_press_event", - G_CALLBACK(select_button_press_callback), - NULL); - g_signal_connect((gpointer) navbar.button_book_menu, + G_CALLBACK(select_button_press_callback), NULL); + g_signal_connect((gpointer)navbar.button_book_menu, "button_press_event", G_CALLBACK(select_book_button_press_callback), NULL); - g_signal_connect((gpointer) navbar.button_chapter_menu, + g_signal_connect((gpointer)navbar.button_chapter_menu, "button_press_event", G_CALLBACK(select_chapter_button_press_callback), - NULL ); - g_signal_connect((gpointer) navbar.button_verse_menu, + NULL); + g_signal_connect((gpointer)navbar.button_verse_menu, "button_press_event", G_CALLBACK(select_verse_button_press_callback), - NULL ); -#ifndef HAVE_GTK_34 - g_signal_connect ((gpointer)navbar.button_verse_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - NULL); - g_signal_connect ((gpointer)navbar.button_chapter_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - NULL); - g_signal_connect ((gpointer)navbar.button_book_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - NULL); + NULL); +#ifndef HAVE_GTK_34 + g_signal_connect((gpointer)navbar.button_verse_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), NULL); + g_signal_connect((gpointer)navbar.button_chapter_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + NULL); + g_signal_connect((gpointer)navbar.button_book_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), NULL); #endif } @@ -949,34 +930,40 @@ GladeXML *gxml; #endif #ifdef HAVE_GTK_34 - GtkWidget * eventbox; + GtkWidget *eventbox; #endif - - gchar *glade_file = gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); + + gchar *glade_file = + gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); g_return_val_if_fail((glade_file != NULL), NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "navbar", NULL); #endif navbar_versekey.dialog = FALSE; - navbar_versekey.module_name = g_string_new(settings.MainWindowModule); - navbar_versekey.key = g_string_new(settings.currentverse); + navbar_versekey.module_name = + g_string_new(settings.MainWindowModule); + navbar_versekey.key = g_string_new(settings.currentverse); navbar_versekey.navbar = UI_GET_ITEM(gxml, "navbar"); - navbar_versekey.button_history_back = UI_GET_ITEM(gxml, "button_history_back"); - navbar_versekey.button_history_next = UI_GET_ITEM(gxml, "button_history_foward"); - navbar_versekey.button_history_menu = UI_GET_ITEM(gxml, "togglebutton_history_list"); + navbar_versekey.button_history_back = + UI_GET_ITEM(gxml, "button_history_back"); + navbar_versekey.button_history_next = + UI_GET_ITEM(gxml, "button_history_foward"); + navbar_versekey.button_history_menu = + UI_GET_ITEM(gxml, "togglebutton_history_list"); navbar_versekey.button_book_up = UI_GET_ITEM(gxml, "eventbox9"); navbar_versekey.button_book_down = UI_GET_ITEM(gxml, "eventbox6"); navbar_versekey.button_chapter_up = UI_GET_ITEM(gxml, "eventbox8"); - navbar_versekey.button_chapter_down = UI_GET_ITEM(gxml, "eventbox4"); + navbar_versekey.button_chapter_down = + UI_GET_ITEM(gxml, "eventbox4"); navbar_versekey.button_verse_up = UI_GET_ITEM(gxml, "eventbox7"); navbar_versekey.button_verse_down = UI_GET_ITEM(gxml, "eventbox1"); @@ -986,36 +973,41 @@ navbar_versekey.arrow_book_down = UI_GET_ITEM(gxml, "image14"); navbar_versekey.arrow_chapter_up_box = UI_GET_ITEM(gxml, "image9"); navbar_versekey.arrow_chapter_up = UI_GET_ITEM(gxml, "image8"); - navbar_versekey.arrow_chapter_down_box = UI_GET_ITEM(gxml, "image11"); + navbar_versekey.arrow_chapter_down_box = + UI_GET_ITEM(gxml, "image11"); navbar_versekey.arrow_chapter_down = UI_GET_ITEM(gxml, "image10"); navbar_versekey.arrow_verse_up_box = UI_GET_ITEM(gxml, "image7"); navbar_versekey.arrow_verse_up = UI_GET_ITEM(gxml, "image6"); - navbar_versekey.arrow_verse_down_box = UI_GET_ITEM(gxml, "image16"); + navbar_versekey.arrow_verse_down_box = + UI_GET_ITEM(gxml, "image16"); navbar_versekey.arrow_verse_down = UI_GET_ITEM(gxml, "image5"); - navbar_versekey.button_book_menu = UI_GET_ITEM(gxml, "togglebutton_book"); - navbar_versekey.button_chapter_menu = UI_GET_ITEM(gxml, "togglebutton_chapter"); - navbar_versekey.button_verse_menu = UI_GET_ITEM(gxml, "togglebutton_verse"); + navbar_versekey.button_book_menu = + UI_GET_ITEM(gxml, "togglebutton_book"); + navbar_versekey.button_chapter_menu = + UI_GET_ITEM(gxml, "togglebutton_chapter"); + navbar_versekey.button_verse_menu = + UI_GET_ITEM(gxml, "togglebutton_verse"); navbar_versekey.lookup_entry = UI_GET_ITEM(gxml, "entry_lookup"); navbar_versekey.label_book_menu = UI_GET_ITEM(gxml, "label_book"); - navbar_versekey.label_chapter_menu = UI_GET_ITEM(gxml, "label_chapter"); - navbar_versekey.label_verse_menu = UI_GET_ITEM(gxml, "label_verse"); + navbar_versekey.label_chapter_menu = + UI_GET_ITEM(gxml, "label_chapter"); + navbar_versekey.label_verse_menu = + UI_GET_ITEM(gxml, "label_verse"); #ifdef HAVE_GTK_34 eventbox = UI_GET_ITEM(gxml, "eventbox_book"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - NULL); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), NULL); + eventbox = UI_GET_ITEM(gxml, "eventbox_chapter"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - NULL); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + NULL); + eventbox = UI_GET_ITEM(gxml, "eventbox_verse"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - NULL); -#endif + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), NULL); +#endif _connect_signals(navbar_versekey); return navbar_versekey.navbar; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_verse_dialog.c - navigation bar for versekey modules in dialogs * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/navbar_versekey_dialog.h" @@ -42,7 +42,6 @@ #include "gui/debug_glib_null.h" - /****************************************************************************** * Name * on_verse_button_up_clicked @@ -59,10 +58,9 @@ * void */ -static -gboolean on_verse_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_verse_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_verse(dialog->navbar, 0); return FALSE; @@ -84,16 +82,14 @@ * void */ -static -gboolean on_verse_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_verse_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_verse(dialog->navbar, 1); return FALSE; } - /****************************************************************************** * Name * on_chapter_button_up_clicked @@ -110,10 +106,9 @@ * void */ -static -gboolean on_chapter_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_chapter(dialog->navbar, 0); return FALSE; @@ -135,16 +130,14 @@ * void */ -static -gboolean on_chapter_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_chapter(dialog->navbar, 1); return FALSE; } - /****************************************************************************** * Name * on_book_button_up_clicked @@ -161,10 +154,9 @@ * void */ -static -gboolean on_book_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_book_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_book(dialog->navbar, 0); return FALSE; @@ -186,10 +178,9 @@ * void */ -static -gboolean on_book_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean on_book_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_book(dialog->navbar, 1); return FALSE; @@ -211,14 +202,15 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -237,30 +229,28 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; *push_in = FALSE; } - /****************************************************************************** * Name * select_book_button_press_callback @@ -280,10 +270,9 @@ * gboolean */ -static -gboolean select_book_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean select_book_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { GtkWidget *menu; @@ -293,15 +282,19 @@ glong time_diff; guint32 time_add; #endif - g_get_current_time( &start_time ); -// XI_message(("Start time is: %d sec %d mil", start_time.tv_sec, start_time.tv_usec)); + g_get_current_time(&start_time); + // XI_message(("Start time is: %d sec %d mil", start_time.tv_sec, start_time.tv_usec)); - menu = main_versekey_drop_down_book_menu(dialog->navbar, NB_DIALOG, dialog, NULL); + menu = + main_versekey_drop_down_book_menu(dialog->navbar, NB_DIALOG, + dialog, NULL); - g_get_current_time( &end_time ); -// XI_message(("End time is: %d sec %d mil", end_time.tv_sec, end_time.tv_usec)); + g_get_current_time(&end_time); +// XI_message(("End time is: %d sec %d mil", end_time.tv_sec, end_time.tv_usec)); #ifdef WIN32 - time_diff = ((end_time.tv_sec - start_time.tv_sec) * 1000000) + (end_time.tv_usec - start_time.tv_usec); + time_diff = + ((end_time.tv_sec - start_time.tv_sec) * 1000000) + + (end_time.tv_usec - start_time.tv_usec); time_add = 0; if (time_diff > 10000) time_add = (guint32)(time_diff / 1000); @@ -312,21 +305,20 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, #ifdef WIN32 event->time + time_add); #else - event->time); + event->time); #endif return TRUE; } return FALSE; } - - /****************************************************************************** * Name * select_chapter_button_press_callback @@ -346,21 +338,23 @@ * gboolean */ -static -gboolean select_chapter_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean select_chapter_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { GtkWidget *menu; - menu = main_versekey_drop_down_chapter_menu(dialog->navbar, NB_DIALOG, dialog, NULL); + menu = + main_versekey_drop_down_chapter_menu(dialog->navbar, NB_DIALOG, + dialog, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -369,8 +363,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_verse_button_press_callback @@ -390,20 +382,23 @@ * gboolean */ -static gboolean select_verse_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - DIALOG_DATA * dialog) +static gboolean select_verse_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + DIALOG_DATA *dialog) { GtkWidget *menu; - menu = main_versekey_drop_down_verse_menu(dialog->navbar, NB_DIALOG, dialog, NULL); + menu = + main_versekey_drop_down_verse_menu(dialog->navbar, NB_DIALOG, + dialog, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -428,40 +423,41 @@ * void */ -static void on_entry_activate(GtkEntry * entry, DIALOG_DATA *dialog) +static void on_entry_activate(GtkEntry *entry, DIALOG_DATA *dialog) { const gchar *buf = gtk_entry_get_text(entry); if (buf == NULL) return; /* handle potential subsection anchor */ - if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ - (settings.special_anchor = strchr(buf, '!'))) /* osisref */ + if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ + (settings.special_anchor = strchr(buf, '!'))) /* osisref */ *settings.special_anchor = '\0'; - const gchar *gkey = main_get_valid_key(dialog->mod_name, (gchar*)buf); + const gchar *gkey = + main_get_valid_key(dialog->mod_name, (gchar *)buf); // we got a valid key. but was it really a valid key within v11n? // for future use in determining whether to show normal navbar content. - dialog->navbar.valid_key = main_is_Bible_key(dialog->mod_name, gkey); + dialog->navbar.valid_key = + main_is_Bible_key(dialog->mod_name, gkey); if (settings.special_anchor) - *settings.special_anchor = '#'; /* put it back. */ + *settings.special_anchor = '#'; /* put it back. */ if (gkey == NULL) return; - gchar *url = g_strdup_printf("sword:///%s%s", gkey, (settings.special_anchor - ? settings.special_anchor - : "")); + gchar *url = g_strdup_printf("sword:///%s%s", gkey, + (settings.special_anchor ? settings.special_anchor : "")); - dialog->navbar.module_name = g_string_assign(dialog->navbar.module_name, dialog->mod_name); + dialog->navbar.module_name = + g_string_assign(dialog->navbar.module_name, dialog->mod_name); main_navbar_versekey_set(dialog->navbar, gkey); main_dialogs_url_handler(dialog, url, TRUE); if (dialog->sync) sword_uri(url, TRUE); g_free(url); - g_free((gchar*)gkey); + g_free((gchar *)gkey); } - /****************************************************************************** * Name * on_button_verse_menu_verse_scroll_event @@ -480,18 +476,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_verse_scroll_event(GtkWidget * widget, - GdkEvent * event, - DIALOG_DATA * dialog) +static gboolean on_button_verse_menu_verse_scroll_event(GtkWidget *widget, + GdkEvent *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_verse(dialog->navbar, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_chapter_scroll_event @@ -510,18 +503,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget * widget, - GdkEvent * event, - DIALOG_DATA * dialog) +static gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget *widget, + GdkEvent *event, + DIALOG_DATA *dialog) { main_navbar_versekey_spin_chapter(dialog->navbar, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_book_scroll_event @@ -540,16 +530,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_book_scroll_event(GtkWidget * widget, - GdkEvent * event, - DIALOG_DATA * dialog) +static gboolean on_button_verse_menu_book_scroll_event(GtkWidget *widget, + GdkEvent *event, + DIALOG_DATA *dialog) { - main_navbar_versekey_spin_book(dialog->navbar,event->scroll.direction); + main_navbar_versekey_spin_book(dialog->navbar, + event->scroll.direction); return FALSE; } - /****************************************************************************** * Name * on_up_leave_notify_event @@ -568,27 +557,27 @@ * gboolean */ -static -gboolean on_book_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_book_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_book_up_box); gtk_widget_show(dialog->navbar.arrow_book_up); return FALSE; } -static -gboolean on_chapter_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_chapter_up_box); gtk_widget_show(dialog->navbar.arrow_chapter_up); return FALSE; } -static -gboolean on_verse_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_verse_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_verse_up_box); gtk_widget_show(dialog->navbar.arrow_verse_up); @@ -613,9 +602,9 @@ * gboolean */ -static -gboolean on_book_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_book_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_book_down_box); @@ -623,25 +612,24 @@ return FALSE; } -static -gboolean on_chapter_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_chapter_down_box); gtk_widget_show(dialog->navbar.arrow_chapter_down); return FALSE; } -static -gboolean on_verse_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_verse_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_verse_down_box); gtk_widget_show(dialog->navbar.arrow_verse_down); return FALSE; } - /****************************************************************************** * Name * on_up_enter_notify_event @@ -660,35 +648,33 @@ * gboolean */ -static -gboolean on_book_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_book_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_book_up); gtk_widget_show(dialog->navbar.arrow_book_up_box); return FALSE; } - -static -gboolean on_chapter_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_chapter_up); gtk_widget_show(dialog->navbar.arrow_chapter_up_box); return FALSE; } -static -gboolean on_verse_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_verse_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_verse_up); gtk_widget_show(dialog->navbar.arrow_verse_up_box); return FALSE; } - /****************************************************************************** * Name * on_down_enter_notify_event @@ -707,139 +693,152 @@ * gboolean */ -static -gboolean on_book_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_book_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_book_down); gtk_widget_show(dialog->navbar.arrow_book_down_box); return FALSE; } -static -gboolean on_chapter_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_chapter_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_chapter_down); gtk_widget_show(dialog->navbar.arrow_chapter_down_box); return FALSE; } -static -gboolean on_verse_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - DIALOG_DATA * dialog) +static gboolean on_verse_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + DIALOG_DATA *dialog) { gtk_widget_hide(dialog->navbar.arrow_verse_down); gtk_widget_show(dialog->navbar.arrow_verse_down_box); return FALSE; } - -static -void _connect_signals(NAVBAR_VERSEKEY navbar, DIALOG_DATA * dialog) +static void _connect_signals(NAVBAR_VERSEKEY navbar, DIALOG_DATA *dialog) { - g_signal_connect((gpointer) navbar.lookup_entry, + g_signal_connect((gpointer)navbar.lookup_entry, "activate", G_CALLBACK(on_entry_activate), dialog); - g_signal_connect((gpointer) navbar.button_book_up, - "button_release_event", G_CALLBACK(on_book_up_button_release_event), - dialog); - g_signal_connect((gpointer) navbar.button_book_down, - "button_release_event", G_CALLBACK(on_book_down_button_release_event), - dialog); - g_signal_connect((gpointer) navbar.button_chapter_up, - "button_release_event", G_CALLBACK(on_chapter_up_button_release_event), - dialog); - g_signal_connect((gpointer) navbar.button_chapter_down, - "button_release_event", G_CALLBACK(on_chapter_down_button_release_event), - dialog); - g_signal_connect((gpointer) navbar.button_verse_up, - "button_release_event", G_CALLBACK(on_verse_up_button_release_event), - dialog); - g_signal_connect((gpointer) navbar.button_verse_down, - "button_release_event", G_CALLBACK(on_verse_down_button_release_event), + g_signal_connect((gpointer)navbar.button_book_up, + "button_release_event", + G_CALLBACK(on_book_up_button_release_event), + dialog); + g_signal_connect((gpointer)navbar.button_book_down, + "button_release_event", + G_CALLBACK(on_book_down_button_release_event), + dialog); + g_signal_connect((gpointer)navbar.button_chapter_up, + "button_release_event", + G_CALLBACK(on_chapter_up_button_release_event), + dialog); + g_signal_connect((gpointer)navbar.button_chapter_down, + "button_release_event", + G_CALLBACK(on_chapter_down_button_release_event), + dialog); + g_signal_connect((gpointer)navbar.button_verse_up, + "button_release_event", + G_CALLBACK(on_verse_up_button_release_event), + dialog); + g_signal_connect((gpointer)navbar.button_verse_down, + "button_release_event", + G_CALLBACK(on_verse_down_button_release_event), dialog); /* */ - g_signal_connect ((gpointer) navbar.button_book_up, - "enter_notify_event", - G_CALLBACK (on_book_up_enter_notify_event), - dialog); - g_signal_connect ((gpointer) navbar.button_book_up, - "leave_notify_event", - G_CALLBACK (on_book_up_leave_notify_event), - dialog); - - g_signal_connect ((gpointer)navbar.button_book_down , - "enter_notify_event", - G_CALLBACK (on_book_down_enter_notify_event), - dialog); - g_signal_connect ((gpointer)navbar.button_book_down , - "leave_notify_event", - G_CALLBACK (on_book_down_leave_notify_event), - dialog); + g_signal_connect((gpointer)navbar.button_book_up, + "enter_notify_event", + G_CALLBACK(on_book_up_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_book_up, + "leave_notify_event", + G_CALLBACK(on_book_up_leave_notify_event), + dialog); + + g_signal_connect((gpointer)navbar.button_book_down, + "enter_notify_event", + G_CALLBACK(on_book_down_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_book_down, + "leave_notify_event", + G_CALLBACK(on_book_down_leave_notify_event), + dialog); /* */ - g_signal_connect ((gpointer) navbar.button_chapter_up, "enter_notify_event", - G_CALLBACK (on_chapter_up_enter_notify_event), - dialog); - g_signal_connect ((gpointer)navbar.button_chapter_up , "leave_notify_event", - G_CALLBACK (on_chapter_up_leave_notify_event), - dialog); - - g_signal_connect ((gpointer) navbar.button_chapter_down, "enter_notify_event", - G_CALLBACK (on_chapter_down_enter_notify_event), - dialog); - g_signal_connect ((gpointer)navbar.button_chapter_down , "leave_notify_event", - G_CALLBACK (on_chapter_down_leave_notify_event), - dialog); + g_signal_connect((gpointer)navbar.button_chapter_up, + "enter_notify_event", + G_CALLBACK(on_chapter_up_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_chapter_up, + "leave_notify_event", + G_CALLBACK(on_chapter_up_leave_notify_event), + dialog); + + g_signal_connect((gpointer)navbar.button_chapter_down, + "enter_notify_event", + G_CALLBACK(on_chapter_down_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_chapter_down, + "leave_notify_event", + G_CALLBACK(on_chapter_down_leave_notify_event), + dialog); /* */ - g_signal_connect ((gpointer) navbar.button_verse_up, "enter_notify_event", - G_CALLBACK (on_verse_up_enter_notify_event), - dialog); - g_signal_connect ((gpointer)navbar.button_verse_up , "leave_notify_event", - G_CALLBACK (on_verse_up_leave_notify_event), - dialog); - - g_signal_connect ((gpointer) navbar.button_verse_down, "enter_notify_event", - G_CALLBACK (on_verse_down_enter_notify_event), - dialog ); - g_signal_connect ((gpointer)navbar.button_verse_down , "leave_notify_event", - G_CALLBACK (on_verse_down_leave_notify_event), - dialog); + g_signal_connect((gpointer)navbar.button_verse_up, + "enter_notify_event", + G_CALLBACK(on_verse_up_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_verse_up, + "leave_notify_event", + G_CALLBACK(on_verse_up_leave_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_verse_down, + "enter_notify_event", + G_CALLBACK(on_verse_down_enter_notify_event), + dialog); + g_signal_connect((gpointer)navbar.button_verse_down, + "leave_notify_event", + G_CALLBACK(on_verse_down_leave_notify_event), + dialog); - g_signal_connect((gpointer) navbar.button_sync, - "clicked", G_CALLBACK(gui_bible_dialog_sync_toggled), + g_signal_connect((gpointer)navbar.button_sync, + "clicked", + G_CALLBACK(gui_bible_dialog_sync_toggled), dialog); - g_signal_connect((gpointer) navbar.button_book_menu, + g_signal_connect((gpointer)navbar.button_book_menu, "button_press_event", G_CALLBACK(select_book_button_press_callback), dialog); - g_signal_connect((gpointer) navbar.button_chapter_menu, + g_signal_connect((gpointer)navbar.button_chapter_menu, "button_press_event", G_CALLBACK(select_chapter_button_press_callback), dialog); - g_signal_connect((gpointer) navbar.button_verse_menu, + g_signal_connect((gpointer)navbar.button_verse_menu, "button_press_event", G_CALLBACK(select_verse_button_press_callback), dialog); -#ifndef HAVE_GTK_34 - g_signal_connect ((gpointer)navbar.button_verse_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - dialog); - g_signal_connect ((gpointer)navbar.button_chapter_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - dialog); - g_signal_connect ((gpointer)navbar.button_book_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - dialog); +#ifndef HAVE_GTK_34 + g_signal_connect((gpointer)navbar.button_verse_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), + dialog); + g_signal_connect((gpointer)navbar.button_chapter_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + dialog); + g_signal_connect((gpointer)navbar.button_book_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), dialog); #endif } - /****************************************************************************** * Name * gui_navbar_versekey_new @@ -856,7 +855,7 @@ * GtkWidget * */ -GtkWidget *gui_navbar_versekey_dialog_new(DIALOG_DATA * dialog) +GtkWidget *gui_navbar_versekey_dialog_new(DIALOG_DATA *dialog) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; @@ -864,30 +863,36 @@ GladeXML *gxml; #endif #ifdef HAVE_GTK_34 - GtkWidget * eventbox; + GtkWidget *eventbox; #endif - - gchar *glade_file = gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); + + gchar *glade_file = + gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); g_return_val_if_fail((glade_file != NULL), NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "navbar", NULL); #endif dialog->navbar.dialog = TRUE; - dialog->navbar.module_name = g_string_new(settings.MainWindowModule); - dialog->navbar.key = g_string_new(settings.currentverse); + dialog->navbar.module_name = + g_string_new(settings.MainWindowModule); + dialog->navbar.key = g_string_new(settings.currentverse); dialog->navbar.navbar = UI_GET_ITEM(gxml, "navbar"); - dialog->navbar.button_history_back = UI_GET_ITEM(gxml, "button_history_back"); - dialog->navbar.button_history_next = UI_GET_ITEM(gxml, "button_history_foward"); - dialog->navbar.button_history_menu = UI_GET_ITEM(gxml, "togglebutton_history_list"); + dialog->navbar.button_history_back = + UI_GET_ITEM(gxml, "button_history_back"); + dialog->navbar.button_history_next = + UI_GET_ITEM(gxml, "button_history_foward"); + dialog->navbar.button_history_menu = + UI_GET_ITEM(gxml, "togglebutton_history_list"); - dialog->navbar.button_sync = UI_GET_ITEM(gxml, "togglebutton_sync"); + dialog->navbar.button_sync = + UI_GET_ITEM(gxml, "togglebutton_sync"); gtk_widget_show(dialog->navbar.button_sync); gtk_widget_set_tooltip_text(dialog->navbar.button_sync, _("Synchronize this window's scrolling with the main window")); @@ -898,7 +903,8 @@ dialog->navbar.button_book_up = UI_GET_ITEM(gxml, "eventbox9"); dialog->navbar.button_book_down = UI_GET_ITEM(gxml, "eventbox6"); dialog->navbar.button_chapter_up = UI_GET_ITEM(gxml, "eventbox8"); - dialog->navbar.button_chapter_down = UI_GET_ITEM(gxml, "eventbox4"); + dialog->navbar.button_chapter_down = + UI_GET_ITEM(gxml, "eventbox4"); dialog->navbar.button_verse_up = UI_GET_ITEM(gxml, "eventbox7"); dialog->navbar.button_verse_down = UI_GET_ITEM(gxml, "eventbox1"); @@ -908,38 +914,42 @@ dialog->navbar.arrow_book_down = UI_GET_ITEM(gxml, "image14"); dialog->navbar.arrow_chapter_up_box = UI_GET_ITEM(gxml, "image9"); dialog->navbar.arrow_chapter_up = UI_GET_ITEM(gxml, "image8"); - dialog->navbar.arrow_chapter_down_box = UI_GET_ITEM(gxml, "image11"); + dialog->navbar.arrow_chapter_down_box = + UI_GET_ITEM(gxml, "image11"); dialog->navbar.arrow_chapter_down = UI_GET_ITEM(gxml, "image10"); dialog->navbar.arrow_verse_up_box = UI_GET_ITEM(gxml, "image7"); dialog->navbar.arrow_verse_up = UI_GET_ITEM(gxml, "image6"); dialog->navbar.arrow_verse_down_box = UI_GET_ITEM(gxml, "image16"); dialog->navbar.arrow_verse_down = UI_GET_ITEM(gxml, "image5"); - dialog->navbar.button_book_menu = UI_GET_ITEM(gxml, "togglebutton_book"); - dialog->navbar.button_chapter_menu = UI_GET_ITEM(gxml, "togglebutton_chapter"); - dialog->navbar.button_verse_menu = UI_GET_ITEM(gxml, "togglebutton_verse"); + dialog->navbar.button_book_menu = + UI_GET_ITEM(gxml, "togglebutton_book"); + dialog->navbar.button_chapter_menu = + UI_GET_ITEM(gxml, "togglebutton_chapter"); + dialog->navbar.button_verse_menu = + UI_GET_ITEM(gxml, "togglebutton_verse"); dialog->navbar.lookup_entry = UI_GET_ITEM(gxml, "entry_lookup"); dialog->navbar.label_book_menu = UI_GET_ITEM(gxml, "label_book"); - dialog->navbar.label_chapter_menu = UI_GET_ITEM(gxml, "label_chapter"); + dialog->navbar.label_chapter_menu = + UI_GET_ITEM(gxml, "label_chapter"); dialog->navbar.label_verse_menu = UI_GET_ITEM(gxml, "label_verse"); -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 eventbox = UI_GET_ITEM(gxml, "eventbox_book"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - dialog); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), dialog); + eventbox = UI_GET_ITEM(gxml, "eventbox_chapter"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - dialog); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + dialog); + eventbox = UI_GET_ITEM(gxml, "eventbox_verse"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - dialog); + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), + dialog); #endif - + _connect_signals(dialog->navbar, dialog); return dialog->navbar.navbar; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_editor.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_editor.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_editor.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_editor.c 2015-02-11 23:48:34.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar_verse_dialog.c - navigation bar for versekey modules in dialogs + * navbar_verse_editor.c - navigation bar for versekey modules in the editor * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,17 +25,15 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif - -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #else #include "editor/slib-editor.h" #endif - #include "gui/navbar_versekey_editor.h" #include "gui/bibletext_dialog.h" #include "gui/tabbed_browser.h" @@ -48,7 +46,6 @@ #include "gui/debug_glib_null.h" - /****************************************************************************** * Name * on_verse_button_up_clicked @@ -65,10 +62,9 @@ * void */ -static -gboolean on_verse_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_verse_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_verse(editor->navbar, 0); return FALSE; @@ -90,10 +86,9 @@ * void */ -static -gboolean on_verse_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_verse_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_verse(editor->navbar, 1); return FALSE; @@ -115,16 +110,14 @@ * void */ -static -gboolean on_chapter_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_chapter_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_chapter(editor->navbar, 0); return FALSE; } - /****************************************************************************** * Name * on_chapter_button_down_clicked @@ -141,10 +134,9 @@ * void */ -static -gboolean on_chapter_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_chapter_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_chapter(editor->navbar, 1); return FALSE; @@ -166,16 +158,14 @@ * void */ -static -gboolean on_book_up_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_book_up_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_book(editor->navbar, 0); return FALSE; } - /****************************************************************************** * Name * on_book_button_down_clicked @@ -192,10 +182,9 @@ * void */ -static -gboolean on_book_down_button_release_event(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean on_book_down_button_release_event(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { main_navbar_versekey_spin_book(editor->navbar, 1); return FALSE; @@ -217,16 +206,17 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -245,31 +235,29 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; *push_in = FALSE; } - /****************************************************************************** * Name * select_button_press_callback @@ -289,21 +277,23 @@ * gboolean */ -static -gboolean select_book_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean select_book_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { GtkWidget *menu; - menu = main_versekey_drop_down_book_menu(editor->navbar, NB_EDITOR, NULL, editor); + menu = + main_versekey_drop_down_book_menu(editor->navbar, NB_EDITOR, + NULL, editor); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -312,8 +302,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -333,21 +321,23 @@ * gboolean */ -static -gboolean select_chapter_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean select_chapter_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { GtkWidget *menu; - menu = main_versekey_drop_down_chapter_menu(editor->navbar, NB_EDITOR, NULL, editor); + menu = + main_versekey_drop_down_chapter_menu(editor->navbar, NB_EDITOR, + NULL, editor); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -356,8 +346,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -377,20 +365,23 @@ * gboolean */ -static gboolean select_verse_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - EDITOR * editor) +static gboolean select_verse_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + EDITOR *editor) { GtkWidget *menu; - menu = main_versekey_drop_down_verse_menu(editor->navbar, NB_EDITOR, NULL, editor); + menu = + main_versekey_drop_down_verse_menu(editor->navbar, NB_EDITOR, + NULL, editor); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -415,31 +406,33 @@ * void */ -static void on_entry_activate(GtkEntry * entry, EDITOR * editor) +static void on_entry_activate(GtkEntry *entry, EDITOR *editor) { const gchar *buf = gtk_entry_get_text(entry); if (buf == NULL) return; /* handle potential subsection anchor */ - if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ - (settings.special_anchor = strchr(buf, '!'))) /* osisref */ + if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ + (settings.special_anchor = strchr(buf, '!'))) /* osisref */ *settings.special_anchor = '\0'; - const gchar *gkey = main_get_valid_key(settings.MainWindowModule, (gchar*)buf); + const gchar *gkey = + main_get_valid_key(settings.MainWindowModule, (gchar *)buf); // we got a valid key. but was it really a valid key within v11n? // for future use in determining whether to show normal navbar content. - editor->navbar.valid_key = main_is_Bible_key(settings.MainWindowModule, gkey); + editor->navbar.valid_key = + main_is_Bible_key(settings.MainWindowModule, gkey); if (settings.special_anchor) - *settings.special_anchor = '#'; /* put it back. */ + *settings.special_anchor = '#'; /* put it back. */ if (gkey == NULL) return; - gchar *url = g_strdup_printf("sword:///%s%s", gkey, (settings.special_anchor - ? settings.special_anchor - : "")); + gchar *url = g_strdup_printf("sword:///%s%s", gkey, + (settings.special_anchor ? settings.special_anchor : "")); - editor->navbar.module_name = g_string_assign(editor->navbar.module_name, - settings.MainWindowModule); + editor->navbar.module_name = + g_string_assign(editor->navbar.module_name, + settings.MainWindowModule); main_navbar_versekey_set(editor->navbar, gkey); editor_load_note(editor, NULL, gkey); @@ -447,10 +440,9 @@ if (url) g_free(url); if (gkey) - g_free((gchar*)gkey); + g_free((gchar *)gkey); } - /****************************************************************************** * Name * on_button_verse_menu_verse_scroll_event @@ -469,19 +461,16 @@ * gboolean */ -static -gboolean on_button_verse_menu_verse_scroll_event(GtkWidget * widget, - GdkEvent * event, - EDITOR * editor) +static gboolean on_button_verse_menu_verse_scroll_event(GtkWidget *widget, + GdkEvent *event, + EDITOR *editor) { - XI_message(("%s","on_button_verse_menu_verse_scroll_event")); + XI_message(("%s", "on_button_verse_menu_verse_scroll_event")); main_navbar_versekey_spin_verse(editor->navbar, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_chapter_scroll_event @@ -500,18 +489,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget * widget, - GdkEvent * event, - EDITOR * editor) +static gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget *widget, + GdkEvent *event, + EDITOR *editor) { main_navbar_versekey_spin_chapter(editor->navbar, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_book_scroll_event @@ -530,16 +516,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_book_scroll_event(GtkWidget * widget, - GdkEvent * event, - EDITOR * editor) +static gboolean on_button_verse_menu_book_scroll_event(GtkWidget *widget, + GdkEvent *event, + EDITOR *editor) { - main_navbar_versekey_spin_book(editor->navbar,event->scroll.direction); + main_navbar_versekey_spin_book(editor->navbar, + event->scroll.direction); return FALSE; } - /****************************************************************************** * Name * on_up_leave_notify_event @@ -558,27 +543,27 @@ * gboolean */ -static -gboolean on_book_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_book_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_book_up_box); gtk_widget_show(editor->navbar.arrow_book_up); return FALSE; } -static -gboolean on_chapter_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_chapter_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_chapter_up_box); gtk_widget_show(editor->navbar.arrow_chapter_up); return FALSE; } -static -gboolean on_verse_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_verse_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_verse_up_box); gtk_widget_show(editor->navbar.arrow_verse_up); @@ -603,9 +588,9 @@ * gboolean */ -static -gboolean on_book_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_book_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_book_down_box); @@ -613,25 +598,24 @@ return FALSE; } -static -gboolean on_chapter_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_chapter_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_chapter_down_box); gtk_widget_show(editor->navbar.arrow_chapter_down); return FALSE; } -static -gboolean on_verse_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_verse_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_verse_down_box); gtk_widget_show(editor->navbar.arrow_verse_down); return FALSE; } - /****************************************************************************** * Name * on_up_enter_notify_event @@ -650,35 +634,33 @@ * gboolean */ -static -gboolean on_book_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_book_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_book_up); gtk_widget_show(editor->navbar.arrow_book_up_box); return FALSE; } - -static -gboolean on_chapter_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_chapter_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_chapter_up); gtk_widget_show(editor->navbar.arrow_chapter_up_box); return FALSE; } -static -gboolean on_verse_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_verse_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_verse_up); gtk_widget_show(editor->navbar.arrow_verse_up_box); return FALSE; } - /****************************************************************************** * Name * on_down_enter_notify_event @@ -697,27 +679,27 @@ * gboolean */ -static -gboolean on_book_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_book_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_book_down); gtk_widget_show(editor->navbar.arrow_book_down_box); return FALSE; } -static -gboolean on_chapter_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_chapter_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_chapter_down); gtk_widget_show(editor->navbar.arrow_chapter_down_box); return FALSE; } -static -gboolean on_verse_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - EDITOR * editor) +static gboolean on_verse_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + EDITOR *editor) { gtk_widget_hide(editor->navbar.arrow_verse_down); gtk_widget_show(editor->navbar.arrow_verse_down_box); @@ -740,102 +722,105 @@ * void */ -static -void _sync_toggled(GtkToggleButton *button, EDITOR * e) +static void _sync_toggled(GtkToggleButton *button, EDITOR *e) { if (gtk_toggle_button_get_active(button)) { e->sync = TRUE; - editor_sync_with_main ();//sync_with_main(c); + editor_sync_with_main(); //sync_with_main(c); } else e->sync = FALSE; } - -static -void _connect_signals(NAVBAR_VERSEKEY navbar, EDITOR * editor) +static void _connect_signals(NAVBAR_VERSEKEY navbar, EDITOR *editor) { - g_signal_connect((gpointer) navbar.lookup_entry, + g_signal_connect((gpointer)navbar.lookup_entry, "activate", G_CALLBACK(on_entry_activate), - editor); - g_signal_connect((gpointer) editor->navbar.button_sync, - "clicked", G_CALLBACK(_sync_toggled), editor); - g_signal_connect((gpointer) navbar.button_book_up, + g_signal_connect((gpointer)editor->navbar.button_sync, + "clicked", G_CALLBACK(_sync_toggled), editor); + g_signal_connect((gpointer)navbar.button_book_up, "button_release_event", G_CALLBACK(on_book_up_button_release_event), editor); - g_signal_connect((gpointer) navbar.button_book_down, + g_signal_connect((gpointer)navbar.button_book_down, "button_release_event", G_CALLBACK(on_book_down_button_release_event), editor); - g_signal_connect((gpointer) navbar.button_chapter_up, + g_signal_connect((gpointer)navbar.button_chapter_up, "button_release_event", G_CALLBACK(on_chapter_up_button_release_event), editor); - g_signal_connect((gpointer) navbar.button_chapter_down, + g_signal_connect((gpointer)navbar.button_chapter_down, "button_release_event", G_CALLBACK(on_chapter_down_button_release_event), editor); - g_signal_connect((gpointer) navbar.button_verse_up, + g_signal_connect((gpointer)navbar.button_verse_up, "button_release_event", G_CALLBACK(on_verse_up_button_release_event), - editor ); - g_signal_connect((gpointer) navbar.button_verse_down, + editor); + g_signal_connect((gpointer)navbar.button_verse_down, "button_release_event", G_CALLBACK(on_verse_down_button_release_event), editor); /* */ - g_signal_connect ((gpointer) navbar.button_book_up, - "enter_notify_event", - G_CALLBACK (on_book_up_enter_notify_event), - editor); - g_signal_connect ((gpointer) navbar.button_book_up, - "leave_notify_event", - G_CALLBACK (on_book_up_leave_notify_event), - editor); - - g_signal_connect ((gpointer)navbar.button_book_down , - "enter_notify_event", - G_CALLBACK (on_book_down_enter_notify_event), - editor); - g_signal_connect ((gpointer)navbar.button_book_down , - "leave_notify_event", - G_CALLBACK (on_book_down_leave_notify_event), - editor); + g_signal_connect((gpointer)navbar.button_book_up, + "enter_notify_event", + G_CALLBACK(on_book_up_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_book_up, + "leave_notify_event", + G_CALLBACK(on_book_up_leave_notify_event), + editor); + + g_signal_connect((gpointer)navbar.button_book_down, + "enter_notify_event", + G_CALLBACK(on_book_down_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_book_down, + "leave_notify_event", + G_CALLBACK(on_book_down_leave_notify_event), + editor); /* */ - g_signal_connect ((gpointer) navbar.button_chapter_up, "enter_notify_event", - G_CALLBACK (on_chapter_up_enter_notify_event), - editor); - g_signal_connect ((gpointer)navbar.button_chapter_up , "leave_notify_event", - G_CALLBACK (on_chapter_up_leave_notify_event), - editor); - - g_signal_connect ((gpointer) navbar.button_chapter_down, "enter_notify_event", - G_CALLBACK (on_chapter_down_enter_notify_event), - editor); - g_signal_connect ((gpointer)navbar.button_chapter_down , "leave_notify_event", - G_CALLBACK (on_chapter_down_leave_notify_event), - editor); + g_signal_connect((gpointer)navbar.button_chapter_up, + "enter_notify_event", + G_CALLBACK(on_chapter_up_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_chapter_up, + "leave_notify_event", + G_CALLBACK(on_chapter_up_leave_notify_event), + editor); + + g_signal_connect((gpointer)navbar.button_chapter_down, + "enter_notify_event", + G_CALLBACK(on_chapter_down_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_chapter_down, + "leave_notify_event", + G_CALLBACK(on_chapter_down_leave_notify_event), + editor); /* */ - g_signal_connect ((gpointer) navbar.button_verse_up, "enter_notify_event", - G_CALLBACK (on_verse_up_enter_notify_event), - editor); - g_signal_connect ((gpointer)navbar.button_verse_up , "leave_notify_event", - G_CALLBACK (on_verse_up_leave_notify_event), - editor); - - g_signal_connect ((gpointer) navbar.button_verse_down, "enter_notify_event", - G_CALLBACK (on_verse_down_enter_notify_event), - editor); - g_signal_connect ((gpointer)navbar.button_verse_down , "leave_notify_event", - G_CALLBACK (on_verse_down_leave_notify_event), - editor); + g_signal_connect((gpointer)navbar.button_verse_up, + "enter_notify_event", + G_CALLBACK(on_verse_up_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_verse_up, + "leave_notify_event", + G_CALLBACK(on_verse_up_leave_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_verse_down, + "enter_notify_event", + G_CALLBACK(on_verse_down_enter_notify_event), + editor); + g_signal_connect((gpointer)navbar.button_verse_down, + "leave_notify_event", + G_CALLBACK(on_verse_down_leave_notify_event), + editor); -/* + /* g_signal_connect((gpointer) navbar.button_book_up, "clicked", G_CALLBACK(on_book_button_up_clicked), editor); @@ -855,33 +840,33 @@ "clicked", G_CALLBACK(on_verse_button_down_clicked), editor); */ - g_signal_connect((gpointer) navbar.button_book_menu, + g_signal_connect((gpointer)navbar.button_book_menu, "button_press_event", G_CALLBACK(select_book_button_press_callback), editor); - g_signal_connect((gpointer) navbar.button_chapter_menu, + g_signal_connect((gpointer)navbar.button_chapter_menu, "button_press_event", G_CALLBACK(select_chapter_button_press_callback), editor); - g_signal_connect((gpointer) navbar.button_verse_menu, + g_signal_connect((gpointer)navbar.button_verse_menu, "button_press_event", G_CALLBACK(select_verse_button_press_callback), editor); -#ifndef HAVE_GTK_34 - g_signal_connect ((gpointer)navbar.button_verse_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - editor); - g_signal_connect ((gpointer)navbar.button_chapter_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - editor); - g_signal_connect ((gpointer)navbar.button_book_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - editor); +#ifndef HAVE_GTK_34 + g_signal_connect((gpointer)navbar.button_verse_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), + editor); + g_signal_connect((gpointer)navbar.button_chapter_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + editor); + g_signal_connect((gpointer)navbar.button_book_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), editor); #endif - } - /****************************************************************************** * Name * @@ -898,7 +883,7 @@ * GtkWidget * */ -GtkWidget *gui_navbar_versekey_editor_new(EDITOR * editor) +GtkWidget *gui_navbar_versekey_editor_new(EDITOR *editor) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; @@ -906,37 +891,44 @@ GladeXML *gxml; #endif #ifdef HAVE_GTK_34 - GtkWidget * eventbox; + GtkWidget *eventbox; #endif - - gchar *glade_file = gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); + + gchar *glade_file = + gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); g_return_val_if_fail((glade_file != NULL), NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "navbar", NULL); #endif editor->navbar.dialog = TRUE; - editor->navbar.module_name = g_string_new(settings.MainWindowModule); - editor->navbar.key = g_string_new(settings.currentverse); + editor->navbar.module_name = + g_string_new(settings.MainWindowModule); + editor->navbar.key = g_string_new(settings.currentverse); editor->navbar.navbar = UI_GET_ITEM(gxml, "navbar"); - editor->navbar.button_history_back = UI_GET_ITEM(gxml, "button_history_back"); - editor->navbar.button_history_next = UI_GET_ITEM(gxml, "button_history_foward"); - editor->navbar.button_history_menu = UI_GET_ITEM(gxml, "togglebutton_history_list"); + editor->navbar.button_history_back = + UI_GET_ITEM(gxml, "button_history_back"); + editor->navbar.button_history_next = + UI_GET_ITEM(gxml, "button_history_foward"); + editor->navbar.button_history_menu = + UI_GET_ITEM(gxml, "togglebutton_history_list"); - editor->navbar.button_sync = UI_GET_ITEM(gxml, "togglebutton_sync"); + editor->navbar.button_sync = + UI_GET_ITEM(gxml, "togglebutton_sync"); gtk_widget_show(editor->navbar.button_sync); gtk_widget_set_tooltip_text(editor->navbar.button_sync, _("Synchronize this window's scrolling with the main window")); editor->navbar.button_book_up = UI_GET_ITEM(gxml, "eventbox9"); editor->navbar.button_book_down = UI_GET_ITEM(gxml, "eventbox6"); editor->navbar.button_chapter_up = UI_GET_ITEM(gxml, "eventbox8"); - editor->navbar.button_chapter_down = UI_GET_ITEM(gxml, "eventbox4"); + editor->navbar.button_chapter_down = + UI_GET_ITEM(gxml, "eventbox4"); editor->navbar.button_verse_up = UI_GET_ITEM(gxml, "eventbox7"); editor->navbar.button_verse_down = UI_GET_ITEM(gxml, "eventbox1"); @@ -946,37 +938,41 @@ editor->navbar.arrow_book_down = UI_GET_ITEM(gxml, "image14"); editor->navbar.arrow_chapter_up_box = UI_GET_ITEM(gxml, "image9"); editor->navbar.arrow_chapter_up = UI_GET_ITEM(gxml, "image8"); - editor->navbar.arrow_chapter_down_box = UI_GET_ITEM(gxml, "image11"); + editor->navbar.arrow_chapter_down_box = + UI_GET_ITEM(gxml, "image11"); editor->navbar.arrow_chapter_down = UI_GET_ITEM(gxml, "image10"); editor->navbar.arrow_verse_up_box = UI_GET_ITEM(gxml, "image7"); editor->navbar.arrow_verse_up = UI_GET_ITEM(gxml, "image6"); editor->navbar.arrow_verse_down_box = UI_GET_ITEM(gxml, "image16"); editor->navbar.arrow_verse_down = UI_GET_ITEM(gxml, "image5"); - editor->navbar.button_book_menu = UI_GET_ITEM(gxml, "togglebutton_book"); - editor->navbar.button_chapter_menu = UI_GET_ITEM(gxml, "togglebutton_chapter"); - editor->navbar.button_verse_menu = UI_GET_ITEM(gxml, "togglebutton_verse"); + editor->navbar.button_book_menu = + UI_GET_ITEM(gxml, "togglebutton_book"); + editor->navbar.button_chapter_menu = + UI_GET_ITEM(gxml, "togglebutton_chapter"); + editor->navbar.button_verse_menu = + UI_GET_ITEM(gxml, "togglebutton_verse"); editor->navbar.lookup_entry = UI_GET_ITEM(gxml, "entry_lookup"); editor->navbar.label_book_menu = UI_GET_ITEM(gxml, "label_book"); - editor->navbar.label_chapter_menu = UI_GET_ITEM(gxml, "label_chapter"); + editor->navbar.label_chapter_menu = + UI_GET_ITEM(gxml, "label_chapter"); editor->navbar.label_verse_menu = UI_GET_ITEM(gxml, "label_verse"); - -#ifdef HAVE_GTK_34 + +#ifdef HAVE_GTK_34 eventbox = UI_GET_ITEM(gxml, "eventbox_book"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - editor); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), editor); + eventbox = UI_GET_ITEM(gxml, "eventbox_chapter"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - editor); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + editor); + eventbox = UI_GET_ITEM(gxml, "eventbox_verse"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - editor); -#endif + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), + editor); +#endif _connect_signals(editor->navbar, editor); return editor->navbar.navbar; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_parallel.c xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_parallel.c --- xiphos-4.0.0+dfsg1/src/gnome2/navbar_versekey_parallel.c 2014-12-19 03:07:47.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/navbar_versekey_parallel.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_parallel.c - navigation bar for the parallel dialog * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/navbar_versekey_parallel.h" @@ -58,16 +58,17 @@ * void */ -static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data) +static void menu_deactivate_callback(GtkWidget *widget, + gpointer user_data) { GtkWidget *menu_button; menu_button = GTK_WIDGET(user_data); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), + FALSE); } - /****************************************************************************** * Name * menu_position_under @@ -86,31 +87,29 @@ * void */ -static -void menu_position_under(GtkMenu * menu, int * x, int * y, - gboolean * push_in, gpointer user_data) +static void menu_position_under(GtkMenu *menu, int *x, int *y, + gboolean *push_in, gpointer user_data) { GtkWidget *widget; GtkAllocation allocation; g_return_if_fail(GTK_IS_BUTTON(user_data)); #if defined(HAVE_GTK_220) || defined(USE_GTK_3) - g_return_if_fail (gtk_widget_get_window(user_data)); + g_return_if_fail(gtk_widget_get_window(user_data)); #else - g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data)); + g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data)); #endif widget = GTK_WIDGET(user_data); - gdk_window_get_origin(gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + gtk_widget_get_allocation(widget, &allocation); *x += allocation.x; *y += allocation.y + allocation.height; - + *push_in = FALSE; } - /****************************************************************************** * Name * select_button_press_callback @@ -130,10 +129,9 @@ * gboolean */ -static -gboolean select_book_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_book_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkWidget *menu = NULL; @@ -143,18 +141,21 @@ glong time_diff; guint32 time_add; #endif - - g_get_current_time( &start_time ); - XI_message(("Start time is: %ld sec %ld mil", start_time.tv_sec, start_time.tv_usec)); + + g_get_current_time(&start_time); + XI_message(("Start time is: %ld sec %ld mil", start_time.tv_sec, + start_time.tv_usec)); menu = main_versekey_drop_down_book_menu(navbar_parallel, - NB_PARALLEL, - NULL, NULL); + NB_PARALLEL, NULL, NULL); - g_get_current_time( &end_time ); - XI_message(("End time is: %ld sec %ld mil", end_time.tv_sec, end_time.tv_usec)); + g_get_current_time(&end_time); + XI_message(("End time is: %ld sec %ld mil", end_time.tv_sec, + end_time.tv_usec)); #ifdef WIN32 - time_diff = ((end_time.tv_sec - start_time.tv_sec) * 1000000) + (end_time.tv_usec - start_time.tv_usec); + time_diff = + ((end_time.tv_sec - start_time.tv_sec) * 1000000) + + (end_time.tv_usec - start_time.tv_usec); time_add = 0; if (time_diff > 10000) time_add = (guint32)(time_diff / 1000); @@ -165,7 +166,8 @@ G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, #ifdef WIN32 @@ -178,8 +180,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -199,23 +199,23 @@ * gboolean */ -static -gboolean select_chapter_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_chapter_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkWidget *menu = NULL; menu = main_versekey_drop_down_chapter_menu(navbar_parallel, - NB_PARALLEL, - NULL, NULL); + NB_PARALLEL, + NULL, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -224,8 +224,6 @@ return FALSE; } - - /****************************************************************************** * Name * select_button_press_callback @@ -245,22 +243,22 @@ * gboolean */ -static gboolean select_verse_button_press_callback(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean select_verse_button_press_callback(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkWidget *menu = NULL; menu = main_versekey_drop_down_verse_menu(navbar_parallel, - NB_PARALLEL, - NULL, NULL); + NB_PARALLEL, NULL, NULL); if (!menu) return 0; g_signal_connect(menu, "deactivate", G_CALLBACK(menu_deactivate_callback), widget); if ((event->type == GDK_BUTTON_PRESS) && event->button == 1) { gtk_widget_grab_focus(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + TRUE); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_position_under, widget, event->button, event->time); @@ -285,15 +283,15 @@ * void */ -static void on_entry_activate(GtkEntry * entry, gpointer user_data) +static void on_entry_activate(GtkEntry *entry, gpointer user_data) { const gchar *buf = gtk_entry_get_text(entry); if (buf == NULL) return; /* handle potential subsection anchor */ - if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ - (settings.special_anchor = strchr(buf, '!'))) /* osisref */ + if ((settings.special_anchor = strchr(buf, '#')) || /* thml */ + (settings.special_anchor = strchr(buf, '!'))) /* osisref */ *settings.special_anchor = '\0'; /* gross. we need a valid key. @@ -301,14 +299,13 @@ * fall back 10 yards and punt: arbitrarily take the 1st one. * if there aren't any, use main window bible. */ - settings.cvparallel = (gchar*)main_get_valid_key( - (settings.parallel_list - ? settings.parallel_list[0] - : settings.MainWindowModule), - (gchar*)buf); + settings.cvparallel = (gchar *) + main_get_valid_key((settings.parallel_list ? settings.parallel_list[0] + : settings.MainWindowModule), + (gchar *)buf); if (settings.special_anchor) - *settings.special_anchor = '#'; /* put it back. */ + *settings.special_anchor = '#'; /* put it back. */ if (settings.cvparallel == NULL) return; @@ -316,17 +313,17 @@ main_navbar_versekey_set(navbar_parallel, settings.cvparallel); main_update_parallel_page_detached(); if (sync_on) { - const gchar *main_window_url = g_strdup_printf("sword:///%s%s", - settings.cvparallel, - (settings.special_anchor - ? settings.special_anchor - : "")); + const gchar *main_window_url = + g_strdup_printf("sword:///%s%s", + settings.cvparallel, + (settings.special_anchor + ? settings.special_anchor + : "")); sword_uri(main_window_url, TRUE); - g_free((gchar*)main_window_url); + g_free((gchar *)main_window_url); } } - /****************************************************************************** * Name * on_button_verse_menu_verse_scroll_event @@ -345,18 +342,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_verse_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_verse_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { main_navbar_versekey_spin_verse(navbar_parallel, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_chapter_scroll_event @@ -375,18 +369,15 @@ * gboolean */ -static -gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_chapter_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { main_navbar_versekey_spin_chapter(navbar_parallel, - event->scroll.direction); + event->scroll.direction); return FALSE; } - - /****************************************************************************** * Name * on_button_verse_menu_book_scroll_event @@ -405,26 +396,24 @@ * gboolean */ -static -gboolean on_button_verse_menu_book_scroll_event(GtkWidget * widget, - GdkEvent * event, - gpointer user_data) +static gboolean on_button_verse_menu_book_scroll_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { - main_navbar_versekey_spin_book(navbar_parallel,event->scroll.direction); + main_navbar_versekey_spin_book(navbar_parallel, + event->scroll.direction); return FALSE; } -static void sync_with_main (GtkToggleButton * button, gpointer data) +static void sync_with_main(GtkToggleButton *button, gpointer data) { - gchar *buf = NULL; - gchar *url = NULL; sync_on = FALSE; - if (gtk_toggle_button_get_active (button)) { + if (gtk_toggle_button_get_active(button)) { sync_on = TRUE; - buf = (gchar*)main_url_encode(settings.currentverse); + gchar *buf = (gchar *)main_url_encode(settings.currentverse); if (buf && (strlen(buf) > 3)) { - url = - g_strdup_printf("passagestudy.jsp?action=showParallel&" + gchar *url = + g_strdup_printf("passagestudy.jsp?action=showParallel&" "type=verse&value=%s", buf); // xml_get_value("keys", "verse"))); main_url_handler(url, TRUE); @@ -451,28 +440,27 @@ * gboolean */ -static -gboolean on_up_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_up_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_book_up); - gtk_widget_show(navbar_parallel.arrow_book_up_box); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_chapter_up); - gtk_widget_show(navbar_parallel.arrow_chapter_up_box); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_verse_up); - gtk_widget_show(navbar_parallel.arrow_verse_up_box); + case BOOK_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_book_up); + gtk_widget_show(navbar_parallel.arrow_book_up_box); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_chapter_up); + gtk_widget_show(navbar_parallel.arrow_chapter_up_box); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_verse_up); + gtk_widget_show(navbar_parallel.arrow_verse_up_box); break; } return FALSE; } - /****************************************************************************** * Name * on_down_enter_notify_event @@ -491,28 +479,27 @@ * gboolean */ -static -gboolean on_down_enter_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_down_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_book_down); - gtk_widget_show(navbar_parallel.arrow_book_down_box); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_chapter_down); - gtk_widget_show(navbar_parallel.arrow_chapter_down_box); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_verse_down); - gtk_widget_show(navbar_parallel.arrow_verse_down_box); + case BOOK_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_book_down); + gtk_widget_show(navbar_parallel.arrow_book_down_box); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_chapter_down); + gtk_widget_show(navbar_parallel.arrow_chapter_down_box); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_verse_down); + gtk_widget_show(navbar_parallel.arrow_verse_down_box); break; } return FALSE; } - /****************************************************************************** * Name * on_up_leave_notify_event @@ -531,28 +518,27 @@ * gboolean */ -static -gboolean on_up_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_up_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_book_up_box); - gtk_widget_show(navbar_parallel.arrow_book_up); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_chapter_up_box); - gtk_widget_show(navbar_parallel.arrow_chapter_up); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_verse_up_box); - gtk_widget_show(navbar_parallel.arrow_verse_up); + case BOOK_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_book_up_box); + gtk_widget_show(navbar_parallel.arrow_book_up); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_chapter_up_box); + gtk_widget_show(navbar_parallel.arrow_chapter_up); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_verse_up_box); + gtk_widget_show(navbar_parallel.arrow_verse_up); break; } return FALSE; } - /****************************************************************************** * Name * on_down_leave_notify_event @@ -571,28 +557,27 @@ * gboolean */ -static -gboolean on_down_leave_notify_event(GtkWidget * widget, GdkEventCrossing * event, - gpointer user_data) +static gboolean on_down_leave_notify_event(GtkWidget *widget, + GdkEventCrossing *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_book_down_box); - gtk_widget_show(navbar_parallel.arrow_book_down); - break; - case CHAPTER_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_chapter_down_box); - gtk_widget_show(navbar_parallel.arrow_chapter_down); - break; - case VERSE_BUTTON: - gtk_widget_hide(navbar_parallel.arrow_verse_down_box); - gtk_widget_show(navbar_parallel.arrow_verse_down); + case BOOK_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_book_down_box); + gtk_widget_show(navbar_parallel.arrow_book_down); + break; + case CHAPTER_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_chapter_down_box); + gtk_widget_show(navbar_parallel.arrow_chapter_down); + break; + case VERSE_BUTTON: + gtk_widget_hide(navbar_parallel.arrow_verse_down_box); + gtk_widget_show(navbar_parallel.arrow_verse_down); break; } return FALSE; } - /****************************************************************************** * Name * on_up_eventbox_button_release_event @@ -611,26 +596,24 @@ * gboolean */ -static -gboolean on_up_eventbox_button_release_event (GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean on_up_eventbox_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - main_navbar_versekey_spin_book(navbar_parallel,0); + case BOOK_BUTTON: + main_navbar_versekey_spin_book(navbar_parallel, 0); break; - case CHAPTER_BUTTON: - main_navbar_versekey_spin_chapter(navbar_parallel,0); + case CHAPTER_BUTTON: + main_navbar_versekey_spin_chapter(navbar_parallel, 0); break; - case VERSE_BUTTON: - main_navbar_versekey_spin_verse(navbar_parallel,0); + case VERSE_BUTTON: + main_navbar_versekey_spin_verse(navbar_parallel, 0); break; } return FALSE; } - /****************************************************************************** * Name * on_down_eventbox_button_release_event @@ -649,156 +632,159 @@ * gboolean */ -static -gboolean on_down_eventbox_button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean on_down_eventbox_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { switch (GPOINTER_TO_INT(user_data)) { - case BOOK_BUTTON: - main_navbar_versekey_spin_book(navbar_parallel,1); + case BOOK_BUTTON: + main_navbar_versekey_spin_book(navbar_parallel, 1); break; - case CHAPTER_BUTTON: - main_navbar_versekey_spin_chapter(navbar_parallel,1); + case CHAPTER_BUTTON: + main_navbar_versekey_spin_chapter(navbar_parallel, 1); break; - case VERSE_BUTTON: - main_navbar_versekey_spin_verse(navbar_parallel,1); + case VERSE_BUTTON: + main_navbar_versekey_spin_verse(navbar_parallel, 1); break; } return FALSE; } - -static -void _connect_signals(NAVBAR_VERSEKEY navbar) +static void _connect_signals(NAVBAR_VERSEKEY navbar) { - g_signal_connect((gpointer) navbar.lookup_entry, - "activate", G_CALLBACK(on_entry_activate), - NULL); + g_signal_connect((gpointer)navbar.lookup_entry, + "activate", G_CALLBACK(on_entry_activate), NULL); - g_signal_connect((gpointer) navbar.button_book_up, + g_signal_connect((gpointer)navbar.button_book_up, "button_release_event", - G_CALLBACK(on_up_eventbox_button_release_event), + G_CALLBACK(on_up_eventbox_button_release_event), GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect((gpointer) navbar.button_book_down, + g_signal_connect((gpointer)navbar.button_book_down, "button_release_event", - G_CALLBACK(on_down_eventbox_button_release_event), + G_CALLBACK(on_down_eventbox_button_release_event), GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect((gpointer) navbar.button_chapter_up, + g_signal_connect((gpointer)navbar.button_chapter_up, "button_release_event", - G_CALLBACK(on_up_eventbox_button_release_event), - GINT_TO_POINTER(CHAPTER_BUTTON) ); - g_signal_connect((gpointer) navbar.button_chapter_down, + G_CALLBACK(on_up_eventbox_button_release_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_down, "button_release_event", - G_CALLBACK(on_down_eventbox_button_release_event), - GINT_TO_POINTER(CHAPTER_BUTTON) ); - g_signal_connect((gpointer) navbar.button_verse_up, + G_CALLBACK(on_down_eventbox_button_release_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_up, "button_release_event", G_CALLBACK(on_up_eventbox_button_release_event), - GINT_TO_POINTER(VERSE_BUTTON) ); - g_signal_connect((gpointer) navbar.button_verse_down, + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_down, "button_release_event", G_CALLBACK(on_down_eventbox_button_release_event), - GINT_TO_POINTER(VERSE_BUTTON) ); + GINT_TO_POINTER(VERSE_BUTTON)); /* */ - g_signal_connect ((gpointer) navbar.button_book_up, - "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect ((gpointer) navbar.button_book_up, - "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - - g_signal_connect ((gpointer)navbar.button_book_down , - "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); - g_signal_connect ((gpointer)navbar.button_book_down , - "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); + + g_signal_connect((gpointer)navbar.button_book_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); + g_signal_connect((gpointer)navbar.button_book_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(BOOK_BUTTON)); /* */ - g_signal_connect ((gpointer) navbar.button_chapter_up, "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - g_signal_connect ((gpointer)navbar.button_chapter_up , "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - - g_signal_connect ((gpointer) navbar.button_chapter_down, "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); - g_signal_connect ((gpointer)navbar.button_chapter_down , "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + + g_signal_connect((gpointer)navbar.button_chapter_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); + g_signal_connect((gpointer)navbar.button_chapter_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(CHAPTER_BUTTON)); /* */ - g_signal_connect ((gpointer) navbar.button_verse_up, "enter_notify_event", - G_CALLBACK (on_up_enter_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - g_signal_connect ((gpointer)navbar.button_verse_up , "leave_notify_event", - G_CALLBACK (on_up_leave_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - - g_signal_connect ((gpointer) navbar.button_verse_down, "enter_notify_event", - G_CALLBACK (on_down_enter_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); - g_signal_connect ((gpointer)navbar.button_verse_down , "leave_notify_event", - G_CALLBACK (on_down_leave_notify_event), - GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_up, + "enter_notify_event", + G_CALLBACK(on_up_enter_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_up, + "leave_notify_event", + G_CALLBACK(on_up_leave_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + + g_signal_connect((gpointer)navbar.button_verse_down, + "enter_notify_event", + G_CALLBACK(on_down_enter_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); + g_signal_connect((gpointer)navbar.button_verse_down, + "leave_notify_event", + G_CALLBACK(on_down_leave_notify_event), + GINT_TO_POINTER(VERSE_BUTTON)); /* - g_signal_connect((gpointer) navbar.button_book_up, - "clicked", G_CALLBACK(on_book_button_up_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_book_down, - "clicked", G_CALLBACK(on_book_button_down_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_chapter_up, - "clicked", G_CALLBACK(on_chapter_button_up_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_chapter_down, - "clicked", G_CALLBACK(on_chapter_button_down_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_verse_up, - "clicked", G_CALLBACK(on_verse_button_up_clicked), - NULL); - g_signal_connect((gpointer) navbar.button_verse_down, - "clicked", G_CALLBACK(on_verse_button_down_clicked), - NULL);*/ - + g_signal_connect((gpointer) navbar.button_book_up, + "clicked", G_CALLBACK(on_book_button_up_clicked), + NULL); + g_signal_connect((gpointer) navbar.button_book_down, + "clicked", G_CALLBACK(on_book_button_down_clicked), + NULL); + g_signal_connect((gpointer) navbar.button_chapter_up, + "clicked", G_CALLBACK(on_chapter_button_up_clicked), + NULL); + g_signal_connect((gpointer) navbar.button_chapter_down, + "clicked", G_CALLBACK(on_chapter_button_down_clicked), + NULL); + g_signal_connect((gpointer) navbar.button_verse_up, + "clicked", G_CALLBACK(on_verse_button_up_clicked), + NULL); + g_signal_connect((gpointer) navbar.button_verse_down, + "clicked", G_CALLBACK(on_verse_button_down_clicked), + NULL); */ - g_signal_connect((gpointer) navbar.button_sync, + g_signal_connect((gpointer)navbar.button_sync, "toggled", G_CALLBACK(G_CALLBACK(sync_with_main)), NULL); - g_signal_connect((gpointer) navbar.button_book_menu, + g_signal_connect((gpointer)navbar.button_book_menu, "button_press_event", G_CALLBACK(select_book_button_press_callback), NULL); - g_signal_connect((gpointer) navbar.button_chapter_menu, + g_signal_connect((gpointer)navbar.button_chapter_menu, "button_press_event", G_CALLBACK(select_chapter_button_press_callback), NULL); - g_signal_connect((gpointer) navbar.button_verse_menu, + g_signal_connect((gpointer)navbar.button_verse_menu, "button_press_event", G_CALLBACK(select_verse_button_press_callback), NULL); -#ifndef HAVE_GTK_34 - g_signal_connect ((gpointer)navbar.button_verse_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - NULL); - g_signal_connect ((gpointer)navbar.button_chapter_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - NULL); - g_signal_connect ((gpointer)navbar.button_book_menu , "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - NULL); +#ifndef HAVE_GTK_34 + g_signal_connect((gpointer)navbar.button_verse_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), NULL); + g_signal_connect((gpointer)navbar.button_chapter_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + NULL); + g_signal_connect((gpointer)navbar.button_book_menu, + "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), NULL); #endif } - /****************************************************************************** * Name * @@ -824,31 +810,37 @@ GladeXML *gxml; #endif #ifdef HAVE_GTK_34 - GtkWidget * eventbox; + GtkWidget *eventbox; #endif - - glade_file = gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); + + glade_file = + gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE); g_return_val_if_fail((glade_file != NULL), NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "navbar", NULL); #endif navbar_parallel.dialog = TRUE; - navbar_parallel.module_name = g_string_new(settings.MainWindowModule); - navbar_parallel.key = g_string_new(settings.currentverse); + navbar_parallel.module_name = + g_string_new(settings.MainWindowModule); + navbar_parallel.key = g_string_new(settings.currentverse); navbar_parallel.valid_key = TRUE; navbar_parallel.navbar = UI_GET_ITEM(gxml, "navbar"); - navbar_parallel.button_history_back = UI_GET_ITEM(gxml, "button_history_back"); - navbar_parallel.button_history_next = UI_GET_ITEM(gxml, "button_history_foward"); - navbar_parallel.button_history_menu = UI_GET_ITEM(gxml, "togglebutton_history_list"); + navbar_parallel.button_history_back = + UI_GET_ITEM(gxml, "button_history_back"); + navbar_parallel.button_history_next = + UI_GET_ITEM(gxml, "button_history_foward"); + navbar_parallel.button_history_menu = + UI_GET_ITEM(gxml, "togglebutton_history_list"); - navbar_parallel.button_sync = UI_GET_ITEM(gxml, "togglebutton_sync"); + navbar_parallel.button_sync = + UI_GET_ITEM(gxml, "togglebutton_sync"); gtk_widget_show(navbar_parallel.button_sync); gtk_widget_set_tooltip_text(navbar_parallel.button_sync, @@ -856,7 +848,7 @@ gtk_widget_hide(navbar_parallel.button_history_back); gtk_widget_hide(navbar_parallel.button_history_next); gtk_widget_hide(navbar_parallel.button_history_menu); -/* + /* navbar_parallel.button_book_up = glade_xml_get_widget(gxml, "button_book2"); navbar_parallel.button_book_down = glade_xml_get_widget(gxml, "button_book1"); navbar_parallel.button_chapter_up = glade_xml_get_widget(gxml, "button_chapter2"); @@ -867,7 +859,8 @@ navbar_parallel.button_book_up = UI_GET_ITEM(gxml, "eventbox9"); navbar_parallel.button_book_down = UI_GET_ITEM(gxml, "eventbox6"); navbar_parallel.button_chapter_up = UI_GET_ITEM(gxml, "eventbox8"); - navbar_parallel.button_chapter_down = UI_GET_ITEM(gxml, "eventbox4"); + navbar_parallel.button_chapter_down = + UI_GET_ITEM(gxml, "eventbox4"); navbar_parallel.button_verse_up = UI_GET_ITEM(gxml, "eventbox7"); navbar_parallel.button_verse_down = UI_GET_ITEM(gxml, "eventbox1"); @@ -877,38 +870,44 @@ navbar_parallel.arrow_book_down = UI_GET_ITEM(gxml, "image14"); navbar_parallel.arrow_chapter_up_box = UI_GET_ITEM(gxml, "image9"); navbar_parallel.arrow_chapter_up = UI_GET_ITEM(gxml, "image8"); - navbar_parallel.arrow_chapter_down_box = UI_GET_ITEM(gxml, "image11"); + navbar_parallel.arrow_chapter_down_box = + UI_GET_ITEM(gxml, "image11"); navbar_parallel.arrow_chapter_down = UI_GET_ITEM(gxml, "image10"); navbar_parallel.arrow_verse_up_box = UI_GET_ITEM(gxml, "image7"); navbar_parallel.arrow_verse_up = UI_GET_ITEM(gxml, "image6"); - navbar_parallel.arrow_verse_down_box = UI_GET_ITEM(gxml, "image16"); + navbar_parallel.arrow_verse_down_box = + UI_GET_ITEM(gxml, "image16"); navbar_parallel.arrow_verse_down = UI_GET_ITEM(gxml, "image5"); - navbar_parallel.button_book_menu = UI_GET_ITEM(gxml, "togglebutton_book"); - navbar_parallel.button_chapter_menu = UI_GET_ITEM(gxml, "togglebutton_chapter"); - navbar_parallel.button_verse_menu = UI_GET_ITEM(gxml, "togglebutton_verse"); + navbar_parallel.button_book_menu = + UI_GET_ITEM(gxml, "togglebutton_book"); + navbar_parallel.button_chapter_menu = + UI_GET_ITEM(gxml, "togglebutton_chapter"); + navbar_parallel.button_verse_menu = + UI_GET_ITEM(gxml, "togglebutton_verse"); navbar_parallel.lookup_entry = UI_GET_ITEM(gxml, "entry_lookup"); navbar_parallel.label_book_menu = UI_GET_ITEM(gxml, "label_book"); - navbar_parallel.label_chapter_menu = UI_GET_ITEM(gxml, "label_chapter"); - navbar_parallel.label_verse_menu = UI_GET_ITEM(gxml, "label_verse"); - + navbar_parallel.label_chapter_menu = + UI_GET_ITEM(gxml, "label_chapter"); + navbar_parallel.label_verse_menu = + UI_GET_ITEM(gxml, "label_verse"); + #ifdef HAVE_GTK_34 eventbox = UI_GET_ITEM(gxml, "eventbox_book"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_book_scroll_event), - NULL); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_book_scroll_event), NULL); + eventbox = UI_GET_ITEM(gxml, "eventbox_chapter"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_chapter_scroll_event), - NULL); - + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_chapter_scroll_event), + NULL); + eventbox = UI_GET_ITEM(gxml, "eventbox_verse"); - g_signal_connect ((gpointer) eventbox, "scroll_event", - G_CALLBACK (on_button_verse_menu_verse_scroll_event), - NULL); -#endif + g_signal_connect((gpointer)eventbox, "scroll_event", + G_CALLBACK(on_button_verse_menu_verse_scroll_event), NULL); +#endif _connect_signals(navbar_parallel); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync), settings.linkedtabs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(navbar_parallel.button_sync), + settings.linkedtabs); return navbar_parallel.navbar; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/parallel_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/parallel_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/parallel_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/parallel_dialog.c 2015-06-16 17:34:49.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.c - dialog for detached parallel * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,12 +20,12 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "xiphos_html/xiphos_html.h" @@ -62,17 +62,14 @@ static GtkWidget *parallel_UnDock_Dialog; static GtkWidget *vboxInt; static gboolean ApplyChangeBook; -static NAVBAR navbar; +//static NAVBAR navbar; NAVBAR_VERSEKEY navbar_parallel; static GtkWidget *create_parallel_dialog(void); static void sync_with_main(void); - static void -_popupmenu_requested_cb(XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { gui_popup_menu_parallel(); } @@ -102,10 +99,9 @@ parallel_UnDock_Dialog = create_parallel_dialog(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - FALSE); + FALSE); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - 0); - + 0); gtk_widget_show(parallel_UnDock_Dialog); //main_update_parallel_page_detached(); @@ -134,7 +130,7 @@ * void */ -void gui_btnDockInt_clicked(GtkButton * button, gpointer user_data) +void gui_btnDockInt_clicked(GtkButton *button, gpointer user_data) { gtk_widget_destroy(parallel_UnDock_Dialog); } @@ -158,15 +154,14 @@ * void */ -static void on_dlgparallel_destroy(GObject * object, - gpointer user_data) +static void on_dlgparallel_destroy(GObject *object, gpointer user_data) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - TRUE); + TRUE); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - 1); + 1); settings.dockedInt = TRUE; main_update_parallel_page(); @@ -174,7 +169,6 @@ xml_set_value("Xiphos", "layout", "parallelopen", "0"); } - /****************************************************************************** * Name * sync_with_main @@ -195,19 +189,18 @@ { gchar *buf = NULL; - buf = (gchar*)main_url_encode (settings.currentverse); + buf = (gchar *)main_url_encode(settings.currentverse); if (buf && (strlen(buf) > 3)) { gchar *url = - g_strdup_printf ("passagestudy.jsp?action=showParallel&" - "type=verse&value=%s", - buf); - main_url_handler (url, TRUE); - g_free (url); + g_strdup_printf("passagestudy.jsp?action=showParallel&" + "type=verse&value=%s", + buf); + main_url_handler(url, TRUE); + g_free(url); } } - /****************************************************************************** * Name * gui_keep_parallel_dialog_in_sync @@ -225,11 +218,12 @@ void gui_keep_parallel_dialog_in_sync(void) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(navbar_parallel.button_sync))) sync_with_main(); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_set_parallel_navbar @@ -245,12 +239,11 @@ * void */ -void gui_set_parallel_navbar(const char * key) +void gui_set_parallel_navbar(const char *key) { main_navbar_set(navbar, key); } - - +#endif /****************************************************************************** * Name @@ -273,7 +266,6 @@ return gui_navbar_versekey_parallel_new(); } - /****************************************************************************** * Name * on_parallel_configure_event @@ -293,18 +285,17 @@ * gboolean */ -static gboolean on_parallel_configure_event(GtkWidget * widget, - GdkEventConfigure * event, +static gboolean on_parallel_configure_event(GtkWidget *widget, + GdkEventConfigure *event, gpointer user_data) { gchar layout[10]; gint x; gint y; - gdk_window_get_root_origin( - GDK_WINDOW(gtk_widget_get_window (dialog_parallel)), &x, &y); + gdk_window_get_root_origin(GDK_WINDOW(gtk_widget_get_window(dialog_parallel)), &x, &y); - settings.parallel_width = event->width; + settings.parallel_width = event->width; settings.parallel_height = event->height; settings.parallel_x = x; settings.parallel_y = y; @@ -341,10 +332,9 @@ * Return value * GtkWidget * */ -static -GtkWidget *create_parallel_dialog(void) +static GtkWidget *create_parallel_dialog(void) { - GtkWidget *box_parallel_labels; + GtkWidget *box_parallel_labels; GtkWidget *dialog_vbox25; GtkWidget *toolbar29; GtkWidget *dialog_action_area25; @@ -353,7 +343,7 @@ GtkWidget *scrolled_window; gchar title[256]; - sprintf(title,"%s - %s", settings.program_title, _("Parallel")); + sprintf(title, "%s - %s", settings.program_title, _("Parallel")); dialog_parallel = gtk_dialog_new(); gtk_window_set_title(GTK_WINDOW(dialog_parallel), title); @@ -365,24 +355,25 @@ settings.parallel_height); gtk_window_set_resizable(GTK_WINDOW(dialog_parallel), TRUE); - dialog_vbox25 = gtk_dialog_get_content_area (GTK_DIALOG(dialog_parallel)); - g_object_set_data(G_OBJECT(dialog_parallel), - "dialog_vbox25", dialog_vbox25); + dialog_vbox25 = + gtk_dialog_get_content_area(GTK_DIALOG(dialog_parallel)); + g_object_set_data(G_OBJECT(dialog_parallel), "dialog_vbox25", + dialog_vbox25); gtk_widget_show(dialog_vbox25); UI_VBOX(vboxInt, FALSE, 0); gtk_widget_show(vboxInt); - gtk_box_pack_start(GTK_BOX(dialog_vbox25), vboxInt, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(dialog_vbox25), vboxInt, TRUE, TRUE, 0); toolbar29 = create_nav_toolbar(); gtk_widget_show(toolbar29); - gtk_box_pack_start(GTK_BOX(vboxInt), toolbar29, FALSE, FALSE, - 0); + gtk_box_pack_start(GTK_BOX(vboxInt), toolbar29, FALSE, FALSE, 0); UI_HBOX(box_parallel_labels, TRUE, 2); - gtk_widget_show (box_parallel_labels); - gtk_box_pack_start (GTK_BOX (vboxInt), box_parallel_labels, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (box_parallel_labels), 2); + gtk_widget_show(box_parallel_labels); + gtk_box_pack_start(GTK_BOX(vboxInt), box_parallel_labels, FALSE, + TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(box_parallel_labels), + 2); #if 0 if (settings.parallel_list) { @@ -393,28 +384,34 @@ for (modidx = 0; settings.parallel_list[modidx]; ++modidx) { plabel = gtk_label_new(NULL); gtk_widget_show(plabel); - gtk_box_pack_start(GTK_BOX (box_parallel_labels), plabel, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box_parallel_labels), + plabel, FALSE, FALSE, 0); gtk_label_set_use_markup(GTK_LABEL(plabel), TRUE); - label = g_strdup_printf("%s", - settings.bible_verse_num_color, - settings.parallel_list[modidx]); + label = + g_strdup_printf + ("%s", + settings.bible_verse_num_color, + settings.parallel_list[modidx]); gtk_label_set_markup(GTK_LABEL(plabel), label); g_free(label); } } #endif /* 0 */ - + scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); - gtk_box_pack_start(GTK_BOX(vboxInt), scrolled_window, TRUE, TRUE,0); + gtk_box_pack_start(GTK_BOX(vboxInt), scrolled_window, TRUE, TRUE, + 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolled_window, - settings.shadow_type); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolled_window, + settings.shadow_type); - widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); + widgets.html_parallel_dialog = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel_dialog); gtk_container_add(GTK_CONTAINER(scrolled_window), @@ -422,48 +419,53 @@ g_signal_connect((gpointer)widgets.html_parallel_dialog, "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + G_CALLBACK(_popupmenu_requested_cb), NULL); dialog_action_area25 = - gtk_dialog_get_action_area (GTK_DIALOG(dialog_parallel)); +#ifdef HAVE_GTK_312 + gtk_dialog_get_content_area(GTK_DIALOG(dialog_parallel)); +#else + gtk_dialog_get_action_area(GTK_DIALOG(dialog_parallel)); +#endif g_object_set_data(G_OBJECT(dialog_parallel), - "dialog_action_area25", - dialog_action_area25); + "dialog_action_area25", dialog_action_area25); gtk_widget_show(dialog_action_area25); - gtk_container_set_border_width(GTK_CONTAINER - (dialog_action_area25), 10); + gtk_container_set_border_width(GTK_CONTAINER(dialog_action_area25), 10); #ifdef USE_GTK_3 - hbuttonbox4 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + hbuttonbox4 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else hbuttonbox4 = gtk_hbutton_box_new(); #endif gtk_widget_show(hbuttonbox4); + +#ifdef HAVE_GTK_312 + gtk_box_pack_start(GTK_BOX(dialog_action_area25), hbuttonbox4, + FALSE, TRUE, 3); +#else gtk_box_pack_start(GTK_BOX(dialog_action_area25), hbuttonbox4, TRUE, TRUE, 0); +#endif + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox4), GTK_BUTTONBOX_END); - btnDockInt = + btnDockInt = #ifdef HAVE_GTK_310 - gtk_button_new_from_icon_name ("window-close", - GTK_ICON_SIZE_BUTTON); -#else - gtk_button_new_from_stock (GTK_STOCK_CLOSE); -#endif + gtk_button_new_from_icon_name("window-close", + GTK_ICON_SIZE_BUTTON); +#else + gtk_button_new_from_stock(GTK_STOCK_CLOSE); +#endif gtk_widget_show(btnDockInt); gtk_container_add(GTK_CONTAINER(hbuttonbox4), btnDockInt); - gtk_widget_set_can_default (btnDockInt, 1); - + gtk_widget_set_can_default(btnDockInt, 1); g_signal_connect(G_OBJECT(dialog_parallel), "destroy", - G_CALLBACK(on_dlgparallel_destroy), - NULL); + G_CALLBACK(on_dlgparallel_destroy), NULL); g_signal_connect(G_OBJECT(btnDockInt), "clicked", - G_CALLBACK(gui_btnDockInt_clicked), - NULL); + G_CALLBACK(gui_btnDockInt_clicked), NULL); - g_signal_connect((gpointer) dialog_parallel, + g_signal_connect((gpointer)dialog_parallel, "configure_event", G_CALLBACK(on_parallel_configure_event), NULL); @@ -484,7 +486,8 @@ if ((settings.parallel_y < 0) || (settings.parallel_y > 2000)) settings.parallel_y = 40; - gtk_window_move(GTK_WINDOW(dialog_parallel),settings.parallel_x,settings.parallel_y); + gtk_window_move(GTK_WINDOW(dialog_parallel), settings.parallel_x, + settings.parallel_y); return dialog_parallel; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/parallel_tab.c xiphos-4.0.4+dfsg1/src/gnome2/parallel_tab.c --- xiphos-4.0.0+dfsg1/src/gnome2/parallel_tab.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/parallel_tab.c 2015-02-21 02:22:54.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * parallel_dialog.c - dialog for detached parallel + * parallel_dialog.c - dialog for parallel in a tab * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,12 +20,12 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "xiphos_html/xiphos_html.h" @@ -61,18 +61,16 @@ static GtkWidget *parallel_vbox; NAVBAR_VERSEKEY navbar_parallel; -static void sync_with_main(const gchar * key); - +static void sync_with_main(const gchar *key); static void -_popupmenu_requested_cb(XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { gui_popup_menu_parallel(); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * on_btnDockInt_clicked @@ -92,11 +90,11 @@ * void */ -void gui_parallel_close_tab(GtkButton * button, gpointer user_data) +void gui_parallel_close_tab(GtkButton *button, gpointer user_data) { //gtk_widget_destroy(parallel_UnDock_Dialog); } - +#endif /****************************************************************************** * Name @@ -117,20 +115,18 @@ * void */ -static void on_parallel_tab_destroy(GObject * object, - gpointer user_data) +static void on_parallel_tab_destroy(GObject *object, gpointer user_data) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - TRUE); + TRUE); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - 1); + 1); settings.dockedInt = TRUE; main_update_parallel_page(); } - /****************************************************************************** * Name * sync_with_main @@ -147,28 +143,26 @@ * void */ -static void sync_with_main(const gchar * key) +static void sync_with_main(const gchar *key) { gchar *buf = NULL; - gchar *url = NULL; if (key) - buf = (gchar*)main_url_encode(key); + buf = (gchar *)main_url_encode(key); else - buf = (gchar*)main_url_encode(xml_get_value("keys", "verse")); - XI_message(("%s",buf)); + buf = (gchar *) + main_url_encode(xml_get_value("keys", "verse")); + XI_message(("%s", buf)); if (buf && (strlen(buf) > 3)) { - url = + gchar *url = g_strdup_printf("passagestudy.jsp?action=showParallel&" - "type=verse&value=%s", - buf); + "type=verse&value=%s", buf); main_url_handler(url, TRUE); g_free(url); } } - /****************************************************************************** * Name * gui_keep_parallel_dialog_in_sync @@ -186,23 +180,23 @@ void gui_keep_parallel_tab_in_sync(void) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(navbar_parallel.button_sync))) sync_with_main(NULL); } -void gui_parallel_tab_sync(const gchar * key) +void gui_parallel_tab_sync(const gchar *key) { sync_with_main(key); } void gui_force_parallel_tab_sync(void) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync), settings.linkedtabs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(navbar_parallel.button_sync), + settings.linkedtabs); sync_on = settings.linkedtabs; /* tell somebody that this button has been hacked */ } - /****************************************************************************** * Name * create_nav_toolbar @@ -224,7 +218,6 @@ return gui_navbar_versekey_parallel_new(); } - /****************************************************************************** * Name * create_parallel_tab @@ -245,31 +238,33 @@ GtkWidget *_create_parallel_tab(void) { GtkWidget *toolbar29; - GtkWidget *box_parallel_labels; + GtkWidget *box_parallel_labels; GtkWidget *scrolled_window; - gtk_notebook_set_show_tabs (GTK_NOTEBOOK(widgets.notebook_bible_parallel), - FALSE); - gtk_notebook_set_current_page (GTK_NOTEBOOK(widgets.notebook_bible_parallel), - 0); - gtk_notebook_set_show_border (GTK_NOTEBOOK(widgets.notebook_bible_parallel), - TRUE); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + FALSE); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + 0); + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + TRUE); UI_VBOX(parallel_vbox, FALSE, 0); g_signal_connect(G_OBJECT(parallel_vbox), "destroy", - G_CALLBACK(on_parallel_tab_destroy), - NULL); + G_CALLBACK(on_parallel_tab_destroy), NULL); gtk_widget_show(parallel_vbox); - gtk_box_pack_start(GTK_BOX(widgets.page), parallel_vbox, TRUE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(widgets.page), parallel_vbox, TRUE, + TRUE, 0); toolbar29 = create_nav_toolbar(); gtk_widget_show(toolbar29); - gtk_box_pack_start(GTK_BOX(parallel_vbox), toolbar29, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(parallel_vbox), toolbar29, FALSE, FALSE, + 0); UI_HBOX(box_parallel_labels, TRUE, 2); - gtk_widget_show (box_parallel_labels); - gtk_box_pack_start (GTK_BOX (parallel_vbox), box_parallel_labels, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (box_parallel_labels), 2); + gtk_widget_show(box_parallel_labels); + gtk_box_pack_start(GTK_BOX(parallel_vbox), box_parallel_labels, + FALSE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(box_parallel_labels), + 2); #if 0 if (settings.parallel_list) { @@ -280,12 +275,15 @@ for (modidx = 0; settings.parallel_list[modidx]; ++modidx) { plabel = gtk_label_new(NULL); gtk_widget_show(plabel); - gtk_box_pack_start(GTK_BOX (box_parallel_labels), plabel, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box_parallel_labels), + plabel, FALSE, FALSE, 0); gtk_label_set_use_markup(GTK_LABEL(plabel), TRUE); - label = g_strdup_printf("%s", - settings.bible_verse_num_color, - settings.parallel_list[modidx]); + label = + g_strdup_printf + ("%s", + settings.bible_verse_num_color, + settings.parallel_list[modidx]); gtk_label_set_markup(GTK_LABEL(plabel), label); g_free(label); } @@ -294,36 +292,35 @@ scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); - gtk_box_pack_start(GTK_BOX(parallel_vbox), scrolled_window, TRUE, TRUE,0); + gtk_box_pack_start(GTK_BOX(parallel_vbox), scrolled_window, TRUE, + TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolled_window, - settings.shadow_type); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolled_window, + settings.shadow_type); - widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); + widgets.html_parallel_dialog = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel_dialog); - + gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel_dialog); - + g_signal_connect((gpointer)widgets.html_parallel_dialog, "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + G_CALLBACK(_popupmenu_requested_cb), NULL); gtk_widget_hide(widgets.hpaned); return parallel_vbox; - } - GtkWidget *gui_create_parallel_tab(void) { settings.dockedInt = FALSE; return _create_parallel_tab(); } - void gui_destroy_parallel_tab(void) { settings.dockedInt = TRUE; diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/parallel_view.c xiphos-4.0.4+dfsg1/src/gnome2/parallel_view.c --- xiphos-4.0.0+dfsg1/src/gnome2/parallel_view.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/parallel_view.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gs_parallel.c - support for displaying multiple modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -63,7 +63,7 @@ * void */ -void on_undockInt_activate(GtkMenuItem * menuitem) +void on_undockInt_activate(GtkMenuItem *menuitem) { if (settings.dockedInt) { settings.dockedInt = FALSE; @@ -75,8 +75,6 @@ } } - - /****************************************************************************** * Name * on_paratab_activate @@ -93,13 +91,11 @@ * void */ -void on_paratab_activate(GtkMenuItem * menuitem) +void on_paratab_activate(GtkMenuItem *menuitem) { gui_open_parallel_view_in_new_tab(); } - - void gui_popup_menu_parallel(void) { GtkWidget *menu; @@ -112,13 +108,13 @@ g_object_set_data(G_OBJECT(menu), "pmInt", menu); if (!settings.showparatab) { - undockInt = gtk_menu_item_new_with_label(_("Detach/Attach")); + undockInt = + gtk_menu_item_new_with_label(_("Detach/Attach")); gtk_widget_show(undockInt); gtk_container_add(GTK_CONTAINER(menu), undockInt); } - module_options = - gtk_menu_item_new_with_label(_("Module Options")); + module_options = gtk_menu_item_new_with_label(_("Module Options")); gtk_widget_show(module_options); gtk_container_add(GTK_CONTAINER(menu), module_options); @@ -143,25 +139,20 @@ } } - gtk_menu_popup((GtkMenu*)menu, NULL, NULL, NULL, NULL, 0, + gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); } - static gboolean -on_enter_notify_event(GtkWidget *widget, - GdkEventCrossing *event, - gpointer user_data) +on_enter_notify_event(GtkWidget *widget, + GdkEventCrossing *event, gpointer user_data) { - gtk_widget_grab_focus (widgets.html_parallel); - return FALSE; + gtk_widget_grab_focus(widgets.html_parallel); + return FALSE; } - static void -_popupmenu_requested_cb(XiphosHtml *html, - gchar *uri, - gpointer user_data) +_popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) { gui_popup_menu_parallel(); } @@ -200,28 +191,26 @@ gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel), scrolled_window); - widgets.html_parallel = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); + widgets.html_parallel = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel); - + widgets.frame_parallel = scrolled_window; gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel); g_signal_connect((gpointer)widgets.html_parallel, "popupmenu_requested", - G_CALLBACK (_popupmenu_requested_cb), - NULL); + G_CALLBACK(_popupmenu_requested_cb), NULL); label = gtk_label_new(_("Parallel View")); gtk_widget_show(label); gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - gtk_notebook_get_nth_page - (GTK_NOTEBOOK - (widgets.notebook_bible_parallel), - 1), + gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + 1), label); - g_signal_connect ((gpointer) widgets.html_parallel, "enter_notify_event", - G_CALLBACK (on_enter_notify_event), - NULL); + g_signal_connect((gpointer)widgets.html_parallel, + "enter_notify_event", + G_CALLBACK(on_enter_notify_event), NULL); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/preferences_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/preferences_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/preferences_dialog.c 2014-12-22 02:44:44.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/preferences_dialog.c 2015-02-20 16:38:13.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * preferences_dialog.c - get user preferences * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,9 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif - #include #include #include @@ -32,7 +31,7 @@ #include #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "gui/bibletext.h" @@ -65,7 +64,8 @@ #include "gui/debug_glib_null.h" typedef struct _preferences_combo COMBOBOXS; -struct _preferences_combo { +struct _preferences_combo +{ GtkWidget *default_dictionary_module; GtkWidget *percomm_module; GtkWidget *devotion_module; @@ -79,7 +79,8 @@ }; typedef struct _preferences_color_pickers COLOR_PICKERS; -struct _preferences_color_pickers { +struct _preferences_color_pickers +{ GtkWidget *text; GtkWidget *text_background; GtkWidget *text_current_verse; @@ -92,8 +93,9 @@ }; typedef struct _preferences_check_buttons CHECK_BUTTONS; -struct _preferences_check_buttons { - GtkWidget *use_defaults; /* radio button */ +struct _preferences_check_buttons +{ + GtkWidget *use_defaults; /* radio button */ GtkWidget *use_default_dictionary; GtkWidget *use_linked_tabs; @@ -109,6 +111,7 @@ GtkWidget *xrefs_in_verse_list; GtkWidget *show_splash_screen; GtkWidget *prayerlist; + GtkWidget *statusbar; GtkWidget *show_in_viewer; GtkWidget *show_in_dictionary; @@ -122,7 +125,8 @@ }; typedef struct _preferences_radio_buttons RADIO_BUTTONS; -struct _preferences_radio_buttons { +struct _preferences_radio_buttons +{ /* BibleSync mode selection */ GtkWidget *bs_mode_off; GtkWidget *bs_mode_personal; @@ -140,15 +144,17 @@ }; /* fixed callback values, for radio button assignment. */ -static int rb_cb[] = { 0, 1, 2, 3 }; // userdata callback values. +static int rb_cb[] = {0, 1, 2, 3}; // userdata callback values. typedef struct _preferences_buttons BUTTONS; -struct _preferences_buttons { +struct _preferences_buttons +{ GtkWidget *xiphos_defaults; }; typedef struct _parallel_select PARALLEL_SELECT; -struct _parallel_select { +struct _parallel_select +{ GtkWidget *button_clear; GtkWidget *button_cut; GtkWidget *button_add; @@ -160,8 +166,8 @@ }; static GtkWidget *dialog_prefs = NULL; -GtkWidget *speaker_window = NULL; // BibleSync -GtkWidget *speaker_list = NULL; // BibleSync +GtkWidget *speaker_window = NULL; // BibleSync +GtkWidget *speaker_list = NULL; // BibleSync /***************************************************************************** * externs @@ -178,7 +184,6 @@ static RADIO_BUTTONS radio_button; static PARALLEL_SELECT parallel_select; - /****************************************************************************** * Name * on_prefs_configure_event @@ -197,18 +202,18 @@ * gboolean */ -static gboolean on_prefs_configure_event(GtkWidget * widget, - GdkEventConfigure * event, +static gboolean on_prefs_configure_event(GtkWidget *widget, + GdkEventConfigure *event, gpointer user_data) { gchar layout[10]; gint x; gint y; - gdk_window_get_root_origin( - GDK_WINDOW(gtk_widget_get_window (dialog_prefs)), &x, &y); + gdk_window_get_root_origin(GDK_WINDOW(gtk_widget_get_window(dialog_prefs)), + &x, &y); - settings.prefs_width = event->width; + settings.prefs_width = event->width; settings.prefs_height = event->height; settings.prefs_x = x; settings.prefs_y = y; @@ -244,8 +249,7 @@ * gint */ #ifndef HAVE_GTK_34 -static gint -string_is_color(gchar * color) +static gint string_is_color(gchar *color) { gint i; @@ -262,34 +266,26 @@ return 0; } for (i = 1; i < 7; i++) { - if ((color[i] > 102) - || (color[i] < 48) - || ((color[i] > 57) && (color[i] < 65)) - || ((color[i] > 70) && (color[i] < 97))) { - XI_warning - (("string_is_color, %d in %s is not from a color, it is %d\n", - i, color, color[i])); + if ((color[i] > 102) || (color[i] < 48) || ((color[i] > 57) && (color[i] < 65)) || ((color[i] > 70) && (color[i] < 97))) { + XI_warning(("string_is_color, %d in %s is not from a color, it is %d\n", i, color, color[i])); return 0; } } XI_print(("string_is_color, %s is color\n", color)); return 1; - } #endif - #ifdef HAVE_GTK_34 -static gchar * -gdkrgba_to_hex(GdkRGBA * color) +static gchar *gdkrgba_to_hex(GdkRGBA *color) { gchar *tmpstr; - tmpstr = g_malloc(8*sizeof(char)); - g_snprintf (tmpstr, 8,"#%.2X%.2X%.2X", - (unsigned int)(color->red*255), - (unsigned int)(color->green*255), - (unsigned int)(color->blue*255)); + tmpstr = g_malloc(8 * sizeof(char)); + g_snprintf(tmpstr, 8, "#%.2X%.2X%.2X", + (unsigned int)(color->red * 255), + (unsigned int)(color->green * 255), + (unsigned int)(color->blue * 255)); return tmpstr; } @@ -309,46 +305,44 @@ * gchar * */ -static gchar * -gdkcolor_to_hex(GdkColor color, - gint websafe) +static gchar *gdkcolor_to_hex(GdkColor color, gint websafe) { gchar *tmpstr; - tmpstr = g_malloc(8*sizeof(char)); + tmpstr = g_malloc(8 * sizeof(char)); if (websafe) { - g_snprintf (tmpstr, 8,"#%.2X%.2X%.2X", - (0x33 * color.red/(256*0x33)), - (0x33 * color.green/(256*0x33)), - (0x33 * color.blue/(256*0x33)) ); + g_snprintf(tmpstr, 8, "#%.2X%.2X%.2X", + (0x33 * color.red / (256 * 0x33)), + (0x33 * color.green / (256 * 0x33)), + (0x33 * color.blue / (256 * 0x33))); } else { - g_snprintf (tmpstr, 8,"#%.2X%.2X%.2X", - color.red/256, - color.green/256, - color.blue/256); + g_snprintf(tmpstr, 8, "#%.2X%.2X%.2X", + color.red / 256, + color.green / 256, color.blue / 256); } return tmpstr; } #endif -void -apply_color_settings(void) +void apply_color_settings(void) { if (settings.havebible) { - main_display_bible(settings.MainWindowModule, settings.currentverse); + main_display_bible(settings.MainWindowModule, + settings.currentverse); main_update_parallel_page(); } if (settings.havecomm) - main_display_commentary(settings.CommWindowModule, settings.currentverse); + main_display_commentary(settings.CommWindowModule, + settings.currentverse); if (settings.havebook) main_display_book(settings.book_mod, settings.book_key); if (settings.havedict) - main_display_dictionary(settings.DictWindowModule, settings.dictkey); + main_display_dictionary(settings.DictWindowModule, + settings.dictkey); main_init_previewer(); } - /****************************************************************************** * Name * invert_colors @@ -394,7 +388,7 @@ * void */ -void on_invert(GtkWidget * button, gchar * user_data) +void on_invert(GtkWidget *button, gchar *user_data) { if (user_data) invert_colors(&settings.bible_bg_color, "background", @@ -420,21 +414,22 @@ */ void -on_colorbutton1_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton1_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf = gdkrgba_to_hex (&color);//gdk_rgba_to_string (&color); + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf = gdkrgba_to_hex(&color); //gdk_rgba_to_string (&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf = gdkcolor_to_hex(color,1); + buf = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "background", buf); - settings.bible_bg_color = xml_get_value("HTMLcolors", "background"); + settings.bible_bg_color = + xml_get_value("HTMLcolors", "background"); if (buf) g_free(buf); apply_color_settings(); @@ -456,20 +451,20 @@ */ void -on_colorbutton2_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton2_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "text_fg", buf2); settings.bible_text_color = xml_get_value("HTMLcolors", "text_fg"); @@ -494,24 +489,24 @@ */ void -on_colorbutton3_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton3_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "currentverse", buf2); settings.currentverse_color = - xml_get_value("HTMLcolors", "currentverse"); + xml_get_value("HTMLcolors", "currentverse"); if (buf2) g_free(buf2); apply_color_settings(); @@ -533,24 +528,24 @@ */ void -on_colorbutton4_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton4_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "versenum", buf2); settings.bible_verse_num_color = - xml_get_value("HTMLcolors", "versenum"); + xml_get_value("HTMLcolors", "versenum"); if (buf2) g_free(buf2); apply_color_settings(); @@ -572,20 +567,20 @@ */ void -on_colorbutton5_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton5_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "link", buf2); settings.link_color = xml_get_value("HTMLcolors", "link"); @@ -610,23 +605,24 @@ */ void -on_colorbutton6_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton6_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "highlight_fg", buf2); - settings.highlight_fg = xml_get_value("HTMLcolors", "highlight_fg"); + settings.highlight_fg = + xml_get_value("HTMLcolors", "highlight_fg"); if (buf2) g_free(buf2); apply_color_settings(); @@ -648,23 +644,24 @@ */ void -on_colorbutton7_color_set(GtkColorButton * colorbutton, - gpointer user_data) +on_colorbutton7_color_set(GtkColorButton *colorbutton, gpointer user_data) { gchar *buf2 = NULL; -#ifdef HAVE_GTK_34 +#ifdef HAVE_GTK_34 GdkRGBA color; - - gtk_color_chooser_get_rgba ((GtkColorChooser *) colorbutton, &color); - buf2 = gdkrgba_to_hex (&color); + + gtk_color_chooser_get_rgba((GtkColorChooser *)colorbutton, + &color); + buf2 = gdkrgba_to_hex(&color); #else - GdkColor color; + GdkColor color; gtk_color_button_get_color(colorbutton, &color); - buf2 = gdkcolor_to_hex(color,1); + buf2 = gdkcolor_to_hex(color, 1); #endif xml_set_value("Xiphos", "HTMLcolors", "highlight_bg", buf2); - settings.highlight_bg = xml_get_value("HTMLcolors", "highlight_bg"); + settings.highlight_bg = + xml_get_value("HTMLcolors", "highlight_bg"); if (buf2) g_free(buf2); apply_color_settings(); @@ -685,11 +682,10 @@ */ void -on_checkbutton1_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton1_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - gui_tabs_on_off (gtk_toggle_button_get_active (togglebutton)); -/* if (togglebutton->active) { + gui_tabs_on_off(gtk_toggle_button_get_active(togglebutton)); + /* if (togglebutton->active) { xml_set_value("Xiphos", "tabs", "browsing", "1"); settings.browsing = TRUE; gui_open_tabs(); @@ -719,17 +715,16 @@ */ void -on_checkbutton2_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton2_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) xml_set_value("Xiphos", "misc", "showtexts", "1"); else xml_set_value("Xiphos", "misc", "showtexts", "0"); settings.showtexts = atoi(xml_get_value("misc", "showtexts")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), - settings.showtexts); - gui_show_hide_texts(gtk_toggle_button_get_active (togglebutton)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), + settings.showtexts); + gui_show_hide_texts(gtk_toggle_button_get_active(togglebutton)); } /****************************************************************************** @@ -747,17 +742,16 @@ */ void -on_checkbutton3_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton3_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) xml_set_value("Xiphos", "misc", "showcomms", "1"); else xml_set_value("Xiphos", "misc", "showcomms", "0"); settings.showcomms = atoi(xml_get_value("misc", "showcomms")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), - settings.showcomms); - gui_show_hide_comms(gtk_toggle_button_get_active (togglebutton)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), + settings.showcomms); + gui_show_hide_comms(gtk_toggle_button_get_active(togglebutton)); } /****************************************************************************** @@ -775,17 +769,16 @@ */ void -on_checkbutton9_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton9_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) xml_set_value("Xiphos", "misc", "showpreview", "1"); else xml_set_value("Xiphos", "misc", "showpreview", "0"); settings.showpreview = atoi(xml_get_value("misc", "showpreview")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewpreview_item), - settings.showpreview); - gui_show_hide_preview(gtk_toggle_button_get_active (togglebutton)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewpreview_item), + settings.showpreview); + gui_show_hide_preview(gtk_toggle_button_get_active(togglebutton)); } /****************************************************************************** @@ -803,17 +796,16 @@ */ void -on_checkbutton4_toggled(GtkToggleButton *togglebutton, - gpointer user_data) +on_checkbutton4_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) xml_set_value("Xiphos", "misc", "showdicts", "1"); else xml_set_value("Xiphos", "misc", "showdicts", "0"); settings.showdicts = atoi(xml_get_value("misc", "showdicts")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), - settings.showdicts); - gui_show_hide_dicts(gtk_toggle_button_get_active (togglebutton)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), + settings.showdicts); + gui_show_hide_dicts(gtk_toggle_button_get_active(togglebutton)); } /****************************************************************************** @@ -831,18 +823,16 @@ */ void -on_checkbutton10_toggled(GtkToggleButton * togglebutton, +on_checkbutton10_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "pinnedtabs", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); settings.linkedtabs = atoi(xml_get_value("misc", "pinnedtabs")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.linkedtabs_item), - settings.linkedtabs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.linkedtabs_item), + settings.linkedtabs); } - /****************************************************************************** * Name * on_biblesync_obtain_passphrase @@ -881,7 +871,6 @@ return retval; } - /****************************************************************************** * Name * on_checkbutton_biblesync_toggled @@ -899,7 +888,7 @@ */ static void -on_checkbutton_biblesync_toggled(GtkToggleButton * togglebutton, +on_checkbutton_biblesync_toggled(GtkToggleButton *togglebutton, gpointer user_data) { *((int *)user_data) = gtk_toggle_button_get_active(togglebutton); @@ -907,7 +896,6 @@ biblesync_privacy(settings.bs_privacy); } - /****************************************************************************** * Name * on_radiobutton_biblesync_mode @@ -925,62 +913,53 @@ */ static void -on_radiobutton_biblesync_mode(GtkToggleButton * togglebutton, +on_radiobutton_biblesync_mode(GtkToggleButton *togglebutton, gpointer user_data) { - int new_mode; - - if (gtk_toggle_button_get_active(togglebutton)) - { - settings.bs_mode = *((int*)user_data); + if (gtk_toggle_button_get_active(togglebutton)) { + settings.bs_mode = *((int *)user_data); - if (settings.bs_mode != 0) - { + if (settings.bs_mode != 0) { g_free(settings.bs_passphrase); settings.bs_passphrase = on_biblesync_obtain_passphrase(); } - new_mode = biblesync_mode_select(settings.bs_mode, - settings.bs_passphrase); + int new_mode = biblesync_mode_select(settings.bs_mode, + settings.bs_passphrase); /* selecting active mode enables polled receiver. */ - if (new_mode != settings.bs_mode) - { + if (new_mode != settings.bs_mode) { /* mode selection failed? probably dead interface */ gui_generic_warning(_("Mode selection failed.\n" "Set \"Debug\" and try " "again to see why.")); settings.bs_mode = new_mode; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_off), - (settings.bs_mode == 0)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_personal), - (settings.bs_mode == 1)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_speaker), - (settings.bs_mode == 2)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_audience), - (settings.bs_mode == 3)); - + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_off), + (settings.bs_mode == + 0)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_personal), + (settings.bs_mode == + 1)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_speaker), + (settings.bs_mode == + 2)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_audience), + (settings.bs_mode == + 3)); } - if (biblesync_personal()) - { - gtk_widget_set_sensitive(check_button.bs_privacy, TRUE); - on_checkbutton_biblesync_toggled( - GTK_TOGGLE_BUTTON(check_button.bs_privacy), - &settings.bs_privacy); - } - else - { - gtk_widget_set_sensitive(check_button.bs_privacy, FALSE); + if (biblesync_personal()) { + gtk_widget_set_sensitive(check_button.bs_privacy, + TRUE); + on_checkbutton_biblesync_toggled(GTK_TOGGLE_BUTTON(check_button.bs_privacy), + &settings.bs_privacy); + } else { + gtk_widget_set_sensitive(check_button.bs_privacy, + FALSE); } } } - /****************************************************************************** * Name * on_biblesync_kbd @@ -997,8 +976,7 @@ * void */ -void -on_biblesync_kbd(int mode) +void on_biblesync_kbd(int mode) { int new_mode; @@ -1006,29 +984,24 @@ new_mode = biblesync_mode_select(settings.bs_mode, settings.bs_passphrase); - if (new_mode != settings.bs_mode) - { + if (new_mode != settings.bs_mode) { gui_generic_warning(_("Mode selection failed.\n")); settings.bs_mode = new_mode; - } - else - { - gchar *msg = g_strdup_printf - (_("BibleSync: %s (passphrase \"%s\")."), - ((mode == 0) - ? _("Disabled") - : ((mode == 1) - ? _("Personal") - : ((mode == 2) - ? _("Speaker") - : _("Audience")))), - settings.bs_passphrase); - gui_set_statusbar(msg); - g_free(msg); + } else { + gchar *msg = g_strdup_printf(_("BibleSync: %s (passphrase \"%s\")."), + ((mode == 0) + ? _("Disabled") + : ((mode == 1) + ? _("Personal") + : ((mode == 2) + ? _("Speaker") + : _("Audience")))), + settings.bs_passphrase); + gui_set_statusbar(msg); + g_free(msg); } } - /****************************************************************************** * Name * on_radiobutton_biblesync_nav @@ -1047,14 +1020,13 @@ */ static void -on_radiobutton_biblesync_nav(GtkToggleButton * togglebutton, +on_radiobutton_biblesync_nav(GtkToggleButton *togglebutton, gpointer user_data) { if (gtk_toggle_button_get_active(togglebutton)) - settings.bs_navdirect = *((int*)user_data); + settings.bs_navdirect = *((int *)user_data); } - /****************************************************************************** * Name * on_radiobutton_biblesync_listen @@ -1074,24 +1046,21 @@ */ static void -on_radiobutton_biblesync_listen(GtkToggleButton * togglebutton, +on_radiobutton_biblesync_listen(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active(togglebutton)) - { - settings.bs_listen_set = *((int*)user_data); + if (gtk_toggle_button_get_active(togglebutton)) { + settings.bs_listen_set = *((int *)user_data); - if (settings.bs_listen_set != 0) // not selective + if (settings.bs_listen_set != 0) // not selective { - biblesync_set_clear_all_listen - ((settings.bs_listen_set == 1) - ? TRUE - : FALSE); + biblesync_set_clear_all_listen((settings.bs_listen_set == 1) + ? TRUE + : FALSE); } } } - /****************************************************************************** * Name * on_checkbutton11_toggled @@ -1107,18 +1076,16 @@ */ void -on_checkbutton11_toggled(GtkToggleButton * togglebutton, +on_checkbutton11_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "readaloud", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); settings.readaloud = atoi(xml_get_value("misc", "readaloud")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.readaloud_item), - settings.readaloud); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.readaloud_item), + settings.readaloud); } - /****************************************************************************** * Name * on_checkbutton12_toggled @@ -1134,19 +1101,18 @@ */ void -on_checkbutton12_toggled(GtkToggleButton * togglebutton, +on_checkbutton12_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "showversenum", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.showversenum = atoi(xml_get_value("misc", "showversenum")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.showversenum = + atoi(xml_get_value("misc", "showversenum")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.showversenum_item), - settings.showversenum); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.showversenum_item), + settings.showversenum); } - /****************************************************************************** * Name * on_checkbutton6_toggled @@ -1162,15 +1128,14 @@ */ void -on_checkbutton6_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton6_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "lexicons", "usedefaultdict", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.useDefaultDict = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.useDefaultDict = + gtk_toggle_button_get_active(togglebutton); } - /****************************************************************************** * Name * on_checkbutton7_toggled @@ -1186,15 +1151,14 @@ */ void -on_checkbutton7_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton7_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "dailydevotional", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.showdevotional = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.showdevotional = + gtk_toggle_button_get_active(togglebutton); } - /****************************************************************************** * Name * on_checkbutton8_toggled @@ -1210,15 +1174,13 @@ */ void -on_checkbutton8_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton8_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "splash", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.showsplash = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.showsplash = gtk_toggle_button_get_active(togglebutton); } - /****************************************************************************** * Name * on_checkbutton_scroll_toggled @@ -1234,12 +1196,13 @@ */ void -on_checkbutton_scroll_toggled(GtkToggleButton * togglebutton, +on_checkbutton_scroll_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "chapter-scroll", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.chapter_scroll = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.chapter_scroll = + gtk_toggle_button_get_active(togglebutton); } /****************************************************************************** @@ -1257,12 +1220,12 @@ */ void -on_checkbutton_imageresize_toggled(GtkToggleButton * togglebutton, +on_checkbutton_imageresize_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "imageresize", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.imageresize = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.imageresize = gtk_toggle_button_get_active(togglebutton); } /****************************************************************************** @@ -1280,18 +1243,18 @@ */ void -on_checkbutton_verse_num_bold_toggled(GtkToggleButton * togglebutton, +on_checkbutton_verse_num_bold_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "verse_num_bold", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.verse_num_bold = atoi(xml_get_value("misc", "verse_num_bold")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.verse_num_bold = + atoi(xml_get_value("misc", "verse_num_bold")); char *url = g_strdup_printf("sword:///%s", settings.currentverse); main_url_handler(url, TRUE); g_free(url); } - /****************************************************************************** * Name * on_checkbutton_verse_num_bracket_toggled @@ -1307,18 +1270,18 @@ */ void -on_checkbutton_verse_num_bracket_toggled(GtkToggleButton * togglebutton, +on_checkbutton_verse_num_bracket_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "verse_num_bracket", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.verse_num_bracket = atoi(xml_get_value("misc", "verse_num_bracket")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.verse_num_bracket = + atoi(xml_get_value("misc", "verse_num_bracket")); char *url = g_strdup_printf("sword:///%s", settings.currentverse); main_url_handler(url, TRUE); g_free(url); } - /****************************************************************************** * Name * on_checkbutton_verse_num_superscript_toggled @@ -1334,18 +1297,19 @@ */ void -on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * togglebutton, +on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * + togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "verse_num_superscript", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.verse_num_superscript = atoi(xml_get_value("misc", "verse_num_superscript")); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.verse_num_superscript = + atoi(xml_get_value("misc", "verse_num_superscript")); char *url = g_strdup_printf("sword:///%s", settings.currentverse); main_url_handler(url, TRUE); g_free(url); } - /****************************************************************************** * Name * on_checkbutton_versehighlight_toggled @@ -1361,16 +1325,17 @@ */ void -on_checkbutton_versehighlight_toggled(GtkToggleButton * togglebutton, +on_checkbutton_versehighlight_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "versehighlight", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.versehighlight = gtk_toggle_button_get_active (togglebutton); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.versehighlight_item), - settings.versehighlight); - main_display_bible(settings.MainWindowModule, settings.currentverse); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.versehighlight = + gtk_toggle_button_get_active(togglebutton); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.versehighlight_item), + settings.versehighlight); + main_display_bible(settings.MainWindowModule, + settings.currentverse); } /****************************************************************************** @@ -1389,13 +1354,15 @@ */ void -on_checkbutton_annotate_highlight_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +on_checkbutton_annotate_highlight_toggled(GtkToggleButton *togglebutton, + gpointer user_data) { xml_set_value("Xiphos", "misc", "annotatehighlight", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.annotate_highlight = gtk_toggle_button_get_active (togglebutton); - main_display_bible(settings.MainWindowModule, settings.currentverse); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.annotate_highlight = + gtk_toggle_button_get_active(togglebutton); + main_display_bible(settings.MainWindowModule, + settings.currentverse); } /****************************************************************************** @@ -1414,12 +1381,13 @@ */ void -on_checkbutton_xrefs_in_verse_list_toggled(GtkToggleButton * togglebutton, +on_checkbutton_xrefs_in_verse_list_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "xrefsinverselist", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.xrefs_in_verse_list = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.xrefs_in_verse_list = + gtk_toggle_button_get_active(togglebutton); } /****************************************************************************** @@ -1437,12 +1405,12 @@ */ void -on_checkbutton_prayerlist_toggled(GtkToggleButton * togglebutton, +on_checkbutton_prayerlist_toggled(GtkToggleButton *togglebutton, gpointer user_data) { xml_set_value("Xiphos", "misc", "prayerlist", - (gtk_toggle_button_get_active (togglebutton) ? "1" : "0")); - settings.prayerlist = gtk_toggle_button_get_active (togglebutton); + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.prayerlist = gtk_toggle_button_get_active(togglebutton); /* update module list to show choice */ if (settings.prayerlist) @@ -1453,6 +1421,32 @@ main_load_module_tree(sidebar.module_list); } +/****************************************************************************** + * Name + * on_checkbutton_statusbar_toggled + * + * Synopsis + * #include "preferences_dialog.h" + * void on_checkbutton_statusbar_toggled(GtkToggleButton * togglebutton, gpointer user_data) + * + * Description + * + * Return value + * void + */ + +void +on_checkbutton_statusbar_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + xml_set_value("Xiphos", "misc", "statusbar", + (gtk_toggle_button_get_active(togglebutton) ? "1" : "0")); + settings.statusbar = gtk_toggle_button_get_active(togglebutton); + + if (settings.statusbar) + gtk_widget_show(widgets.appbar); + else + gtk_widget_hide(widgets.appbar); +} /****************************************************************************** * Name @@ -1468,17 +1462,15 @@ * void */ -void -on_folder_changed(GtkFileChooser * filechooser, - gpointer user_data) +void on_folder_changed(GtkFileChooser *filechooser, gpointer user_data) { - gchar *directory = gtk_file_chooser_get_current_folder(filechooser); + gchar *directory = + gtk_file_chooser_get_current_folder(filechooser); xml_set_value("Xiphos", "studypad", "directory", directory); settings.studypaddir = xml_get_value("studypad", "directory"); g_free(directory); } - /****************************************************************************** * Name * on_combobox1_changed @@ -1495,9 +1487,7 @@ * void */ -void -on_combobox1_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox1_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; gchar *url = NULL; @@ -1509,16 +1499,18 @@ if (!buf) return; xml_set_value("Xiphos", "fontsize", "versenum", buf); - settings.verse_num_font_size_str = xml_get_value("fontsize", "versenum"); - settings.verse_num_font_size = atoi(settings.verse_num_font_size_str); - url = g_strdup_printf("sword://%s/%s",settings.MainWindowModule, - settings.currentverse); + settings.verse_num_font_size_str = + xml_get_value("fontsize", "versenum"); + settings.verse_num_font_size = + atoi(settings.verse_num_font_size_str); + url = + g_strdup_printf("sword://%s/%s", settings.MainWindowModule, + settings.currentverse); main_url_handler(url, TRUE); g_free(url); g_free(buf); } - /****************************************************************************** * Name * on_basecombobox1_changed @@ -1535,9 +1527,7 @@ * void */ -void -on_basecombobox1_changed(GtkComboBox * combobox, - gpointer user_data) +void on_basecombobox1_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; gchar *url = NULL; @@ -1553,7 +1543,8 @@ if (settings.base_font_size_str) g_free(settings.base_font_size_str); - settings.base_font_size_str = xml_get_value("fontsize", "basefontsize"); + settings.base_font_size_str = + xml_get_value("fontsize", "basefontsize"); settings.base_font_size = atoi(settings.base_font_size_str); url = g_strdup_printf("sword://%s/%s", @@ -1561,10 +1552,10 @@ settings.currentverse); main_url_handler(url, TRUE); g_free(url); - main_display_dictionary(settings.DictWindowModule, settings.dictkey); + main_display_dictionary(settings.DictWindowModule, + settings.dictkey); } - /****************************************************************************** * Name * on_combobox2_changed @@ -1581,9 +1572,7 @@ * void */ -void -on_combobox2_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox2_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; gchar *url = NULL; @@ -1592,16 +1581,15 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; - url = g_strdup_printf("sword://%s/%s",buf,settings.currentverse); + url = g_strdup_printf("sword://%s/%s", buf, settings.currentverse); main_url_handler(url, TRUE); g_free(url); g_free(buf); } - /****************************************************************************** * Name * on_combobox4_changed @@ -1618,9 +1606,7 @@ * void */ -void -on_combobox4_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox4_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; gchar *url = NULL; @@ -1629,16 +1615,15 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; - url = g_strdup_printf("sword://%s/%s",buf,settings.dictkey); + url = g_strdup_printf("sword://%s/%s", buf, settings.dictkey); main_url_handler(url, TRUE); g_free(url); g_free(buf); } - /****************************************************************************** * Name * on_combobox5_changed @@ -1655,9 +1640,7 @@ * void */ -void -on_combobox5_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox5_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1665,14 +1648,14 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; xml_set_value("Xiphos", "lexicons", "defaultdictionary", buf); - settings.DefaultDict = xml_get_value("lexicons", "defaultdictionary"); + settings.DefaultDict = + xml_get_value("lexicons", "defaultdictionary"); g_free(buf); } - /****************************************************************************** * Name * on_combobox6_changed @@ -1689,9 +1672,7 @@ * void */ -void -on_combobox6_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox6_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1699,14 +1680,13 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; xml_set_value("Xiphos", "modules", "percomm", buf); settings.personalcommentsmod = xml_get_value("modules", "percomm"); g_free(buf); } - /****************************************************************************** * Name * on_combobox12_changed @@ -1723,9 +1703,7 @@ * void */ -void -on_combobox12_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox12_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1733,14 +1711,13 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; xml_set_value("Xiphos", "modules", "devotional", buf); settings.devotionalmod = xml_get_value("modules", "devotional"); g_free(buf); } - /****************************************************************************** * Name * on_combobox13_changed @@ -1757,9 +1734,7 @@ * void */ -void -on_combobox13_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox13_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1767,14 +1742,13 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; xml_set_value("Xiphos", "lexicons", "hebrew", buf); settings.lex_hebrew = xml_get_value("lexicons", "hebrew"); g_free(buf); } - /****************************************************************************** * Name * on_combobox14_changed @@ -1791,9 +1765,7 @@ * void */ -void -on_combobox14_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox14_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1801,14 +1773,13 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; xml_set_value("Xiphos", "lexicons", "greek", buf); settings.lex_greek = xml_get_value("lexicons", "greek"); g_free(buf); } - /****************************************************************************** * Name * on_combobox15_changed @@ -1825,9 +1796,7 @@ * void */ -void -on_combobox15_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox15_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; gchar *url = NULL; @@ -1836,15 +1805,14 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; - url = g_strdup_printf("sword://%s/%s",buf,"1"); + url = g_strdup_printf("sword://%s/%s", buf, "1"); main_url_handler(url, TRUE); g_free(url); g_free(buf); } - /****************************************************************************** * Name * on_combobox16_changed @@ -1861,9 +1829,7 @@ * void */ -void -on_combobox16_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox16_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1872,7 +1838,7 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; clear = !strcmp(buf, NONE); @@ -1892,12 +1858,13 @@ *buf = '\0'; /* NOTE: These 2 uses of "None" are NOT TRANSLATABLE. */ - xml_set_value("Xiphos", "locale", "special", (clear ? "None" : buf)); - g_free(settings.special_locale); /* dispose of old content */ - settings.special_locale = (clear ? g_strdup("None") : g_strdup(buf)); + xml_set_value("Xiphos", "locale", "special", + (clear ? "None" : buf)); + g_free(settings.special_locale); /* dispose of old content */ + settings.special_locale = + (clear ? g_strdup("None") : g_strdup(buf)); } - /****************************************************************************** * Name * on_combobox17_changed @@ -1913,9 +1880,7 @@ * void */ -void -on_combobox17_changed(GtkComboBox * combobox, - gpointer user_data) +void on_combobox17_changed(GtkComboBox *combobox, gpointer user_data) { gchar *buf = NULL; GtkTreeIter iter; @@ -1924,7 +1889,7 @@ gtk_combo_box_get_active_iter(combobox, &iter); gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1); - if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ + if (!buf || !strcmp(buf, _("-- Select --"))) /* see fill_combobox */ return; buf = strrchr(buf, '(') + 1; @@ -1936,7 +1901,6 @@ g_free(mod_name); } - /****************************************************************************** * Name * add_columns @@ -1951,8 +1915,7 @@ * void */ -static void -add_columns(GtkWidget * treeview) +static void add_columns(GtkWidget *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1966,7 +1929,6 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); } - /****************************************************************************** * Name * tree_selection_changed @@ -1983,22 +1945,19 @@ */ static void -tree_selection_changed(GtkTreeSelection * selection, - gpointer data) +tree_selection_changed(GtkTreeSelection *selection, gpointer data) { GtkTreeIter selected; gint page; GtkTreeModel *model; - if (!gtk_tree_selection_get_selected - (selection, &model, &selected)) + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return; gtk_tree_model_get(model, &selected, 1, &page, -1); gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), page); } - /****************************************************************************** * Name * on_dialog_prefs_response @@ -2015,9 +1974,8 @@ */ void -on_dialog_prefs_response(GtkDialog * dialog, - gint response_id, - gpointer user_data) +on_dialog_prefs_response(GtkDialog *dialog, + gint response_id, gpointer user_data) { if (response_id == GTK_RESPONSE_CLOSE) { settings.display_prefs = 0; @@ -2033,9 +1991,7 @@ main_update_parallel_page(); } - -static GtkTreeModel * -create_model(void) +static GtkTreeModel *create_model(void) { GtkTreeStore *model; GtkTreeIter iter; @@ -2050,8 +2006,8 @@ gtk_tree_store_set(model, &child_iter, 0, _("Options"), 1, 4, -1); gtk_tree_store_append(model, &child_iter, &iter); - gtk_tree_store_set(model, &child_iter, 0, _("BibleSync"), 1, 3, -1); - + gtk_tree_store_set(model, &child_iter, 0, _("BibleSync"), 1, 3, + -1); gtk_tree_store_append(model, &iter, NULL); gtk_tree_store_set(model, &iter, 0, _("Fonts"), -1); @@ -2060,8 +2016,8 @@ gtk_tree_store_set(model, &child_iter, 0, _("Color"), 1, 1, -1); gtk_tree_store_append(model, &child_iter, &iter); - gtk_tree_store_set(model, &child_iter, 0, _("Sizes and Faces"), 1, 2, -1); - + gtk_tree_store_set(model, &child_iter, 0, _("Sizes and Faces"), 1, + 2, -1); gtk_tree_store_append(model, &iter, NULL); gtk_tree_store_set(model, &iter, 0, _("Modules"), -1); @@ -2079,8 +2035,6 @@ return GTK_TREE_MODEL(model); } - - /****************************************************************************** * Name * setup_color_pickers @@ -2095,82 +2049,83 @@ * void */ -void -setup_color_pickers(void) +void setup_color_pickers(void) { #ifdef HAVE_GTK_34 GdkRGBA rgba; - if(gdk_rgba_parse (&rgba, settings.bible_bg_color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.text_background, &rgba); - if(gdk_rgba_parse (&rgba, settings.bible_text_color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.text, &rgba); - if(gdk_rgba_parse (&rgba, settings.currentverse_color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.text_current_verse, &rgba); - if(gdk_rgba_parse (&rgba, settings.bible_verse_num_color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.verse_numbers, &rgba); - if(gdk_rgba_parse (&rgba, settings.link_color)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.href_links, &rgba); - if(gdk_rgba_parse (&rgba, settings.highlight_fg)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.highlight_fg, &rgba); - if(gdk_rgba_parse (&rgba, settings.highlight_bg)) - gtk_color_chooser_set_rgba ((GtkColorChooser*) color_picker.highlight_bg, &rgba); + if (gdk_rgba_parse(&rgba, settings.bible_bg_color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.text_background, + &rgba); + if (gdk_rgba_parse(&rgba, settings.bible_text_color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.text, + &rgba); + if (gdk_rgba_parse(&rgba, settings.currentverse_color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.text_current_verse, + &rgba); + if (gdk_rgba_parse(&rgba, settings.bible_verse_num_color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.verse_numbers, + &rgba); + if (gdk_rgba_parse(&rgba, settings.link_color)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.href_links, + &rgba); + if (gdk_rgba_parse(&rgba, settings.highlight_fg)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.highlight_fg, + &rgba); + if (gdk_rgba_parse(&rgba, settings.highlight_bg)) + gtk_color_chooser_set_rgba((GtkColorChooser *) + color_picker.highlight_bg, + &rgba); #else GdkColor color; if (string_is_color(settings.bible_bg_color)) { gdk_color_parse(settings.bible_bg_color, &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.text_background), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text_background), + &color); } else { gdk_color_parse("#FFFFFF", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.text_background), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text_background), + &color); } if (string_is_color(settings.bible_text_color)) { gdk_color_parse(settings.bible_text_color, &color); - gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text), &color); } else { gdk_color_parse("#000000", &color); - gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text), &color); } if (string_is_color(settings.currentverse_color)) { gdk_color_parse(settings.currentverse_color, &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.text_current_verse), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text_current_verse), &color); } else { gdk_color_parse("#339766", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.text_current_verse), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.text_current_verse), &color); } if (string_is_color(settings.bible_verse_num_color)) { gdk_color_parse(settings.bible_verse_num_color, &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.verse_numbers), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.verse_numbers), + &color); } else { gdk_color_parse("#0000CF", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.verse_numbers), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.verse_numbers), + &color); } if (string_is_color(settings.link_color)) { gdk_color_parse(settings.link_color, &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.href_links), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.href_links), + &color); } else { gdk_color_parse("#878787", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.href_links), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.href_links), + &color); } // contrasty highlighting -- foreground. @@ -2178,113 +2133,83 @@ gdk_color_parse(settings.highlight_fg, &color); else gdk_color_parse("#FFFF00", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.highlight_fg), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.highlight_fg), &color); // contrasty highlighting -- background. if (string_is_color(settings.highlight_bg)) gdk_color_parse(settings.highlight_bg, &color); else gdk_color_parse("#060680", &color); - gtk_color_button_set_color( - GTK_COLOR_BUTTON(color_picker.highlight_bg), - &color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(color_picker.highlight_bg), &color); #endif } - -static void -setup_check_buttons(void) +static void setup_check_buttons(void) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_default_dictionary), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_default_dictionary), settings.useDefaultDict); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.show_devotion), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.show_devotion), settings.showdevotional); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.show_splash_screen), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.show_splash_screen), settings.showsplash); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_chapter_scroll), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_chapter_scroll), settings.chapter_scroll); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_imageresize), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_imageresize), settings.imageresize); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_verse_num_bold), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_verse_num_bold), settings.verse_num_bold); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_verse_num_bracket), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_verse_num_bracket), settings.verse_num_bracket); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.use_verse_num_superscript), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.use_verse_num_superscript), settings.verse_num_superscript); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.versehighlight), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.versehighlight), settings.versehighlight); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.annotate_highlight), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.annotate_highlight), settings.annotate_highlight); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.xrefs_in_verse_list), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.xrefs_in_verse_list), settings.xrefs_in_verse_list); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.prayerlist), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.prayerlist), settings.prayerlist); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.statusbar), + settings.statusbar); /* v-- BibleSync --v */ /* toggles */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.bs_debug), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.bs_debug), settings.bs_debug); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.bs_presence), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.bs_presence), settings.bs_presence); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.bs_mismatch), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.bs_mismatch), settings.bs_mismatch); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.bs_group_tab), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.bs_group_tab), settings.bs_group_tab); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (check_button.bs_privacy), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button.bs_privacy), settings.bs_privacy); gtk_widget_set_sensitive(check_button.bs_privacy, biblesync_personal()); /* mode */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_off), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_off), (settings.bs_mode == 0)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_personal), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_personal), (settings.bs_mode == 1)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_speaker), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_speaker), (settings.bs_mode == 2)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_mode_audience), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_audience), (settings.bs_mode == 3)); /* navigation method */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_nav_direct), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_nav_direct), (settings.bs_navdirect == 1)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_nav_verselist), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_nav_verselist), (settings.bs_navdirect == 0)); /* listening choice */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_listen_some), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_listen_some), (settings.bs_listen_set == 0)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_listen_all), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_listen_all), (settings.bs_listen_set == 1)); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (radio_button.bs_listen_none), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_listen_none), (settings.bs_listen_set == 2)); /* ^-- BibleSync --^ */ @@ -2297,62 +2222,85 @@ g_signal_connect(check_button.use_chapter_scroll, "toggled", G_CALLBACK(on_checkbutton_scroll_toggled), NULL); g_signal_connect(check_button.use_imageresize, "toggled", - G_CALLBACK(on_checkbutton_imageresize_toggled), NULL); + G_CALLBACK(on_checkbutton_imageresize_toggled), + NULL); g_signal_connect(check_button.use_verse_num_bold, "toggled", - G_CALLBACK(on_checkbutton_verse_num_bold_toggled), NULL); + G_CALLBACK(on_checkbutton_verse_num_bold_toggled), + NULL); g_signal_connect(check_button.use_verse_num_bracket, "toggled", G_CALLBACK(on_checkbutton_verse_num_bracket_toggled), NULL); g_signal_connect(check_button.use_verse_num_superscript, "toggled", - G_CALLBACK(on_checkbutton_verse_num_superscript_toggled), NULL); + G_CALLBACK(on_checkbutton_verse_num_superscript_toggled), + NULL); g_signal_connect(check_button.versehighlight, "toggled", - G_CALLBACK(on_checkbutton_versehighlight_toggled), NULL); + G_CALLBACK(on_checkbutton_versehighlight_toggled), + NULL); g_signal_connect(check_button.annotate_highlight, "toggled", - G_CALLBACK(on_checkbutton_annotate_highlight_toggled), NULL); + G_CALLBACK(on_checkbutton_annotate_highlight_toggled), + NULL); g_signal_connect(check_button.xrefs_in_verse_list, "toggled", - G_CALLBACK(on_checkbutton_xrefs_in_verse_list_toggled), NULL); + G_CALLBACK(on_checkbutton_xrefs_in_verse_list_toggled), + NULL); g_signal_connect(check_button.prayerlist, "toggled", - G_CALLBACK(on_checkbutton_prayerlist_toggled), NULL); + G_CALLBACK(on_checkbutton_prayerlist_toggled), + NULL); + g_signal_connect(check_button.statusbar, "toggled", + G_CALLBACK(on_checkbutton_statusbar_toggled), + NULL); /* v-- BibleSync --v */ g_signal_connect(check_button.bs_debug, "toggled", - G_CALLBACK(on_checkbutton_biblesync_toggled), &settings.bs_debug); + G_CALLBACK(on_checkbutton_biblesync_toggled), + &settings.bs_debug); g_signal_connect(check_button.bs_presence, "toggled", - G_CALLBACK(on_checkbutton_biblesync_toggled), &settings.bs_presence); + G_CALLBACK(on_checkbutton_biblesync_toggled), + &settings.bs_presence); g_signal_connect(check_button.bs_mismatch, "toggled", - G_CALLBACK(on_checkbutton_biblesync_toggled), &settings.bs_mismatch); + G_CALLBACK(on_checkbutton_biblesync_toggled), + &settings.bs_mismatch); g_signal_connect(check_button.bs_group_tab, "toggled", - G_CALLBACK(on_checkbutton_biblesync_toggled), &settings.bs_group_tab); + G_CALLBACK(on_checkbutton_biblesync_toggled), + &settings.bs_group_tab); g_signal_connect(check_button.bs_privacy, "toggled", - G_CALLBACK(on_checkbutton_biblesync_toggled), &settings.bs_privacy); + G_CALLBACK(on_checkbutton_biblesync_toggled), + &settings.bs_privacy); g_signal_connect(radio_button.bs_mode_off, "toggled", - G_CALLBACK(on_radiobutton_biblesync_mode), &rb_cb[0]); + G_CALLBACK(on_radiobutton_biblesync_mode), + &rb_cb[0]); g_signal_connect(radio_button.bs_mode_personal, "toggled", - G_CALLBACK(on_radiobutton_biblesync_mode), &rb_cb[1]); + G_CALLBACK(on_radiobutton_biblesync_mode), + &rb_cb[1]); g_signal_connect(radio_button.bs_mode_speaker, "toggled", - G_CALLBACK(on_radiobutton_biblesync_mode), &rb_cb[2]); + G_CALLBACK(on_radiobutton_biblesync_mode), + &rb_cb[2]); g_signal_connect(radio_button.bs_mode_audience, "toggled", - G_CALLBACK(on_radiobutton_biblesync_mode), &rb_cb[3]); + G_CALLBACK(on_radiobutton_biblesync_mode), + &rb_cb[3]); g_signal_connect(radio_button.bs_nav_direct, "toggled", - G_CALLBACK(on_radiobutton_biblesync_nav), &rb_cb[1]); + G_CALLBACK(on_radiobutton_biblesync_nav), + &rb_cb[1]); g_signal_connect(radio_button.bs_nav_verselist, "toggled", - G_CALLBACK(on_radiobutton_biblesync_nav), &rb_cb[0]); + G_CALLBACK(on_radiobutton_biblesync_nav), + &rb_cb[0]); g_signal_connect(radio_button.bs_listen_some, "toggled", - G_CALLBACK(on_radiobutton_biblesync_listen), &rb_cb[0]); + G_CALLBACK(on_radiobutton_biblesync_listen), + &rb_cb[0]); g_signal_connect(radio_button.bs_listen_all, "toggled", - G_CALLBACK(on_radiobutton_biblesync_listen), &rb_cb[1]); + G_CALLBACK(on_radiobutton_biblesync_listen), + &rb_cb[1]); g_signal_connect(radio_button.bs_listen_none, "toggled", - G_CALLBACK(on_radiobutton_biblesync_listen), &rb_cb[2]); + G_CALLBACK(on_radiobutton_biblesync_listen), + &rb_cb[2]); /* ^-- BibleSync --^ */ } /* * comparator function to determine filling of true general dict lists. */ -static gboolean -dict_no_image_map_dd(char *modname, char *feature) +static gboolean dict_no_image_map_dd(char *modname, char *feature) { /* no features or categories */ const char *f = main_get_mod_config_entry(modname, "Feature"); @@ -2363,20 +2311,15 @@ /* * comparator function to determine filling of heb/grk dict lists. */ -static gboolean -dict_match_feature(char *modname, char *feature) +static gboolean dict_match_feature(char *modname, char *feature) { const char *f = main_get_mod_config_entry(modname, "Feature"); return (f && (!strcmp(f, feature))); } -static void -fill_combobox(GList * glist, - GtkComboBox * combo, - gchar * current_item, - gboolean (*eval)(char *, char *), /* evaluator of feature */ - char * feature) /* feature sought or avoided */ -{ +static void fill_combobox(GList *glist, GtkComboBox *combo, gchar *current_item, gboolean (*eval)(char *, char *), /* evaluator of feature */ + char *feature) +{ /* feature sought or avoided */ GtkTreeIter iter; GtkListStore *store; GtkCellRenderer *renderer; @@ -2384,38 +2327,27 @@ gint i = 0; store = gtk_list_store_new(1, G_TYPE_STRING); - gtk_combo_box_set_model(combo, - GTK_TREE_MODEL(store)); + gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store)); renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT - (combo), - renderer, TRUE); - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT - (combo), - renderer, "text", 0, NULL); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL); gtk_list_store_clear(GTK_LIST_STORE(store)); gtk_list_store_append(GTK_LIST_STORE(store), &iter); gtk_list_store_set(GTK_LIST_STORE(store), - &iter, - 0, - _("-- Select --"), - -1); + &iter, 0, _("-- Select --"), -1); while (glist) { if ((eval == NULL) || (*eval)(glist->data, feature)) { /* "anything goes" or "acceptable match" */ - gtk_list_store_append(GTK_LIST_STORE(store), &iter); - gtk_list_store_set(GTK_LIST_STORE(store), - &iter, - 0, - (gchar*)glist->data, - -1); - if (current_item && !strcmp((gchar*)glist->data, - current_item)) - index = i+1; + gtk_list_store_append(GTK_LIST_STORE(store), + &iter); + gtk_list_store_set(GTK_LIST_STORE(store), &iter, 0, + (gchar *)glist->data, -1); + if (current_item && !strcmp((gchar *)glist->data, current_item)) + index = i + 1; ++i; } glist = g_list_next(glist); @@ -2423,9 +2355,7 @@ gtk_combo_box_set_active(combo, index); } - -static gint -get_font_size_index(const char *font) +static gint get_font_size_index(const char *font) { if (!strcmp(font, "-2")) return 0; @@ -2446,28 +2376,27 @@ return 0; } - -static void -setup_module_comboboxes(void) +static void setup_module_comboboxes(void) { /* * Miscellaneous Modules page */ - fill_combobox(get_list(DEVOTION_LIST), GTK_COMBO_BOX(combo.devotion_module), - settings.devotionalmod, - NULL, NULL); - fill_combobox(get_list(DICT_LIST), GTK_COMBO_BOX(combo.hebrew_lex__module), - settings.lex_hebrew, - dict_match_feature, "HebrewDef"); - fill_combobox(get_list(DICT_LIST), GTK_COMBO_BOX(combo.greek_lex__module), - settings.lex_greek, - dict_match_feature, "GreekDef"); - fill_combobox(get_list(DICT_LIST), GTK_COMBO_BOX(combo.default_dictionary_module), - settings.DefaultDict, - dict_no_image_map_dd, NULL); - fill_combobox(get_list(PERCOMM_LIST), GTK_COMBO_BOX(combo.percomm_module), - settings.personalcommentsmod, - NULL, NULL); + fill_combobox(get_list(DEVOTION_LIST), + GTK_COMBO_BOX(combo.devotion_module), + settings.devotionalmod, NULL, NULL); + fill_combobox(get_list(DICT_LIST), + GTK_COMBO_BOX(combo.hebrew_lex__module), + settings.lex_hebrew, dict_match_feature, + "HebrewDef"); + fill_combobox(get_list(DICT_LIST), + GTK_COMBO_BOX(combo.greek_lex__module), + settings.lex_greek, dict_match_feature, "GreekDef"); + fill_combobox(get_list(DICT_LIST), + GTK_COMBO_BOX(combo.default_dictionary_module), + settings.DefaultDict, dict_no_image_map_dd, NULL); + fill_combobox(get_list(PERCOMM_LIST), + GTK_COMBO_BOX(combo.percomm_module), + settings.personalcommentsmod, NULL, NULL); /* * signal connectivity @@ -2484,11 +2413,10 @@ G_CALLBACK(on_combobox6_changed), NULL); } - -void -setup_locale_combobox(void) +void setup_locale_combobox(void) { - char **locale, brief_locale[3], *real_locale, *current_locale = NULL; + char **locale, brief_locale[3], *real_locale, *current_locale = + NULL; GList *chase, *list = g_list_append(NULL, g_strdup(NONE)); brief_locale[2] = '\0'; @@ -2496,8 +2424,7 @@ brief_locale[0] = (*locale)[0]; brief_locale[1] = (*locale)[1]; real_locale = g_strdup_printf("%s (%s)", - main_get_language_map(brief_locale), - *locale); + main_get_language_map(brief_locale), *locale); list = g_list_append(list, real_locale); if (settings.special_locale && !strcmp(settings.special_locale, *locale)) @@ -2514,18 +2441,16 @@ G_CALLBACK(on_combobox16_changed), NULL); } - -void -setup_font_prefs_combobox(void) +void setup_font_prefs_combobox(void) { char **language_list = main_get_module_language_list(); - char *real_language, **language; + char **language; GList *chase, *list = NULL; for (language = &language_list[0]; *language; ++language) { - real_language = g_strdup_printf("%s (%s)", - main_get_language_map(*language), - *language); + char *real_language = + g_strdup_printf("%s (%s)", + main_get_language_map(*language), *language); list = g_list_append(list, real_language); } fill_combobox(list, GTK_COMBO_BOX(combo.font_prefs), @@ -2539,7 +2464,6 @@ G_CALLBACK(on_combobox17_changed), NULL); } - /****************************************************************************** * Name * button_release_event @@ -2557,9 +2481,8 @@ * gboolean */ -static gboolean button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer data) +static gboolean button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeIter selected; @@ -2567,15 +2490,15 @@ GtkTreePath *path; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - if ((!gtk_tree_selection_get_selected(selection, &model, &selected)) || - (!gtk_tree_model_iter_has_child(model, &selected))) + if ((!gtk_tree_selection_get_selected(selection, &model, &selected)) || (!gtk_tree_model_iter_has_child(model, &selected))) return FALSE; path = gtk_tree_model_get_path(model, &selected); if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) - gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); - else - gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, + FALSE); gtk_tree_path_free(path); return FALSE; } @@ -2595,11 +2518,9 @@ * */ -static -void ps_setup_listview() +static void ps_setup_listview() { GtkListStore *model; - GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkTreeIter iter; GtkTreeModel *model_t; @@ -2607,29 +2528,38 @@ int i; model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(parallel_select.listview), GTK_TREE_MODEL(model)); + gtk_tree_view_set_model(GTK_TREE_VIEW(parallel_select.listview), + GTK_TREE_MODEL(model)); for (i = 0; i < 2; ++i) { - renderer = gtk_cell_renderer_text_new(); + GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Module", renderer, - "text", i, - NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(parallel_select.listview), column); + "text", + i, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(parallel_select.listview), + column); } gtk_tree_view_column_set_sort_column_id(column, 0); - model_t = gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); + model_t = + gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); list_store = GTK_LIST_STORE(model_t); gtk_list_store_clear(list_store); if (settings.parallel_list) { for (i = 0; settings.parallel_list[i]; ++i) { + const char *abbreviation = + main_get_abbreviation(settings.parallel_list + [i]); gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, - 0, main_get_module_description - (settings.parallel_list[i]), - 1, (gchar *)settings.parallel_list[i], + 0, main_get_module_description(settings.parallel_list[i]), + 1, + (abbreviation + ? abbreviation + : (gchar *) + settings.parallel_list[i]), -1); } } @@ -2652,12 +2582,13 @@ static gchar *module_selected = NULL; -static void modules_lists_changed(GtkTreeSelection * selection, - GtkTreeView * tree_widget) +static void modules_lists_changed(GtkTreeSelection *selection, + GtkTreeView *tree_widget) { gchar *mod = NULL; GtkTreeIter selected; - GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; @@ -2689,8 +2620,7 @@ * */ -static -void ps_setup_treeview(GtkWidget * treeview) +static void ps_setup_treeview(GtkWidget *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -2699,59 +2629,68 @@ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Found", renderer, - "text", - 0, NULL); + "text", 0, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); gtk_tree_view_column_set_sort_column_id(column, 0); gui_load_module_tree(treeview, TRUE); - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); g_signal_connect_after(G_OBJECT(treeview), "button_release_event", - G_CALLBACK(button_release_event), GINT_TO_POINTER(0)); - g_signal_connect(selection, "changed", G_CALLBACK(modules_lists_changed), treeview); + G_CALLBACK(button_release_event), + GINT_TO_POINTER(0)); + g_signal_connect(selection, "changed", + G_CALLBACK(modules_lists_changed), treeview); } - -static void on_mod_sel_add_clicked(GtkWidget * button, gchar * user_data) +static void on_mod_sel_add_clicked(GtkWidget *button, gchar *user_data) { GtkTreeModel *model; GtkListStore *list_store; GtkTreeIter iter; char *parallels = g_strdup(""), *newhold; + const char *abbreviation; int count; if (!module_selected) { g_free(parallels); return; } + abbreviation = main_get_abbreviation(module_selected); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); list_store = GTK_LIST_STORE(model); gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, 0, main_get_module_description(module_selected), - 1, module_selected, + 1, + (abbreviation ? abbreviation : module_selected), -1); if (settings.parallel_list == NULL) { - settings.parallel_list = g_strsplit(module_selected, ",", -1); + settings.parallel_list = + g_strsplit(module_selected, ",", -1); } else { for (count = 0; settings.parallel_list[count]; ++count) ; /* count up the set */ - settings.parallel_list = g_renew(gchar *, settings.parallel_list, count + 2); - settings.parallel_list[count] = g_strdup(module_selected); /* new element */ - settings.parallel_list[count+1] = NULL; + settings.parallel_list = + g_renew(gchar *, settings.parallel_list, count + 2); + settings.parallel_list[count] = g_strdup(module_selected); /* new element */ + settings.parallel_list[count + 1] = NULL; } for (count = 0; settings.parallel_list[count]; ++count) { - newhold = g_strconcat(parallels, settings.parallel_list[count], ",", NULL); + newhold = + g_strconcat(parallels, settings.parallel_list[count], + ",", NULL); g_free(parallels); parallels = newhold; } if (*parallels) { - *(parallels + strlen(parallels) - 1) = '\0'; /* end comma */ + *(parallels + strlen(parallels) - 1) = '\0'; /* end comma */ xml_set_value("Xiphos", "modules", "parallels", parallels); } g_free(parallels); @@ -2775,17 +2714,12 @@ * Return value * void */ -void ps_button_clear(GtkButton * button, gpointer user_data) -{ +void ps_button_clear(GtkButton *button, gpointer user_data) { - GtkTreeModel *model; - GtkListStore *list_store; - gchar *str; - - str = g_strdup_printf("%s\n\n%s", - _("Clear List?"), - _("Are you sure you want to clear the module list?")); - + gchar *str = + g_strdup_printf("%s\n\n%s", + _("Clear List?"), + _("Are you sure you want to clear the module list?")); #ifdef HAVE_GTK_310 if (gui_yes_no_dialog(str, "dialog-warning")) { @@ -2793,8 +2727,9 @@ if (gui_yes_no_dialog(str, GTK_STOCK_DIALOG_WARNING)) { #endif - model = gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); - list_store = GTK_LIST_STORE(model); + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); + GtkListStore *list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); if (settings.parallel_list) g_strfreev(settings.parallel_list); @@ -2802,7 +2737,7 @@ xml_set_value("Xiphos", "modules", "parallels", ""); } g_free(str); -}} +} /****************************************************************************** * Name @@ -2817,19 +2752,19 @@ * Return value * void */ -void ps_button_cut(GtkButton * button, gpointer user_data) +void ps_button_cut(GtkButton *button, gpointer user_data) { - GList *mods = NULL; - gchar *mod_list; GtkTreeModel *model; GtkListStore *list_store; GtkTreeSelection *selection; GtkTreeIter selected; gchar *str; - model = gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(parallel_select.listview)); + selection = + gtk_tree_view_get_selection(GTK_TREE_VIEW(parallel_select.listview)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; @@ -2844,8 +2779,9 @@ if (gui_yes_no_dialog(str, GTK_STOCK_DIALOG_WARNING)) { #endif gtk_list_store_remove(list_store, &selected); - mods = get_current_list(GTK_TREE_VIEW(parallel_select.listview)); - mod_list = get_modlist_string(mods); + GList *mods = + get_current_list(GTK_TREE_VIEW(parallel_select.listview)); + gchar *mod_list = get_modlist_string(mods); if (settings.parallel_list) g_strfreev(settings.parallel_list); settings.parallel_list = g_strsplit(mod_list, ",", -1); @@ -2868,39 +2804,44 @@ * Return value * void */ -void ps_button_add(GtkButton * button, gpointer user_data) +void ps_button_add(GtkButton *button, gpointer user_data) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; #else GladeXML *gxml; #endif - gchar *glade_file = gui_general_user_file("selector-prefs" UI_SUFFIX, FALSE); + gchar *glade_file = + gui_general_user_file("selector-prefs" UI_SUFFIX, FALSE); g_return_if_fail(glade_file != NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "mod_sel_dialog", NULL); #endif - parallel_select.mod_sel_dialog = UI_GET_ITEM(gxml, "mod_sel_dialog"); - parallel_select.mod_sel_close = UI_GET_ITEM(gxml, "mod_sel_button_close"); - parallel_select.mod_sel_add = UI_GET_ITEM(gxml, "mod_sel_button_add"); - - g_signal_connect((gpointer)parallel_select.mod_sel_close, "clicked", - G_CALLBACK(on_mod_sel_close_clicked), NULL); + parallel_select.mod_sel_dialog = + UI_GET_ITEM(gxml, "mod_sel_dialog"); + parallel_select.mod_sel_close = + UI_GET_ITEM(gxml, "mod_sel_button_close"); + parallel_select.mod_sel_add = + UI_GET_ITEM(gxml, "mod_sel_button_add"); + + g_signal_connect((gpointer)parallel_select.mod_sel_close, + "clicked", G_CALLBACK(on_mod_sel_close_clicked), + NULL); g_signal_connect((gpointer)parallel_select.mod_sel_add, "clicked", G_CALLBACK(on_mod_sel_add_clicked), NULL); - parallel_select.mod_sel_treeview = UI_GET_ITEM(gxml, "mod_sel_treeview"); + parallel_select.mod_sel_treeview = + UI_GET_ITEM(gxml, "mod_sel_treeview"); ps_setup_treeview(parallel_select.mod_sel_treeview); gtk_widget_show(parallel_select.mod_sel_dialog); g_free(glade_file); } - /****************************************************************************** * Name * gui_create_preferences_dialog @@ -2920,8 +2861,7 @@ * GtkWidget * */ -static void -create_preferences_dialog(void) +static void create_preferences_dialog(void) { #ifdef USE_GTKBUILDER GtkBuilder *gxml; @@ -2933,79 +2873,106 @@ GObject *selection; GtkWidget *chooser; gint index = 0; - gchar *glade_file = gui_general_user_file ("prefs" UI_SUFFIX, TRUE); + gchar *glade_file = gui_general_user_file("prefs" UI_SUFFIX, TRUE); g_return_if_fail(glade_file != NULL); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, NULL, NULL); + gxml = glade_xml_new(glade_file, NULL, NULL); #endif - g_free (glade_file); - g_return_if_fail (gxml != NULL); + g_free(glade_file); + g_return_if_fail(gxml != NULL); /* lookup the root widget */ dialog_prefs = UI_GET_ITEM(gxml, "dialog_prefs"); gtk_window_resize(GTK_WINDOW(dialog_prefs), - settings.prefs_width, - settings.prefs_height); + settings.prefs_width, settings.prefs_height); g_signal_connect(dialog_prefs, "response", G_CALLBACK(on_dialog_prefs_response), NULL); /* color pickers */ color_picker.text_background = UI_GET_ITEM(gxml, "colorbutton1"); color_picker.text = UI_GET_ITEM(gxml, "colorbutton2"); - color_picker.text_current_verse = UI_GET_ITEM(gxml, "colorbutton3"); + color_picker.text_current_verse = + UI_GET_ITEM(gxml, "colorbutton3"); color_picker.verse_numbers = UI_GET_ITEM(gxml, "colorbutton4"); color_picker.href_links = UI_GET_ITEM(gxml, "colorbutton5"); color_picker.highlight_fg = UI_GET_ITEM(gxml, "colorbutton6"); color_picker.highlight_bg = UI_GET_ITEM(gxml, "colorbutton7"); color_picker.invert_normal = UI_GET_ITEM(gxml, "invert_normal"); - color_picker.invert_highlight = UI_GET_ITEM(gxml, "invert_highlight"); + color_picker.invert_highlight = + UI_GET_ITEM(gxml, "invert_highlight"); check_button.use_linked_tabs = UI_GET_ITEM(gxml, "checkbutton10"); check_button.readaloud = UI_GET_ITEM(gxml, "checkbutton11"); check_button.show_verse_num = UI_GET_ITEM(gxml, "checkbutton12"); - check_button.use_default_dictionary = UI_GET_ITEM(gxml, "checkbutton6"); + check_button.use_default_dictionary = + UI_GET_ITEM(gxml, "checkbutton6"); check_button.show_devotion = UI_GET_ITEM(gxml, "checkbutton7"); - check_button.show_splash_screen = UI_GET_ITEM(gxml, "checkbutton8"); - check_button.use_chapter_scroll = UI_GET_ITEM(gxml, "checkbutton_scroll"); + check_button.show_splash_screen = + UI_GET_ITEM(gxml, "checkbutton8"); + check_button.use_chapter_scroll = + UI_GET_ITEM(gxml, "checkbutton_scroll"); - check_button.use_imageresize = UI_GET_ITEM(gxml, "checkbutton_imageresize"); + check_button.use_imageresize = + UI_GET_ITEM(gxml, "checkbutton_imageresize"); #ifdef WIN32 /* webkit image hackery requires resize always be enabled. */ gtk_widget_hide(check_button.use_imageresize); #endif - check_button.use_verse_num_bold = UI_GET_ITEM(gxml, "checkbutton_verse_num_bold"); - check_button.use_verse_num_bracket = UI_GET_ITEM(gxml, "checkbutton_verse_num_bracket"); - check_button.use_verse_num_superscript = UI_GET_ITEM(gxml, "checkbutton_verse_num_superscript"); - check_button.versehighlight = UI_GET_ITEM(gxml, "checkbutton_versehighlight"); - check_button.annotate_highlight = UI_GET_ITEM(gxml, "checkbutton_annotate_highlight"); - check_button.xrefs_in_verse_list = UI_GET_ITEM(gxml, "checkbutton_xrefs_in_verse_list"); - check_button.prayerlist = UI_GET_ITEM(gxml, "checkbutton_prayerlist"); + check_button.use_verse_num_bold = + UI_GET_ITEM(gxml, "checkbutton_verse_num_bold"); + check_button.use_verse_num_bracket = + UI_GET_ITEM(gxml, "checkbutton_verse_num_bracket"); + check_button.use_verse_num_superscript = + UI_GET_ITEM(gxml, "checkbutton_verse_num_superscript"); + check_button.versehighlight = + UI_GET_ITEM(gxml, "checkbutton_versehighlight"); + check_button.annotate_highlight = + UI_GET_ITEM(gxml, "checkbutton_annotate_highlight"); + check_button.xrefs_in_verse_list = + UI_GET_ITEM(gxml, "checkbutton_xrefs_in_verse_list"); + check_button.prayerlist = + UI_GET_ITEM(gxml, "checkbutton_prayerlist"); + check_button.statusbar = UI_GET_ITEM(gxml, "checkbutton_statusbar"); /* v-- BibleSync --v */ - check_button.bs_debug = UI_GET_ITEM(gxml, "checkbutton_BSP_nav_debug"); - check_button.bs_presence = UI_GET_ITEM(gxml, "checkbutton_BSP_presence"); - check_button.bs_mismatch = UI_GET_ITEM(gxml, "checkbutton_BSP_mismatch"); - check_button.bs_group_tab = UI_GET_ITEM(gxml, "checkbutton_BSP_group_tab"); - check_button.bs_privacy = UI_GET_ITEM(gxml, "checkbutton_BSP_privacy"); - - radio_button.bs_mode_off = UI_GET_ITEM(gxml, "radiobutton_BSP_off"); - radio_button.bs_mode_personal = UI_GET_ITEM(gxml, "radiobutton_BSP_personal"); - radio_button.bs_mode_speaker = UI_GET_ITEM(gxml, "radiobutton_BSP_speaker"); - radio_button.bs_mode_audience = UI_GET_ITEM(gxml, "radiobutton_BSP_audience"); - - radio_button.bs_nav_direct = UI_GET_ITEM(gxml, "radiobutton_BSP_nav_direct"); - radio_button.bs_nav_verselist = UI_GET_ITEM(gxml, "radiobutton_BSP_nav_verselist"); - - radio_button.bs_listen_some = UI_GET_ITEM(gxml, "radiobutton_BSP_listen_some"); - radio_button.bs_listen_all = UI_GET_ITEM(gxml, "radiobutton_BSP_listen_all"); - radio_button.bs_listen_none = UI_GET_ITEM(gxml, "radiobutton_BSP_listen_none"); + check_button.bs_debug = + UI_GET_ITEM(gxml, "checkbutton_BSP_nav_debug"); + check_button.bs_presence = + UI_GET_ITEM(gxml, "checkbutton_BSP_presence"); + check_button.bs_mismatch = + UI_GET_ITEM(gxml, "checkbutton_BSP_mismatch"); + check_button.bs_group_tab = + UI_GET_ITEM(gxml, "checkbutton_BSP_group_tab"); + check_button.bs_privacy = + UI_GET_ITEM(gxml, "checkbutton_BSP_privacy"); + + radio_button.bs_mode_off = + UI_GET_ITEM(gxml, "radiobutton_BSP_off"); + radio_button.bs_mode_personal = + UI_GET_ITEM(gxml, "radiobutton_BSP_personal"); + radio_button.bs_mode_speaker = + UI_GET_ITEM(gxml, "radiobutton_BSP_speaker"); + radio_button.bs_mode_audience = + UI_GET_ITEM(gxml, "radiobutton_BSP_audience"); + + radio_button.bs_nav_direct = + UI_GET_ITEM(gxml, "radiobutton_BSP_nav_direct"); + radio_button.bs_nav_verselist = + UI_GET_ITEM(gxml, "radiobutton_BSP_nav_verselist"); + + radio_button.bs_listen_some = + UI_GET_ITEM(gxml, "radiobutton_BSP_listen_some"); + radio_button.bs_listen_all = + UI_GET_ITEM(gxml, "radiobutton_BSP_listen_all"); + radio_button.bs_listen_none = + UI_GET_ITEM(gxml, "radiobutton_BSP_listen_none"); speaker_window = UI_GET_ITEM(gxml, "speakerwindow"); biblesync_update_speaker(); @@ -3029,9 +2996,9 @@ /* color inverters */ g_signal_connect((gpointer)color_picker.invert_normal, "clicked", - G_CALLBACK(on_invert), (void*)1); - g_signal_connect((gpointer)color_picker.invert_highlight, "clicked", - G_CALLBACK(on_invert), (void*)0); + G_CALLBACK(on_invert), (void *)1); + g_signal_connect((gpointer)color_picker.invert_highlight, + "clicked", G_CALLBACK(on_invert), (void *)0); /* check buttons */ @@ -3043,14 +3010,16 @@ /* verse number size */ index = get_font_size_index(settings.verse_num_font_size_str); combo.verse_number_size = UI_GET_ITEM(gxml, "combobox1"); - gtk_combo_box_set_active(GTK_COMBO_BOX(combo.verse_number_size), index); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo.verse_number_size), + index); g_signal_connect(combo.verse_number_size, "changed", G_CALLBACK(on_combobox1_changed), NULL); /* base font size */ index = get_font_size_index(settings.base_font_size_str); combo.base_font_size = UI_GET_ITEM(gxml, "basecombobox1"); - gtk_combo_box_set_active(GTK_COMBO_BOX(combo.base_font_size), index); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo.base_font_size), + index); g_signal_connect(combo.base_font_size, "changed", G_CALLBACK(on_basecombobox1_changed), NULL); @@ -3071,11 +3040,10 @@ /* studypad directory chooserbutton */ chooser = UI_GET_ITEM(gxml, "filechooserbutton1"); gtk_file_chooser_set_current_folder((GtkFileChooser *)chooser, - settings.studypaddir); + settings.studypaddir); g_signal_connect(chooser, "current_folder_changed", G_CALLBACK(on_folder_changed), NULL); - /* prefs notebook */ notebook = UI_GET_ITEM(gxml, "notebook"); /* setup treeview */ @@ -3086,14 +3054,15 @@ gtk_widget_set_size_request(treeview, 130, -1); add_columns(treeview); gtk_tree_view_expand_all(GTK_TREE_VIEW(treeview)); - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); - /* connect signals and data */ + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); +/* connect signals and data */ #ifdef USE_GTKBUILDER - gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); + gtk_builder_connect_signals_full(gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, + NULL); #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif g_signal_connect(selection, "changed", @@ -3102,10 +3071,13 @@ /* * parallel select dialog: chooser and button connectivity */ - parallel_select.button_clear = UI_GET_ITEM(gxml, "ps_toolbutton_clear"); - parallel_select.button_cut = UI_GET_ITEM(gxml, "ps_toolbutton_cut"); - parallel_select.button_add = UI_GET_ITEM(gxml, "ps_toolbutton_add"); - parallel_select.listview = UI_GET_ITEM(gxml, "ps_listview"); + parallel_select.button_clear = + UI_GET_ITEM(gxml, "ps_toolbutton_clear"); + parallel_select.button_cut = + UI_GET_ITEM(gxml, "ps_toolbutton_cut"); + parallel_select.button_add = + UI_GET_ITEM(gxml, "ps_toolbutton_add"); + parallel_select.listview = UI_GET_ITEM(gxml, "ps_listview"); g_signal_connect(parallel_select.button_clear, "clicked", G_CALLBACK(ps_button_clear), NULL); @@ -3117,7 +3089,7 @@ ps_setup_listview(); /* geometry notifications */ - g_signal_connect((gpointer) dialog_prefs, + g_signal_connect((gpointer)dialog_prefs, "configure_event", G_CALLBACK(on_prefs_configure_event), NULL); @@ -3136,10 +3108,10 @@ if ((settings.prefs_y < 0) || (settings.prefs_y > 2000)) settings.prefs_y = 40; - gtk_window_move(GTK_WINDOW(dialog_prefs),settings.prefs_x,settings.prefs_y); + gtk_window_move(GTK_WINDOW(dialog_prefs), settings.prefs_x, + settings.prefs_y); } - /****************************************************************************** * Name * gui_setup_preferences_dialog @@ -3157,8 +3129,7 @@ * void */ -void -gui_setup_preferences_dialog(void) +void gui_setup_preferences_dialog(void) { if (dialog_prefs == NULL) { create_preferences_dialog(); diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/search_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/search_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/search_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/search_dialog.c 2015-02-20 04:02:23.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.c - gui for searching Sword modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ #include #ifndef USE_GTKBUILDER - #include +#include #endif #include "xiphos_html/xiphos_html.h" @@ -55,14 +55,14 @@ #include "gui/debug_glib_null.h" /******************************************************************************/ -#define _BYTE 8 -#define _WORD 16 -#define _DWORD 32 +#define _BYTE 8 +#define _WORD 16 +#define _DWORD 32 #define SEARCHING N_("Searching the ") #define SMODULE N_(" Module") #define FINDS N_("found in ") -#define HTML_START "" +#define HTML_START "" SEARCH_DIALOG1 search1; @@ -70,7 +70,7 @@ static gchar *module_selected; gchar *verse_selected; -GtkWidget *remember_search; /* needed to change button in search stop */ +GtkWidget *remember_search; /* needed to change button in search stop */ /****************************************************************************** * Name @@ -91,18 +91,18 @@ * gboolean */ -static gboolean on_advsearch_configure_event(GtkWidget * widget, - GdkEventConfigure * event, - gpointer user_data) +static gboolean on_advsearch_configure_event(GtkWidget *widget, + GdkEventConfigure *event, + gpointer user_data) { gchar layout[10]; gint x; gint y; - gdk_window_get_root_origin( - GDK_WINDOW(gtk_widget_get_window (search1.dialog)), &x, &y); + gdk_window_get_root_origin(GDK_WINDOW(gtk_widget_get_window(search1.dialog)), + &x, &y); - settings.advsearch_width = event->width; + settings.advsearch_width = event->width; settings.advsearch_height = event->height; settings.advsearch_x = x; settings.advsearch_y = y; @@ -124,9 +124,8 @@ } /* click on treeview folder to expand or collapse it */ -static gboolean button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer data) +static gboolean button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeIter selected; @@ -142,21 +141,20 @@ return FALSE; path = gtk_tree_model_get_path(model, &selected); - if (gtk_tree_view_row_expanded (GTK_TREE_VIEW(widget), path)) - gtk_tree_view_collapse_row ( GTK_TREE_VIEW(widget), path ); - else - gtk_tree_view_expand_row ( GTK_TREE_VIEW(widget), path, FALSE ); - gtk_tree_path_free ( path ); + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, + FALSE); + gtk_tree_path_free(path); return FALSE; } -void on_comboboxentry2_changed(GtkComboBox * combobox, - gpointer user_data) +void on_comboboxentry2_changed(GtkComboBox *combobox, gpointer user_data) { main_comboboxentry2_changed(combobox, user_data); } - /****************************************************************************** * Name * button_clean @@ -173,27 +171,33 @@ * void */ -void button_clean(GtkButton * button, gpointer user_data) +void button_clean(GtkButton *button, gpointer user_data) { GtkTreeModel *model; GtkListStore *list_store; GString *html_text = g_string_new(""); XI_message(("button_clean")); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_results)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_results)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); - g_string_printf(html_text, HTML_START " ", - settings.bible_text_color, settings.bible_bg_color); - XIPHOS_HTML_OPEN_STREAM(search1.preview_html,"text/html"); - XIPHOS_HTML_WRITE(search1.preview_html,html_text->str,html_text->len); + g_string_printf(html_text, + HTML_START + " ", + settings.bible_text_color, + settings.bible_bg_color); + XIPHOS_HTML_OPEN_STREAM(search1.preview_html, "text/html"); + XIPHOS_HTML_WRITE(search1.preview_html, html_text->str, + html_text->len); XIPHOS_HTML_CLOSE(search1.preview_html); - g_string_free(html_text,TRUE); + g_string_free(html_text, TRUE); } /****************************************************************************** @@ -213,12 +217,11 @@ * void */ -void button_save(GtkButton * button, gpointer user_data) +void button_save(GtkButton *button, gpointer user_data) { - main_save_current_adv_search_as_bookmarks (); + main_save_current_adv_search_as_bookmarks(); } - /****************************************************************************** * Name * button_export @@ -236,7 +239,7 @@ * void */ -void button_export(GtkButton * button, gpointer user_data) +void button_export(GtkButton *button, gpointer user_data) { gui_export_bookmarks_dialog(ADV_SEARCH_RESULTS_EXPORT, NULL); } @@ -257,7 +260,7 @@ * void */ -void _on_destroy(GtkWidget * dialog, gpointer user_data) +void _on_destroy(GtkWidget *dialog, gpointer user_data) { /* main_do_dialog_search() initializes these as search starts */ if (search_active) { @@ -280,9 +283,6 @@ } } - - - /****************************************************************************** * Name * on_button_begin_search @@ -299,45 +299,48 @@ * void */ -void on_button_begin_search(GtkButton * button, gpointer user_data) +void on_button_begin_search(GtkButton *button, gpointer user_data) { if (search_active) { terminate_search = TRUE; #ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("edit-find", GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-find"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); + gtk_button_set_label((GtkButton *)remember_search, + "gtk-find"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); -#endif +#endif sync_windows(); } else { #ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("process-stop", - GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("process-stop", + GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-stop"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); -#endif - + gtk_button_set_label((GtkButton *)remember_search, + "gtk-stop"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); +#endif + // do the search main_do_dialog_search(); - -#ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON)); + +#ifdef HAVE_GTK_310 + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("edit-find", GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-find"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); + gtk_button_set_label((GtkButton *)remember_search, + "gtk-find"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); #endif } } - /****************************************************************************** * Name * list_name_changed @@ -356,7 +359,7 @@ * void */ -void list_name_changed(GtkEditable * editable, gpointer user_data) +void list_name_changed(GtkEditable *editable, gpointer user_data) { const gchar *text; GtkTreeModel *model; @@ -364,10 +367,10 @@ GtkTreeSelection *selection; GtkTreeIter selected; - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.module_lists)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; @@ -376,7 +379,6 @@ gtk_list_store_set(list_store, &selected, 0, text, -1); } - /****************************************************************************** * Name * range_name_changed @@ -395,7 +397,7 @@ * void */ -void range_name_changed(GtkEditable * editable, gpointer user_data) +void range_name_changed(GtkEditable *editable, gpointer user_data) { const gchar *text; GtkTreeModel *model; @@ -403,20 +405,18 @@ GtkTreeSelection *selection; GtkTreeIter selected; - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.list_range_name)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.list_range_name)); - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; text = gtk_entry_get_text(GTK_ENTRY(editable)); gtk_list_store_set(list_store, &selected, 0, text, -1); } - /****************************************************************************** * Name * range_text_changed @@ -434,12 +434,11 @@ * void */ -void range_text_changed(GtkEditable * editable, gpointer user_data) +void range_text_changed(GtkEditable *editable, gpointer user_data) { main_range_text_changed(editable); } - /****************************************************************************** * Name * new_modlist @@ -456,7 +455,7 @@ * void */ -void new_modlist(GtkButton * button, gpointer user_data) +void new_modlist(GtkButton *button, gpointer user_data) { gchar buf[80]; GtkTreeModel *model; @@ -467,12 +466,15 @@ GtkTreeSelection *selection; GtkTreePath *path; - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); + selection = + gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); list_store = GTK_LIST_STORE(model); - model2 = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); + model2 = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); list_store2 = GTK_LIST_STORE(model2); { @@ -493,7 +495,6 @@ gtk_tree_path_free(path); } - /****************************************************************************** * Name * @@ -510,12 +511,8 @@ * void */ -void clear_modules(GtkButton * button, gpointer user_data) +void clear_modules(GtkButton *button, gpointer user_data) { - GtkTreeModel *model; - GtkListStore *list_store; - GtkTreeSelection *selection; - GtkTreeIter selected; gchar *str; str = g_strdup_printf("%s\n\n%s", @@ -527,20 +524,23 @@ #else if (gui_yes_no_dialog(str, GTK_STOCK_DIALOG_WARNING)) { #endif - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); - list_store = GTK_LIST_STORE(model); + GtkTreeIter selected; + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); + GtkListStore *list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); + GtkTreeSelection *selection = + gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); if (gtk_tree_selection_get_selected(selection, NULL, &selected)) - gtk_list_store_set(list_store, &selected, 1, "", -1); + gtk_list_store_set(list_store, &selected, 1, "", + -1); } g_free(str); } - /****************************************************************************** * Name * @@ -557,12 +557,11 @@ * void */ -void delete_module(GtkButton * button, gpointer user_data) +void delete_module(GtkButton *button, gpointer user_data) { main_delete_module(GTK_TREE_VIEW(search1.listview_modules)); } - /****************************************************************************** * Name * save_modlist @@ -579,12 +578,11 @@ * void */ -void save_modlist(GtkButton * button, gpointer user_data) +void save_modlist(GtkButton *button, gpointer user_data) { main_save_modlist(); } - /****************************************************************************** * Name * new_range @@ -601,7 +599,7 @@ * void */ -void new_range(GtkButton * button, gpointer user_data) +void new_range(GtkButton *button, gpointer user_data) { gchar *text[2]; GtkTreeModel *model; @@ -611,29 +609,24 @@ GtkTreePath *path; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.list_range_name)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.list_range_name)); text[0] = "[New Range]"; text[1] = ""; gtk_list_store_append(list_store, &iter); - gtk_list_store_set(list_store, &iter, - 0, text[0], 1, text[1], -1); + gtk_list_store_set(list_store, &iter, 0, text[0], 1, text[1], -1); path = gtk_tree_model_get_path(model, &iter); gtk_tree_selection_select_path(selection, path); gtk_tree_path_free(path); - gtk_entry_set_text(GTK_ENTRY(search1.entry_range_name), - text[0]); + gtk_entry_set_text(GTK_ENTRY(search1.entry_range_name), text[0]); gtk_entry_set_text(GTK_ENTRY(search1.entry_range_text), ""); } - /****************************************************************************** * Name * save_range @@ -650,12 +643,11 @@ * void */ -void save_range(GtkButton * button, gpointer user_data) +void save_range(GtkButton *button, gpointer user_data) { main_save_range(); } - /****************************************************************************** * Name * delete_range @@ -672,12 +664,11 @@ * void */ -void delete_range(GtkButton * button, gpointer user_data) +void delete_range(GtkButton *button, gpointer user_data) { main_delete_range(); } - /****************************************************************************** * Name * delete_list @@ -694,7 +685,7 @@ * void */ -void delete_list(GtkButton * button, gpointer user_data) +void delete_list(GtkButton *button, gpointer user_data) { gchar *name_string = NULL; GtkTreeModel *model; @@ -712,14 +703,11 @@ #endif model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.module_lists)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.module_lists)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(model, &selected, 0, &name_string, -1); @@ -740,7 +728,7 @@ g_free(str); return; } -#endif +#endif gtk_list_store_remove(list_store, &selected); xml_remove_node("modlists", "modlist", name_string); @@ -751,7 +739,6 @@ g_free(str); } - /****************************************************************************** * Name * scope_toggled @@ -770,16 +757,15 @@ * void */ -void scope_toggled(GtkToggleButton * togglebutton, gpointer user_data) +void scope_toggled(GtkToggleButton *togglebutton, gpointer user_data) { search1.which_scope = togglebutton; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_custom_range))) - gtk_widget_set_sensitive(search1.combo_range,TRUE); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_custom_range))) + gtk_widget_set_sensitive(search1.combo_range, TRUE); else - gtk_widget_set_sensitive(search1.combo_range,FALSE); + gtk_widget_set_sensitive(search1.combo_range, FALSE); } - /****************************************************************************** * Name * mod_list_toggled @@ -797,20 +783,19 @@ * void */ -void mod_list_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +void mod_list_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) { - main_comboboxentry2_changed((GtkComboBox *) search1. - combo_list, user_data); + if (gtk_toggle_button_get_active(togglebutton)) { + main_comboboxentry2_changed((GtkComboBox *) + search1.combo_list, + user_data); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_custom_list))) - gtk_widget_set_sensitive(search1.combo_list,TRUE); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_custom_list))) + gtk_widget_set_sensitive(search1.combo_list, TRUE); else - gtk_widget_set_sensitive(search1.combo_list,FALSE); + gtk_widget_set_sensitive(search1.combo_list, FALSE); } - /****************************************************************************** * Name * optimized_toggled @@ -828,16 +813,14 @@ * void */ -void optimized_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +void optimized_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) gtk_widget_show(search1.button_intro_lucene); else gtk_widget_hide(search1.button_intro_lucene); } - /****************************************************************************** * Name * on_lucene_intro_clicked @@ -855,22 +838,19 @@ * void */ -#define LUCENE_INTRO \ -_("Syntax overview for optimized \"lucene\" searches\nSearch for verses that contain...\n\nloved one\n\t \"loved\" or \"one\"\n\tThis is the same as searching for loved OR one\n\"loved one\"\n\tThe phrase \"loved one\"\nlove*\n\tA word starting with \"love\"\n\t(love OR loves OR loved OR etc...)\nloved AND one\n\tThe word \"loved\" and the word \"one\"\n\t&& can be used in place of AND\n+loved one\n\tVerses that must contain \"loved\" and may contain \"one\"\nloved NOT one\n\t\"loved\" but not \"one\"\n(loved one) AND God\n\t\"loved\" or \"one\" and \"God\"\nlemma:G2316\n\tSearch for the Strong's Greek (\"G\") word number 2316.\n\tAlso, select Strong's display on the Attribute Search tab.\n\nFor complete details, search the web for \"lucene search syntax\".") +#define LUCENE_INTRO \ + _("Syntax overview for optimized \"lucene\" searches\nSearch for verses that contain...\n\nloved one\n\t \"loved\" or \"one\"\n\tThis is the same as searching for loved OR one\n\"loved one\"\n\tThe phrase \"loved one\"\nlove*\n\tA word starting with \"love\"\n\t(love OR loves OR loved OR etc...)\nloved AND one\n\tThe word \"loved\" and the word \"one\"\n\t&& can be used in place of AND\n+loved one\n\tVerses that must contain \"loved\" and may contain \"one\"\nloved NOT one\n\t\"loved\" but not \"one\"\n(loved one) AND God\n\t\"loved\" or \"one\" and \"God\"\nlemma:G2316\n\tSearch for the Strong's Greek (\"G\") word number 2316.\n\tAlso, select Strong's display on the Attribute Search tab.\n\nFor complete details, search the web for \"lucene search syntax\".") -void -on_lucene_intro_clicked(GtkButton * button, gpointer user_data) +void on_lucene_intro_clicked(GtkButton *button, gpointer user_data) { GtkWidget *dialog; - dialog = gtk_message_dialog_new_with_markup - (NULL, /* no need for a parent window */ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - LUCENE_INTRO); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + dialog = gtk_message_dialog_new_with_markup(NULL, /* no need for a parent window */ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + LUCENE_INTRO); + g_signal_connect_swapped(dialog, "response", + G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show(dialog); } @@ -891,16 +871,14 @@ * void */ -void attributes_toggled(GtkToggleButton * togglebutton, - gpointer user_data) +void attributes_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) gtk_widget_show(search1.button_intro_attributes); else gtk_widget_hide(search1.button_intro_attributes); } - /****************************************************************************** * Name * on_attributes_intro_clicked @@ -918,22 +896,19 @@ * void */ -#define ATTRIBUTES_INTRO \ -_("Attribute-based searches\nSearches for content contained in markup outside the main text. Attributes are footnotes, Strong's numbers, and morphological symbols.\n\nBe aware that most such searches can now be done faster via optimized \"lucene\" searches using keyword qualifiers.\n\nTo use attribute searches, you must select the appropriate button on the Attribute Search tab.\n* Footnote text is searched just like regular text.\n* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n* Morphological tags are identified literally, e.g. N-ASF for \"noun, accusative singular feminine\" -- see the Robinson module for details.") +#define ATTRIBUTES_INTRO \ + _("Attribute-based searches\nSearches for content contained in markup outside the main text. Attributes are footnotes, Strong's numbers, and morphological symbols.\n\nBe aware that most such searches can now be done faster via optimized \"lucene\" searches using keyword qualifiers.\n\nTo use attribute searches, you must select the appropriate button on the Attribute Search tab.\n* Footnote text is searched just like regular text.\n* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n* Morphological tags are identified literally, e.g. N-ASF for \"noun, accusative singular feminine\" -- see the Robinson module for details.") -void -on_attributes_intro_clicked(GtkButton * button, gpointer user_data) +void on_attributes_intro_clicked(GtkButton *button, gpointer user_data) { GtkWidget *dialog; - dialog = gtk_message_dialog_new_with_markup - (NULL, /* no need for a parent window */ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - ATTRIBUTES_INTRO); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + dialog = gtk_message_dialog_new_with_markup(NULL, /* no need for a parent window */ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + ATTRIBUTES_INTRO); + g_signal_connect_swapped(dialog, "response", + G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show(dialog); } @@ -956,21 +931,19 @@ * void */ -void current_module_toggled(GtkToggleButton * togglebutton, +void current_module_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { main_change_mods_select_label(search1.search_mod); gtk_widget_set_sensitive(search1.rb_last, TRUE); - gtk_widget_set_sensitive(search1.combo_list,FALSE); + gtk_widget_set_sensitive(search1.combo_list, FALSE); } else { gtk_widget_set_sensitive(search1.rb_last, FALSE); gtk_toggle_button_set_active(search1.which_scope, TRUE); } } - - /****************************************************************************** * Name * mod_selection_changed @@ -988,13 +961,12 @@ * void */ -static void mod_selection_changed(GtkTreeSelection * selection, - GtkWidget * tree_widget) +static void mod_selection_changed(GtkTreeSelection *selection, + GtkWidget *tree_widget) { main_mod_selection_changed(selection, tree_widget); } - /****************************************************************************** * Name * @@ -1013,12 +985,12 @@ */ static void _selection_finds_list_changed(GtkTreeSelection * - selection, gpointer data) + selection, + gpointer data) { main_selection_finds_list_changed(selection, data); } - /****************************************************************************** * Name * selection_modules_lists_changed @@ -1037,14 +1009,12 @@ */ static void _selection_modules_lists_changed(GtkTreeSelection * - selection, gpointer data) + selection, + gpointer data) { main_selection_modules_lists_changed(selection, data); } - - - /****************************************************************************** * Name * _modules_lists_changed @@ -1063,11 +1033,13 @@ */ static void _modules_lists_changed(GtkTreeSelection * - selection, GtkTreeView * tree_widget) + selection, + GtkTreeView *tree_widget) { gchar *mod = NULL; GtkTreeIter selected; - GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; @@ -1082,10 +1054,8 @@ g_free(module_selected); module_selected = mod; } - } - /****************************************************************************** * Name * @@ -1103,25 +1073,28 @@ * void */ -static void _finds_verselist_selection_changed(GtkWidget * widget, - GdkEventButton * event, - gpointer data) +static void _finds_verselist_selection_changed(GtkWidget *widget, + GdkEventButton *event, + gpointer data) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter selected; gchar *key = NULL; - selection = - gtk_tree_view_get_selection((GtkTreeView *) search1.listview_verses); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); + selection = gtk_tree_view_get_selection((GtkTreeView *) + search1.listview_verses); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, 0, &key, -1); - main_finds_verselist_selection_changed(selection, model, event->type == GDK_2BUTTON_PRESS); + main_finds_verselist_selection_changed(selection, model, + event->type == + GDK_2BUTTON_PRESS); } /****************************************************************************** @@ -1141,24 +1114,23 @@ * gboolean */ -static gboolean on_treeview_button_press_event_advsearch(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +static gboolean on_treeview_button_press_event_advsearch(GtkWidget * + widget, + GdkEventButton * + event, + gpointer + user_data) { - if (event->button == 3) - { - gtk_menu_popup((GtkMenu*)search1.menu_item_send_search, + if (event->button == 3) { + gtk_menu_popup((GtkMenu *)search1.menu_item_send_search, NULL, NULL, NULL, NULL, 2, gtk_get_current_event_time()); return TRUE; - } - else - { + } else { return FALSE; } } - /****************************************************************************** * Name * on_send_list_via_biblesync_advsearch_activate @@ -1175,80 +1147,73 @@ */ G_MODULE_EXPORT void -on_send_list_via_biblesync_advsearch_activate(GtkMenuItem * menuitem, +on_send_list_via_biblesync_advsearch_activate(GtkMenuItem *menuitem, gpointer user_data) { - if (biblesync_active_xmit_allowed()) - { - GtkTreeIter iter; - GtkTreeModel *model = - gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); - - GString *vlist = g_string_new(""); - gchar *module = NULL, *text, *buf, *key; - - gboolean first = TRUE; - gboolean valid = gtk_tree_model_get_iter_first(model, &iter); - - while (valid) { - // retrieve a verse ref line. - gtk_tree_model_get(model, &iter, 0, &text, -1); - - // painful parse of "NET: Revelation of John 2:12 and text here..." - // first `:' finds end of module name. - buf = strchr(text, ':'); - *buf = '\0'; - // key starts 2 characters after the (former) ':'. - key = buf + 2; - // next : is the middle of chapter:verse. - buf = strchr(key, ':'); - // if that works, then space after that ends key. - // it might not work, if not bible/comm...to be caught just below. - if (buf) - buf = strchr(buf, ' '); - if (buf) - *buf = '\0'; - - if (first) - { - /* we can send only verse nav -- no lex, no books */ - module = g_strdup(text); - if (!main_is_module(module) || - ((main_get_mod_type(module) != TEXT_TYPE) && - (main_get_mod_type(module) != COMMENTARY_TYPE))) - { - g_free(module); - g_free(text); - g_string_free(vlist, TRUE); - gui_generic_warning - (_("Module is neither Bible nor commentary")); - return; + if (biblesync_active_xmit_allowed()) { + GtkTreeIter iter; + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); + + GString *vlist = g_string_new(""); + gchar *module = NULL, *text, *buf; + + gboolean first = TRUE; + gboolean valid = + gtk_tree_model_get_iter_first(model, &iter); + + while (valid) { + // retrieve a verse ref line. + gtk_tree_model_get(model, &iter, 0, &text, -1); + + // painful parse of "NET: Revelation of John 2:12 and text here..." + // first `:' finds end of module name. + buf = strchr(text, ':'); + *buf = '\0'; + // key starts 2 characters after the (former) ':'. + gchar *key = buf + 2; + // next : is the middle of chapter:verse. + buf = strchr(key, ':'); + // if that works, then space after that ends key. + // it might not work, if not bible/comm...to be caught just below. + if (buf) + buf = strchr(buf, ' '); + if (buf) + *buf = '\0'; + + if (first) { + /* we can send only verse nav -- no lex, no books */ + module = g_strdup(text); + if (!main_is_module(module) || + ((main_get_mod_type(module) != + TEXT_TYPE) && + (main_get_mod_type(module) != + COMMENTARY_TYPE))) { + g_free(module); + g_free(text); + g_string_free(vlist, TRUE); + gui_generic_warning(_("Module is neither Bible nor commentary")); + return; + } + } else { + vlist = g_string_append_c(vlist, ';'); + } + vlist = g_string_append(vlist, (char *) + main_get_osisref_from_key(module, key)); + + g_free(text); + first = FALSE; + valid = gtk_tree_model_iter_next(model, &iter); } - } - else - { - vlist = g_string_append_c(vlist, ';'); - } - vlist = g_string_append( - vlist, - (char *)main_get_osisref_from_key(module, key)); - - g_free(text); - first = FALSE; - valid = gtk_tree_model_iter_next(model, &iter); - } - biblesync_transmit_verse_list(module, vlist->str); - g_free(module); - g_string_free(vlist, TRUE); - } - else - { - gui_generic_warning(_("BibleSync is not active for transmit.")); - } + biblesync_transmit_verse_list(module, vlist->str); + g_free(module); + g_string_free(vlist, TRUE); + } else { + gui_generic_warning(_("BibleSync is not active for transmit.")); + } } - /****************************************************************************** * Name * create_results_menu_advsearch @@ -1270,39 +1235,44 @@ gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_verselist_advsearch", NULL); + gxml = glade_xml_new(glade_file, "menu_verselist_advsearch", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); menu = UI_GET_ITEM(gxml, "menu_verselist_advsearch"); #ifdef USE_GTKBUILDER /* connect signals and data */ - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - /* connect signals and data */ - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + /* connect signals and data */ + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif return menu; } - /****************************************************************************** * Name * selection_range_lists_changed @@ -1320,7 +1290,7 @@ * void */ -static void selection_range_lists_changed(GtkTreeSelection * selection, +static void selection_range_lists_changed(GtkTreeSelection *selection, gpointer data) { gchar *name = NULL; @@ -1328,13 +1298,11 @@ GtkTreeModel *model; GtkTreeIter selected; - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); gtk_tree_model_get(model, &selected, 0, &name, 1, &range, -1); gtk_entry_set_text(GTK_ENTRY(search1.entry_range_name), name); @@ -1343,7 +1311,6 @@ g_free(range); } - /****************************************************************************** * Name * @@ -1361,25 +1328,20 @@ * void */ -static void selection_verselist_changed(GtkTreeSelection * selection, - gpointer data) +static void selection_verselist_changed(GtkTreeSelection *selection, + gpointer data) { GtkTreeModel *model; GtkTreeIter selected; - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); - main_finds_verselist_selection_changed(selection, - model, - FALSE); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); + main_finds_verselist_selection_changed(selection, model, FALSE); } - /****************************************************************************** * Name * add_two_text_columns @@ -1396,7 +1358,7 @@ * void */ -static void _add_two_text_columns(GtkTreeView * treeview) +static void _add_two_text_columns(GtkTreeView *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1405,22 +1367,17 @@ column = gtk_tree_view_column_new_with_attributes("Module", renderer, - "text", 0, - NULL); + "text", 0, NULL); gtk_tree_view_append_column(treeview, column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Module", renderer, - "text", 1, - NULL); + "text", 1, NULL); gtk_tree_view_append_column(treeview, column); gtk_tree_view_column_set_sort_column_id(column, 0); - } - - /****************************************************************************** * Name * @@ -1437,21 +1394,19 @@ * */ -static -void _setup_combobox(GtkComboBox * combo) +static void _setup_combobox(GtkComboBox *combo) { GtkListStore *store; store = gtk_list_store_new(1, G_TYPE_STRING); gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store)); #ifdef USE_GTK_3 - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX(combo), 0); -#else + gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo), 0); +#else gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); #endif } - /****************************************************************************** * Name * @@ -1468,46 +1423,44 @@ * */ -static -void _setup_listviews(GtkWidget * listview, GCallback callback) +static void _setup_listviews(GtkWidget *listview, GCallback callback) { GtkListStore *model; GObject *selection; model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(listview), GTK_TREE_MODEL(model)); + gtk_tree_view_set_model(GTK_TREE_VIEW(listview), + GTK_TREE_MODEL(model)); _add_two_text_columns(GTK_TREE_VIEW(listview)); if (!callback) return; - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(listview))); + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(listview))); g_signal_connect(selection, "changed", G_CALLBACK(callback), NULL); - } -static -void _setup_listviews2(GtkWidget * listview, GCallback callback) +static void _setup_listviews2(GtkWidget *listview, GCallback callback) { GtkListStore *model; GObject *selection; model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(listview), GTK_TREE_MODEL(model)); + gtk_tree_view_set_model(GTK_TREE_VIEW(listview), + GTK_TREE_MODEL(model)); _add_two_text_columns(GTK_TREE_VIEW(listview)); if (!callback) return; - g_signal_connect((gpointer) listview, - "button_press_event", + g_signal_connect((gpointer)listview, + "button_press_event", G_CALLBACK(callback), NULL); + g_signal_connect((gpointer)listview, + "button_release_event", G_CALLBACK(callback), NULL); - g_signal_connect((gpointer) listview, - "button_release_event", - G_CALLBACK(callback), NULL); - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(listview))); - g_signal_connect(selection, "changed", G_CALLBACK(selection_verselist_changed), - NULL); - + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(listview))); + g_signal_connect(selection, "changed", + G_CALLBACK(selection_verselist_changed), NULL); } - /****************************************************************************** * Name * @@ -1524,8 +1477,7 @@ * */ -static -void _setup_treeview(GtkWidget * treeview) +static void _setup_treeview(GtkWidget *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1534,13 +1486,13 @@ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Found", renderer, - "text", - 0, NULL); + "text", 0, NULL); gtk_tree_view_column_set_sort_column_id(column, 0); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); gui_load_module_tree(treeview, FALSE); - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); g_signal_connect(selection, "changed", G_CALLBACK(mod_selection_changed), treeview); @@ -1550,9 +1502,7 @@ GINT_TO_POINTER(0)); } - -static -void _setup_treeview2(GtkWidget * treeview) +static void _setup_treeview2(GtkWidget *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -1561,18 +1511,18 @@ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("Found", renderer, - "text", - 0, NULL); + "text", 0, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); gtk_tree_view_column_set_sort_column_id(column, 0); gui_load_module_tree(treeview, FALSE); - selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); - g_signal_connect(selection, "changed", G_CALLBACK(_modules_lists_changed), treeview); + selection = + G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview))); + g_signal_connect(selection, "changed", + G_CALLBACK(_modules_lists_changed), treeview); } - -void on_closebutton2_clicked(GtkButton * button, gpointer user_data) +void on_closebutton2_clicked(GtkButton *button, gpointer user_data) { gtk_widget_hide(search1.mod_sel_dialog); } @@ -1593,15 +1543,16 @@ * */ -void _on_dialog2_response(GtkDialog * dialog, gint response_id, - gpointer user_data) +void _on_dialog2_response(GtkDialog *dialog, gint response_id, + gpointer user_data) { switch (response_id) { case GTK_RESPONSE_CLOSE: gtk_widget_hide(GTK_WIDGET(dialog)); break; case GTK_RESPONSE_APPLY: - main_add_mod_to_list(search1.listview_modules, module_selected); + main_add_mod_to_list(search1.listview_modules, + module_selected); break; } } @@ -1622,25 +1573,24 @@ * void */ -#ifndef USE_GTKBUILDER -static -void _create_mod_sel_dialog(void) -{ +#ifndef USE_GTKBUILDER +static void _create_mod_sel_dialog(void) +{ gchar *glade_file; GladeXML *gxml2; glade_file = gui_general_user_file("search-dialog.glade", FALSE); g_return_if_fail(glade_file != NULL); - XI_message(("%s",glade_file)); - + XI_message(("%s", glade_file)); gxml2 = glade_xml_new(glade_file, "dialog2", NULL); search1.mod_sel_dialog = glade_xml_get_widget(gxml2, "dialog2"); g_signal_connect((gpointer)search1.mod_sel_dialog, "response", G_CALLBACK(_on_dialog2_response), NULL); - - search1.mod_sel_dlg_treeview = glade_xml_get_widget(gxml2, "treeview8"); + + search1.mod_sel_dlg_treeview = + glade_xml_get_widget(gxml2, "treeview8"); _setup_treeview2(search1.mod_sel_dlg_treeview); gtk_widget_hide(search1.mod_sel_dialog); @@ -1666,8 +1616,8 @@ */ void -on_toolbutton12_clicked(GtkToolButton * toolbutton, gpointer user_data) -{ +on_toolbutton12_clicked(GtkToolButton *toolbutton, gpointer user_data) +{ #ifndef USE_GTKBUILDER _create_mod_sel_dialog(); #endif @@ -1691,27 +1641,26 @@ */ /* add html widgets */ -static -void _add_html_widget(GtkWidget * vbox) +static void _add_html_widget(GtkWidget *vbox) { GtkWidget *scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); - search1.preview_html = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DIALOG_SEARCH_PREVIEW_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindow), search1.preview_html); - gtk_box_pack_start(GTK_BOX(scrolledwindow), search1.preview_html, TRUE, TRUE, 0); + search1.preview_html = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DIALOG_SEARCH_PREVIEW_TYPE)); + gtk_container_add(GTK_CONTAINER(scrolledwindow), + search1.preview_html); + gtk_box_pack_start(GTK_BOX(scrolledwindow), search1.preview_html, + TRUE, TRUE, 0); gtk_widget_show(search1.preview_html); } - - /****************************************************************************** * Name * @@ -1728,7 +1677,7 @@ * */ -void _on_dialog_response(GtkDialog * dialog, gint response_id, +void _on_dialog_response(GtkDialog *dialog, gint response_id, gpointer user_data) { switch (response_id) { @@ -1758,8 +1707,7 @@ * void */ -static -void _create_search_dialog(void) +static void _create_search_dialog(void) { gchar *glade_file; #ifdef USE_GTKBUILDER @@ -1783,14 +1731,15 @@ verse_selected = NULL; _preview_on = TRUE; - glade_file = gui_general_user_file("search-dialog" UI_SUFFIX, FALSE); + glade_file = + gui_general_user_file("search-dialog" UI_SUFFIX, FALSE); g_return_if_fail(glade_file != NULL); - XI_message(("%s",glade_file)); + XI_message(("%s", glade_file)); - /* build the widget */ +/* build the widget */ #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else gxml = glade_xml_new(glade_file, "dialog", NULL); #endif @@ -1822,14 +1771,14 @@ search1.list_range_name = UI_GET_ITEM(gxml, "treeview4"); _setup_listviews(search1.list_range_name, - (GCallback) selection_range_lists_changed); + (GCallback)selection_range_lists_changed); search1.list_ranges = UI_GET_ITEM(gxml, "treeview5"); _setup_listviews(search1.list_ranges, NULL); search1.module_lists = UI_GET_ITEM(gxml, "treeview6"); _setup_listviews(search1.module_lists, - (GCallback) _selection_modules_lists_changed); + (GCallback)_selection_modules_lists_changed); search1.listview_modules = UI_GET_ITEM(gxml, "treeview7"); _setup_listviews(search1.listview_modules, NULL); @@ -1856,14 +1805,15 @@ G_CALLBACK(mod_list_toggled), NULL); /* search type selection */ - search1.rb_words = UI_GET_ITEM(gxml, "radiobutton9"); - search1.rb_regexp = UI_GET_ITEM(gxml, "radiobutton10"); + search1.rb_words = UI_GET_ITEM(gxml, "radiobutton9"); + search1.rb_regexp = UI_GET_ITEM(gxml, "radiobutton10"); search1.rb_exact_phrase = UI_GET_ITEM(gxml, "radiobutton11"); - search1.rb_optimized = UI_GET_ITEM(gxml, "radiobutton16"); + search1.rb_optimized = UI_GET_ITEM(gxml, "radiobutton16"); g_signal_connect(search1.rb_optimized, "toggled", G_CALLBACK(optimized_toggled), NULL); - search1.button_intro_lucene = UI_GET_ITEM(gxml, "button_intro_lucene"); + search1.button_intro_lucene = + UI_GET_ITEM(gxml, "button_intro_lucene"); g_signal_connect(search1.button_intro_lucene, "clicked", G_CALLBACK(on_lucene_intro_clicked), NULL); gtk_widget_show(search1.button_intro_lucene); @@ -1872,22 +1822,23 @@ g_signal_connect(search1.rb_attributes, "toggled", G_CALLBACK(attributes_toggled), NULL); - search1.button_intro_attributes = UI_GET_ITEM(gxml, "button_intro_attributes"); + search1.button_intro_attributes = + UI_GET_ITEM(gxml, "button_intro_attributes"); g_signal_connect(search1.button_intro_attributes, "clicked", G_CALLBACK(on_attributes_intro_clicked), NULL); gtk_widget_hide(search1.button_intro_attributes); /* attributes radio buttons */ - search1.rb_strongs = UI_GET_ITEM(gxml, "radiobutton13"); - search1.rb_morphs = UI_GET_ITEM(gxml, "radiobutton15"); - search1.rb_footnotes = UI_GET_ITEM(gxml, "radiobutton14"); + search1.rb_strongs = UI_GET_ITEM(gxml, "radiobutton13"); + search1.rb_morphs = UI_GET_ITEM(gxml, "radiobutton15"); + search1.rb_footnotes = UI_GET_ITEM(gxml, "radiobutton14"); /* */ search1.cb_case_sensitive = UI_GET_ITEM(gxml, "checkbutton1"); /* display options check buttons */ - search1.cb_include_strongs = UI_GET_ITEM(gxml, "checkbutton2"); - search1.cb_include_morphs = UI_GET_ITEM(gxml, "checkbutton3"); + search1.cb_include_strongs = UI_GET_ITEM(gxml, "checkbutton2"); + search1.cb_include_morphs = UI_GET_ITEM(gxml, "checkbutton3"); search1.cb_include_footnotes = UI_GET_ITEM(gxml, "checkbutton4"); toolbutton1 = UI_GET_ITEM(gxml, "toolbutton1"); @@ -1958,9 +1909,9 @@ g_signal_connect(search1.entry_range_text, "changed", G_CALLBACK(range_text_changed), NULL); - search1.progressbar = UI_GET_ITEM(gxml, "progressbar1"); + search1.progressbar = UI_GET_ITEM(gxml, "progressbar1"); #ifdef USE_GTKBUILDER - gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(search1.progressbar),TRUE); + gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(search1.progressbar), TRUE); #endif search1.label_mod_select = UI_GET_ITEM(gxml, "label5"); search1.listview_results = UI_GET_ITEM(gxml, "treeview9"); @@ -1969,28 +1920,29 @@ /* setup module select dialog */ search1.mod_sel_dialog = UI_GET_ITEM(gxml, "dialog2"); g_signal_connect((gpointer)search1.mod_sel_dialog, "response", - G_CALLBACK(_on_dialog2_response), NULL); + G_CALLBACK(_on_dialog2_response), NULL); search1.mod_sel_dlg_treeview = UI_GET_ITEM(gxml, "treeview8"); _setup_treeview2(search1.mod_sel_dlg_treeview); gtk_widget_hide(search1.mod_sel_dialog); #endif - _setup_listviews(search1.listview_results, (GCallback) _selection_finds_list_changed); + _setup_listviews(search1.listview_results, + (GCallback)_selection_finds_list_changed); search1.listview_verses = UI_GET_ITEM(gxml, "treeview10"); search1.menu_item_send_search = create_results_menu_advsearch(); - _setup_listviews2(search1.listview_verses, (GCallback) _finds_verselist_selection_changed); - g_signal_connect((gpointer) search1.listview_verses, + _setup_listviews2(search1.listview_verses, + (GCallback)_finds_verselist_selection_changed); + g_signal_connect((gpointer)search1.listview_verses, "button_press_event", - G_CALLBACK(on_treeview_button_press_event_advsearch), - NULL); + G_CALLBACK(on_treeview_button_press_event_advsearch), NULL); #ifdef USE_GTKBUILDER - _add_html_widget(GTK_WIDGET (gtk_builder_get_object (gxml, "vbox12"))); + _add_html_widget(GTK_WIDGET(gtk_builder_get_object(gxml, "vbox12"))); #else _add_html_widget(glade_xml_get_widget(gxml, "vbox12")); #endif - g_signal_connect((gpointer) search1.dialog, + g_signal_connect((gpointer)search1.dialog, "configure_event", G_CALLBACK(on_advsearch_configure_event), NULL); @@ -2009,10 +1961,10 @@ if ((settings.advsearch_y < 0) || (settings.advsearch_y > 2000)) settings.advsearch_y = 40; - gtk_window_move(GTK_WINDOW(search1.dialog),settings.advsearch_x,settings.advsearch_y); + gtk_window_move(GTK_WINDOW(search1.dialog), settings.advsearch_x, + settings.advsearch_y); } - /****************************************************************************** * Name * gui_create_search_dialog diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/search_sidebar.c xiphos-4.0.4+dfsg1/src/gnome2/search_sidebar.c --- xiphos-4.0.0+dfsg1/src/gnome2/search_sidebar.c 2014-12-20 00:29:46.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/search_sidebar.c 2015-03-23 01:52:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * shortcutbar_search.c - create search group gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -39,10 +39,9 @@ #include "gui/debug_glib_null.h" - SIDESEARCH ss; -GtkWidget *remember_search; /* needed to change button in search stop */ +GtkWidget *remember_search; /* needed to change button in search stop */ /****************************************************************************** * Name @@ -60,45 +59,49 @@ * void */ -static void on_search_button_clicked(GtkButton * button, gpointer user_data) +static void on_search_button_clicked(GtkButton *button, + gpointer user_data) { if (search_active) { terminate_search = TRUE; #ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("edit-find-symbolic", GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-find"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); + gtk_button_set_label((GtkButton *)remember_search, + "gtk-find"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); -#endif +#endif sync_windows(); } else { #ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("process-stop", - GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("process-stop-symbolic", + GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-stop"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); -#endif - + gtk_button_set_label((GtkButton *)remember_search, + "gtk-stop"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); +#endif + // do the search main_do_sidebar_search(user_data); - -#ifdef HAVE_GTK_310 - gtk_button_set_image ((GtkButton *)remember_search, - gtk_image_new_from_icon_name ("edit-find", - GTK_ICON_SIZE_BUTTON)); + +#ifdef HAVE_GTK_310 + gtk_button_set_image((GtkButton *)remember_search, + gtk_image_new_from_icon_name("edit-find-symbolic", GTK_ICON_SIZE_BUTTON)); #else - gtk_button_set_label((GtkButton *)remember_search, "gtk-find"); - gtk_button_set_use_stock((GtkButton *)remember_search, TRUE); + gtk_button_set_label((GtkButton *)remember_search, + "gtk-find"); + gtk_button_set_use_stock((GtkButton *)remember_search, + TRUE); #endif } } - /****************************************************************************** * Name * on_rrbUseBounds_toggled @@ -117,18 +120,17 @@ * void */ -static void on_rrbUseBounds_toggled(GtkToggleButton * togglebutton, +static void on_rrbUseBounds_toggled(GtkToggleButton *togglebutton, gpointer user_data) { main_init_sidebar_search_backend(); - if (gtk_toggle_button_get_active (togglebutton)) { + if (gtk_toggle_button_get_active(togglebutton)) { gtk_widget_show(ss.frame5); } else { gtk_widget_hide(ss.frame5); } } - /****************************************************************************** * Name * gui_create_shortcutbar_search @@ -170,12 +172,11 @@ gtk_widget_show(scrolledwindow_search); gtk_container_add(GTK_CONTAINER(widgets.notebook_sidebar), scrolledwindow_search); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW ( - scrolledwindow_search), settings.shadow_type); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow_search), 2); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow_search), + settings.shadow_type); + gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_search), 2); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow_search), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_search), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -190,61 +191,71 @@ UI_VBOX(vbox5, FALSE, 0); gtk_widget_show(vbox5); - gtk_box_pack_start(GTK_BOX(vbox1), vbox5, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(vbox1), vbox5, FALSE, TRUE, 0); /* text entry */ ss.entrySearch = gtk_entry_new(); gtk_widget_show(ss.entrySearch); gtk_box_pack_start(GTK_BOX(vbox5), ss.entrySearch, TRUE, TRUE, 0); - gtk_widget_set_size_request(ss.entrySearch, 130, -1);; + gtk_widget_set_size_request(ss.entrySearch, 130, -1); + ; - /* find button */ -#ifdef HAVE_GTK_310 - remember_search = gtk_button_new_from_icon_name ("edit-find", GTK_ICON_SIZE_BUTTON); +/* find button */ +#ifdef HAVE_GTK_310 + remember_search = + gtk_button_new_from_icon_name("edit-find-symbolic", + GTK_ICON_SIZE_BUTTON); #else - remember_search = gtk_button_new_from_stock(GTK_STOCK_FIND); + remember_search = gtk_button_new_from_stock(GTK_STOCK_FIND); #endif gtk_widget_show(remember_search); - gtk_box_pack_start(GTK_BOX(vbox5), remember_search, TRUE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox5), remember_search, TRUE, FALSE, + 0); gtk_widget_set_tooltip_text(remember_search, - _("This is an inclusive (\"AND\") search:\nFind matches showing all words.")); - gtk_button_set_relief(GTK_BUTTON(remember_search), GTK_RELIEF_HALF); + _("This is an inclusive (\"AND\") search:\nFind matches showing all words.")); + gtk_button_set_relief(GTK_BUTTON(remember_search), + GTK_RELIEF_HALF); /* progress bar */ ss.progressbar_search = gtk_progress_bar_new(); gtk_widget_show(ss.progressbar_search); - gtk_box_pack_start(GTK_BOX(vbox5), ss.progressbar_search, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox5), ss.progressbar_search, FALSE, + TRUE, 0); /* button to open advanced search */ - ss.advanced_search = gtk_button_new_with_mnemonic(_("_Open Advanced Search")); + ss.advanced_search = + gtk_button_new_with_mnemonic(_("_Open Advanced Search")); gtk_widget_show(ss.advanced_search); - gtk_box_pack_start(GTK_BOX(vbox5), ss.advanced_search, TRUE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox5), ss.advanced_search, TRUE, FALSE, + 0); gtk_widget_set_tooltip_text(ss.advanced_search, _("Open the separate Advanced Search dialog.")); - gtk_button_set_relief(GTK_BUTTON(ss.advanced_search), GTK_RELIEF_HALF); + gtk_button_set_relief(GTK_BUTTON(ss.advanced_search), + GTK_RELIEF_HALF); ss.frame_module = gtk_frame_new(NULL); gtk_widget_show(ss.frame_module); gtk_box_pack_start(GTK_BOX(vbox1), ss.frame_module, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (ss.frame_module), 2); - gtk_frame_set_shadow_type(GTK_FRAME(ss.frame_module),GTK_SHADOW_NONE); + gtk_container_set_border_width(GTK_CONTAINER(ss.frame_module), 2); + gtk_frame_set_shadow_type(GTK_FRAME(ss.frame_module), + GTK_SHADOW_NONE); label1 = gtk_label_new(NULL); - header = g_strdup_printf("%s",_("Search Module")); - gtk_label_set_markup(GTK_LABEL(label1), header); + header = + g_strdup_printf("%s", + _("Search Module")); + gtk_label_set_markup(GTK_LABEL(label1), header); g_free(header); gtk_widget_show(label1); - gtk_frame_set_label_widget (GTK_FRAME(ss.frame_module), - label1); + gtk_frame_set_label_widget(GTK_FRAME(ss.frame_module), label1); UI_VBOX(vbox90, FALSE, 0); gtk_widget_show(vbox90); gtk_container_add(GTK_CONTAINER(ss.frame_module), vbox90); - gtk_container_set_border_width (GTK_CONTAINER (vbox90), 4); + gtk_container_set_border_width(GTK_CONTAINER(vbox90), 4); ss.radiobutton_search_text = gtk_radio_button_new_with_label(NULL, _("Bible")); @@ -254,9 +265,8 @@ FALSE, FALSE, 0); ss.radiobutton_search_comm = - gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(ss.radiobutton_search_text), - _("Commentary")); + gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ss.radiobutton_search_text), + _("Commentary")); gtk_widget_show(ss.radiobutton_search_comm); gtk_widget_set_size_request(ss.radiobutton_search_comm, -1, 20); gtk_box_pack_start(GTK_BOX(vbox90), ss.radiobutton_search_comm, @@ -265,13 +275,15 @@ frame2 = gtk_frame_new(NULL); gtk_widget_show(frame2); gtk_box_pack_start(GTK_BOX(vbox1), frame2, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame2), 2); - gtk_frame_set_shadow_type(GTK_FRAME(frame2),GTK_SHADOW_NONE); + gtk_container_set_border_width(GTK_CONTAINER(frame2), 2); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_NONE); label1 = gtk_label_new(NULL); - header = g_strdup_printf("%s",_("Search Type")); - gtk_label_set_markup(GTK_LABEL(label1), header); + header = + g_strdup_printf("%s", + _("Search Type")); + gtk_label_set_markup(GTK_LABEL(label1), header); g_free(header); gtk_widget_show(label1); @@ -280,30 +292,26 @@ UI_VBOX(vbox2, TRUE, 0); gtk_widget_show(vbox2); gtk_container_add(GTK_CONTAINER(frame2), vbox2); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 4); + gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); ss.rbMultiword = - gtk_radio_button_new_with_label(NULL, - _("Multi word")); + gtk_radio_button_new_with_label(NULL, _("Multi word")); gtk_widget_show(ss.rbMultiword); gtk_box_pack_start(GTK_BOX(vbox2), ss.rbMultiword, FALSE, FALSE, 0); gtk_widget_set_size_request(ss.rbMultiword, -1, 20); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON - (ss.rbMultiword), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ss.rbMultiword), TRUE); ss.rbRegExp = - gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(ss.rbMultiword), - _("Regular expression")); + gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ss.rbMultiword), + _("Regular expression")); gtk_widget_show(ss.rbRegExp); gtk_box_pack_start(GTK_BOX(vbox2), ss.rbRegExp, FALSE, FALSE, 0); gtk_widget_set_size_request(ss.rbRegExp, -1, 20); ss.rbPhraseSearch = - gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(ss.rbMultiword), - _("Exact phrase")); + gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ss.rbMultiword), + _("Exact phrase")); gtk_widget_show(ss.rbPhraseSearch); gtk_box_pack_start(GTK_BOX(vbox2), ss.rbPhraseSearch, FALSE, FALSE, 0); @@ -312,13 +320,15 @@ frame3 = gtk_frame_new(NULL); gtk_widget_show(frame3); gtk_box_pack_start(GTK_BOX(vbox1), frame3, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame3), 2); - gtk_frame_set_shadow_type(GTK_FRAME(frame3),GTK_SHADOW_NONE); + gtk_container_set_border_width(GTK_CONTAINER(frame3), 2); + gtk_frame_set_shadow_type(GTK_FRAME(frame3), GTK_SHADOW_NONE); label1 = gtk_label_new(NULL); - header = g_strdup_printf("%s",_("Search Options")); - gtk_label_set_markup(GTK_LABEL(label1), header); + header = + g_strdup_printf("%s", + _("Search Options")); + gtk_label_set_markup(GTK_LABEL(label1), header); g_free(header); gtk_widget_show(label1); @@ -327,7 +337,7 @@ UI_VBOX(vbox3, FALSE, 0); gtk_widget_show(vbox3); gtk_container_add(GTK_CONTAINER(frame3), vbox3); - gtk_container_set_border_width (GTK_CONTAINER (vbox3), 4); + gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4); ss.ckbCaseSensitive = gtk_check_button_new_with_label(_("Match case")); @@ -336,26 +346,27 @@ FALSE, 0); gtk_widget_set_size_request(ss.ckbCaseSensitive, -1, 20); - frame4 = gtk_frame_new(NULL); gtk_widget_show(frame4); gtk_box_pack_start(GTK_BOX(vbox1), frame4, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame4), 2); - gtk_frame_set_shadow_type(GTK_FRAME(frame4),GTK_SHADOW_NONE); + gtk_container_set_border_width(GTK_CONTAINER(frame4), 2); + gtk_frame_set_shadow_type(GTK_FRAME(frame4), GTK_SHADOW_NONE); label1 = gtk_label_new(NULL); - header = g_strdup_printf("%s",_("Search Scope")); - gtk_label_set_markup(GTK_LABEL(label1), header); + header = + g_strdup_printf("%s", + _("Search Scope")); + gtk_label_set_markup(GTK_LABEL(label1), header); g_free(header); gtk_widget_show(label1); - gtk_frame_set_label_widget(GTK_FRAME(frame4),label1); + gtk_frame_set_label_widget(GTK_FRAME(frame4), label1); UI_VBOX(vbox4, TRUE, 0); gtk_widget_show(vbox4); gtk_container_add(GTK_CONTAINER(frame4), vbox4); - gtk_container_set_border_width (GTK_CONTAINER (vbox4), 4); + gtk_container_set_border_width(GTK_CONTAINER(vbox4), 4); ss.rbNoScope = gtk_radio_button_new_with_label(NULL, _("No scope")); @@ -366,18 +377,16 @@ TRUE); ss.rrbUseBounds = - gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(ss.rbNoScope), - _("Use bounds")); + gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ss.rbNoScope), + _("Use bounds")); gtk_widget_show(ss.rrbUseBounds); gtk_box_pack_start(GTK_BOX(vbox4), ss.rrbUseBounds, FALSE, FALSE, 0); gtk_widget_set_size_request(ss.rrbUseBounds, -1, 20); ss.rbLastSearch = - gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(ss.rbNoScope), - _("Last search")); + gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ss.rbNoScope), + _("Last search")); gtk_widget_show(ss.rbLastSearch); gtk_box_pack_start(GTK_BOX(vbox4), ss.rbLastSearch, FALSE, FALSE, 0); @@ -386,26 +395,28 @@ ss.frame5 = gtk_frame_new(NULL); gtk_widget_show(ss.frame5); gtk_box_pack_start(GTK_BOX(vbox1), ss.frame5, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (ss.frame5), 2); + gtk_container_set_border_width(GTK_CONTAINER(ss.frame5), 2); gtk_widget_hide(ss.frame5); - gtk_frame_set_shadow_type(GTK_FRAME(ss.frame5),GTK_SHADOW_NONE); + gtk_frame_set_shadow_type(GTK_FRAME(ss.frame5), GTK_SHADOW_NONE); label1 = gtk_label_new(NULL); - header = g_strdup_printf("%s",_("Bounds")); - gtk_label_set_markup(GTK_LABEL(label1), header); + header = + g_strdup_printf("%s", + _("Bounds")); + gtk_label_set_markup(GTK_LABEL(label1), header); g_free(header); gtk_widget_show(label1); gtk_frame_set_label_widget(GTK_FRAME(ss.frame5), label1); - -#ifdef HAVE_GTK_34 + +#ifdef HAVE_GTK_34 table1 = gtk_grid_new(); gtk_widget_show(table1); gtk_container_add(GTK_CONTAINER(ss.frame5), table1); - gtk_grid_set_row_spacing (GTK_GRID(table1), 3); - gtk_grid_set_column_spacing (GTK_GRID(table1), 3); - gtk_container_set_border_width (GTK_CONTAINER (table1), 8); + gtk_grid_set_row_spacing(GTK_GRID(table1), 3); + gtk_grid_set_column_spacing(GTK_GRID(table1), 3); + gtk_container_set_border_width(GTK_CONTAINER(table1), 8); label1 = gtk_label_new(_("Lower")); gtk_widget_show(label1); @@ -413,8 +424,8 @@ #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(label1), 1.0, 0.5); #endif - - ss.entryLower = gtk_combo_box_text_new_with_entry(); + + ss.entryLower = gtk_combo_box_text_new_with_entry(); gtk_widget_show(ss.entryLower); gtk_grid_attach(GTK_GRID(table1), ss.entryLower, 1, 0, 1, 1); gtk_widget_set_size_request(ss.entryLower, 114, 22); @@ -425,9 +436,8 @@ #ifndef HAVE_GTK_310 gtk_misc_set_alignment(GTK_MISC(label2), 1.0, 0.5); #endif - - - ss.entryUpper = gtk_combo_box_text_new_with_entry(); + + ss.entryUpper = gtk_combo_box_text_new_with_entry(); gtk_widget_show(ss.entryUpper); gtk_grid_attach(GTK_GRID(table1), ss.entryUpper, 1, 1, 1, 1); gtk_widget_set_size_request(ss.entryUpper, 114, 22); @@ -438,49 +448,48 @@ gtk_container_add(GTK_CONTAINER(ss.frame5), table1); gtk_table_set_row_spacings(GTK_TABLE(table1), 3); gtk_table_set_col_spacings(GTK_TABLE(table1), 3); - gtk_container_set_border_width (GTK_CONTAINER (table1), 8); + gtk_container_set_border_width(GTK_CONTAINER(table1), 8); label1 = gtk_label_new(_("Lower")); gtk_widget_show(label1); gtk_table_attach(GTK_TABLE(table1), label1, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label1), 1.0, 0.5); label2 = gtk_label_new(_("Upper")); gtk_widget_show(label2); gtk_table_attach(GTK_TABLE(table1), label2, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label2), 1.0, 0.5); - + #ifdef HAVE_GTK_224 ss.entryLower = gtk_combo_box_text_new_with_entry(); -#else +#else ss.entryLower = gtk_combo_box_entry_new_text(); -#endif +#endif gtk_widget_show(ss.entryLower); gtk_table_attach(GTK_TABLE(table1), ss.entryLower, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_widget_set_size_request(ss.entryLower, 114, 22); - + #ifdef HAVE_GTK_224 - ss.entryUpper = gtk_combo_box_text_new_with_entry(); + ss.entryUpper = gtk_combo_box_text_new_with_entry(); #else - ss.entryUpper = gtk_combo_box_entry_new_text(); -#endif + ss.entryUpper = gtk_combo_box_entry_new_text(); +#endif gtk_widget_show(ss.entryUpper); gtk_table_attach(GTK_TABLE(table1), ss.entryUpper, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_widget_set_size_request(ss.entryUpper, 114, 22); #endif - + g_signal_connect(G_OBJECT(ss.rrbUseBounds), "toggled", - G_CALLBACK(on_rrbUseBounds_toggled), - NULL); + G_CALLBACK(on_rrbUseBounds_toggled), NULL); g_signal_connect(G_OBJECT(remember_search), "clicked", G_CALLBACK(on_search_button_clicked), NULL); diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/sidebar.c xiphos-4.0.4+dfsg1/src/gnome2/sidebar.c --- xiphos-4.0.0+dfsg1/src/gnome2/sidebar.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/sidebar.c 2015-02-21 02:22:54.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.c - create and maintain the new sidebar bar * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,18 +24,15 @@ #endif #ifndef USE_GTKBUILDER - #include +#include #endif - -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #else #include "editor/slib-editor.h" #endif - - #include "gui/sidebar.h" #include "gui/bookmarks_treeview.h" #include "gui/dialog.h" @@ -68,7 +65,6 @@ #include "gui/debug_glib_null.h" - SIDEBAR sidebar; static GtkWidget *button_bookmarks; static GtkWidget *button_search; @@ -81,11 +77,12 @@ extern gboolean shift_key_pressed; +static GtkWidget *create_menu_modules(void); +void on_export_verselist_activate(GtkMenuItem *menuitem, + gpointer user_data); -static GtkWidget* create_menu_modules(void); -void on_export_verselist_activate (GtkMenuItem * menuitem, gpointer user_data); - - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * @@ -102,11 +99,10 @@ * void */ -void gui_sync_module_treeview(gint direction) +void gui_sync_module_treeview(gint direction) { - } - +#endif #ifdef USE_TREEVIEW_PATH /****************************************************************************** @@ -124,15 +120,17 @@ * Return value * void */ -void gui_save_treeview_path_string (const gchar * path_str, const gchar * book_name) +void gui_save_treeview_path_string(const gchar *path_str, + const gchar *book_name) { - gchar *file = g_strdup_printf("%s/book_path.conf", settings.gSwordDir); + gchar *file = + g_strdup_printf("%s/book_path.conf", settings.gSwordDir); save_conf_file_item(file, book_name, "PATH", path_str); - XI_message (("book %s, path %s, file %s\n", book_name, path_str, file)); + XI_message(("book %s, path %s, file %s\n", book_name, path_str, + file)); g_free(file); } - /****************************************************************************** * Name * gui_collapse_treeview_to_book @@ -150,8 +148,8 @@ * void */ - -void gui_collapse_treeview_to_book (GtkTreeView * tree, const gchar * book_name) +void gui_collapse_treeview_to_book(GtkTreeView *tree, + const gchar *book_name) { gchar file[250]; gchar *path_string = NULL; @@ -160,23 +158,24 @@ GtkTreePath *path; sprintf(file, "%s/book_path.conf", settings.gSwordDir); - path_string = get_conf_file_item (file, (gchar*)book_name, "PATH"); + path_string = + get_conf_file_item(file, (gchar *)book_name, "PATH"); - if (!path_string) return; + if (!path_string) + return; - work_buf = g_strsplit ( path_string, ":", 4); + work_buf = g_strsplit(path_string, ":", 4); - tmp_path_string = g_strdup_printf ("%s:%s:%s", - work_buf[0], - work_buf[1], - work_buf[2]); + tmp_path_string = g_strdup_printf("%s:%s:%s", + work_buf[0], + work_buf[1], work_buf[2]); - path = gtk_tree_path_new_from_string ((gchar *)tmp_path_string); - gtk_tree_view_collapse_row (tree, path); + path = gtk_tree_path_new_from_string((gchar *)tmp_path_string); + gtk_tree_view_collapse_row(tree, path); gtk_tree_path_free(path); - g_free (path_string); - g_free (tmp_path_string); + g_free(path_string); + g_free(tmp_path_string); g_strfreev(work_buf); } @@ -197,7 +196,8 @@ * gboolean */ -gboolean gui_expand_treeview_to_path (GtkTreeView * tree, const gchar * book_name) +gboolean gui_expand_treeview_to_path(GtkTreeView *tree, + const gchar *book_name) { gchar file[250]; gchar *path_string = NULL; @@ -206,74 +206,69 @@ GtkTreeIter iter; GtkTreeModel *model; GtkTreePath *path; - GtkTreeSelection *selection; gchar **work_buf = NULL; gint i = 3; sprintf(file, "%s/book_path.conf", settings.gSwordDir); - path_string = get_conf_file_item (file, (gchar*)book_name, "PATH"); - if (!path_string) return 0; - - work_buf = g_strsplit ( path_string, ":", -1); - XI_message (("\n\nbuf[0]: %s\nbuf[1]: %s\nbuf[2]: %s\n\n", - work_buf[0], - work_buf[1], - work_buf[2])); - model = gtk_tree_view_get_model (tree); - - tmp_path_string = g_strdup_printf ("%s:%s:%s", - work_buf[0], - work_buf[1], - work_buf[2]); - if (gtk_tree_model_get_iter_from_string (model, &iter, - (gchar *)tmp_path_string)) { - gtk_tree_model_get(model, &iter, 3, &mod, -1); + path_string = + get_conf_file_item(file, (gchar *)book_name, "PATH"); + if (!path_string) + return 0; + + work_buf = g_strsplit(path_string, ":", -1); + XI_message(("\n\nbuf[0]: %s\nbuf[1]: %s\nbuf[2]: %s\n\n", + work_buf[0], work_buf[1], work_buf[2])); + model = gtk_tree_view_get_model(tree); + + tmp_path_string = g_strdup_printf("%s:%s:%s", + work_buf[0], + work_buf[1], work_buf[2]); + if (gtk_tree_model_get_iter_from_string(model, &iter, + (gchar *)tmp_path_string)) { + gtk_tree_model_get(model, &iter, 3, &mod, -1); if (!g_utf8_collate(mod, book_name)) { - selection = gtk_tree_view_get_selection (tree); - path = gtk_tree_path_new_from_string ((gchar *)tmp_path_string); - gtk_tree_view_expand_to_path (tree, path); - gtk_tree_selection_select_path (selection, path); + GtkTreeSelection *selection = gtk_tree_view_get_selection(tree); + + path = gtk_tree_path_new_from_string((gchar *) + tmp_path_string); + gtk_tree_view_expand_to_path(tree, path); + gtk_tree_selection_select_path(selection, path); - main_expand_treeview_to_path(model,iter); + main_expand_treeview_to_path(model, iter); gtk_tree_path_free(path); while (work_buf[i]) { - XI_message (("\n\nwork_buf[%d]: %s\n\n", - i, - work_buf[i])); + XI_message(("\n\nwork_buf[%d]: %s\n\n", + i, work_buf[i])); tmp_path_string = - g_strdup_printf ("%s:%s", - tmp_path_string, - work_buf[i]); - gtk_tree_model_get_iter_from_string (model, - &iter, - (gchar *)tmp_path_string); - - XI_message (("\n\nmod: %s\npath: %s\n\n", - mod, - tmp_path_string)); - path = gtk_tree_path_new_from_string ( - (gchar *)tmp_path_string); - gtk_tree_view_expand_to_path (tree, path); - gtk_tree_selection_select_path (selection, path); + g_strdup_printf("%s:%s", + tmp_path_string, + work_buf[i]); + gtk_tree_model_get_iter_from_string(model, + &iter, + (gchar *) + tmp_path_string); + + XI_message(("\n\nmod: %s\npath: %s\n\n", + mod, tmp_path_string)); + path = gtk_tree_path_new_from_string((gchar *) + tmp_path_string); + gtk_tree_view_expand_to_path(tree, path); + gtk_tree_selection_select_path(selection, + path); - main_expand_treeview_to_path(model,iter); + main_expand_treeview_to_path(model, iter); gtk_tree_path_free(path); ++i; } } - g_free (mod); + g_free(mod); } - path = gtk_tree_path_new_from_string ((gchar *)tmp_path_string); - gtk_tree_view_scroll_to_cell (tree, - path, - NULL, - FALSE, - 0.0, - 0.0); + path = gtk_tree_path_new_from_string((gchar *)tmp_path_string); + gtk_tree_view_scroll_to_cell(tree, path, NULL, FALSE, 0.0, 0.0); gtk_tree_path_free(path); - g_free (tmp_path_string); + g_free(tmp_path_string); g_strfreev(work_buf); @@ -300,15 +295,13 @@ * void */ #ifdef USE_GTK_3 -static void on_notebook_switch_page(GtkNotebook * notebook, +static void on_notebook_switch_page(GtkNotebook *notebook, gpointer arg, - guint page_num, - gpointer user_data) + guint page_num, gpointer user_data) #else -static void on_notebook_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, - guint page_num, - gpointer user_data) +static void on_notebook_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, + guint page_num, gpointer user_data) #endif { switch (page_num) { @@ -342,7 +335,6 @@ } } - /****************************************************************************** * Name * add_columns @@ -359,7 +351,7 @@ * void */ -static void add_columns(GtkTreeView * treeview) +static void add_columns(GtkTreeView *treeview) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -368,13 +360,11 @@ column = gtk_tree_view_column_new_with_attributes("Results", renderer, - "text", 0, - NULL); + "text", 0, NULL); gtk_tree_view_column_set_sort_column_id(column, 0); gtk_tree_view_append_column(treeview, column); } - /****************************************************************************** * Name * gui_set_sidebar_program_start @@ -401,7 +391,7 @@ gtk_paned_set_position(GTK_PANED(widgets.epaned), settings.sidebar_width); } -/* + /* else if (!settings.showshortcutbar && settings.showdevotional) { gtk_widget_show(widgets.shortcutbar); gui_sidebar_showhide(); @@ -421,7 +411,6 @@ } } - /****************************************************************************** * Name * gui_sidebar_showhide @@ -442,33 +431,32 @@ { GtkAllocation allocation; if (!settings.docked) { - gdk_window_raise(gtk_widget_get_window (GTK_WIDGET(widgets.dock_sb))); + gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(widgets.dock_sb))); return; } if (settings.showshortcutbar) { - xml_set_value("Xiphos", "misc", "show_sidebar", "0"); + xml_set_value("Xiphos", "misc", "show_sidebar", "0"); settings.showshortcutbar = FALSE; gtk_widget_hide(widgets.shortcutbar); sync_windows(); - gtk_widget_get_allocation (GTK_WIDGET(widgets.vpaned), &allocation); + gtk_widget_get_allocation(GTK_WIDGET(widgets.vpaned), + &allocation); settings.biblepane_width = allocation.width; } else { - xml_set_value("Xiphos", "misc", "show_sidebar", "1"); + xml_set_value("Xiphos", "misc", "show_sidebar", "1"); settings.showshortcutbar = TRUE; gtk_paned_set_position(GTK_PANED(widgets.epaned), settings.sidebar_width); gtk_widget_show(widgets.shortcutbar); sync_windows(); - gtk_widget_get_allocation (GTK_WIDGET(widgets.vpaned), &allocation); + gtk_widget_get_allocation(GTK_WIDGET(widgets.vpaned), + &allocation); settings.biblepane_width = allocation.width; - } } - - /****************************************************************************** * Name * on_modules_activate @@ -485,12 +473,12 @@ * void */ -static void on_modules_activate(GtkToggleButton * button, +static void on_modules_activate(GtkToggleButton *button, gpointer user_data) { - if (gtk_toggle_button_get_active (button)) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets. - notebook_sidebar), 0); + if (gtk_toggle_button_get_active(button)) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), + 0); } } @@ -510,16 +498,15 @@ * void */ -static void on_bookmarks_activate(GtkToggleButton * button, +static void on_bookmarks_activate(GtkToggleButton *button, gpointer user_data) { - if (gtk_toggle_button_get_active (button)) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets. - notebook_sidebar), 1); + if (gtk_toggle_button_get_active(button)) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), + 1); } } - /****************************************************************************** * Name * on_search_activate @@ -536,17 +523,16 @@ * void */ -static void on_search_activate(GtkToggleButton * button, +static void on_search_activate(GtkToggleButton *button, gpointer user_data) { - if (gtk_toggle_button_get_active (button)) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets. - notebook_sidebar), 2); + if (gtk_toggle_button_get_active(button)) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), + 2); gtk_widget_grab_focus(ss.entrySearch); } } - /****************************************************************************** * Name * on_search_results_activate @@ -562,16 +548,15 @@ * Return value * void */ -static void on_search_results_activate(GtkToggleButton * button, +static void on_search_results_activate(GtkToggleButton *button, gpointer user_data) { - if (gtk_toggle_button_get_active (button)) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets. - notebook_sidebar), 3); + if (gtk_toggle_button_get_active(button)) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), + 3); } } - /****************************************************************************** * Name * on_modules_list_button_release @@ -605,18 +590,20 @@ if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return FALSE; - gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, 2, &caption, 3, &mod, -1); + gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, 2, &caption, + 3, &mod, -1); //uncomment the following two lines if you want to see how it looks without //triangls or plus symbols //gtk_tree_view_set_show_expanders(sidebar.module_list, FALSE); //gtk_tree_view_set_level_indentation(sidebar.module_list, 12); GtkTreePath *path = gtk_tree_model_get_path(model, &selected); - if (gtk_tree_view_row_expanded (GTK_TREE_VIEW(sidebar.module_list), path)) - gtk_tree_view_collapse_row ( GTK_TREE_VIEW(sidebar.module_list), path ); - else - gtk_tree_view_expand_row ( GTK_TREE_VIEW(sidebar.module_list), path, FALSE ); - gtk_tree_path_free ( path ); + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(sidebar.module_list), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(sidebar.module_list), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(sidebar.module_list), path, + FALSE); + gtk_tree_path_free(path); switch (event->button) { case 1: @@ -624,33 +611,32 @@ break; case 2: - if (mod && (g_utf8_collate(mod, _("Parallel View"))) - && (g_utf8_collate(mod, _("Standard View")))) + if (mod && (g_utf8_collate(mod, _("Parallel View"))) && (g_utf8_collate(mod, _("Standard View")))) gui_open_module_in_new_tab(mod); break; case 3: - if (mod && (g_utf8_collate(mod, _("Parallel View"))) - && (g_utf8_collate(mod, _("Standard View")))//) { - && (main_get_mod_type(mod) != PRAYERLIST_TYPE)) { + if (mod && (g_utf8_collate(mod, _("Parallel View"))) && (g_utf8_collate(mod, _("Standard View"))) //) { + && (main_get_mod_type(mod) != PRAYERLIST_TYPE)) { buf_module = mod; - create_menu_modules (); + create_menu_modules(); /*gtk_menu_popup(GTK_MENU(sidebar.menu_modules), - NULL, NULL, NULL, NULL, - 0, gtk_get_current_event_time());*/ + NULL, NULL, NULL, NULL, + 0, gtk_get_current_event_time()); */ g_free(caption); return FALSE; } - if (caption && (!g_utf8_collate(caption, _("Prayer List/Journal")))) { + if (caption && + (!g_utf8_collate(caption, _("Prayer List/Journal")))) { gui_menu_prayerlist_popup(NULL, NULL); g_free(mod); return FALSE; } - if (mod && (main_get_mod_type(mod) == PRAYERLIST_TYPE)) { + if (mod && (main_get_mod_type(mod) == PRAYERLIST_TYPE)) { buf_module = mod; - gtk_menu_popup(GTK_MENU(sidebar.menu_prayerlist_mod), - NULL, NULL, NULL, NULL, - 0, gtk_get_current_event_time()); + gtk_menu_popup(GTK_MENU(sidebar.menu_prayerlist_mod), NULL, + NULL, NULL, NULL, 0, + gtk_get_current_event_time()); g_free(caption); return FALSE; } @@ -662,7 +648,6 @@ return FALSE; } - /****************************************************************************** * Name * gui_verselist_button_release_event @@ -680,8 +665,8 @@ * gboolean */ -gboolean gui_verselist_button_release_event(GtkWidget * widget, - GdkEventButton * event, +gboolean gui_verselist_button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkTreeSelection *selection; @@ -690,9 +675,10 @@ gchar *key = NULL; gchar *text = NULL; - selection = - gtk_tree_view_get_selection((GtkTreeView *) sidebar.results_list); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); + selection = gtk_tree_view_get_selection((GtkTreeView *) + sidebar.results_list); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return FALSE; @@ -705,12 +691,12 @@ switch (event->button) { case 2: gui_open_passage_in_new_tab(key); - /* fall through... */ + /* fall through... */ - case 3: /* button 3 is no-op */ + case 3: /* button 3 is no-op */ return FALSE; - default: /* button 1 handled below */ + default: /* button 1 handled below */ break; } } @@ -722,14 +708,15 @@ if (main_get_mod_type(settings.sb_search_mod) == PERCOM_TYPE) text = main_get_raw_text(settings.sb_search_mod, key); else - text = main_get_search_results_text(settings.sb_search_mod, key); + text = + main_get_search_results_text(settings.sb_search_mod, + key); if (text) { settings.displaySearchResults = TRUE; - main_entry_display(settings.show_previewer_in_sidebar - ? sidebar.html_viewer_widget - : widgets.html_previewer_text, //sidebar.html_widget, - settings.sb_search_mod, text, key, TRUE); + main_entry_display(settings.show_previewer_in_sidebar ? sidebar.html_viewer_widget : widgets.html_previewer_text, //sidebar.html_widget, + settings.sb_search_mod, text, key, + TRUE); settings.displaySearchResults = FALSE; g_free(text); gtk_widget_grab_focus(sidebar.results_list); @@ -739,7 +726,6 @@ return FALSE; } - /****************************************************************************** * Name * on_treeview_button_press_event @@ -757,8 +743,8 @@ * gboolean */ -static gboolean on_treeview_button_press_event(GtkWidget * widget, - GdkEventButton * event, +static gboolean on_treeview_button_press_event(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { GtkTreeSelection *selection; @@ -766,9 +752,10 @@ GtkTreeIter selected; gchar *key = NULL; - selection = - gtk_tree_view_get_selection((GtkTreeView *) sidebar.results_list); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); + selection = gtk_tree_view_get_selection((GtkTreeView *) + sidebar.results_list); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return FALSE; @@ -777,8 +764,7 @@ if (!key) return FALSE; - if (event->type == GDK_2BUTTON_PRESS) - { + if (event->type == GDK_2BUTTON_PRESS) { if (verse_selected) g_free(verse_selected); verse_selected = g_strdup_printf("sword:///%s", key); @@ -786,7 +772,7 @@ } switch (event->button) { case 3: - gtk_menu_popup((GtkMenu*)sidebar.menu_item_save_search, + gtk_menu_popup((GtkMenu *)sidebar.menu_item_save_search, NULL, NULL, NULL, NULL, 2, gtk_get_current_event_time()); return TRUE; @@ -797,7 +783,6 @@ return FALSE; } - /****************************************************************************** * Name * on_save_list_as_bookmarks_activate @@ -839,29 +824,29 @@ */ G_MODULE_EXPORT void -on_open_in_dialog_activate(GtkMenuItem * menuitem, - gpointer user_data) +on_open_in_dialog_activate(GtkMenuItem *menuitem, gpointer user_data) { int mod_type = main_get_mod_type(buf_module); if ((mod_type == PERCOM_TYPE) || (mod_type == PRAYERLIST_TYPE)) { - gchar *dialog_text = g_strdup_printf( - "%s\n\n%s", - _("Open module in editor?"), _("If no, it will open for display only.")); + gchar *dialog_text = + g_strdup_printf("%s\n\n%s", + _("Open module in editor?"), + _("If no, it will open for display only.")); if (gui_yes_no_dialog(dialog_text, NULL)) { if (mod_type == PERCOM_TYPE) editor_create_new((gchar *)buf_module, - (gchar *)settings.currentverse, + (gchar *) + settings.currentverse, NOTE_EDITOR); else editor_create_new((gchar *)buf_module, - "0", - BOOK_EDITOR); + "0", BOOK_EDITOR); } else { if (mod_type == PERCOM_TYPE) - main_dialogs_open(buf_module, - (gchar *)settings.currentverse); + main_dialogs_open(buf_module, (gchar *) + settings.currentverse); else main_dialogs_open(buf_module, NULL); } @@ -873,7 +858,6 @@ buf_module = NULL; } - /****************************************************************************** * Name * on_open_in_tab_activate @@ -891,15 +875,13 @@ */ G_MODULE_EXPORT void -on_open_in_tab_activate2(GtkMenuItem * menuitem, - gpointer user_data) +on_open_in_tab_activate2(GtkMenuItem *menuitem, gpointer user_data) { gui_open_module_in_new_tab(buf_module); g_free(buf_module); buf_module = NULL; } - /****************************************************************************** * Name * on_about2_activate @@ -917,116 +899,100 @@ */ G_MODULE_EXPORT void -on_about2_activate(GtkMenuItem * menuitem, - gpointer user_data) +on_about2_activate(GtkMenuItem *menuitem, gpointer user_data) { gui_display_about_module_dialog(buf_module); g_free(buf_module); buf_module = NULL; } - G_MODULE_EXPORT void -on_save_list_as_a_single_bookmark_activate (GtkMenuItem * menuitem, - gpointer user_data) +on_save_list_as_a_single_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data) { gui_verselist_to_bookmarks(list_of_verses, TRUE); } - G_MODULE_EXPORT void -on_save_list_as_a_series_of_bookmarks_activate (GtkMenuItem * menuitem, - gpointer user_data) +on_save_list_as_a_series_of_bookmarks_activate(GtkMenuItem *menuitem, + gpointer user_data) { gui_verselist_to_bookmarks(list_of_verses, FALSE); } - G_MODULE_EXPORT void -on_populate_verse_list_activate(GtkMenuItem * menuitem, - gpointer user_data) +on_populate_verse_list_activate(GtkMenuItem *menuitem, gpointer user_data) { - GS_DIALOG *info = gui_new_dialog(); - + GS_DIALOG *info = gui_new_dialog(); + #ifdef HAVE_GTK_310 info->stock_icon = g_strdup("dialog-warning"); #else info->stock_icon = g_strdup(GTK_STOCK_DIALOG_WARNING); #endif - - info->label_top = g_strdup(_("Paste verse references")); - info->text1 = g_strdup(""); - info->label1 = _("List:"); - info->ok = TRUE; - - (void)gui_gs_dialog(info); - - main_display_verse_list_in_sidebar - (settings.currentverse, settings.MainWindowModule, info->text1); - - g_free(info->label_top); - g_free(info->text1); - g_free(info); -} + info->label_top = g_strdup(_("Paste verse references")); + info->text1 = g_strdup(""); + info->label1 = _("List:"); + info->ok = TRUE; + + (void)gui_gs_dialog(info); + + main_display_verse_list_in_sidebar(settings.currentverse, settings.MainWindowModule, + info->text1); + + g_free(info->label_top); + g_free(info->text1); + g_free(info); +} G_MODULE_EXPORT void -on_send_list_via_biblesync_activate(GtkMenuItem * menuitem, +on_send_list_via_biblesync_activate(GtkMenuItem *menuitem, gpointer user_data) { - if (biblesync_active_xmit_allowed()) - { - GList *verse; - GString *vlist = g_string_new(""); - gboolean first = TRUE; - RESULTS *item; - - for (verse = list_of_verses; verse; verse = g_list_next(verse)) - { - item = (RESULTS *)verse->data; - if (!first) - { - vlist = g_string_append_c(vlist, ';'); - } - vlist = g_string_append( - vlist, - (char *)main_get_osisref_from_key - (settings.MainWindowModule, item->key)); - first = FALSE; - } - biblesync_transmit_verse_list(settings.MainWindowModule, - vlist->str); - g_string_free(vlist, TRUE); - } - else - { - gui_generic_warning(_("BibleSync is not active for transmit.")); - } + if (biblesync_active_xmit_allowed()) { + GList *verse; + GString *vlist = g_string_new(""); + gboolean first = TRUE; + + for (verse = list_of_verses; verse; + verse = g_list_next(verse)) { + RESULTS *item = (RESULTS *)verse->data; + if (!first) { + vlist = g_string_append_c(vlist, ';'); + } + vlist = g_string_append(vlist, (char *) + main_get_osisref_from_key(settings.MainWindowModule, + item->key)); + first = FALSE; + } + biblesync_transmit_verse_list(settings.MainWindowModule, + vlist->str); + g_string_free(vlist, TRUE); + } else { + gui_generic_warning(_("BibleSync is not active for transmit.")); + } } - G_MODULE_EXPORT void -on_preload_history_from_verse_list_activate(GtkMenuItem * menuitem, +on_preload_history_from_verse_list_activate(GtkMenuItem *menuitem, gpointer user_data) { - GList *verse; - RESULTS *item; + GList *verse; - for (verse = list_of_verses; verse; verse = g_list_next(verse)) - { - item = (RESULTS *)verse->data; - main_fake_tab_history_item((char *)main_getShortText(item->key)); - } + for (verse = list_of_verses; verse; verse = g_list_next(verse)) { + RESULTS *item = (RESULTS *)verse->data; + main_fake_tab_history_item((char *) + main_getShortText(item->key)); + } } - G_MODULE_EXPORT void -on_export_verselist_activate (GtkMenuItem * menuitem, - gpointer user_data) +on_export_verselist_activate(GtkMenuItem *menuitem, gpointer user_data) { gui_export_bookmarks_dialog((is_search_result - ? SEARCH_RESULTS_EXPORT - : VERSE_LIST_EXPORT), + ? SEARCH_RESULTS_EXPORT + : VERSE_LIST_EXPORT), list_of_verses); } @@ -1052,33 +1018,39 @@ gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_verselist", NULL); + gxml = glade_xml_new(glade_file, "menu_verselist", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); menu = UI_GET_ITEM(gxml, "menu_verselist"); #ifdef USE_GTKBUILDER /* connect signals and data */ - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - /* connect signals and data */ - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + /* connect signals and data */ + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif return menu; @@ -1099,75 +1071,74 @@ * Return value * void */ -static -GtkWidget* create_menu_modules(void) +static GtkWidget *create_menu_modules(void) { gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); - + g_return_val_if_fail((glade_file != NULL), NULL); + #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_modules", NULL); + gxml = glade_xml_new(glade_file, "menu_modules", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); GtkWidget *menu = UI_GET_ITEM(gxml, "menu_modules"); #ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif - gtk_menu_popup ((GtkMenu*)menu, NULL, NULL, NULL, NULL, 2, - gtk_get_current_event_time()); + gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 2, + gtk_get_current_event_time()); return menu; } - G_MODULE_EXPORT void -on_simple_activate(GtkMenuItem *menuitem, - gpointer user_data) +on_simple_activate(GtkMenuItem *menuitem, gpointer user_data) { main_prayerlist_basic_create(); } G_MODULE_EXPORT void -on_subject_activate(GtkMenuItem *menuitem, - gpointer user_data) +on_subject_activate(GtkMenuItem *menuitem, gpointer user_data) { main_prayerlist_subject_create(); } G_MODULE_EXPORT void -on_monthly_activate(GtkMenuItem *menuitem, - gpointer user_data) +on_monthly_activate(GtkMenuItem *menuitem, gpointer user_data) { main_prayerlist_monthly_create(); } G_MODULE_EXPORT void -on_journal_activate(GtkMenuItem *menuitem, - gpointer user_data) +on_journal_activate(GtkMenuItem *menuitem, gpointer user_data) { main_prayerlist_journal_create(); } G_MODULE_EXPORT void -on_outlined_topic_activate(GtkMenuItem *menuitem, - gpointer user_data) +on_outlined_topic_activate(GtkMenuItem *menuitem, gpointer user_data) { main_prayerlist_outlined_topic_create(); } @@ -1178,39 +1149,42 @@ gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_prayerlist", NULL); + gxml = glade_xml_new(glade_file, "menu_prayerlist", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); - menu = UI_GET_ITEM(gxml, "menu_prayerlist"); + menu = UI_GET_ITEM(gxml, "menu_prayerlist"); #ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif return menu; - } -void -on_edit_activate(GtkMenuItem *menuitem, - gpointer user_data) +void on_edit_activate(GtkMenuItem *menuitem, gpointer user_data) { editor_create_new(buf_module, NULL, BOOK_EDITOR); } @@ -1221,59 +1195,66 @@ gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_prayerlist_mod", NULL); + gxml = glade_xml_new(glade_file, "menu_prayerlist_mod", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); menu = UI_GET_ITEM(gxml, "menu_prayerlist_mod"); #ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, NULL); - /*gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);*/ + gtk_builder_connect_signals(gxml, NULL); +/*gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL); */ #else - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL); + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + NULL); #endif return menu; } -G_MODULE_EXPORT void gui_menu_prayerlist_popup(GtkMenuItem *menuitem, gpointer user_data) +G_MODULE_EXPORT void gui_menu_prayerlist_popup(GtkMenuItem *menuitem, + gpointer user_data) { gtk_menu_popup(GTK_MENU(sidebar.menu_prayerlist), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); } -static void tree_selection_changed_cb(GtkTreeSelection * selection, +static void tree_selection_changed_cb(GtkTreeSelection *selection, gpointer data) { gui_verselist_button_release_event(NULL, NULL, NULL); } - -static gboolean tree_key_press_cb(GtkWidget * widget, - GdkEventKey * event, - gpointer user_data) +static gboolean tree_key_press_cb(GtkWidget *widget, + GdkEventKey *event, gpointer user_data) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter selected; gchar *key = NULL; - selection = gtk_tree_view_get_selection((GtkTreeView *) sidebar.results_list); - model = gtk_tree_view_get_model(GTK_TREE_VIEW (sidebar.results_list)); + selection = gtk_tree_view_get_selection((GtkTreeView *) + sidebar.results_list); + model = + gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return FALSE; @@ -1282,30 +1263,29 @@ if (!key) return FALSE; - XI_warning(("%d", event->keyval)); if (event) { switch (event->keyval) { - case 0xff0d: /* "65293" */ - case 0xff8d: /* "65421" */ - { - gchar *url = g_strdup_printf("sword://%s/%s", - settings.sb_search_mod, - key); - main_url_handler(url, TRUE); - g_free(url); - } - break; + case 0xff0d: /* "65293" */ + case 0xff8d: /* "65421" */ + { + gchar *url = + g_strdup_printf("sword://%s/%s", + settings.sb_search_mod, + key); + main_url_handler(url, TRUE); + g_free(url); + } break; - case 0x20: /* "32" */ + case 0x20: /* "32" */ gui_open_passage_in_new_tab(key); sync_windows(); break; - case 0xffe1: /* shift keys */ + case 0xffe1: /* shift keys */ case 0xffe2: XI_warning(("shift key pressed")); - shift_key_pressed = TRUE; + shift_key_pressed = TRUE; sync_windows(); break; @@ -1321,7 +1301,6 @@ return FALSE; } - /****************************************************************************** * Name * create_search_results_page @@ -1338,7 +1317,7 @@ * void */ -static void create_search_results_page(GtkWidget * notebook) +static void create_search_results_page(GtkWidget *notebook) { GtkWidget *scrolledwindow3; GtkTreeSelection *selection; @@ -1350,42 +1329,44 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow3, + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) + scrolledwindow3, settings.shadow_type); /* create list model */ model_verselist = gtk_list_store_new(1, G_TYPE_STRING); - sidebar.results_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model_verselist)); + sidebar.results_list = + gtk_tree_view_new_with_model(GTK_TREE_MODEL(model_verselist)); gtk_widget_show(sidebar.results_list); - gtk_container_add(GTK_CONTAINER(scrolledwindow3), sidebar.results_list); + gtk_container_add(GTK_CONTAINER(scrolledwindow3), + sidebar.results_list); #ifndef HAVE_GTK_310 - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(sidebar.results_list), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(sidebar.results_list), + TRUE); #endif gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sidebar.results_list), FALSE); add_columns(GTK_TREE_VIEW(sidebar.results_list)); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sidebar.results_list)); - + selection = + gtk_tree_view_get_selection(GTK_TREE_VIEW(sidebar.results_list)); - g_signal_connect((gpointer) sidebar.results_list, + g_signal_connect((gpointer)sidebar.results_list, "key_press_event", G_CALLBACK(tree_key_press_cb), NULL); - g_signal_connect((gpointer) selection, + g_signal_connect((gpointer)selection, "changed", G_CALLBACK(tree_selection_changed_cb), NULL); - g_signal_connect((gpointer) sidebar.results_list, + g_signal_connect((gpointer)sidebar.results_list, "button_release_event", G_CALLBACK(gui_verselist_button_release_event), NULL); - g_signal_connect((gpointer) sidebar.results_list, + g_signal_connect((gpointer)sidebar.results_list, "button_press_event", - G_CALLBACK(on_treeview_button_press_event), - NULL); + G_CALLBACK(on_treeview_button_press_event), NULL); } - /****************************************************************************** * Name * paned_button_release_event @@ -1403,8 +1384,8 @@ * void */ -static gboolean paned_button_release_event(GtkWidget * widget, - GdkEventButton * event, +static gboolean paned_button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer user_data) { gint panesize; @@ -1425,12 +1406,12 @@ { if (choice) { gtk_widget_show(widgets.box_side_preview); - gtk_widget_show (widgets.box_side_preview); + gtk_widget_show(widgets.box_side_preview); gtk_widget_hide(widgets.vbox_previewer); gtk_paned_set_position(GTK_PANED(widgets.paned_sidebar), settings.sidebar_notebook_height); } else { - gtk_widget_show (widgets.vbox_previewer); + gtk_widget_show(widgets.vbox_previewer); gtk_widget_hide(widgets.box_side_preview); gtk_paned_set_position(GTK_PANED(widgets.vpaned), settings.biblepane_height); @@ -1455,7 +1436,7 @@ * GtkWidget * */ -GtkWidget *gui_create_sidebar(GtkWidget * paned) +GtkWidget *gui_create_sidebar(GtkWidget *paned) { GtkWidget *vbox1; GtkWidget *scrolledwindow4; @@ -1469,73 +1450,79 @@ gtk_widget_show(vbox1); widgets.paned_sidebar = UI_VPANE(); - gtk_paned_pack1 (GTK_PANED (paned), widgets.paned_sidebar, FALSE, TRUE); - gtk_widget_show (widgets.paned_sidebar); - gtk_paned_pack1 (GTK_PANED (widgets.paned_sidebar), vbox1, FALSE, TRUE); + gtk_paned_pack1(GTK_PANED(paned), widgets.paned_sidebar, FALSE, + TRUE); + gtk_widget_show(widgets.paned_sidebar); + gtk_paned_pack1(GTK_PANED(widgets.paned_sidebar), vbox1, FALSE, + TRUE); UI_VBOX(widgets.box_side_preview, FALSE, 0); - gtk_paned_pack2 (GTK_PANED (widgets.paned_sidebar), + gtk_paned_pack2(GTK_PANED(widgets.paned_sidebar), widgets.box_side_preview, FALSE, TRUE); gtk_container_set_border_width(GTK_CONTAINER(widgets.box_side_preview), 2); - g_signal_connect (G_OBJECT (widgets.paned_sidebar), - "button_release_event", - G_CALLBACK (paned_button_release_event), - (gchar *) "paned_sidebar"); + g_signal_connect(G_OBJECT(widgets.paned_sidebar), + "button_release_event", + G_CALLBACK(paned_button_release_event), + (gchar *)"paned_sidebar"); widgets.shortcutbar = widgets.paned_sidebar; scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(widgets.box_side_preview), scrolledwindow, TRUE, TRUE, - 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW - (scrolledwindow), + gtk_box_pack_start(GTK_BOX(widgets.box_side_preview), + scrolledwindow, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); - sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindow), sidebar.html_viewer_widget); + sidebar.html_viewer_widget = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); + gtk_container_add(GTK_CONTAINER(scrolledwindow), + sidebar.html_viewer_widget); gtk_widget_show(sidebar.html_viewer_widget); - /* ---------------------------------------------------------------- */ - /* 2x2 button box set: modules/bookmarks/search/vlist */ - /* ---------------------------------------------------------------- */ - -#ifdef HAVE_GTK_34 +/* ---------------------------------------------------------------- */ +/* 2x2 button box set: modules/bookmarks/search/vlist */ +/* ---------------------------------------------------------------- */ + +#ifdef HAVE_GTK_34 table2 = gtk_grid_new(); gtk_widget_show(table2); gtk_box_pack_start(GTK_BOX(vbox1), table2, FALSE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(table2), 2); - gtk_grid_set_row_spacing (GTK_GRID(table2), 6); - gtk_grid_set_column_spacing (GTK_GRID(table2), 6); - gtk_grid_set_row_homogeneous (GTK_GRID(table2),TRUE); - gtk_grid_set_column_homogeneous (GTK_GRID(table2),TRUE); - - button_bookmarks = gtk_toggle_button_new_with_mnemonic(_("Bookmarks")); + gtk_grid_set_row_spacing(GTK_GRID(table2), 6); + gtk_grid_set_column_spacing(GTK_GRID(table2), 6); + gtk_grid_set_row_homogeneous(GTK_GRID(table2), TRUE); + gtk_grid_set_column_homogeneous(GTK_GRID(table2), TRUE); + + button_bookmarks = + gtk_toggle_button_new_with_mnemonic(_("Bookmarks")); gtk_widget_show(button_bookmarks); - gtk_grid_attach (GTK_GRID(table2), button_bookmarks, 1, 0, 1, 1); - gtk_button_set_relief(GTK_BUTTON(button_bookmarks), GTK_RELIEF_HALF); + gtk_grid_attach(GTK_GRID(table2), button_bookmarks, 1, 0, 1, 1); + gtk_button_set_relief(GTK_BUTTON(button_bookmarks), + GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_bookmarks), FALSE); button_search = gtk_toggle_button_new_with_mnemonic(_("Search")); gtk_widget_show(button_search); - gtk_grid_attach (GTK_GRID(table2), button_search, 0, 1, 1, 1); + gtk_grid_attach(GTK_GRID(table2), button_search, 0, 1, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_search), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_search), FALSE); - button_v_lists = gtk_toggle_button_new_with_mnemonic(_("Verse List")); + button_v_lists = + gtk_toggle_button_new_with_mnemonic(_("Verse List")); gtk_widget_show(button_v_lists); - gtk_grid_attach (GTK_GRID(table2), button_v_lists, 1, 1, 1, 1); + gtk_grid_attach(GTK_GRID(table2), button_v_lists, 1, 1, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_v_lists), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_v_lists), FALSE); button_modules = gtk_toggle_button_new_with_mnemonic(_("Modules")); gtk_widget_show(button_modules); - gtk_grid_attach (GTK_GRID(table2), button_modules, 0, 0, 1, 1); + gtk_grid_attach(GTK_GRID(table2), button_modules, 0, 0, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_modules), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_modules), FALSE); - + #else table2 = gtk_table_new(2, 2, TRUE); @@ -1545,47 +1532,53 @@ gtk_table_set_row_spacings(GTK_TABLE(table2), 6); gtk_table_set_col_spacings(GTK_TABLE(table2), 6); - button_bookmarks = gtk_toggle_button_new_with_mnemonic(_("Bookmarks")); + button_bookmarks = + gtk_toggle_button_new_with_mnemonic(_("Bookmarks")); gtk_widget_show(button_bookmarks); gtk_table_attach(GTK_TABLE(table2), button_bookmarks, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_relief(GTK_BUTTON(button_bookmarks), GTK_RELIEF_HALF); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_button_set_relief(GTK_BUTTON(button_bookmarks), + GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_bookmarks), FALSE); button_search = gtk_toggle_button_new_with_mnemonic(_("Search")); gtk_widget_show(button_search); gtk_table_attach(GTK_TABLE(table2), button_search, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_button_set_relief(GTK_BUTTON(button_search), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_search), FALSE); - button_v_lists = gtk_toggle_button_new_with_mnemonic(_("Verse List")); + button_v_lists = + gtk_toggle_button_new_with_mnemonic(_("Verse List")); gtk_widget_show(button_v_lists); gtk_table_attach(GTK_TABLE(table2), button_v_lists, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_button_set_relief(GTK_BUTTON(button_v_lists), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_v_lists), FALSE); button_modules = gtk_toggle_button_new_with_mnemonic(_("Modules")); gtk_widget_show(button_modules); gtk_table_attach(GTK_TABLE(table2), button_modules, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(0), 0, 0); gtk_button_set_relief(GTK_BUTTON(button_modules), GTK_RELIEF_HALF); gtk_button_set_focus_on_click(GTK_BUTTON(button_modules), FALSE); #endif - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button_modules), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button_modules), + TRUE); /* ---------------------------------------------------------------- */ widgets.notebook_sidebar = gtk_notebook_new(); gtk_widget_show(widgets.notebook_sidebar); - gtk_box_pack_start(GTK_BOX(vbox1), widgets.notebook_sidebar, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), widgets.notebook_sidebar, TRUE, + TRUE, 0); gtk_widget_set_can_default(widgets.notebook_sidebar, 1); - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_sidebar), FALSE); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_sidebar), + FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_sidebar), FALSE); gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_sidebar), 2); @@ -1630,26 +1623,24 @@ main_load_module_tree(sidebar.module_list); - g_signal_connect_after((gpointer) sidebar.module_list, + g_signal_connect_after((gpointer)sidebar.module_list, "button_release_event", - G_CALLBACK - (on_modules_list_button_release), NULL); + G_CALLBACK(on_modules_list_button_release), NULL); // sidebar.menu_modules = create_menu_modules(); sidebar.menu_prayerlist = create_menu_prayerlist(); sidebar.menu_prayerlist_mod = create_menu_prayerlist_mod(); - g_signal_connect((gpointer) button_bookmarks, "toggled", + g_signal_connect((gpointer)button_bookmarks, "toggled", G_CALLBACK(on_bookmarks_activate), NULL); - g_signal_connect((gpointer) button_search, "toggled", + g_signal_connect((gpointer)button_search, "toggled", G_CALLBACK(on_search_activate), NULL); - g_signal_connect((gpointer) button_v_lists, "toggled", + g_signal_connect((gpointer)button_v_lists, "toggled", G_CALLBACK(on_search_results_activate), NULL); - g_signal_connect((gpointer) button_modules, "toggled", + g_signal_connect((gpointer)button_modules, "toggled", G_CALLBACK(on_modules_activate), NULL); - g_signal_connect((gpointer) widgets.notebook_sidebar, + g_signal_connect((gpointer)widgets.notebook_sidebar, "switch-page", - G_CALLBACK(on_notebook_switch_page), - title_label); + G_CALLBACK(on_notebook_switch_page), title_label); return vbox1; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/sidebar_dialog.c xiphos-4.0.4+dfsg1/src/gnome2/sidebar_dialog.c --- xiphos-4.0.0+dfsg1/src/gnome2/sidebar_dialog.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/sidebar_dialog.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar_dialog.c - dialog for detached sidebar * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -40,8 +40,8 @@ #include "xiphos_html/xiphos_html.h" -static GtkWidget* create_sidebar_dialog(void); -static GtkWidget * vbox_dock; +static GtkWidget *create_sidebar_dialog(void); +static GtkWidget *vbox_dock; /****************************************************************************** * Name @@ -69,20 +69,23 @@ biblepanesize = settings.gs_width / 2; widgets.dock_sb = create_sidebar_dialog(); #ifdef HAVE_GTK_310 - gtk_container_add(GTK_CONTAINER(vbox_dock), widgets.shortcutbar); + gtk_container_add(GTK_CONTAINER(vbox_dock), + widgets.shortcutbar); #else gtk_widget_reparent(widgets.shortcutbar, vbox_dock); #endif settings.showshortcutbar = TRUE; gtk_paned_set_position(GTK_PANED(widgets.epaned), 0); /*gtk_paned_set_position(GTK_PANED(widgets.hpaned), - biblepanesize);*/ - + biblepanesize); */ + /* ugly fix until someone can make mozembed work with 'gtk_widget_reparent()' */ gtk_widget_destroy(sidebar.html_viewer_widget); - sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); - gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), sidebar.html_viewer_widget); - + sidebar.html_viewer_widget = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); + gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), + sidebar.html_viewer_widget); + gtk_widget_show_all(widgets.dock_sb); gtk_widget_show(sidebar.html_viewer_widget); @@ -95,15 +98,18 @@ gtk_paned_set_position(GTK_PANED(widgets.hpaned), biblepanesize); #ifdef HAVE_GTK_310 - gtk_container_add(GTK_CONTAINER(widgets.epaned), widgets.shortcutbar); + gtk_container_add(GTK_CONTAINER(widgets.epaned), + widgets.shortcutbar); #else gtk_widget_reparent(widgets.shortcutbar, widgets.epaned); #endif - + /* ugly fix until someone can make mozembed work with 'gtk_widget_reparent()' */ gtk_widget_destroy(sidebar.html_viewer_widget); - sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); - gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), sidebar.html_viewer_widget); + sidebar.html_viewer_widget = + GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); + gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), + sidebar.html_viewer_widget); gtk_widget_show(sidebar.html_viewer_widget); gtk_widget_destroy(widgets.dock_sb); @@ -154,7 +160,7 @@ * GtkWidget* */ -GtkWidget* create_sidebar_dialog(void) +GtkWidget *create_sidebar_dialog(void) { GtkWidget *dlgDock; gchar *title; @@ -164,18 +170,20 @@ gtk_window_set_title(GTK_WINDOW(dlgDock), _("Sidebar")); gtk_window_set_resizable(GTK_WINDOW(dlgDock), TRUE); gtk_widget_set_size_request(dlgDock, settings.sidebar_width, - settings.gs_height); + settings.gs_height); UI_VBOX(vbox_dock, FALSE, 0); gtk_widget_show(vbox_dock); gtk_container_add(GTK_CONTAINER(dlgDock), vbox_dock); - title = g_strdup_printf("%s - %s", _("Sidebar"), settings.program_title); + title = + g_strdup_printf("%s - %s", _("Sidebar"), + settings.program_title); gtk_window_set_title(GTK_WINDOW(dlgDock), title); g_free(title); g_signal_connect(G_OBJECT(dlgDock), "destroy", - G_CALLBACK(on_dialog_destroy), NULL); + G_CALLBACK(on_dialog_destroy), NULL); return dlgDock; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/splash.c xiphos-4.0.4+dfsg1/src/gnome2/splash.c --- xiphos-4.0.0+dfsg1/src/gnome2/splash.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/splash.c 2015-03-12 02:57:29.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * splash.c - Splash related functions * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -32,48 +32,49 @@ #include "main/settings.h" #include "gui/splash.h" #include "gui/utilities.h" - + #ifndef USE_GTK_3 /*****************************************************************************/ /* FIXME: clean up below */ -#define E_TYPE_SPLASH (e_splash_get_type ()) -#define E_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - E_TYPE_SPLASH, ESplash)) -#define E_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ - E_TYPE_SPLASH, ESplashClass)) -#define E_IS_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SPLASH)) -#define E_IS_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), \ - E_TYPE_SPLASH)) +#define E_TYPE_SPLASH (e_splash_get_type()) +#define E_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + E_TYPE_SPLASH, ESplash)) +#define E_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \ + E_TYPE_SPLASH, ESplashClass)) +#define E_IS_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), E_TYPE_SPLASH)) +#define E_IS_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((obj), \ + E_TYPE_SPLASH)) typedef struct _ESplash ESplash; typedef struct _ESplashPrivate ESplashPrivate; typedef struct _ESplashClass ESplashClass; -struct _ESplash { +struct _ESplash +{ GtkWindow parent; ESplashPrivate *priv; }; -struct _ESplashClass { +struct _ESplashClass +{ GtkWindowClass parent_class; }; -GType e_splash_get_type (void); -void e_splash_construct (ESplash * splash, - GdkPixbuf * splash_image); -GtkWidget *e_splash_new (void); - -int e_splash_add_icon (ESplash * splash, - GdkPixbuf * icon); -void e_splash_set_icon_highlight (ESplash * splash, - int num, gboolean highlight); +GType e_splash_get_type(void); +void e_splash_construct(ESplash *splash, GdkPixbuf *splash_image); +GtkWidget *e_splash_new(void); + +int e_splash_add_icon(ESplash *splash, GdkPixbuf *icon); +void e_splash_set_icon_highlight(ESplash *splash, + int num, gboolean highlight); -#define PARENT_TYPE gtk_window_get_type () +#define PARENT_TYPE gtk_window_get_type() static GtkWindowClass *parent_class = NULL; -struct _Icon { +struct _Icon +{ GdkPixbuf *dark_pixbuf; GdkPixbuf *light_pixbuf; double x; @@ -82,11 +83,12 @@ }; typedef struct _Icon Icon; -struct _ESplashPrivate { +struct _ESplashPrivate +{ GtkDrawingArea *canvas; GdkPixbuf *splash_image_pixbuf; GtkProgressBar *progressbar; - GList *icons; /* (Icon *) */ + GList *icons; /* (Icon *) */ int num_icons; int layout_idle_id; @@ -94,12 +96,12 @@ /* Layout constants. These need to be changed if the splash changes. */ -#define ICON_Y 340 +#define ICON_Y 340 #define ICON_SIZE 28 /* Icon management. */ -static GdkPixbuf *create_darkened_pixbuf(GdkPixbuf * pixbuf) +static GdkPixbuf *create_darkened_pixbuf(GdkPixbuf *pixbuf) { GdkPixbuf *new; unsigned char *rowp; @@ -131,7 +133,7 @@ return new; } -static Icon *icon_new(ESplash * splash, GdkPixbuf * image_pixbuf) +static Icon *icon_new(ESplash *splash, GdkPixbuf *image_pixbuf) { Icon *icon; @@ -142,10 +144,10 @@ ICON_SIZE); gdk_pixbuf_scale(image_pixbuf, icon->light_pixbuf, 0, 0, ICON_SIZE, ICON_SIZE, 0, 0, - (double) ICON_SIZE / - gdk_pixbuf_get_width(image_pixbuf), - (double) ICON_SIZE / - gdk_pixbuf_get_height(image_pixbuf), + (double)ICON_SIZE / + gdk_pixbuf_get_width(image_pixbuf), + (double)ICON_SIZE / + gdk_pixbuf_get_height(image_pixbuf), GDK_INTERP_HYPER); icon->dark_pixbuf = create_darkened_pixbuf(icon->light_pixbuf); @@ -153,16 +155,17 @@ return icon; } -static void icon_free(Icon * icon) +static void icon_free(Icon *icon) { g_object_unref(icon->dark_pixbuf); g_object_unref(icon->light_pixbuf); g_free(icon); } + /* Icon layout management. */ -static void layout_icons(ESplash * splash) +static void layout_icons(ESplash *splash) { ESplashPrivate *priv; GList *p; @@ -172,7 +175,7 @@ priv = splash->priv; x_step = - ((double) gdk_pixbuf_get_width(priv->splash_image_pixbuf)) / + ((double)gdk_pixbuf_get_width(priv->splash_image_pixbuf)) / priv->num_icons; x = (x_step - ICON_SIZE) / 2.0; @@ -182,7 +185,7 @@ and store them in the icon struct */ for (p = priv->icons; p != NULL; p = p->next) { Icon *icon; - icon = (Icon *) p->data; + icon = (Icon *)p->data; icon->x = x; icon->y = y; @@ -205,7 +208,7 @@ return FALSE; } -static void schedule_relayout(ESplash * splash) +static void schedule_relayout(ESplash *splash) { ESplashPrivate *priv; @@ -214,15 +217,15 @@ if (priv->layout_idle_id != 0) return; - layout_idle_cb (splash); + layout_idle_cb(splash); } /* GtkObject methods. */ #ifdef USE_GTK_3 -static void impl_destroy(GObject * object) +static void impl_destroy(GObject *object) #else -static void impl_destroy(GtkObject * object) +static void impl_destroy(GtkObject *object) #endif { ESplash *splash; @@ -238,7 +241,7 @@ for (p = priv->icons; p != NULL; p = p->next) { Icon *icon; - icon = (Icon *) p->data; + icon = (Icon *)p->data; icon_free(icon); } @@ -248,8 +251,9 @@ g_source_remove(priv->layout_idle_id); g_free(priv); -} -static void class_init(ESplashClass * klass) +} + +static void class_init(ESplashClass *klass) { #ifdef USE_GTK_3 GtkWidgetClass *object_class; @@ -264,7 +268,7 @@ parent_class = g_type_class_ref(gtk_window_get_type()); } -static void init(ESplash * splash) +static void init(ESplash *splash) { ESplashPrivate *priv; @@ -279,10 +283,10 @@ } static gboolean -button_press_event(GtkWidget * widget, GdkEventButton * event, +button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) { - ESplash *splash = (ESplash *) data; + ESplash *splash = (ESplash *)data; gtk_widget_hide(GTK_WIDGET(splash)); @@ -300,47 +304,42 @@ **/ gboolean -expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) +expose_event_callback(GtkWidget *widget, GdkEventExpose *event, + gpointer data) { #ifndef USE_GTK_3 - ESplashPrivate *priv = (ESplashPrivate *) data; + ESplashPrivate *priv = (ESplashPrivate *)data; GtkWidget *canvas = widget; GList *p; /* draws main image */ - gdk_draw_pixbuf(gtk_widget_get_window (canvas), + gdk_draw_pixbuf(gtk_widget_get_window(canvas), NULL, GDK_PIXBUF(priv->splash_image_pixbuf), 0, 0, 0, 0, gdk_pixbuf_get_width(priv->splash_image_pixbuf), gdk_pixbuf_get_height(priv->splash_image_pixbuf), - 2, - 0, 0); + 2, 0, 0); /* draws each of the small icons */ for (p = priv->icons; p != NULL; p = p->next) { Icon *icon; - icon = (Icon *) p->data; + icon = (Icon *)p->data; - gdk_draw_pixbuf(gtk_widget_get_window (canvas), + gdk_draw_pixbuf(gtk_widget_get_window(canvas), NULL, - GDK_PIXBUF(icon->light ? - icon->light_pixbuf : icon->dark_pixbuf), - 0, 0, - icon->x, - icon->y, + GDK_PIXBUF(icon->light ? icon->light_pixbuf : icon->dark_pixbuf), 0, 0, + icon->x, icon->y, gdk_pixbuf_get_width(icon->light_pixbuf), gdk_pixbuf_get_height(icon->light_pixbuf), - 2, - 0, 0); + 2, 0, 0); } return TRUE; #endif - return FALSE; + return FALSE; } - /** * e_splash_construct: * @splash: A pointer to an ESplash widget @@ -348,8 +347,7 @@ * * Construct @splash with @splash_image_pixbuf as the splash image. **/ -void -e_splash_construct(ESplash * splash, GdkPixbuf * splash_image_pixbuf) +void e_splash_construct(ESplash *splash, GdkPixbuf *splash_image_pixbuf) { ESplashPrivate *priv; GtkWidget *canvas, *frame, *vbox; @@ -371,8 +369,8 @@ gtk_widget_set_size_request(canvas, image_width, image_height); - g_signal_connect (G_OBJECT (canvas), "expose_event", - G_CALLBACK (expose_event_callback), priv); + g_signal_connect(G_OBJECT(canvas), "expose_event", + G_CALLBACK(expose_event_callback), priv); gtk_widget_show(canvas); @@ -386,11 +384,12 @@ gtk_widget_show(vbox); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_box_pack_start((GtkBox *)vbox, canvas,TRUE,TRUE,0); + gtk_box_pack_start((GtkBox *)vbox, canvas, TRUE, TRUE, 0); - priv->progressbar = (GtkProgressBar*)gtk_progress_bar_new(); + priv->progressbar = (GtkProgressBar *)gtk_progress_bar_new(); gtk_widget_show(GTK_WIDGET(priv->progressbar)); - gtk_box_pack_start((GtkBox *)vbox, GTK_WIDGET(priv->progressbar),FALSE,TRUE,0); + gtk_box_pack_start((GtkBox *)vbox, GTK_WIDGET(priv->progressbar), + FALSE, TRUE, 0); g_signal_connect(G_OBJECT(splash), "button-press-event", G_CALLBACK(button_press_event), splash); @@ -399,8 +398,9 @@ gtk_window_set_position(GTK_WINDOW(splash), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(splash), FALSE); gtk_window_set_default_size(GTK_WINDOW(splash), image_width, - image_height+20); - gtk_window_set_title(GTK_WINDOW(splash), _("Powered by the SWORD Project")); + image_height + 20); + gtk_window_set_title(GTK_WINDOW(splash), + _("Powered by the SWORD Project")); } /** @@ -418,8 +418,7 @@ splash_image_pixbuf = pixbuf_finder("splash.png", 0, &error); if (!splash_image_pixbuf) { - XI_warning(("pixmap file error: %s\n", - error->message)); + XI_warning(("pixmap file error: %s\n", error->message)); g_error_free(error); error = NULL; settings.showsplash = FALSE; @@ -427,7 +426,6 @@ } g_return_val_if_fail(splash_image_pixbuf != NULL, NULL); - new = g_object_new(e_splash_get_type(), NULL); e_splash_construct(new, splash_image_pixbuf); @@ -446,7 +444,7 @@ * Return value: The total number of icons in the splash after the new icon has * been added. **/ -int e_splash_add_icon(ESplash * splash, GdkPixbuf * icon_pixbuf) +int e_splash_add_icon(ESplash *splash, GdkPixbuf *icon_pixbuf) { ESplashPrivate *priv; Icon *icon; @@ -465,7 +463,8 @@ icon->x = 0; icon->y = ICON_Y; - GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET (splash)); + GtkTextDirection dir = + gtk_widget_get_direction(GTK_WIDGET(splash)); if (dir == GTK_TEXT_DIR_LTR) priv->icons = g_list_append(priv->icons, icon); @@ -488,8 +487,7 @@ * Change the highlight state of the @num-th icon. **/ void -e_splash_set_icon_highlight(ESplash * splash, - int num, gboolean highlight) +e_splash_set_icon_highlight(ESplash *splash, int num, gboolean highlight) { ESplashPrivate *priv; Icon *icon; @@ -498,19 +496,21 @@ g_return_if_fail(splash != NULL); g_return_if_fail(E_IS_SPLASH(splash)); - if (num >= splash->priv->num_icons) return; // no noisy logging - if (!splash) - return; + if (!splash || (num >= splash->priv->num_icons)) + return; // no noisy logging priv = splash->priv; - GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET (splash)); + GtkTextDirection dir = + gtk_widget_get_direction(GTK_WIDGET(splash)); if (dir == GTK_TEXT_DIR_LTR) - icon = (Icon *) g_list_nth(priv->icons, num)->data; + icon = (Icon *)g_list_nth(priv->icons, num)->data; else - icon = (Icon *) g_list_nth(priv->icons, priv->num_icons - num -1)->data; + icon = + (Icon *)g_list_nth(priv->icons, + priv->num_icons - num - 1)->data; icon->light = TRUE; @@ -520,8 +520,9 @@ rectangle.height = gdk_pixbuf_get_height(icon->light_pixbuf); canvas = GTK_WIDGET(priv->canvas); - gdk_window_invalidate_rect(gtk_widget_get_window (canvas), &rectangle, TRUE); - gdk_window_process_updates(gtk_widget_get_window (canvas), TRUE); + gdk_window_invalidate_rect(gtk_widget_get_window(canvas), + &rectangle, TRUE); + gdk_window_process_updates(gtk_widget_get_window(canvas), TRUE); } E_MAKE_TYPE(e_splash, "ESplash", ESplash, class_init, init, PARENT_TYPE) @@ -531,11 +532,11 @@ void gui_splash_init() { - GdkPixbuf *icon_pixbuf; GError *error = NULL; - GList *icons = NULL; if (settings.showsplash) { + GList *icons = NULL; + splash = e_splash_new(); if (!splash) return; @@ -544,15 +545,14 @@ set_window_icon(GTK_WINDOW(splash)); g_object_ref(G_OBJECT(splash)); - icons = g_list_append(icons, "gnome-windows.png"); icons = g_list_append(icons, "sword.png"); icons = g_list_append(icons, "gnome-session.png"); icons = g_list_append(icons, "gs2-48x48.png"); - while (icons != NULL) - { - icon_pixbuf = pixbuf_finder(icons->data, 0, &error); + while (icons != NULL) { + GdkPixbuf *icon_pixbuf = + pixbuf_finder(icons->data, 0, &error); if (!icon_pixbuf) { XI_warning(("pixmap file error: %s\n", error->message)); @@ -573,17 +573,12 @@ sync_windows(); } - - void gui_splash_step(gchar *text, gdouble progress, gint step) { - ESplashPrivate *priv; if (settings.showsplash) { - priv = E_SPLASH(splash)->priv; - gtk_progress_bar_set_text(priv->progressbar, - text); - gtk_progress_bar_set_fraction(priv->progressbar, - progress); + ESplashPrivate *priv = E_SPLASH(splash)->priv; + gtk_progress_bar_set_text(priv->progressbar, text); + gtk_progress_bar_set_fraction(priv->progressbar, progress); e_splash_set_icon_highlight(E_SPLASH(splash), step, TRUE); sync_windows(); @@ -601,19 +596,19 @@ } #else - -GtkWidget *splash; -GtkWidget *progressbar; -GtkWidget *image1; + +GtkWidget *splash; +GtkWidget *progressbar; +GtkWidget *image1; GtkWidget *image2; GtkWidget *image3; GtkWidget *image4; - + gboolean gui_splash_done(void) { if (settings.showsplash) { sync_windows(); - /*g_object_unref(splash);*/ + /*g_object_unref(splash); */ gtk_widget_destroy(splash); } return FALSE; @@ -624,48 +619,44 @@ if (settings.showsplash) { gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar), text); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), - progress); - + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), progress); + sync_windows(); } } -void gui_splash_init (void) +void gui_splash_init(void) { gchar *builder_file; GtkBuilder *builder; - GError* error = NULL; - - if (!settings.showsplash) return; - - builder_file = gui_general_user_file ("xi-splash.ui", FALSE); - g_return_if_fail ((builder_file != NULL)); - - builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, builder_file, &error)) - { - g_warning ("Couldn't load builder file: %s", error->message); - g_error_free (error); + GError *error = NULL; + + if (!settings.showsplash) + return; + + builder_file = gui_general_user_file("xi-splash.ui", FALSE); + g_return_if_fail((builder_file != NULL)); + + builder = gtk_builder_new(); + if (!gtk_builder_add_from_file(builder, builder_file, &error)) { + g_warning("Couldn't load builder file: %s", + error->message); + g_error_free(error); } /* This is important */ - splash = GTK_WIDGET (gtk_builder_get_object (builder, "window")); - image1 = GTK_WIDGET (gtk_builder_get_object (builder, "image2")); - image2 = GTK_WIDGET (gtk_builder_get_object (builder, "image3")); - image3 = GTK_WIDGET (gtk_builder_get_object (builder, "image4")); - image4 = GTK_WIDGET (gtk_builder_get_object (builder, "image5")); - progressbar = GTK_WIDGET (gtk_builder_get_object (builder, "progressbar1")); - gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR(progressbar),TRUE); - - - gtk_builder_connect_signals (builder, NULL); - - g_object_unref (builder); - - - - - + splash = GTK_WIDGET(gtk_builder_get_object(builder, "window")); + image1 = GTK_WIDGET(gtk_builder_get_object(builder, "image2")); + image2 = GTK_WIDGET(gtk_builder_get_object(builder, "image3")); + image3 = GTK_WIDGET(gtk_builder_get_object(builder, "image4")); + image4 = GTK_WIDGET(gtk_builder_get_object(builder, "image5")); + progressbar = + GTK_WIDGET(gtk_builder_get_object(builder, "progressbar1")); + gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progressbar), + TRUE); + + gtk_builder_connect_signals(builder, NULL); + + g_object_unref(builder); } -#endif /* !USE_GTK_3 */ +#endif /* !USE_GTK_3 */ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/tabbed_browser.c xiphos-4.0.4+dfsg1/src/gnome2/tabbed_browser.c --- xiphos-4.0.0+dfsg1/src/gnome2/tabbed_browser.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/tabbed_browser.c 2015-03-12 02:57:29.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tabbed_browser.c - functions to facilitate tabbed browsing of different passages at once * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,10 +59,10 @@ #include "gui/debug_glib_null.h" -static GtkWidget* tab_widget_new(PASSAGE_TAB_INFO *tbinf, - const gchar *label_text); +static GtkWidget *tab_widget_new(PASSAGE_TAB_INFO *tbinf, + const gchar *label_text); void notebook_main_add_page(PASSAGE_TAB_INFO *tbinf); -void set_current_tab (PASSAGE_TAB_INFO *pt); +void set_current_tab(PASSAGE_TAB_INFO *pt); gboolean stop_refresh = FALSE; gboolean change_tabs_no_redisplay = FALSE; @@ -86,7 +86,7 @@ static const gchar *default_tab_filename = ".last_session_tabs"; static const gchar *no_tab_filename = ".last_session_no_tabs"; -static int yes_no2true_false(const gchar * yes_no) +static int yes_no2true_false(const gchar *yes_no) { return (yes_no && !strcmp(yes_no, "yes")); } @@ -96,7 +96,6 @@ return (true_false ? "yes" : "no"); } - /****************************************************************************** * Name * gui_recompute_shows @@ -158,30 +157,29 @@ { change_tabs_no_redisplay = TRUE; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewtexts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), settings.showtexts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewcomms_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), settings.showcomms); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewdicts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), settings.showdicts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewpreview_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewpreview_item), settings.showpreview); change_tabs_no_redisplay = FALSE; } +#if 0 +// unneeded at this time. disabled to silence cppcheck. void setup_book_editor_tab(PASSAGE_TAB_INFO *pt) { /*pt->editor = editor_create_new_book_editor(pt->book_mod, PRAYERLIST_TYPE); - gtk_widget_show(GTK_WIDGET(pt->editor)); + gtk_widget_show(GTK_WIDGET(pt->editor)); - gtk_box_pack_start (GTK_BOX (widgets.vboxMain), GTK_WIDGET(pt->editor), - TRUE, TRUE, 0);*/ + gtk_box_pack_start (GTK_BOX (widgets.vboxMain), GTK_WIDGET(pt->editor), + TRUE, TRUE, 0); */ } +#endif /****************************************************************************** * Name @@ -200,7 +198,7 @@ * void */ -void set_current_tab (PASSAGE_TAB_INFO *pt) +void set_current_tab(PASSAGE_TAB_INFO *pt) { PASSAGE_TAB_INFO *ot = cur_passage_tab; @@ -216,16 +214,15 @@ gtk_widget_set_sensitive(pt->button_close, TRUE); /* adopt panel shows from passage tab memory. */ - settings.showtexts = pt->showtexts; + settings.showtexts = pt->showtexts; settings.showpreview = pt->showpreview; - settings.showcomms = pt->showcomms; - settings.showdicts = pt->showdicts; + settings.showcomms = pt->showcomms; + settings.showdicts = pt->showdicts; settings.comm_showing = pt->comm_showing; gui_recompute_shows(TRUE); } } - /****************************************************************************** * Name * pick_tab_label @@ -243,11 +240,16 @@ * ** caller must free it ** */ -GString * -pick_tab_label(PASSAGE_TAB_INFO *pt) +GString *pick_tab_label(PASSAGE_TAB_INFO *pt) { GString *str = g_string_new(NULL); + const char *abbrev_text = main_get_abbreviation(pt->text_mod); + const char *abbrev_comm = + main_get_abbreviation(pt->commentary_mod); + const char *abbrev_dict = main_get_abbreviation(pt->dictlex_mod); + const char *abbrev_book = main_get_abbreviation(pt->book_mod); + if (pt->showparallel) { g_string_printf(str, "%s", _("Parallel View")); return str; @@ -256,25 +258,24 @@ if (pt->showtexts || (pt->showcomms && pt->comm_showing)) { g_string_printf(str, "%s: %s", (pt->showtexts - ? pt->text_mod - : (pt->commentary_mod - ? pt->commentary_mod - : "[no commentary]")), + ? (abbrev_text ? abbrev_text : pt->text_mod) + : (pt->commentary_mod + ? (abbrev_comm ? abbrev_comm : pt->commentary_mod) + : "[no commentary]")), pt->text_commentary_key); } else { g_string_printf(str, "%s", (pt->showcomms - ? (pt->book_mod - ? pt->book_mod - : "[no book]") - : (pt->dictlex_mod - ? pt->dictlex_mod - : "[no dict]"))); + ? (pt->book_mod + ? (abbrev_book ? abbrev_book : pt->book_mod) + : "[no book]") + : (pt->dictlex_mod + ? (abbrev_dict ? abbrev_dict : pt->dictlex_mod) + : "[no dict]"))); } return str; } - /****************************************************************************** * Name * notebook_main_add_page @@ -304,23 +305,21 @@ tab_widget = tab_widget_new(tbinf, str->str); /*gtk_notebook_insert_page(GTK_NOTEBOOK(widgets.notebook_main), - tbinf->page_widget, - tab_widget, - tbinf->showparallel ? 1 : -1);*/ + tbinf->page_widget, + tab_widget, + tbinf->showparallel ? 1 : -1); */ gtk_notebook_append_page(GTK_NOTEBOOK(widgets.notebook_main), tbinf->page_widget, tab_widget); gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(widgets.notebook_main), - tbinf->page_widget, str->str); + tbinf->page_widget, str->str); menu_label = gtk_label_new(str->str); gtk_notebook_set_menu_label(GTK_NOTEBOOK(widgets.notebook_main), - tbinf->page_widget, - menu_label); + tbinf->page_widget, menu_label); g_string_free(str, TRUE); } - /****************************************************************************** * Name * gui_save_tabs @@ -341,12 +340,10 @@ xmlNodePtr root_node; xmlNodePtr cur_node; xmlNodePtr section_node; -// xmlAttrPtr xml_attr; + // xmlAttrPtr xml_attr; //const xmlChar *xml_filename; - gchar *tabs_dir; gchar *file; GList *tmp = NULL; - PASSAGE_TAB_INFO *pt; if (NULL == filename) filename = default_tab_filename; @@ -355,72 +352,81 @@ /* we're done, just copy for local use that can be free'd */ file = g_strdup(filename); } else { - tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir); + gchar *tabs_dir = g_strdup_printf("%s/tabs/", settings.gSwordDir); if (g_access(tabs_dir, F_OK) == -1) { if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) { gui_generic_warning_modal(_("Can't create tabs dir.")); return; } } - file = g_strdup_printf("%s%s",tabs_dir,filename); + file = g_strdup_printf("%s%s", tabs_dir, filename); g_free(tabs_dir); } //xml_filename = (const xmlChar *) file; - xml_doc = xmlNewDoc((const xmlChar *) "1.0"); + xml_doc = xmlNewDoc((const xmlChar *)"1.0"); if (xml_doc == NULL) { gui_generic_warning_modal("Tabs document not created successfully."); return; } - root_node = xmlNewNode(NULL, (const xmlChar *) "Xiphos_Tabs"); - //xml_attr = - xmlNewProp(root_node, (const xmlChar *)"Version", (const xmlChar *) VERSION); + root_node = xmlNewNode(NULL, (const xmlChar *)"Xiphos_Tabs"); + //xml_attr = + xmlNewProp(root_node, (const xmlChar *)"Version", + (const xmlChar *)VERSION); xmlDocSetRootElement(xml_doc, root_node); section_node = xmlNewChild(root_node, NULL, - (const xmlChar *) "tabs", NULL); + (const xmlChar *)"tabs", NULL); - for (tmp = g_list_first(passage_list); tmp != NULL; tmp = g_list_next(tmp)) { + for (tmp = g_list_first(passage_list); tmp != NULL; + tmp = g_list_next(tmp)) { - pt = (PASSAGE_TAB_INFO*) tmp->data; + PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO *)tmp->data; cur_node = xmlNewChild(section_node, - NULL, (const xmlChar *) "tab", NULL); - xmlNewProp(cur_node,(const xmlChar *)"text_mod", - (const xmlChar *)pt->text_mod); + NULL, (const xmlChar *)"tab", + NULL); + xmlNewProp(cur_node, (const xmlChar *)"text_mod", + (const xmlChar *)pt->text_mod); xmlNewProp(cur_node, (const xmlChar *)"commentary_mod", - (const xmlChar *)pt->commentary_mod); + (const xmlChar *)pt->commentary_mod); xmlNewProp(cur_node, (const xmlChar *)"dictlex_mod", - (const xmlChar *)pt->dictlex_mod); + (const xmlChar *)pt->dictlex_mod); xmlNewProp(cur_node, (const xmlChar *)"book_mod", - (const xmlChar *)pt->book_mod); - xmlNewProp(cur_node, (const xmlChar *)"text_commentary_key", - (const xmlChar *)pt->text_commentary_key); + (const xmlChar *)pt->book_mod); + xmlNewProp(cur_node, + (const xmlChar *)"text_commentary_key", + (const xmlChar *)pt->text_commentary_key); xmlNewProp(cur_node, (const xmlChar *)"dictlex_key", - (const xmlChar *)pt->dictlex_key); + (const xmlChar *)pt->dictlex_key); xmlNewProp(cur_node, (const xmlChar *)"book_offset", - (const xmlChar *)pt->book_offset); + (const xmlChar *)pt->book_offset); xmlNewProp(cur_node, (const xmlChar *)"comm_showing", - (const xmlChar *)true_false2yes_no(pt->comm_showing)); + (const xmlChar *) + true_false2yes_no(pt->comm_showing)); xmlNewProp(cur_node, (const xmlChar *)"showtexts", - (const xmlChar *)true_false2yes_no(pt->showtexts)); + (const xmlChar *) + true_false2yes_no(pt->showtexts)); xmlNewProp(cur_node, (const xmlChar *)"showpreview", - (const xmlChar *)true_false2yes_no(pt->showpreview)); + (const xmlChar *) + true_false2yes_no(pt->showpreview)); xmlNewProp(cur_node, (const xmlChar *)"showcomms", - (const xmlChar *)true_false2yes_no(pt->showcomms)); + (const xmlChar *) + true_false2yes_no(pt->showcomms)); xmlNewProp(cur_node, (const xmlChar *)"showdicts", - (const xmlChar *)true_false2yes_no(pt->showdicts)); + (const xmlChar *) + true_false2yes_no(pt->showdicts)); xmlNewProp(cur_node, (const xmlChar *)"showparallel", - (const xmlChar *)true_false2yes_no(pt->showparallel)); + (const xmlChar *) + true_false2yes_no(pt->showparallel)); } - xmlSaveFormatFile(file, xml_doc,1); + xmlSaveFormatFile(file, xml_doc, 1); g_free(file); xmlFreeDoc(xml_doc); } - /****************************************************************************** * Name * @@ -437,8 +443,7 @@ * */ -static -void _save_off_tab (const gchar * filename) +static void _save_off_tab(const gchar *filename) { xmlDocPtr xml_doc; xmlNodePtr root_node; @@ -451,7 +456,7 @@ if (NULL == filename) filename = no_tab_filename; - tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir); + tabs_dir = g_strdup_printf("%s/tabs/", settings.gSwordDir); if (g_access(tabs_dir, F_OK) == -1) { if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) { @@ -459,59 +464,64 @@ return; } } - file = g_strdup_printf("%s%s",tabs_dir,filename); + file = g_strdup_printf("%s%s", tabs_dir, filename); g_free(tabs_dir); - xml_doc = xmlNewDoc((const xmlChar *) "1.0"); + xml_doc = xmlNewDoc((const xmlChar *)"1.0"); if (xml_doc == NULL) { gui_generic_warning_modal("Tabs document not created successfully."); return; } - root_node = xmlNewNode(NULL, (const xmlChar *) "Xiphos_Tabs"); - //xml_attr = - xmlNewProp(root_node, (const xmlChar *)"Version", (const xmlChar *) VERSION); + root_node = xmlNewNode(NULL, (const xmlChar *)"Xiphos_Tabs"); + //xml_attr = + xmlNewProp(root_node, (const xmlChar *)"Version", + (const xmlChar *)VERSION); xmlDocSetRootElement(xml_doc, root_node); section_node = xmlNewChild(root_node, NULL, - (const xmlChar *) "tabs", NULL); + (const xmlChar *)"tabs", NULL); cur_node = xmlNewChild(section_node, - NULL, (const xmlChar *) "tab", NULL); - xmlNewProp(cur_node,(const xmlChar *)"text_mod", - (const xmlChar *)settings.MainWindowModule); + NULL, (const xmlChar *)"tab", NULL); + xmlNewProp(cur_node, (const xmlChar *)"text_mod", + (const xmlChar *)settings.MainWindowModule); xmlNewProp(cur_node, (const xmlChar *)"commentary_mod", - (const xmlChar *)settings.CommWindowModule); + (const xmlChar *)settings.CommWindowModule); xmlNewProp(cur_node, (const xmlChar *)"dictlex_mod", - (const xmlChar *)settings.DictWindowModule); + (const xmlChar *)settings.DictWindowModule); xmlNewProp(cur_node, (const xmlChar *)"book_mod", - (const xmlChar *)settings.book_mod); + (const xmlChar *)settings.book_mod); xmlNewProp(cur_node, (const xmlChar *)"text_commentary_key", - (const xmlChar *)settings.currentverse); + (const xmlChar *)settings.currentverse); xmlNewProp(cur_node, (const xmlChar *)"dictlex_key", - (const xmlChar *)settings.dictkey); + (const xmlChar *)settings.dictkey); xmlNewProp(cur_node, (const xmlChar *)"book_offset", - (const xmlChar *)settings.book_key); + (const xmlChar *)settings.book_key); xmlNewProp(cur_node, (const xmlChar *)"comm_showing", - (const xmlChar *)true_false2yes_no(settings.comm_showing)); + (const xmlChar *) + true_false2yes_no(settings.comm_showing)); xmlNewProp(cur_node, (const xmlChar *)"showtexts", - (const xmlChar *)true_false2yes_no(settings.showtexts)); + (const xmlChar *) + true_false2yes_no(settings.showtexts)); xmlNewProp(cur_node, (const xmlChar *)"showpreview", - (const xmlChar *)true_false2yes_no(settings.showpreview)); + (const xmlChar *) + true_false2yes_no(settings.showpreview)); xmlNewProp(cur_node, (const xmlChar *)"showcomms", - (const xmlChar *)true_false2yes_no(settings.showcomms)); + (const xmlChar *) + true_false2yes_no(settings.showcomms)); xmlNewProp(cur_node, (const xmlChar *)"showdicts", - (const xmlChar *)true_false2yes_no(settings.showdicts)); + (const xmlChar *) + true_false2yes_no(settings.showdicts)); xmlNewProp(cur_node, (const xmlChar *)"showparallel", - (const xmlChar *)"no"); + (const xmlChar *)"no"); - xmlSaveFormatFile(file, xml_doc,1); + xmlSaveFormatFile(file, xml_doc, 1); g_free(file); xmlFreeDoc(xml_doc); } - /****************************************************************************** * Name * gui_load_tabs @@ -531,7 +541,6 @@ xmlDocPtr xml_doc; xmlNodePtr tmp_node, childnode; //const xmlChar *xml_filename; - gchar *tabs_dir, *file, *val; gboolean error = FALSE; gboolean back_compat_need_save = FALSE; settings.showparatab = FALSE; @@ -539,143 +548,194 @@ stop_refresh = TRUE; - if (filename == NULL) - { + if (filename == NULL) { error = TRUE; - } - else - { + } else { + gchar *file; + if (g_access(filename, F_OK) == 0) { /* we're done, just copy for local use that can be free'd */ file = g_strdup(filename); } else { - tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir); + gchar *tabs_dir = + g_strdup_printf("%s/tabs/", + settings.gSwordDir); if (g_access(tabs_dir, F_OK) == -1) { XI_message(("Creating new tabs directory\n")); gui_save_tabs(filename); } - file = g_strdup_printf("%s%s",tabs_dir,filename); + file = g_strdup_printf("%s%s", tabs_dir, filename); g_free(tabs_dir); } - /* we need this for first time non tabbed browsing */ - if (!settings.browsing && g_access(file, F_OK) == -1) { - _save_off_tab (filename); + /* we need this for first time non tabbed browsing */ + if (!settings.browsing && g_access(file, F_OK) == -1) { + _save_off_tab(filename); } - //xml_filename = (const xmlChar *) file; xml_doc = xmlParseFile(file); g_free(file); if (xml_doc == NULL) { gui_generic_warning_modal("Tabs document not parsed successfully."); error = TRUE; - } - else { + } else { tmp_node = xmlDocGetRootElement(xml_doc); if (tmp_node == NULL) { gui_generic_warning_modal("Tabs document is empty."); xmlFreeDoc(xml_doc); error = TRUE; - } - else if (xmlStrcmp(tmp_node->name, (const xmlChar *)"Xiphos_Tabs")) { - gui_generic_warning_modal - ("Tabs document has wrong type, root node != Xiphos_Tabs"); + } else if (xmlStrcmp(tmp_node->name, + (const xmlChar *)"Xiphos_Tabs")) { + gui_generic_warning_modal("Tabs document has wrong type, root node != Xiphos_Tabs"); xmlFreeDoc(xml_doc); error = TRUE; } } - if (error == FALSE) - { - for (childnode = tmp_node->children; childnode != NULL; childnode = childnode->next) - { - if (!xmlStrcmp(childnode->name, (const xmlChar*)"tabs")) - { + if (error == FALSE) { + for (childnode = tmp_node->children; + childnode != NULL; + childnode = childnode->next) { + if (!xmlStrcmp(childnode->name, + (const xmlChar *)"tabs")) { tmp_node = childnode; - for (tmp_node = tmp_node->children; tmp_node != NULL; tmp_node = tmp_node->next) - { - if (!xmlStrcmp(tmp_node->name, (const xmlChar*)"tab")) - { - pt = g_new0(PASSAGE_TAB_INFO, 1); - if (pt_first == NULL) - pt_first = pt; + for (tmp_node = tmp_node->children; + tmp_node != NULL; + tmp_node = tmp_node->next) { + if (!xmlStrcmp(tmp_node->name, + (const xmlChar *)"tab")) { + gchar *val; + + pt = g_new0(PASSAGE_TAB_INFO, + 1); + if (pt_first == + NULL) + pt_first = + pt; /* load per-tab module information. */ - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"text_mod"); - pt->text_mod = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"text_mod"); + pt->text_mod = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"commentary_mod"); - pt->commentary_mod = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"commentary_mod"); + pt->commentary_mod = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"dictlex_mod"); - pt->dictlex_mod = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"dictlex_mod"); + pt->dictlex_mod = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"book_mod"); - pt->book_mod = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"book_mod"); + pt->book_mod = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"text_commentary_key"); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"text_commentary_key"); pt->text_commentary_key = g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"dictlex_key"); - pt->dictlex_key = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"dictlex_key"); + pt->dictlex_key = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"book_offset"); - pt->book_offset = g_strdup(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"book_offset"); + pt->book_offset = + g_strdup(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"comm_showing"); - pt->comm_showing = yes_no2true_false(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"comm_showing"); + pt->comm_showing = + yes_no2true_false(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"showparallel"); - pt->showparallel = yes_no2true_false(val); + val = (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"showparallel"); + pt->showparallel = + yes_no2true_false(val); xmlFree(val); if (pt->showparallel) { settings.showparatab = TRUE; - pt->paratab = gui_create_parallel_tab(); - gtk_box_pack_start(GTK_BOX(widgets.page), pt->paratab, TRUE, TRUE, - 0); + pt->paratab = + gui_create_parallel_tab(); + gtk_box_pack_start(GTK_BOX(widgets.page), + pt->paratab, + TRUE, + TRUE, + 0); gtk_widget_hide(pt->paratab); - gui_parallel_tab_sync((gchar*)settings.currentverse); + gui_parallel_tab_sync((gchar *) + settings.currentverse); settings.showparatab = TRUE; - sync_on = TRUE; - } - else + sync_on = + TRUE; + } else pt->paratab = NULL; + /* * load per-tab "show" state. * includes backward compatibility: * if there is no per-tab state, * take tab state from global state. */ - if ((val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"showtexts"))) { + if ((val = + (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"showtexts"))) { pt->showtexts = yes_no2true_false(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"showpreview"); + val = + (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"showpreview"); pt->showpreview = yes_no2true_false(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"showcomms"); + val = + (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"showcomms"); pt->showcomms = yes_no2true_false(val); xmlFree(val); - val = (gchar*)xmlGetProp(tmp_node, (const xmlChar *)"showdicts"); + val = + (gchar *) + xmlGetProp(tmp_node, + (const xmlChar *)"showdicts"); pt->showdicts = yes_no2true_false(val); xmlFree(val); } else { - pt->showtexts = settings.showtexts; + pt->showtexts = settings.showtexts; pt->showpreview = settings.showpreview; - pt->showcomms = settings.showcomms; - pt->showdicts = settings.showdicts; + pt->showcomms = settings.showcomms; + pt->showdicts = settings.showdicts; back_compat_need_save = TRUE; } - pt->history_items = 0; + pt->history_items = + 0; pt->current_history_item = 0; pt->first_back_click = TRUE; - main_add_tab_history_item((PASSAGE_TAB_INFO*)pt); + main_add_tab_history_item((PASSAGE_TAB_INFO *)pt); gui_reassign_strdup(&settings.currentverse, pt->text_commentary_key); - passage_list = g_list_append(passage_list, (PASSAGE_TAB_INFO*)pt); + passage_list = + g_list_append(passage_list, + (PASSAGE_TAB_INFO *)pt); notebook_main_add_page(pt); } } @@ -691,41 +751,50 @@ if (error == TRUE || pt == NULL) { pt = g_new0(PASSAGE_TAB_INFO, 1); pt->text_mod = g_strdup(settings.MainWindowModule); - pt->commentary_mod = g_strdup(settings.CommWindowModule); - pt->dictlex_mod = g_strdup(settings.DictWindowModule); - pt->book_mod = g_strdup(settings.book_mod);//NULL; - pt->text_commentary_key = g_strdup(settings.currentverse); + pt->commentary_mod = + g_strdup(settings.CommWindowModule); + pt->dictlex_mod = + g_strdup(settings.DictWindowModule); + pt->book_mod = g_strdup(settings.book_mod); //NULL; + pt->text_commentary_key = + g_strdup(settings.currentverse); pt->dictlex_key = g_strdup(settings.dictkey); pt->book_offset = NULL; //settings.book_offset = atol(xml_get_value( "keys", "offset")); pt->paratab = NULL; - pt->showtexts = settings.showtexts; + pt->showtexts = settings.showtexts; pt->showpreview = settings.showpreview; - pt->showcomms = settings.showcomms; - pt->showdicts = settings.showdicts; + pt->showcomms = settings.showcomms; + pt->showdicts = settings.showdicts; pt->history_items = 0; pt->current_history_item = 0; pt->first_back_click = TRUE; -// main_add_tab_history_item((PASSAGE_TAB_INFO*)pt); - passage_list = g_list_append(passage_list, (PASSAGE_TAB_INFO*)pt); + // main_add_tab_history_item((PASSAGE_TAB_INFO*)pt); + passage_list = + g_list_append(passage_list, + (PASSAGE_TAB_INFO *)pt); notebook_main_add_page(pt); - } - else - { + } else { // first passage is current/displayed. pt = pt_first; pt->paratab = NULL; // This is a hack to keep gs from loading the settings // from the last session into the last tab loaded here. - gui_reassign_strdup(&settings.MainWindowModule, pt->text_mod); - gui_reassign_strdup(&settings.CommWindowModule, pt->commentary_mod); - gui_reassign_strdup(&settings.DictWindowModule, pt->dictlex_mod); - gui_reassign_strdup(&settings.book_mod, pt->book_mod); - gui_reassign_strdup(&settings.currentverse, pt->text_commentary_key); - gui_reassign_strdup(&settings.dictkey, pt->dictlex_key); + gui_reassign_strdup(&settings.MainWindowModule, + pt->text_mod); + gui_reassign_strdup(&settings.CommWindowModule, + pt->commentary_mod); + gui_reassign_strdup(&settings.DictWindowModule, + pt->dictlex_mod); + gui_reassign_strdup(&settings.book_mod, + pt->book_mod); + gui_reassign_strdup(&settings.currentverse, + pt->text_commentary_key); + gui_reassign_strdup(&settings.dictkey, + pt->dictlex_key); settings.book_offset = atol(pt->book_offset); } } @@ -735,7 +804,6 @@ gui_recompute_view_menu_choices(); } - /****************************************************************************** * Name * on_notebook_main_close_page @@ -752,17 +820,16 @@ * void */ -static void on_notebook_main_close_page(GtkButton * button, gpointer user_data) +static void on_notebook_main_close_page(GtkButton *button, + gpointer user_data) { - PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)user_data; + PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO *)user_data; closing_tab = TRUE; - gui_close_passage_tab(gtk_notebook_page_num - (GTK_NOTEBOOK(widgets.notebook_main), - pt->page_widget)); + gui_close_passage_tab(gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + pt->page_widget)); closing_tab = FALSE; } - /****************************************************************************** * Name * tab_widget_new @@ -779,87 +846,88 @@ * GtkWidget* */ -static GtkWidget* tab_widget_new(PASSAGE_TAB_INFO *tbinf, const gchar *label_text) +static GtkWidget *tab_widget_new(PASSAGE_TAB_INFO *tbinf, + const gchar *label_text) { - GtkWidget *tmp_toolbar_icon; GtkWidget *box; - GtkRequisition r; #ifdef USE_GTK_3 - GtkRequisition r0; - GdkRGBA color; +// GdkRGBA color; #else - GdkColor color; + GdkColor color; #endif g_return_val_if_fail(label_text != NULL, NULL); #ifdef HAVE_GTK_310 - tmp_toolbar_icon = gtk_image_new_from_icon_name ("window-close", - GTK_ICON_SIZE_MENU); + tbinf->button_close = + gtk_button_new_from_icon_name("window-close-symbolic", + GTK_ICON_SIZE_MENU); #else - tmp_toolbar_icon = gtk_image_new_from_stock(GTK_STOCK_CLOSE, - GTK_ICON_SIZE_MENU); -#endif + GtkWidget *tmp_toolbar_icon = + gtk_image_new_from_stock(GTK_STOCK_CLOSE, + GTK_ICON_SIZE_MENU); tbinf->button_close = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(tbinf->button_close), tmp_toolbar_icon); - gtk_button_set_relief(GTK_BUTTON(tbinf->button_close), GTK_RELIEF_NONE); - -#ifndef USE_GTK_3 - gtk_rc_parse_string ( - "style \"tab-button-style\"\n" - "{\n" - " GtkWidget::focus-padding = 0\n" - " GtkWidget::focus-line-width = 0\n" - " xthickness = 0\n" - " ythickness = 0\n" - " GtkButton::internal-border = {0, 0, 0, 0}\n" - " GtkButton::default-border = {0, 0, 0, 0}\n" - " GtkButton::default-outside-border = {0, 0, 0, 0}\n" - "}\n" - "widget \"*.button-close\" style \"tab-button-style\""); - gtk_widget_set_name(GTK_WIDGET (tbinf->button_close), "button-close"); + gtk_button_set_image(GTK_BUTTON(tbinf->button_close), + tmp_toolbar_icon); + gtk_button_set_relief(GTK_BUTTON(tbinf->button_close), + GTK_RELIEF_NONE); #endif +#ifndef USE_GTK_3 + gtk_rc_parse_string("style \"tab-button-style\"\n" + "{\n" + " GtkWidget::focus-padding = 0\n" + " GtkWidget::focus-line-width = 0\n" + " xthickness = 0\n" + " ythickness = 0\n" + " GtkButton::internal-border = {0, 0, 0, 0}\n" + " GtkButton::default-border = {0, 0, 0, 0}\n" + " GtkButton::default-outside-border = {0, 0, 0, 0}\n" + "}\n" + "widget \"*.button-close\" style \"tab-button-style\""); + gtk_widget_set_name(GTK_WIDGET(tbinf->button_close), + "button-close"); +#else gtk_widget_set_size_request(tbinf->button_close, 18, 16); +#endif -#ifdef USE_GTK_3 - gtk_widget_get_preferred_size(tbinf->button_close, &r0, &r); -#else +#ifndef USE_GTK_3 + GtkRequisition r; gtk_widget_size_request(tbinf->button_close, &r); #endif gtk_widget_set_sensitive(tbinf->button_close, FALSE); gtk_widget_show(tbinf->button_close); - tbinf->tab_label = GTK_LABEL(gtk_label_new (label_text)); - gtk_widget_show (GTK_WIDGET(tbinf->tab_label)); + tbinf->tab_label = GTK_LABEL(gtk_label_new(label_text)); + gtk_widget_show(GTK_WIDGET(tbinf->tab_label)); +#ifdef USE_GTK_3 +#else color.red = 0; color.green = 0; color.blue = 0; - -#ifdef USE_GTK_3 - gtk_widget_override_color (tbinf->button_close, GTK_STATE_NORMAL, &color); - gtk_widget_override_color (tbinf->button_close, GTK_STATE_INSENSITIVE, &color); - gtk_widget_override_color (tbinf->button_close, GTK_STATE_ACTIVE, &color); - gtk_widget_override_color (tbinf->button_close, GTK_STATE_PRELIGHT, &color); - gtk_widget_override_color (tbinf->button_close, GTK_STATE_SELECTED, &color); -#else - gtk_widget_modify_fg (tbinf->button_close, GTK_STATE_NORMAL, &color); - gtk_widget_modify_fg (tbinf->button_close, GTK_STATE_INSENSITIVE, &color); - gtk_widget_modify_fg (tbinf->button_close, GTK_STATE_ACTIVE, &color); - gtk_widget_modify_fg (tbinf->button_close, GTK_STATE_PRELIGHT, &color); - gtk_widget_modify_fg (tbinf->button_close, GTK_STATE_SELECTED, &color); + + gtk_widget_modify_fg(tbinf->button_close, GTK_STATE_NORMAL, + &color); + gtk_widget_modify_fg(tbinf->button_close, GTK_STATE_INSENSITIVE, + &color); + gtk_widget_modify_fg(tbinf->button_close, GTK_STATE_ACTIVE, + &color); + gtk_widget_modify_fg(tbinf->button_close, GTK_STATE_PRELIGHT, + &color); + gtk_widget_modify_fg(tbinf->button_close, GTK_STATE_SELECTED, + &color); #endif UI_HBOX(box, FALSE, 0); gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(tbinf->tab_label), TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(box), tbinf->button_close, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), tbinf->button_close, FALSE, FALSE, + 0); gtk_widget_show(box); - g_signal_connect (G_OBJECT (tbinf->button_close), "clicked", - G_CALLBACK(on_notebook_main_close_page), - tbinf); + g_signal_connect(G_OBJECT(tbinf->button_close), "clicked", + G_CALLBACK(on_notebook_main_close_page), tbinf); return box; } @@ -882,21 +950,19 @@ * void */ #ifdef USE_GTK_3 -void gui_notebook_main_switch_page(GtkNotebook * notebook, +void gui_notebook_main_switch_page(GtkNotebook *notebook, gpointer arg, - gint page_num, - GList **tl) + gint page_num, GList **tl) #else -void gui_notebook_main_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, - gint page_num, - GList **tl) +void gui_notebook_main_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, + gint page_num, GList **tl) #endif { gboolean comm_showing; gint number_of_pages = gtk_notebook_get_n_pages(notebook); PASSAGE_TAB_INFO *pt; - + if (stop_refresh) return; @@ -909,16 +975,16 @@ * thought there is only 1. */ if (number_of_pages == 2 && removed_page == 0) - pt = (PASSAGE_TAB_INFO*)g_list_nth_data(*tl, 0); + pt = (PASSAGE_TAB_INFO *)g_list_nth_data(*tl, 0); else - pt = (PASSAGE_TAB_INFO*)g_list_nth_data(*tl, page_num); + pt = (PASSAGE_TAB_INFO *)g_list_nth_data(*tl, page_num); removed_page = 1; - //cur_passage_tab = pt; +//cur_passage_tab = pt; #ifdef USE_TREEVIEW_PATH if (cur_passage_tab && cur_passage_tab->book_mod) - gui_collapse_treeview_to_book (GTK_TREE_VIEW (sidebar.module_list), - cur_passage_tab->book_mod); + gui_collapse_treeview_to_book(GTK_TREE_VIEW(sidebar.module_list), + cur_passage_tab->book_mod); #endif /* USE_TREEVIEW_PATH */ if (!pt->showparallel) { @@ -927,7 +993,7 @@ gtk_widget_show(widgets.hpaned); } - set_current_tab (pt); + set_current_tab(pt); companion_activity = TRUE; if (pt->showparallel) { @@ -941,27 +1007,30 @@ } else settings.paratab_showing = FALSE; - //sets the book mod and key main_display_book(pt->book_mod, pt->book_offset); #ifdef USE_TREEVIEW_PATH if (pt->showcomms && pt->book_mod) - gui_expand_treeview_to_path (GTK_TREE_VIEW (sidebar.module_list), - pt->book_mod); + gui_expand_treeview_to_path(GTK_TREE_VIEW(sidebar.module_list), + pt->book_mod); #endif /* USE_TREEVIEW_PATH */ comm_showing = settings.comm_showing; settings.comm_showing = 1; //sets the commentary mod and key - main_display_commentary(pt->commentary_mod, pt->text_commentary_key); + main_display_commentary(pt->commentary_mod, + pt->text_commentary_key); settings.comm_showing = comm_showing; //sets the text mod and key main_display_bible(pt->text_mod, pt->text_commentary_key); - navbar_versekey.module_name = g_string_assign(navbar_versekey.module_name,pt->text_mod); - navbar_versekey.key = g_string_assign(navbar_versekey.key,pt->text_commentary_key); - main_update_nav_controls(navbar_versekey.module_name->str, pt->text_commentary_key); + navbar_versekey.module_name = + g_string_assign(navbar_versekey.module_name, pt->text_mod); + navbar_versekey.key = + g_string_assign(navbar_versekey.key, pt->text_commentary_key); + main_update_nav_controls(navbar_versekey.module_name->str, + pt->text_commentary_key); //sets the dictionary mod and key main_display_dictionary(pt->dictlex_mod, pt->dictlex_key); @@ -976,7 +1045,6 @@ page_change = FALSE; } - /****************************************************************************** * Name * gui_select_nth_tab @@ -996,7 +1064,8 @@ void gui_select_nth_tab(gint page_num) { - gint number_of_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)); + gint number_of_pages = + gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)); /* within bounds of available tabs? */ if (page_num >= number_of_pages) @@ -1006,12 +1075,9 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_main), page_num); gui_notebook_main_switch_page(GTK_NOTEBOOK(widgets.notebook_main), - NULL, - page_num, - &passage_list); + NULL, page_num, &passage_list); } - /****************************************************************************** * Name * gui_set_tab_label @@ -1030,21 +1096,21 @@ * void */ -void gui_set_tab_label(const gchar * key, gboolean one_tab) +void gui_set_tab_label(const gchar *key, gboolean one_tab) { if (stop_refresh) return; if ((settings.linkedtabs && !one_tab) || (cur_passage_tab == NULL)) { GList *tmp = NULL; - for (tmp = g_list_first(passage_list); tmp != NULL; tmp = g_list_next(tmp)) - gui_set_named_tab_label - (key, - (PASSAGE_TAB_INFO*)tmp->data, - ((PASSAGE_TAB_INFO*)tmp->data == cur_passage_tab)); - } - else - { + for (tmp = g_list_first(passage_list); tmp != NULL; + tmp = g_list_next(tmp)) + gui_set_named_tab_label(key, (PASSAGE_TAB_INFO *) + tmp->data, + ((PASSAGE_TAB_INFO *) + tmp->data == + cur_passage_tab)); + } else { gui_set_named_tab_label(key, cur_passage_tab, TRUE); } } @@ -1065,7 +1131,8 @@ * void */ -void gui_set_named_tab_label(const gchar * key, PASSAGE_TAB_INFO *pt, gboolean update) +void gui_set_named_tab_label(const gchar *key, PASSAGE_TAB_INFO *pt, + gboolean update) { GString *str; @@ -1076,11 +1143,10 @@ str = pick_tab_label(pt); gtk_label_set_text(pt->tab_label, str->str); - gtk_notebook_set_menu_label_text( - GTK_NOTEBOOK(widgets.notebook_main), - pt->page_widget, str->str); + gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(widgets.notebook_main), + pt->page_widget, str->str); if (update) - main_add_tab_history_item((PASSAGE_TAB_INFO*)pt); + main_add_tab_history_item((PASSAGE_TAB_INFO *)pt); g_string_free(str, TRUE); } @@ -1100,22 +1166,21 @@ * void */ -void gui_update_tab_struct(const gchar * text_mod, - const gchar * commentary_mod, - const gchar * dictlex_mod, - const gchar * book_mod, - const gchar * dictlex_key, - const gchar * book_offset, +void gui_update_tab_struct(const gchar *text_mod, + const gchar *commentary_mod, + const gchar *dictlex_mod, + const gchar *book_mod, + const gchar *dictlex_key, + const gchar *book_offset, gboolean comm_showing, gboolean showtexts, gboolean showpreview, - gboolean showcomms, - gboolean showdicts) + gboolean showcomms, gboolean showdicts) { if (stop_refresh) return; -/* if (!settings.browsing) + /* if (!settings.browsing) return; */ @@ -1123,30 +1188,36 @@ return; if (!cur_passage_tab) return; - cur_passage_tab->showtexts = showtexts; + cur_passage_tab->showtexts = showtexts; cur_passage_tab->showpreview = showpreview; - cur_passage_tab->showcomms = showcomms; - cur_passage_tab->showdicts = showdicts; + cur_passage_tab->showcomms = showcomms; + cur_passage_tab->showdicts = showdicts; if (text_mod) { - gui_reassign_strdup(&cur_passage_tab->text_mod, (char *)text_mod); + gui_reassign_strdup(&cur_passage_tab->text_mod, + (char *)text_mod); } if (commentary_mod) { cur_passage_tab->comm_showing = comm_showing; - gui_reassign_strdup(&cur_passage_tab->commentary_mod, (char *)commentary_mod); + gui_reassign_strdup(&cur_passage_tab->commentary_mod, + (char *)commentary_mod); } if (dictlex_mod) { - gui_reassign_strdup(&cur_passage_tab->dictlex_mod, (char *)dictlex_mod); + gui_reassign_strdup(&cur_passage_tab->dictlex_mod, + (char *)dictlex_mod); } if (book_mod) { cur_passage_tab->comm_showing = comm_showing; - gui_reassign_strdup(&cur_passage_tab->book_mod, (char *)book_mod); + gui_reassign_strdup(&cur_passage_tab->book_mod, + (char *)book_mod); } if (book_offset) { - gui_reassign_strdup(&cur_passage_tab->book_offset, (char *)book_offset); + gui_reassign_strdup(&cur_passage_tab->book_offset, + (char *)book_offset); } if (dictlex_key) { - gui_reassign_strdup(&cur_passage_tab->dictlex_key, (char *)dictlex_key); + gui_reassign_strdup(&cur_passage_tab->dictlex_key, + (char *)dictlex_key); } } @@ -1187,38 +1258,37 @@ pt->text_commentary_key = g_strdup(verse_key); pt->dictlex_key = g_strdup(settings.dictkey); - pt->book_offset = g_strdup_printf("%ld",settings.book_offset); + pt->book_offset = g_strdup_printf("%ld", settings.book_offset); pt->comm_showing = settings.comm_showing; if (cur_passage_tab && cur_passage_tab->showparallel) { - pt->showtexts = 1; - pt->showcomms = 1; - pt->showdicts = 1; + pt->showtexts = 1; + pt->showcomms = 1; + pt->showdicts = 1; } else { - pt->showtexts = settings.showtexts; - pt->showcomms = settings.showcomms; - pt->showdicts = settings.showdicts; + pt->showtexts = settings.showtexts; + pt->showcomms = settings.showcomms; + pt->showdicts = settings.showdicts; } pt->showpreview = settings.showpreview; - pt->showparallel = FALSE; + pt->showparallel = FALSE; pt->history_items = 0; pt->current_history_item = 0; pt->first_back_click = TRUE; - main_add_tab_history_item((PASSAGE_TAB_INFO*)pt); + main_add_tab_history_item((PASSAGE_TAB_INFO *)pt); - passage_list = g_list_append(passage_list, (PASSAGE_TAB_INFO*)pt); + passage_list = + g_list_append(passage_list, (PASSAGE_TAB_INFO *)pt); //set_current_tab(pt); notebook_main_add_page(pt); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_main), - gtk_notebook_page_num - (GTK_NOTEBOOK(widgets.notebook_main), - pt->page_widget)); + gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + pt->page_widget)); } - /****************************************************************************** * Name * gui_open_parallel_view_in_new_tab @@ -1250,11 +1320,11 @@ return; } - pt->showtexts = FALSE; - pt->showpreview = TRUE; - pt->showcomms = FALSE; - pt->showdicts = FALSE; - pt->showparallel = TRUE; + pt->showtexts = FALSE; + pt->showpreview = TRUE; + pt->showcomms = FALSE; + pt->showdicts = FALSE; + pt->showparallel = TRUE; pt->text_mod = g_strdup(settings.MainWindowModule); pt->commentary_mod = g_strdup(settings.CommWindowModule); pt->dictlex_mod = g_strdup(settings.DictWindowModule); @@ -1264,23 +1334,22 @@ pt->text_commentary_key = g_strdup(settings.currentverse); pt->dictlex_key = g_strdup(settings.dictkey); - pt->book_offset = g_strdup_printf("%ld",settings.book_offset); + pt->book_offset = g_strdup_printf("%ld", settings.book_offset); - passage_list = g_list_append(passage_list, (PASSAGE_TAB_INFO*)pt); + passage_list = + g_list_append(passage_list, (PASSAGE_TAB_INFO *)pt); set_current_tab(pt); gui_recompute_view_menu_choices(); notebook_main_add_page(pt); pt->paratab = gui_create_parallel_tab(); - gui_parallel_tab_sync((gchar*)settings.currentverse); + gui_parallel_tab_sync((gchar *)settings.currentverse); /*gtk_box_pack_start(GTK_BOX(widgets.page), pt->paratab, TRUE, TRUE, - 0);*/ + 0); */ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_main), - gtk_notebook_page_num - (GTK_NOTEBOOK(widgets.notebook_main), - pt->page_widget)); + gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + pt->page_widget)); } - /****************************************************************************** * Name * gui_open_module_in_new_tab @@ -1314,11 +1383,11 @@ } module_type = main_get_mod_type(module); - pt->showtexts = FALSE; + pt->showtexts = FALSE; pt->showpreview = settings.showpreview; - pt->showcomms = FALSE; - pt->showdicts = FALSE; - pt->showparallel = FALSE; + pt->showcomms = FALSE; + pt->showdicts = FALSE; + pt->showparallel = FALSE; pt->paratab = NULL; switch (module_type) { @@ -1363,24 +1432,22 @@ pt->showcomms = TRUE; pt->comm_showing = 0; break; - } pt->text_commentary_key = g_strdup(settings.currentverse); pt->dictlex_key = g_strdup(settings.dictkey); - pt->book_offset = g_strdup_printf("%ld",settings.book_offset); + pt->book_offset = g_strdup_printf("%ld", settings.book_offset); - passage_list = g_list_append(passage_list, (PASSAGE_TAB_INFO*)pt); + passage_list = + g_list_append(passage_list, (PASSAGE_TAB_INFO *)pt); //set_current_tab(pt); notebook_main_add_page(pt); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_main), - gtk_notebook_page_num - (GTK_NOTEBOOK(widgets.notebook_main), - pt->page_widget)); + gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + pt->page_widget)); } - /****************************************************************************** * Name * gui_close_all_tabs @@ -1401,14 +1468,15 @@ { gint i; gint number_of_pages = - gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)); + gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)); if (stop_refresh) return; - for(i = number_of_pages - 1; i > -1; i--) { + for (i = number_of_pages - 1; i > -1; i--) { PASSAGE_TAB_INFO *pt = - (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)i); + (PASSAGE_TAB_INFO *)g_list_nth_data(passage_list, + (guint)i); passage_list = g_list_remove(passage_list, pt); g_free(pt->text_mod); g_free(pt->commentary_mod); @@ -1424,10 +1492,11 @@ g_list_free(passage_list); passage_list = NULL; cur_passage_tab = NULL; -// gui_set_text_frame_label(cur_t); + // gui_set_text_frame_label(cur_t); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * gui_open_tabs @@ -1456,7 +1525,7 @@ gtk_widget_show(widgets.button_new_tab); } - +#endif /****************************************************************************** * Name @@ -1479,18 +1548,22 @@ return; if (-1 == pagenum) - pagenum = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main)); - if (1 == gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main))) - return; - PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum); - if (pt->showparallel || (2 <= gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))) { + pagenum = + gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main)); + if (1 == + gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main))) + return; + PASSAGE_TAB_INFO *pt = + (PASSAGE_TAB_INFO *)g_list_nth_data(passage_list, + (guint)pagenum); + if (pt->showparallel || (2 <= + gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))) { // (surely this is always true!?) - if (pagenum > 0){ - gtk_notebook_set_current_page( - GTK_NOTEBOOK(widgets.notebook_main), 0); - cur_passage_tab = (PASSAGE_TAB_INFO*) - g_list_nth_data(passage_list, (guint)0); + if (pagenum > 0) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_main), 0); + cur_passage_tab = (PASSAGE_TAB_INFO *) + g_list_nth_data(passage_list, (guint)0); } } @@ -1499,28 +1572,36 @@ stop_refresh = FALSE; passage_list = g_list_remove(passage_list, pt); - if (pt->text_mod) g_free(pt->text_mod); - if (pt->commentary_mod) g_free(pt->commentary_mod); - if (pt->dictlex_mod) g_free(pt->dictlex_mod); - if (pt->book_mod) g_free(pt->book_mod); - if (pt->text_commentary_key) g_free(pt->text_commentary_key); - if (pt->dictlex_key) g_free(pt->dictlex_key); - if (pt->book_offset) g_free(pt->book_offset); + if (pt->text_mod) + g_free(pt->text_mod); + if (pt->commentary_mod) + g_free(pt->commentary_mod); + if (pt->dictlex_mod) + g_free(pt->dictlex_mod); + if (pt->book_mod) + g_free(pt->book_mod); + if (pt->text_commentary_key) + g_free(pt->text_commentary_key); + if (pt->dictlex_key) + g_free(pt->dictlex_key); + if (pt->book_offset) + g_free(pt->book_offset); if (pt->showparallel) { gtk_widget_hide(pt->paratab); gui_destroy_parallel_tab(); settings.showparatab = FALSE; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.parallel_tab_item), - settings.showparatab); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.parallel_tab_item), + settings.showparatab); } g_free(pt); //cur_passage_tab = NULL; removed_page = pagenum; - gtk_notebook_remove_page(GTK_NOTEBOOK(widgets.notebook_main), pagenum); + gtk_notebook_remove_page(GTK_NOTEBOOK(widgets.notebook_main), + pagenum); } -void on_notebook_main_new_tab_clicked(GtkButton *button, gpointer user_data) +void on_notebook_main_new_tab_clicked(GtkButton *button, + gpointer user_data) { gui_open_passage_in_new_tab(settings.currentverse); } @@ -1549,22 +1630,24 @@ cur_passage_tab = NULL; passage_list = NULL; - gui_load_tabs(tabsfile ? tabsfile : (tabs ? default_tab_filename : no_tab_filename)); + gui_load_tabs(tabsfile ? tabsfile + : (tabs ? default_tab_filename : no_tab_filename)); g_signal_connect(G_OBJECT(widgets.notebook_main), - "switch-page", - G_CALLBACK (gui_notebook_main_switch_page), &passage_list); - + "switch-page", + G_CALLBACK(gui_notebook_main_switch_page), + &passage_list); + g_signal_connect(G_OBJECT(widgets.button_new_tab), "clicked", - G_CALLBACK(on_notebook_main_new_tab_clicked), NULL); + G_CALLBACK(on_notebook_main_new_tab_clicked), + NULL); //show the new tab button here instead of in main_window.c so it //doesn't get shown if !settings.browsing gtk_widget_show(widgets.button_new_tab); gui_notebook_main_switch_page(GTK_NOTEBOOK(widgets.notebook_main), - NULL, - settings.tab_page, - &passage_list); + NULL, + settings.tab_page, &passage_list); } /****************************************************************************** @@ -1590,7 +1673,8 @@ gui_save_tabs(tabs ? default_tab_filename : no_tab_filename); passage_list = g_list_first(passage_list); while (passage_list != NULL) { - PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)passage_list->data; + PASSAGE_TAB_INFO *pt = + (PASSAGE_TAB_INFO *)passage_list->data; g_free(pt->text_mod); g_free(pt->commentary_mod); g_free(pt->dictlex_mod); @@ -1598,7 +1682,7 @@ g_free(pt->text_commentary_key); g_free(pt->dictlex_key); g_free(pt->book_offset); - g_free((PASSAGE_TAB_INFO*)passage_list->data); + g_free((PASSAGE_TAB_INFO *)passage_list->data); passage_list = g_list_next(passage_list); } g_list_free(passage_list); @@ -1629,49 +1713,45 @@ cur_passage_tab->showdicts = show; } -static -int _is_paratab_showing (void) +static int _is_paratab_showing(void) { if (settings.paratab_showing) return 1; return 0; } -static -void _tabs_on(void) +static void _tabs_on(void) { - xml_set_value ("Xiphos", "tabs", "browsing", "1"); + xml_set_value("Xiphos", "tabs", "browsing", "1"); settings.browsing = TRUE; - gui_close_all_tabs (); - gui_load_tabs (default_tab_filename); - gtk_widget_show (widgets.hboxtb); + gui_close_all_tabs(); + gui_load_tabs(default_tab_filename); + gtk_widget_show(widgets.hboxtb); gtk_widget_show(widgets.hpaned); } -static -void _tabs_off(void) +static void _tabs_off(void) { int page = _is_paratab_showing(); - xml_set_value ("Xiphos", "tabs", "browsing", "0"); - gui_save_tabs (default_tab_filename); + xml_set_value("Xiphos", "tabs", "browsing", "0"); + gui_save_tabs(default_tab_filename); if (settings.showparatab) { - gui_close_passage_tab (gtk_notebook_page_num ( - GTK_NOTEBOOK (widgets.notebook_main), - widgets.parallel_tab)); + gui_close_passage_tab(gtk_notebook_page_num(GTK_NOTEBOOK(widgets.notebook_main), + widgets.parallel_tab)); settings.showparatab = FALSE; } - gui_close_all_tabs (); + gui_close_all_tabs(); settings.browsing = FALSE; - gui_load_tabs (no_tab_filename); - gtk_widget_hide (widgets.hboxtb); - gtk_notebook_set_current_page (GTK_NOTEBOOK(widgets.notebook_bible_parallel), - page); + gui_load_tabs(no_tab_filename); + gtk_widget_hide(widgets.hboxtb); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + page); } void gui_tabs_on_off(int on) { if (on) - _tabs_on (); + _tabs_on(); else - _tabs_off (); + _tabs_off(); } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/treekey-editor.c xiphos-4.0.4+dfsg1/src/gnome2/treekey-editor.c --- xiphos-4.0.0+dfsg1/src/gnome2/treekey-editor.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/treekey-editor.c 2015-02-20 04:02:23.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * prayer_list.c - + * treekey-editor.c - functions to manage a treeview of keys * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,23 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include #endif #ifndef USE_GTKBUILDER - #include +#include #endif - -#ifdef USE_WEBKIT_EDITOR +#ifdef USE_WEBKIT_EDITOR #include "editor/webkit_editor.h" #else #include "editor/slib-editor.h" #endif - #include "gui/treekey-editor.h" #include "gui/dialog.h" #include "gui/utilities.h" @@ -46,23 +43,23 @@ #include "gui/debug_glib_null.h" -void on_add_sibling_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_add_child_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_remove_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_edit_activate2 (GtkMenuItem * menuitem, gpointer user_data); +void on_add_sibling_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_add_child_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_remove_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_edit_activate2(GtkMenuItem *menuitem, gpointer user_data); typedef struct _item_info INFO; struct _item_info { gchar *book; - gchar *local_name; /* tree node name */ + gchar *local_name; /* tree node name */ gchar *offset; GtkTreeIter iter; GtkTreeModel *model; }; -INFO *_get_info (GtkWidget * tree); +INFO *_get_info(GtkWidget *tree); enum { COL_OPEN_PIXBUF, @@ -75,37 +72,33 @@ static GtkWidget *menu; -INFO * -_get_info (GtkWidget * tree) +INFO *_get_info(GtkWidget *tree) { GtkTreeSelection *selection = NULL; GtkTreeView *t = GTK_TREE_VIEW(tree); - INFO *info = g_new0 (INFO, 1); + INFO *info = g_new0(INFO, 1); selection = gtk_tree_view_get_selection(t); if (gtk_tree_selection_get_selected(selection, &info->model, &info->iter)) - gtk_tree_model_get(GTK_TREE_MODEL(info->model), &info->iter, - 2, &info->local_name, - 3, &info->book, - 4, &info->offset, - -1); + gtk_tree_model_get(GTK_TREE_MODEL(info->model), + &info->iter, 2, &info->local_name, 3, + &info->book, 4, &info->offset, -1); return info; - } -static void _button_one(EDITOR * e) +static void _button_one(EDITOR *e) { INFO *info; editor_save_book(e); - info = _get_info (e->treeview); + info = _get_info(e->treeview); if (atol(info->offset) == 0) - gtk_widget_set_sensitive(e->html_widget,FALSE); + gtk_widget_set_sensitive(e->html_widget, FALSE); else - gtk_widget_set_sensitive(e->html_widget,TRUE); + gtk_widget_set_sensitive(e->html_widget, TRUE); if (e->module) g_free(e->module); @@ -123,51 +116,47 @@ } G_MODULE_EXPORT void -on_add_sibling_activate (GtkMenuItem * menuitem, gpointer user_data) +on_add_sibling_activate(GtkMenuItem *menuitem, gpointer user_data) { INFO *info; - char *buf = NULL; - unsigned long l_offset = 0; - EDITOR * e = (EDITOR*) user_data; - GtkWidget *tree = GTK_WIDGET (e->treeview); + EDITOR *e = (EDITOR *)user_data; + GtkWidget *tree = GTK_WIDGET(e->treeview); gint test; GS_DIALOG *d; GtkTreeIter sibling; - info = _get_info (tree); + info = _get_info(tree); - d = gui_new_dialog (); + d = gui_new_dialog(); #ifdef HAVE_GTK_310 d->stock_icon = "dialog-question"; -#else +#else d->stock_icon = GTK_STOCK_DIALOG_QUESTION; #endif d->title = _("Prayer List/Journal Item"); d->label_top = _("New name"); d->label1 = _("Name: "); - d->text1 = g_strdup (info->local_name); + d->text1 = g_strdup(info->local_name); d->ok = TRUE; d->cancel = TRUE; - test = gui_gs_dialog (d); + test = gui_gs_dialog(d); if (test == GS_OK) { - l_offset = main_treekey_append_sibling(info->book, - d->text1, - info->offset); + unsigned long l_offset = main_treekey_append_sibling(info->book, + d->text1, + info->offset); if (l_offset) { - buf = g_strdup_printf("%ld",l_offset); + char *buf = g_strdup_printf("%ld", l_offset); gtk_tree_store_insert_after(GTK_TREE_STORE(info->model), - &sibling, - NULL, - &info->iter); + &sibling, NULL, + &info->iter); gtk_tree_store_set(GTK_TREE_STORE(info->model), - &sibling, - COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, - COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, d->text1, - COL_MODULE, info->book, - COL_OFFSET, buf, - -1); + &sibling, COL_OPEN_PIXBUF, + pixbufs->pixbuf_helpdoc, + COL_CLOSED_PIXBUF, NULL, + COL_CAPTION, d->text1, + COL_MODULE, info->book, + COL_OFFSET, buf, -1); if (e->key) g_free(e->key); e->key = g_strdup(buf); @@ -179,62 +168,60 @@ g_free(info->local_name); g_free(info->offset); g_free(info); - g_free (d->text1); - g_free (d); + g_free(d->text1); + g_free(d); } - - G_MODULE_EXPORT void -on_add_child_activate (GtkMenuItem * menuitem, gpointer user_data) +on_add_child_activate(GtkMenuItem *menuitem, gpointer user_data) { INFO *info; - char *buf = NULL; - unsigned long l_offset = 0; - EDITOR * e = (EDITOR*) user_data; - GtkWidget *tree = GTK_WIDGET (e->treeview); + EDITOR *e = (EDITOR *)user_data; + GtkWidget *tree = GTK_WIDGET(e->treeview); gint test; GS_DIALOG *d; GtkTreeIter child; - info = _get_info (tree); + info = _get_info(tree); - d = gui_new_dialog (); + d = gui_new_dialog(); #ifdef HAVE_GTK_310 d->stock_icon = "dialog-question"; -#else +#else d->stock_icon = GTK_STOCK_DIALOG_QUESTION; #endif d->title = _("Prayer List/Journal Item"); d->label_top = _("New name"); d->label1 = _("Name: "); - d->text1 = g_strdup (info->local_name); + d->text1 = g_strdup(info->local_name); d->ok = TRUE; d->cancel = TRUE; - test = gui_gs_dialog (d); + test = gui_gs_dialog(d); if (test == GS_OK) { - l_offset = main_treekey_append_child(info->book, - d->text1, - info->offset); + unsigned long l_offset = main_treekey_append_child(info->book, + d->text1, + info->offset); if (l_offset) { + char *buf = NULL; + gtk_tree_store_set(GTK_TREE_STORE(info->model), /* change treenode pixbuf from leaf to branch */ - &info->iter, - COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, - COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - -1); - buf = g_strdup_printf("%ld",l_offset); - gtk_tree_store_append (GTK_TREE_STORE (info->model), - &child, - &info->iter); + &info->iter, + COL_OPEN_PIXBUF, + pixbufs->pixbuf_closed, + COL_CLOSED_PIXBUF, + pixbufs->pixbuf_closed, -1); + buf = g_strdup_printf("%ld", l_offset); + gtk_tree_store_append(GTK_TREE_STORE(info->model), + &child, &info->iter); gtk_tree_store_set(GTK_TREE_STORE(info->model), - &child, - COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, - COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, d->text1, - COL_MODULE, info->book, - COL_OFFSET, buf, - -1); + &child, + COL_OPEN_PIXBUF, + pixbufs->pixbuf_helpdoc, + COL_CLOSED_PIXBUF, NULL, + COL_CAPTION, d->text1, + COL_MODULE, info->book, + COL_OFFSET, buf, -1); if (e->key) g_free(e->key); e->key = g_strdup(buf); @@ -247,21 +234,20 @@ g_free(info->local_name); g_free(info->offset); g_free(info); - g_free (d->text1); - g_free (d); + g_free(d->text1); + g_free(d); } - G_MODULE_EXPORT void -on_remove_activate (GtkMenuItem * menuitem, gpointer user_data) +on_remove_activate(GtkMenuItem *menuitem, gpointer user_data) { INFO *info; - EDITOR * editor = (EDITOR*) user_data; - GtkWidget *tree = GTK_WIDGET (editor->treeview); + EDITOR *editor = (EDITOR *)user_data; + GtkWidget *tree = GTK_WIDGET(editor->treeview); gchar *str; gchar *icon_name; - info = _get_info (tree); + info = _get_info(tree); str = g_strdup_printf("%s\n\n%s/%s", _("Remove the selected item"), info->book, info->local_name); @@ -271,8 +257,10 @@ icon_name = g_strdup(GTK_STOCK_DIALOG_WARNING); #endif if (gui_yes_no_dialog(str, icon_name)) { - gtk_tree_store_remove(GTK_TREE_STORE(info->model), &info->iter); - main_treekey_remove (info->book, info->local_name, info->offset); + gtk_tree_store_remove(GTK_TREE_STORE(info->model), + &info->iter); + main_treekey_remove(info->book, info->local_name, + info->offset); } g_free(info->book); @@ -283,90 +271,91 @@ g_free(icon_name); } - G_MODULE_EXPORT void -on_edit_activate2 (GtkMenuItem * menuitem, gpointer user_data) +on_edit_activate2(GtkMenuItem *menuitem, gpointer user_data) { INFO *info; - EDITOR * editor = (EDITOR*) user_data; - GtkWidget *tree = GTK_WIDGET (editor->treeview); + EDITOR *editor = (EDITOR *)user_data; + GtkWidget *tree = GTK_WIDGET(editor->treeview); gint test; GS_DIALOG *d; - info = _get_info (tree); + info = _get_info(tree); - d = gui_new_dialog (); + d = gui_new_dialog(); #ifdef HAVE_GTK_310 d->stock_icon = "dialog-question"; -#else +#else d->stock_icon = GTK_STOCK_DIALOG_QUESTION; #endif d->title = _("Prayer List/Journal Item"); d->label_top = _("New name"); d->label1 = _("Name: "); - d->text1 = g_strdup (info->local_name); + d->text1 = g_strdup(info->local_name); d->ok = TRUE; d->cancel = TRUE; - test = gui_gs_dialog (d); + test = gui_gs_dialog(d); if (test == GS_OK) { main_treekey_set_local_name(info->book, - d->text1, - info->offset); + d->text1, info->offset); gtk_tree_store_set(GTK_TREE_STORE(info->model), - &info->iter, - COL_CAPTION, (gchar *) d->text1, - -1); + &info->iter, + COL_CAPTION, (gchar *)d->text1, -1); } g_free(info->book); g_free(info->local_name); g_free(info->offset); g_free(info); - g_free (d->text1); - g_free (d); + g_free(d->text1); + g_free(d); } -GtkWidget * -create_edit_tree_menu (EDITOR * editor) +GtkWidget *create_edit_tree_menu(EDITOR *editor) { GtkWidget *menu; gchar *glade_file; #ifdef USE_GTKBUILDER GtkBuilder *gxml; - glade_file = gui_general_user_file ("xi-menus-popup.gtkbuilder", FALSE); +#ifdef HAVE_GTK_314 + glade_file = + gui_general_user_file("xi-menus-popup.gtkbuilder", FALSE); +#else + glade_file = + gui_general_user_file("xi-menus-popup_old.gtkbuilder", FALSE); +#endif #else GladeXML *gxml; - glade_file = gui_general_user_file ("xi-menus.glade", FALSE); + glade_file = gui_general_user_file("xi-menus.glade", FALSE); #endif - g_return_val_if_fail ((glade_file != NULL), NULL); + g_return_val_if_fail((glade_file != NULL), NULL); #ifdef USE_GTKBUILDER - gxml = gtk_builder_new (); - gtk_builder_add_from_file (gxml, glade_file, NULL); + gxml = gtk_builder_new(); + gtk_builder_add_from_file(gxml, glade_file, NULL); #else - gxml = glade_xml_new (glade_file, "menu_edit_tree", NULL); + gxml = glade_xml_new(glade_file, "menu_edit_tree", NULL); #endif - g_free (glade_file); - g_return_val_if_fail ((gxml != NULL), NULL); + g_free(glade_file); + g_return_val_if_fail((gxml != NULL), NULL); - menu = UI_GET_ITEM(gxml, "menu_edit_tree"); + menu = UI_GET_ITEM(gxml, "menu_edit_tree"); #ifdef USE_GTKBUILDER - gtk_builder_connect_signals (gxml, editor); - /* gtk_builder_connect_signals_full - (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, editor); */ + gtk_builder_connect_signals(gxml, editor); +/* gtk_builder_connect_signals_full + (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, editor); */ #else - /* connect signals and data */ - glade_xml_signal_autoconnect_full - (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, editor); + /* connect signals and data */ + glade_xml_signal_autoconnect_full(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, + editor); #endif return menu; } static gboolean on_button_release(GtkWidget *widget, - GdkEventButton *event, - EDITOR * editor) + GdkEventButton *event, EDITOR *editor) { GtkTreeSelection *selection; GtkTreeIter selected; @@ -386,9 +375,10 @@ case 3: selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - gtk_tree_selection_get_selected(selection, &model, &selected); + gtk_tree_selection_get_selected(selection, &model, + &selected); path = gtk_tree_model_get_path(model, &selected); - depth = gtk_tree_path_get_depth (path); + depth = gtk_tree_path_get_depth(path); if (depth > 1) gtk_menu_popup(GTK_MENU(menu), @@ -401,21 +391,21 @@ return FALSE; } -GtkWidget * -gui_create_editor_tree (EDITOR * editor) +GtkWidget *gui_create_editor_tree(EDITOR *editor) { GtkWidget *treeview; - treeview = gtk_tree_view_new (); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + treeview = gtk_tree_view_new(); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); - main_add_mod_tree_columns (GTK_TREE_VIEW (treeview)); - XI_message(("\ngui_create_editor_tree Mod Name:%s\n",editor->module)); - main_load_book_tree_in_editor (GTK_TREE_VIEW (treeview), editor->module); - menu = create_edit_tree_menu (editor); + main_add_mod_tree_columns(GTK_TREE_VIEW(treeview)); + XI_message(("\ngui_create_editor_tree Mod Name:%s\n", + editor->module)); + main_load_book_tree_in_editor(GTK_TREE_VIEW(treeview), + editor->module); + menu = create_edit_tree_menu(editor); - g_signal_connect_after((gpointer) treeview, + g_signal_connect_after((gpointer)treeview, "button_release_event", - G_CALLBACK - (on_button_release), editor); + G_CALLBACK(on_button_release), editor); return treeview; } diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/utilities.c xiphos-4.0.4+dfsg1/src/gnome2/utilities.c --- xiphos-4.0.0+dfsg1/src/gnome2/utilities.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/utilities.c 2015-08-19 01:52:00.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * utilities.c - support functions * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif -#define _GNU_SOURCE 1 +#define _GNU_SOURCE 1 #include #include @@ -32,6 +32,9 @@ #include #include +#include +#include + #include #include @@ -77,7 +80,8 @@ /* * month names and lengths, for use in constructing journals and devotional references. */ -int month_day_counts[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +int month_day_counts[] = + {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; char *(month_names[]) = { N_("January"), N_("February"), @@ -87,11 +91,7 @@ N_("June"), N_("July"), N_("August"), - N_("September"), - N_("October"), - N_("November"), - N_("December") -}; + N_("September"), N_("October"), N_("November"), N_("December")}; /****************************************************************************** * Name @@ -110,8 +110,7 @@ gint stop_window_sync = 0; -void -sync_windows() +void sync_windows() { if (stop_window_sync == 0) { while (gtk_events_pending()) @@ -135,7 +134,8 @@ * void */ -void utilities_parse_treeview(xmlNodePtr parent, GtkTreeIter * tree_parent, GtkTreeModel *model) +void utilities_parse_treeview(xmlNodePtr parent, GtkTreeIter *tree_parent, + GtkTreeModel *model) { static xmlNodePtr cur_node; GtkTreeIter child; @@ -146,29 +146,24 @@ gchar *description = NULL; gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child, - tree_parent); + tree_parent); do { gtk_tree_model_get(GTK_TREE_MODEL(model), &child, - 2, &caption, - 3, &key, - 4, &module, - 5, &mod_desc, - 6, &description, - -1); + 2, &caption, + 3, &key, + 4, &module, + 5, &mod_desc, 6, &description, -1); if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), - &child)) { + &child)) { cur_node = xml_add_folder_to_parent(parent, - caption); + caption); utilities_parse_treeview(cur_node, &child, model); - } - else + } else xml_add_bookmark_to_parent(parent, - description, - key, - module, - mod_desc); + description, + key, module, mod_desc); g_free(caption); g_free(key); @@ -178,8 +173,7 @@ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &child)); } - -gint gui_of2tf(const gchar * on_off) +gint gui_of2tf(const gchar *on_off) { return (!strcmp(on_off, "On") ? TRUE : FALSE); } @@ -196,128 +190,106 @@ *where = g_strdup(what); } - -void gui_set_progressbar_text(GtkWidget * pb, gchar * text) +void gui_set_progressbar_text(GtkWidget *pb, gchar *text) { gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pb), text); sync_windows(); } -void gui_set_statusbar (const gchar * message) +void gui_set_statusbar(const gchar *message) { static guint context_id = 0; - gtk_statusbar_pop (GTK_STATUSBAR(widgets.appbar), context_id); + gtk_statusbar_pop(GTK_STATUSBAR(widgets.appbar), context_id); context_id = - gtk_statusbar_get_context_id (GTK_STATUSBAR (widgets.appbar), - message); + gtk_statusbar_get_context_id(GTK_STATUSBAR(widgets.appbar), + message); context_id = - gtk_statusbar_push (GTK_STATUSBAR(widgets.appbar), - context_id, - message); - XI_message (("context_id: %d\nmessage: %s",context_id,message)); - + gtk_statusbar_push(GTK_STATUSBAR(widgets.appbar), + context_id, message); + XI_message(("context_id: %d\nmessage: %s", context_id, message)); } -void gui_set_progressbar_fraction(GtkWidget * pb, gdouble fraction) +void gui_set_progressbar_fraction(GtkWidget *pb, gdouble fraction) { gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pb), fraction); sync_windows(); } - -void gui_set_combo_index(GtkWidget * combo, gint index) +void gui_set_combo_index(GtkWidget *combo, gint index) { gtk_combo_box_set_active(GTK_COMBO_BOX(combo), index); } - -void gui_clear_combo(GtkWidget * combo) +void gui_clear_combo(GtkWidget *combo) { - GtkTreeModel* model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo)); + GtkTreeModel *model = + gtk_combo_box_get_model(GTK_COMBO_BOX(combo)); gtk_list_store_clear(GTK_LIST_STORE(model)); } -void gui_add_item_to_combo(GtkWidget * combo, gchar * item) +void gui_add_item_to_combo(GtkWidget *combo, gchar *item) { GtkTreeIter iter; - GtkTreeModel* model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo)); + GtkTreeModel *model = + gtk_combo_box_get_model(GTK_COMBO_BOX(combo)); gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, (gchar*)item, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, (gchar *)item, + -1); } - /* * taken from galeon * glade_signal_connect_func: used by glade_xml_signal_autoconnect_full */ -void gui_glade_signal_connect_func (const gchar *cb_name, GObject *obj, - const gchar *signal_name, const gchar *signal_data, - GObject *conn_obj, gboolean conn_after, - gpointer user_data) +void gui_glade_signal_connect_func(const gchar *cb_name, GObject *obj, + const gchar *signal_name, + const gchar *signal_data, + GObject *conn_obj, gboolean conn_after, + gpointer user_data) { /** Module with all the symbols of the program */ static GModule *mod_self = NULL; gpointer handler_func; - /* initialize gmodule */ - if (mod_self == NULL) - { - mod_self = g_module_open (NULL, 0); - g_assert (mod_self != NULL); + /* initialize gmodule */ + if (mod_self == NULL) { + mod_self = g_module_open(NULL, 0); + g_assert(mod_self != NULL); } /*g_print( "glade_signal_connect_func: cb_name = '%s', signal_name = '%s', signal_data = '%s'\n", - cb_name, signal_name, signal_data ); */ + cb_name, signal_name, signal_data ); */ - if (g_module_symbol (mod_self, cb_name, &handler_func)) - { + if (g_module_symbol(mod_self, cb_name, &handler_func)) { /* found callback */ - if (conn_obj) - { - if (conn_after) - { - g_signal_connect_object - (obj, signal_name, - handler_func, conn_obj, - G_CONNECT_AFTER); - } - else - { - g_signal_connect_object - (obj, signal_name, - handler_func, conn_obj, - G_CONNECT_SWAPPED); + if (conn_obj) { + if (conn_after) { + g_signal_connect_object(obj, signal_name, + handler_func, conn_obj, + G_CONNECT_AFTER); + } else { + g_signal_connect_object(obj, signal_name, + handler_func, conn_obj, + G_CONNECT_SWAPPED); } - } - else - { + } else { /* no conn_obj; use standard connect */ gpointer data = NULL; data = user_data; - if (conn_after) - { - g_signal_connect_after - (obj, signal_name, - handler_func, data); - } - else - { - g_signal_connect - (obj, signal_name, - handler_func, data); + if (conn_after) { + g_signal_connect_after(obj, signal_name, handler_func, data); + } else { + g_signal_connect(obj, signal_name, handler_func, data); } } - } - else - { + } else { XI_warning(("callback function not found: %s", cb_name)); } } - /** * taken form galeon-1.3.21 * misc_general_user_file: returns the pathname of galeon shared files @@ -326,7 +298,7 @@ * fname: just the filename with no path information * critical: critical file? (halt if not found) */ -gchar * gui_general_user_file (const char *fname, gboolean critical) +gchar *gui_general_user_file(const char *fname, gboolean critical) { static GHashTable *already_found = NULL; gchar *alternative[10]; @@ -334,23 +306,19 @@ gint i; /* create cache hash table if it doesnt already exist */ - if (already_found == NULL) - { - already_found = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, g_free); + if (already_found == NULL) { + already_found = + g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + g_free); } - /* Have we already found this? */ - file = g_hash_table_lookup (already_found, fname); - if (file != NULL) - { - if (g_file_test (file, G_FILE_TEST_EXISTS)) - { - return g_strdup (file); - } - else - { - g_hash_table_remove (already_found, fname); + /* Have we already found this? */ + file = g_hash_table_lookup(already_found, fname); + if (file != NULL) { + if (g_file_test(file, G_FILE_TEST_EXISTS)) { + return g_strdup(file); + } else { + g_hash_table_remove(already_found, fname); } } @@ -358,18 +326,17 @@ file = g_build_filename(settings.gSwordDir, fname, NULL); /* success? */ - if (g_file_test (file, G_FILE_TEST_EXISTS)) - { + if (g_file_test(file, G_FILE_TEST_EXISTS)) { /* add it to the set of found files */ - g_hash_table_insert (already_found, g_strdup (fname), - g_strdup (file)); + g_hash_table_insert(already_found, g_strdup(fname), + g_strdup(file)); return file; } g_free(file); /* specify alternate locations in order of precedence */ i = 0; - alternative[i++] = g_strdup (fname); + alternative[i++] = g_strdup(fname); #ifdef DEBUG XI_message(("MAINTAINER_MODE")); /* generally only developers have any use for these */ @@ -379,54 +346,50 @@ alternative[i++] = g_build_filename("..", "..", "ui", fname, NULL); #endif #ifdef WIN32 - alternative[i++] = g_build_filename(xiphos_win32_get_subdir("share"), - "xiphos", fname, NULL); + alternative[i++] = + g_build_filename(xiphos_win32_get_subdir("share"), "xiphos", + fname, NULL); #else - alternative[i++] = g_build_filename("..", "share", "xiphos", fname, NULL); + alternative[i++] = + g_build_filename("..", "share", "xiphos", fname, NULL); #endif alternative[i++] = g_build_filename(SHARE_DIR, fname, NULL); - alternative[i++] = NULL; /* NULL terminator needed */ + alternative[i++] = NULL; /* NULL terminator needed */ /* select one of the alternatives */ file = NULL; - for (i = 0; alternative[i] != NULL; i++) - { - if (file == NULL && g_file_test (alternative[i], G_FILE_TEST_IS_REGULAR)) - { + for (i = 0; alternative[i] != NULL; i++) { + if (file == NULL && g_file_test(alternative[i], + G_FILE_TEST_IS_REGULAR)) { file = alternative[i]; - } - else - { + } else { /* free unused string */ - g_free (alternative[i]); + g_free(alternative[i]); } } /* check for success */ - if (file != NULL) - { + if (file != NULL) { /* warn if we're using other than the install default */ - if (!g_path_is_absolute (file)) - { - gchar * cwd, *file1; + if (!g_path_is_absolute(file)) { + gchar *cwd, *file1; XI_message(("Using %s (usually OK)", file)); /* Make it absolute */ cwd = g_get_current_dir(); file1 = g_build_filename(cwd, file, NULL); - g_free (file); - g_free (cwd); + g_free(file); + g_free(cwd); file = file1; } /* add it to the set of found files */ - g_hash_table_insert (already_found, g_strdup (fname), - g_strdup (file)); + g_hash_table_insert(already_found, g_strdup(fname), + g_strdup(file)); } /* if nothing then theres an error */ - else if (critical) - { + else if (critical) { XI_error(("%s not found", fname)); } @@ -434,7 +397,6 @@ return file; } - /****************************************************************************** * Name * language_add_folders @@ -453,28 +415,25 @@ */ static void -language_add_folders(GtkTreeModel * model, - GtkTreeIter iter, - gchar ** languages) +language_add_folders(GtkTreeModel *model, + GtkTreeIter iter, gchar **languages) { GtkTreeIter iter_iter; GtkTreeIter child_iter; int j; - (void) gtk_tree_model_iter_children(model, &iter_iter, &iter); + (void)gtk_tree_model_iter_children(model, &iter_iter, &iter); for (j = 0; languages[j]; ++j) { - gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter); - gtk_tree_store_set(GTK_TREE_STORE(model), - &child_iter, - 0, + gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, + &iter); + gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, 0, ((g_utf8_validate(languages[j], -1, NULL)) - ? languages[j] - : _("Unknown")), + ? languages[j] + : _("Unknown")), -1); } } - /****************************************************************************** * Name * add_module_to_prayerlist_folder @@ -491,20 +450,18 @@ * Return value * void */ -static void add_module_to_prayerlist_folder(GtkTreeModel * model, - GtkTreeIter iter, - gchar * module_name) +static void add_module_to_prayerlist_folder(GtkTreeModel *model, + GtkTreeIter iter, + gchar *module_name) { GtkTreeIter child_iter; - gtk_tree_store_append(GTK_TREE_STORE(model), - &child_iter, &iter); + gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter); gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, 0, module_name, -1); } - /****************************************************************************** * Name * add_module_to_language_folder @@ -522,11 +479,11 @@ * void */ -static void add_module_to_language_folder(GtkTreeModel * model, +static void add_module_to_language_folder(GtkTreeModel *model, GtkTreeIter iter, - const gchar * language, - gchar * module_name, - gchar * description) + const gchar *language, + gchar *module_name, + gchar *description) { GtkTreeIter iter_iter; GtkTreeIter child_iter; @@ -534,7 +491,7 @@ /* Check language */ const gchar *buf = language; - if (!g_utf8_validate(buf,-1,NULL)) + if (!g_utf8_validate(buf, -1, NULL)) language = _("Unknown"); if (!g_unichar_isalnum(g_utf8_get_char(buf)) || (language == NULL)) language = _("Unknown"); @@ -547,13 +504,21 @@ gtk_tree_model_get(model, &iter_iter, 0, &str_data, -1); if (!strcmp(language, str_data)) { gchar *content; + const gchar *abbreviation = + main_get_abbreviation(module_name); + gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter_iter); - content = g_strdup_printf("%s: %s", module_name, description); - gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, - UTIL_COL_CAPTION, (gchar *) content, - UTIL_COL_MODULE, (gchar *) module_name, - -1); + content = g_strdup_printf("%s: %s", + (abbreviation + ? abbreviation + : module_name), + description); + gtk_tree_store_set(GTK_TREE_STORE(model), + &child_iter, UTIL_COL_CAPTION, + (gchar *)content, + UTIL_COL_MODULE, + (gchar *)module_name, -1); g_free(content); g_free(str_data); return; @@ -563,7 +528,6 @@ } } - /****************************************************************************** * Name * load_module_tree @@ -580,97 +544,93 @@ * void */ -void gui_load_module_tree(GtkWidget * tree, gboolean limited) +void gui_load_module_tree(GtkWidget *tree, gboolean limited) { + // GtkTreeIter should be an opaque type. + // but because cppcheck(1) complains of uninit'd use, + // we cheat & peek & assign the structs (perhaps pointlessly). + GtkTreeIter text = { -1, NULL, NULL, NULL }; + GtkTreeIter commentary = { -1, NULL, NULL, NULL }; + GtkTreeIter dictionary = { -1, NULL, NULL, NULL }; + GtkTreeIter glossary = { -1, NULL, NULL, NULL }; + GtkTreeIter devotional = { -1, NULL, NULL, NULL }; + GtkTreeIter book = { -1, NULL, NULL, NULL }; + GtkTreeIter map = { -1, NULL, NULL, NULL }; + GtkTreeIter image = { -1, NULL, NULL, NULL }; + GtkTreeIter cult = { -1, NULL, NULL, NULL }; + GtkTreeIter prayerlist = { -1, NULL, NULL, NULL }; GtkTreeStore *store; - GtkTreeIter text; - GtkTreeIter commentary; - GtkTreeIter dictionary; - GtkTreeIter glossary; - GtkTreeIter devotional; - GtkTreeIter book; - GtkTreeIter map; - GtkTreeIter image; - GtkTreeIter cult; - GtkTreeIter prayerlist; GList *tmp = NULL; GList *tmp2 = NULL; - MOD_MGR *info; - store = gtk_tree_store_new(UTIL_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); + store = + gtk_tree_store_new(UTIL_N_COLUMNS, G_TYPE_STRING, + G_TYPE_STRING); gtk_tree_store_clear(store); /* Biblical Texts folders */ gtk_tree_store_append(store, &text, NULL); gtk_tree_store_set(store, &text, UTIL_COL_CAPTION, _("Biblical Texts"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Commentaries folders */ gtk_tree_store_append(store, &commentary, NULL); gtk_tree_store_set(store, &commentary, UTIL_COL_CAPTION, _("Commentaries"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); if (!limited) { /* Dictionaries folders */ gtk_tree_store_append(store, &dictionary, NULL); gtk_tree_store_set(store, &dictionary, UTIL_COL_CAPTION, _("Dictionaries"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Glossaries folders */ gtk_tree_store_append(store, &glossary, NULL); gtk_tree_store_set(store, &glossary, UTIL_COL_CAPTION, _("Glossaries"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Devotionals folders */ gtk_tree_store_append(store, &devotional, NULL); gtk_tree_store_set(store, &devotional, - UTIL_COL_CAPTION, _("Daily Devotionals"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_CAPTION, + _("Daily Devotionals"), UTIL_COL_MODULE, + NULL, -1); /* General Books folders */ gtk_tree_store_append(store, &book, NULL); gtk_tree_store_set(store, &book, UTIL_COL_CAPTION, _("General Books"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Maps folders */ gtk_tree_store_append(store, &map, NULL); gtk_tree_store_set(store, &map, UTIL_COL_CAPTION, _("Maps"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Images folders */ gtk_tree_store_append(store, &image, NULL); gtk_tree_store_set(store, &image, UTIL_COL_CAPTION, _("Images"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Cult folders */ gtk_tree_store_append(store, &cult, NULL); gtk_tree_store_set(store, &cult, UTIL_COL_CAPTION, _("Cult/Unorthodox"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_MODULE, NULL, -1); /* Prayer lists folder */ if (settings.prayerlist) { gtk_tree_store_append(store, &prayerlist, NULL); gtk_tree_store_set(store, &prayerlist, - UTIL_COL_CAPTION, _("Prayer List/Journal"), - UTIL_COL_MODULE, NULL, - -1); + UTIL_COL_CAPTION, + _("Prayer List/Journal"), + UTIL_COL_MODULE, NULL, -1); } } @@ -679,65 +639,59 @@ language_make_list(tmp, store, text, commentary, map, image, devotional, dictionary, glossary, book, cult, - NULL, NULL, - language_add_folders, limited); + NULL, NULL, language_add_folders, limited); tmp2 = tmp; while (tmp2 != NULL) { - info = (MOD_MGR *) tmp2->data; + MOD_MGR *info = (MOD_MGR *)tmp2->data; /* see comment on similar code in src/main/sidebar.cc. */ if ((info->type[0] == 'B') && !info->is_cult) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - text, info->language, - info->name, info->description); - } - else if ((info->type[0] == 'C') && !info->is_cult) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - commentary, info->language, - info->name, info->description); - } - else if (!limited) { + add_module_to_language_folder(GTK_TREE_MODEL(store), text, + info->language, + info->name, + info->description); + } else if ((info->type[0] == 'C') && !info->is_cult) { + add_module_to_language_folder(GTK_TREE_MODEL(store), commentary, + info->language, + info->name, + info->description); + } else if (!limited) { if (info->is_cult) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - cult, info->language, - info->name, info->description); - } - else if (info->is_maps) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - map, info->language, - info->name, info->description); - } - else if (info->is_images) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - image, info->language, - info->name, info->description); - } - else if (info->is_devotional) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - devotional, info->language, - info->name, info->description); - } - else if (info->is_glossary) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - glossary, info->language, - info->name, info->description); - } - else if (info->type[0] == 'L') { - add_module_to_language_folder(GTK_TREE_MODEL(store), - dictionary, info->language, - info->name, info->description); - } - else if (info->type[0] == 'G') { - gchar *gstype = main_get_mod_config_entry(info->name, "GSType"); + add_module_to_language_folder(GTK_TREE_MODEL(store), cult, + info->language, info->name, + info->description); + } else if (info->is_maps) { + add_module_to_language_folder(GTK_TREE_MODEL(store), map, + info->language, info->name, + info->description); + } else if (info->is_images) { + add_module_to_language_folder(GTK_TREE_MODEL(store), image, + info->language, info->name, + info->description); + } else if (info->is_devotional) { + add_module_to_language_folder(GTK_TREE_MODEL(store), devotional, + info->language, info->name, + info->description); + } else if (info->is_glossary) { + add_module_to_language_folder(GTK_TREE_MODEL(store), glossary, + info->language, info->name, + info->description); + } else if (info->type[0] == 'L') { + add_module_to_language_folder(GTK_TREE_MODEL(store), dictionary, + info->language, info->name, + info->description); + } else if (info->type[0] == 'G') { + gchar *gstype = + main_get_mod_config_entry(info->name, + "GSType"); if ((gstype == NULL) || strcmp(gstype, "PrayerList")) { - add_module_to_language_folder(GTK_TREE_MODEL(store), - book, info->language, - info->name, info->description); + add_module_to_language_folder(GTK_TREE_MODEL(store), book, + info->language, info->name, + info->description); } - } - else { + } else { XI_warning(("mod `%s' unknown type `%s'", info->name, info->type)); } @@ -759,7 +713,8 @@ while (tmp != NULL) { add_module_to_prayerlist_folder(GTK_TREE_MODEL(store), prayerlist, - (gchar *) tmp->data); + (gchar *) + tmp->data); tmp = g_list_next(tmp); } } @@ -768,7 +723,6 @@ GTK_TREE_MODEL(store)); } - /****************************************************************************** * Name * get_font @@ -785,7 +739,7 @@ * void */ -MOD_FONT *get_font(const gchar * mod_name) +MOD_FONT *get_font(const gchar *mod_name) { MOD_FONT *mf; static gchar *file = NULL; @@ -800,19 +754,23 @@ mf->old_font_size = get_conf_file_item(file, mod_name, "Fontsize"); /* 1st try: module pref */ - if ((mf->old_font == NULL) || - !strcmp(mf->old_font, "none")) { + if ((mf->old_font == NULL) || !strcmp(mf->old_font, "none")) { /* in absence of module pref, user can specify language pref */ gchar *lang = main_get_mod_config_entry(mod_name, "Lang"); - gchar *lang_lang = g_strdup_printf("Language:%s", (lang ? lang : "")); + gchar *lang_lang = + g_strdup_printf("Language:%s", (lang ? lang : "")); g_free(lang); - gchar *lang_font = get_conf_file_item(file, lang_lang, "Font"); - gchar *lang_size = get_conf_file_item(file, lang_lang, "Fontsize"); + gchar *lang_font = + get_conf_file_item(file, lang_lang, "Font"); + gchar *lang_size = + get_conf_file_item(file, lang_lang, "Fontsize"); g_free(lang_lang); /* in absence of any pref, module can name its pref */ - gchar *preferred_font = main_get_mod_config_entry(mod_name, "Font"); - gchar *preferred_size = main_get_mod_config_entry(mod_name, "Fontsize"); + gchar *preferred_font = + main_get_mod_config_entry(mod_name, "Font"); + gchar *preferred_size = + main_get_mod_config_entry(mod_name, "Fontsize"); g_free(mf->old_font); @@ -857,8 +815,9 @@ /* convert string -> int, here, once for all. includes base bias. */ mf->old_font_size_value = ((mf->old_font_size) - ? atoi(mf->old_font_size) + settings.base_font_size - : settings.base_font_size); + ? atoi(mf->old_font_size) + + settings.base_font_size + : settings.base_font_size); return mf; } @@ -882,11 +841,15 @@ void free_font(MOD_FONT *mf) { - if (mf->old_font) g_free(mf->old_font); - if (mf->old_font_size) g_free(mf->old_font_size); + if (mf->old_font) + g_free(mf->old_font); + if (mf->old_font_size) + g_free(mf->old_font_size); g_free(mf); } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * remove_linefeeds @@ -903,15 +866,15 @@ * gchar * */ -gchar * remove_linefeeds(gchar * buf) +gchar *remove_linefeeds(gchar *buf) { - gchar * key = NULL; + gchar *key = NULL; key = g_strdelimit(buf, "\n", ' '); return (key ? g_strdup(key) : NULL); - } +#endif /****************************************************************************** * Name @@ -930,28 +893,27 @@ * void */ -void gui_add_mods_2_gtk_menu(gint mod_type, GtkWidget * menu, - GCallback callback) +void gui_add_mods_2_gtk_menu(gint mod_type, GtkWidget *menu, + GCallback callback) { - GList *tmp = NULL; - GtkWidget * item; + GList *tmp = NULL; - if (mod_type == -1) return; + if (mod_type == -1) + return; tmp = get_list(mod_type); while (tmp != NULL) { - item = - gtk_menu_item_new_with_label((gchar *) tmp->data); + GtkWidget *item = gtk_menu_item_new_with_label((gchar *)tmp->data); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (callback), - (gchar *) tmp->data); + G_CALLBACK(callback), (gchar *)tmp->data); gtk_container_add(GTK_CONTAINER(menu), item); tmp = g_list_next(tmp); } } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * ncr_to_utf8 @@ -974,8 +936,7 @@ * gchar */ -gchar * -ncr_to_utf8(gchar * text) +gchar *ncr_to_utf8(gchar *text) { gchar *ncr; gunichar unicode; @@ -984,35 +945,36 @@ GString *newtext = g_string_new(NULL); for (ncr = strstr(text, "&#"); - ncr; - text = ncr, ncr = strstr(text, "&#")) { + ncr; text = ncr, ncr = strstr(text, "&#")) { newtext = g_string_append_len(newtext, text, ncr - text); // convert ncr value (string) to unicode (guint32) unicode = 0; - for (ncr = ncr + 2; // just past "&#" - (*ncr != '\0') && (*ncr >= '0') && (*ncr <='9'); + for (ncr = ncr + 2; // just past "&#" + (*ncr != '\0') && (*ncr >= '0') && (*ncr <= '9'); ncr++) unicode = (unicode * 10) + ((*ncr) - '0'); // converts unicode char to utf8 // need proper terminator + validation of content if ((*ncr == ';') && g_unichar_validate(unicode)) { - ncr++; // step past ';' + ncr++; // step past ';' len = g_unichar_to_utf8(unicode, utf8); utf8[len] = '\0'; newtext = g_string_append(newtext, utf8); } else { g_string_append_printf(newtext, "&#%d;", unicode); - XI_message(("ncr2utf8: invalid unicode &#%d;\n", unicode)); + XI_message(("ncr2utf8: invalid unicode &#%d;\n", + unicode)); } } - if (*text != '\0') // residual text? paste it on. + if (*text != '\0') // residual text? paste it on. newtext = g_string_append(newtext, text); return g_string_free(newtext, FALSE); } +#endif // // for choosing variants, primary/secondary/all. @@ -1020,31 +982,35 @@ void reading_selector(char *modname, char *key, DIALOG_DATA *dialog, - GtkMenuItem *menuitem, - gpointer user_data) + GtkMenuItem *menuitem, gpointer user_data) { gchar *url; gboolean primary = 0, secondary = 0, all = 0; - gboolean is_dialog = (dialog ? 1 : 0); + gboolean is_dialog = (dialog ? 1 : 0); - switch ((int) GPOINTER_TO_INT(user_data)) - { + switch ((int)GPOINTER_TO_INT(user_data)) { case 0: - primary = TRUE; secondary = FALSE; all = FALSE; + primary = TRUE; + secondary = FALSE; + all = FALSE; break; case 1: - primary = FALSE; secondary = TRUE; all = FALSE; + primary = FALSE; + secondary = TRUE; + all = FALSE; break; case 2: - primary = FALSE; secondary = FALSE; all = TRUE; + primary = FALSE; + secondary = FALSE; + all = TRUE; break; default: - g_message("invalid variant %d\n", (int) GPOINTER_TO_INT(user_data)); + g_message("invalid variant %d\n", + (int)GPOINTER_TO_INT(user_data)); gui_generic_warning("Xiphos: invalid internal variant"); break; } - url = g_strdup_printf("sword://%s/%s", modname, key); main_save_module_options(modname, "Primary Reading", primary); main_save_module_options(modname, "Secondary Reading", secondary); @@ -1061,31 +1027,32 @@ /* language sorting functions, for better module list displays. */ /* **************************************************************** */ -struct language_set { +struct language_set +{ gchar **ptr; int count; + int max; } language_set[N_LANGSET_MODTYPES]; /* one-shot setup during initialization. */ -void -language_init(void) +void language_init(void) { int i; for (i = 0; i < N_LANGSET_MODTYPES; ++i) { - language_set[i].ptr = calloc(LANGSET_COUNT, sizeof(char*)); + language_set[i].ptr = + calloc(LANGSET_STRIDE + 1, sizeof(char *)); language_set[i].count = 0; + language_set[i].max = LANGSET_STRIDE; /* initial limit */ } } /* per-usage clear of old content before a new collection is made. */ -static void -language_clear() +static void language_clear() { int i, j; - char **s; for (i = 0; i < N_LANGSET_MODTYPES; ++i) { - s = language_set[i].ptr; + char **s = language_set[i].ptr; for (j = 0; j < language_set[i].count; ++j) { g_free(s[j]); s[j] = NULL; @@ -1095,8 +1062,7 @@ } /* used during module set analysis: add one language to a per-type set. */ -static void -language_add(const char *language, int module_type) +static void language_add(const char *language, int module_type) { int j; char **s; @@ -1104,30 +1070,42 @@ if ((language == NULL) || (*language == '\0')) language = _("Unknown"); assert((module_type >= 0) && (module_type < N_LANGSET_MODTYPES)); + s = language_set[module_type].ptr; for (j = 0; j < language_set[module_type].count; ++j) { if (!strcmp(s[j], language)) - return; /* found -- duplicate. */ + return; /* found -- duplicate. */ } - assert(j < LANGSET_COUNT); /* let's not overrun the set. */ + + // grow the set dynamically as we run out of space. + if (j >= language_set[module_type].max) { + int old_max = language_set[module_type].max; + + language_set[module_type].max += LANGSET_STRIDE; + s = language_set[module_type].ptr = + realloc(language_set[module_type].ptr, + (language_set[module_type].max + 1) * + sizeof(char*)); + // realloc() does not set newly-alloc'd mem to zeroes. + memset(s + old_max, '\0', (LANGSET_STRIDE + 1) * sizeof(char*)); + } + s[j] = g_strdup(language); ++(language_set[module_type].count); } /* comparator function pulled verbatim from qsort(3). */ -static int -cmpstringp(const void *p1, const void *p2) +static int cmpstringp(const void *p1, const void *p2) { /* The actual arguments to this function are "pointers to pointers to char", but strcmp(3) arguments are "pointers to char", hence the following cast plus dereference */ - return strcmp(* (char * const *) p1, * (char * const *) p2); + return strcmp(*(char *const *)p1, *(char *const *)p2); } /* retrieve the language set specific to the module type requested */ -static gchar ** -language_get_type(int module_type) +static gchar **language_get_type(int module_type) { assert((module_type >= 0) && (module_type < N_LANGSET_MODTYPES)); return language_set[module_type].ptr; @@ -1152,25 +1130,22 @@ void (*add)(GtkTreeModel *, GtkTreeIter, gchar **), gboolean limited) { - MOD_MGR *info; int i; language_clear(); /* append */ while (modlist != NULL) { - info = (MOD_MGR *) modlist->data; + MOD_MGR *info = (MOD_MGR *)modlist->data; /* mod.mgr: special extra lists */ if ((update != NULL) && (uninstalled != NULL)) { if (!info->installed) { - language_add(info->language, LANGSET_UNINSTALLED); - } else if ((!info->old_version && info->new_version && - strcmp(info->new_version, " ")) || - (info->old_version && !info->new_version) || - (info->old_version && info->new_version && - strcmp(info->new_version, info->old_version) > 0)) { - language_add(info->language, LANGSET_UPDATE); + language_add(info->language, + LANGSET_UNINSTALLED); + } else if ((!info->old_version && info->new_version && strcmp(info->new_version, " ")) || (info->old_version && !info->new_version) || (info->old_version && info->new_version && strcmp(info->new_version, info->old_version) > 0)) { + language_add(info->language, + LANGSET_UPDATE); } } @@ -1201,9 +1176,7 @@ /* sort */ for (i = 0; i < N_LANGSET_MODTYPES; ++i) { qsort(language_set[i].ptr, - language_set[i].count, - sizeof(char *), - cmpstringp); + language_set[i].count, sizeof(char *), cmpstringp); } /* generate tree. */ @@ -1251,14 +1224,14 @@ * */ -gchar *get_modlist_string(GList * mods) +gchar *get_modlist_string(GList *mods) { gchar *rv; GString *str = g_string_new(""); GList *orig_mods = mods; while (mods != NULL) { - str = g_string_append(str, (gchar *) mods->data); + str = g_string_append(str, (gchar *)mods->data); g_free(mods->data); mods = g_list_next(mods); if (mods != NULL) @@ -1271,8 +1244,6 @@ return rv; } - - /****************************************************************************** * Name * get_current_list @@ -1301,20 +1272,17 @@ do { gtk_tree_model_get(model, &iter, 1, &buf, -1); items = - g_list_append(items, - (gchar *) g_strdup(buf)); + g_list_append(items, (gchar *)g_strdup(buf)); } while (gtk_tree_model_iter_next(model, &iter)); } return items; } - /* * caller must free the returned string. */ -char * -image_locator(const char *image) +char *image_locator(const char *image) { #ifndef WIN32 return g_strdup_printf("%s/%s", PACKAGE_PIXMAPS_DIR, image); @@ -1327,8 +1295,7 @@ /* * get a pixmap widget from specified file. */ -GtkWidget * -pixmap_finder(char *image) +GtkWidget *pixmap_finder(char *image) { GtkWidget *w; char *image_file; @@ -1342,8 +1309,7 @@ /* * get a pixbuf from specified file. */ -GdkPixbuf * -pixbuf_finder(const char *image, int size, GError **error) +GdkPixbuf *pixbuf_finder(const char *image, int size, GError **error) { GdkPixbuf *p; char *image_file; @@ -1352,10 +1318,9 @@ if (size == 0) p = gdk_pixbuf_new_from_file(image_file, error); else - p = gdk_pixbuf_new_from_file_at_scale (image_file, - size, size, - TRUE, - error); + p = gdk_pixbuf_new_from_file_at_scale(image_file, + size, size, + TRUE, error); g_free(image_file); return p; } @@ -1366,18 +1331,15 @@ #ifdef min #undef min #endif -#define min(x,y) ((x) < (y) ? (x) : (y)) +#define min(x, y) ((x) < (y) ? (x) : (y)) void -HtmlOutput(char *text, - GtkWidget *gtkText, - MOD_FONT *mf, - char *anchor) +HtmlOutput(char *text, GtkWidget *gtkText, MOD_FONT *mf, char *anchor) { - int len = strlen(text), offset = 0; - + int len = strlen(text); + XiphosHtml *html = XIPHOS_HTML(gtkText); - XIPHOS_HTML_OPEN_STREAM(html,"text/html"); + XIPHOS_HTML_OPEN_STREAM(html, "text/html"); // EVIL EVIL EVIL EVIL. // crazy nonsense with xulrunner 1.9.2.3, failure to jump to anchor. @@ -1387,47 +1349,45 @@ gchar *buf; // first, scribble out everything up to the closing . - buf = strstr(text, ""); // yes, lowercase. - assert(buf != NULL); // don't be so stupid as not to include . - offset = buf - text; + buf = strstr(text, ""); // yes, lowercase. + assert(buf != NULL); // don't be so stupid as not to include . + int offset = buf - text; XIPHOS_HTML_WRITE(html, text, offset); len -= offset; // now write the javascript snippet. - buf = g_strdup_printf( - "", (settings.special_anchor - ? settings.special_anchor - : anchor)); + buf = + g_strdup_printf("", + (settings.special_anchor ? settings.special_anchor : anchor)); XIPHOS_HTML_WRITE(html, buf, strlen(buf)); g_free(buf); } - if(!anchor) + if (!anchor) XIPHOS_HTML_WRITE(html, text, len); /* use anchor if asked, but if so, special anchor takes priority. */ XIPHOS_HTML_CLOSE(html); if (anchor || settings.special_anchor) XIPHOS_HTML_JUMP_TO_ANCHOR(html, (settings.special_anchor - ? settings.special_anchor - : anchor)); + ? settings.special_anchor + : anchor)); /* the special anchor gets exactly one use. */ settings.special_anchor = NULL; } -void set_window_icon (GtkWindow *window) +void set_window_icon(GtkWindow *window) { gchar *imagename; GdkPixbuf *pixbuf; imagename = image_locator("xiphos-x-16.png"); - pixbuf = gdk_pixbuf_new_from_file (imagename, NULL); - g_free (imagename); - gtk_window_set_icon (window, pixbuf); - + pixbuf = gdk_pixbuf_new_from_file(imagename, NULL); + g_free(imagename); + gtk_window_set_icon(window, pixbuf); } /************************************************************************** @@ -1452,25 +1412,25 @@ * Return value * void */ -gboolean xiphos_open_default (const gchar *file) +gboolean xiphos_open_default(const gchar *file) { #ifdef WIN32 gunichar2 *w_file; gint rt; w_file = g_utf8_to_utf16(file, -1, NULL, NULL, NULL); XI_message(("opening file %ls", w_file)); - rt = (gint)ShellExecuteW(NULL, L"open", w_file, NULL, NULL, SW_SHOWDEFAULT); + rt = (gint)ShellExecuteW(NULL, L"open", w_file, NULL, NULL, + SW_SHOWDEFAULT); return rt > 32; #else GError *error = NULL; - gtk_show_uri (NULL, file, gtk_get_current_event_time(), &error); + gtk_show_uri(NULL, file, gtk_get_current_event_time(), &error); if (error != NULL) { XI_warning(("%s", error->message)); - g_error_free (error); + g_error_free(error); return FALSE; - } - else + } else return TRUE; #endif } @@ -1485,9 +1445,10 @@ * Since 3.1.2 */ #ifdef WIN32 -gchar* xiphos_win32_get_subdir(const gchar *subdir) +gchar *xiphos_win32_get_subdir(const gchar *subdir) { - gchar *ret_dir = g_win32_get_package_installation_directory_of_module(NULL); + gchar *ret_dir = + g_win32_get_package_installation_directory_of_module(NULL); ret_dir = g_strconcat(ret_dir, "\0", NULL); ret_dir = g_build_filename(ret_dir, subdir, NULL); return ret_dir; @@ -1504,7 +1465,8 @@ * * Since 3.1.2 */ -void archive_addfile(GsfOutfile *output, const gchar *file, const gchar *name) +void archive_addfile(GsfOutfile *output, const gchar *file, + const gchar *name) { GsfInput *inputchild = NULL; GsfOutput *outputchild = NULL; @@ -1532,22 +1494,23 @@ { GDir *dir; const gchar *file; - gchar *complete_file; GsfOutfile *child; child = GSF_OUTFILE(gsf_outfile_new_child(output, name, TRUE)); dir = g_dir_open(path, 0, NULL); while ((file = g_dir_read_name(dir))) { - complete_file = g_build_filename(path, file, NULL); + gchar *complete_file = g_build_filename(path, file, NULL); if (g_file_test(complete_file, G_FILE_TEST_IS_DIR)) - archive_adddir(GSF_OUTFILE(child), complete_file, file); + archive_adddir(GSF_OUTFILE(child), complete_file, + file); else - archive_addfile(GSF_OUTFILE(child), complete_file, file); + archive_addfile(GSF_OUTFILE(child), complete_file, + file); + g_free(complete_file); } g_dir_close(dir); } - /** * xiphos_create_archive * @conf_file: a #gchar with the location of the module's .conf @@ -1559,14 +1522,14 @@ * * Since 3.1.2 */ -void xiphos_create_archive(gchar* conf_file, gchar* datapath, gchar *zip, - const gchar *destination) +void xiphos_create_archive(gchar *conf_file, gchar *datapath, + gchar *zip, const gchar *destination) { GsfOutfile *outputfile; GsfOutput *output; GsfOutfile *tmp; - gchar** path; - gchar* moddirname; + gchar **path; + gchar *moddirname; GString *modpath; int i; @@ -1584,10 +1547,9 @@ /* create a relative path without preceding "." */ /* or the trailing dir name */ modpath = g_string_new(NULL); - for (i = 1; i <= (g_strv_length(path) - 2); i++) - { + for (i = 1; i <= (g_strv_length(path) - 2); i++) { modpath = g_string_append(modpath, path[i]); - if (i < g_strv_length(path) -2) /* avoid a trailing / */ + if (i < g_strv_length(path) - 2) /* avoid a trailing / */ modpath = g_string_append(modpath, "/"); } @@ -1596,7 +1558,8 @@ outputfile = gsf_outfile_zip_new(output, NULL); /* add the module directory */ - tmp = GSF_OUTFILE(gsf_outfile_new_child(outputfile, modpath->str, TRUE)); + tmp = + GSF_OUTFILE(gsf_outfile_new_child(outputfile, modpath->str, TRUE)); /* add all data files */ archive_adddir(tmp, @@ -1606,9 +1569,11 @@ g_object_unref(tmp); /* add conf file */ - tmp = GSF_OUTFILE(gsf_outfile_new_child(outputfile, "mods.d", TRUE)); + tmp = + GSF_OUTFILE(gsf_outfile_new_child(outputfile, "mods.d", TRUE)); archive_addfile(tmp, - g_build_filename(destination, "mods.d", conf_file, NULL), + g_build_filename(destination, "mods.d", conf_file, + NULL), conf_file); /* cleanup */ @@ -1619,7 +1584,6 @@ g_object_unref(output); g_strfreev(path); g_free(moddirname); - } // @@ -1630,46 +1594,46 @@ // #ifndef INVALID_SOCKET -# define INVALID_SOCKET (-1) +#define INVALID_SOCKET (-1) #else -# ifdef WIN32 -# undef INVALID_SOCKET -# define INVALID_SOCKET (-1) -# endif +#ifdef WIN32 +#undef INVALID_SOCKET +#define INVALID_SOCKET (-1) +#endif #endif -void -ReadAloud(unsigned int verse, const char *suppliedtext) +void ReadAloud(unsigned int verse, const char *suppliedtext) { - static int tts_socket = INVALID_SOCKET; // no initial connection. - static int use_counter = -2; // to shortcircuit early uses. + static int tts_socket = INVALID_SOCKET; // no initial connection. + static int use_counter = -2; // to shortcircuit early uses. - if (settings.readaloud || // read anything, or - (verse == 0)) { // read what's handed us. + if (settings.readaloud || // read anything, or + (verse == 0)) { // read what's handed us. gchar *s, *t; // setup for communication. if (tts_socket < 0) { struct sockaddr_in service; - if ((tts_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) { + if ((tts_socket = + socket(AF_INET, SOCK_STREAM, 0)) < 0) { char msg[256]; - sprintf(msg, "ReadAloud disabled:\nsocket failed, %s", + sprintf(msg, + "ReadAloud disabled:\nsocket failed, %s", strerror(errno)); settings.readaloud = 0; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.readaloud_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.readaloud_item), settings.readaloud); gui_generic_warning(msg); return; } - // festival's port (1314) on localhost (127.0.0.1). memset(&service, 0, sizeof service); service.sin_family = AF_INET; service.sin_port = htons(1314); service.sin_addr.s_addr = htonl(0x7f000001); - if (connect(tts_socket, (const struct sockaddr *)&service, + if (connect(tts_socket, + (const struct sockaddr *)&service, sizeof(service)) != 0) { StartFestival(); #ifdef WIN32 @@ -1677,24 +1641,24 @@ #else sleep(2); // give festival a moment to init. #endif - if (connect(tts_socket, (const struct sockaddr *)&service, + if (connect(tts_socket, + (const struct sockaddr *)&service, sizeof(service)) != 0) { // it still didn't work -- missing. char msg[256]; sprintf(msg, "%s\n%s, %s", "TTS \"festival\" not started -- perhaps not installed", - "TTS connect failed", strerror(errno)); + "TTS connect failed", + strerror(errno)); StopFestival(&tts_socket); settings.readaloud = 0; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.readaloud_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.readaloud_item), settings.readaloud); gui_generic_warning(msg); return; } } } - // avoid speaking the first *2* times. // (2 Display() calls are made during startup.) // though speaking may be intended, startup speech is annoying. @@ -1703,8 +1667,9 @@ GString *text = g_string_new(NULL); if (verse != 0) - g_string_printf(text, "%d. ... %s", verse, suppliedtext); - // use of ". ..." is to induce proper pauses. + g_string_printf(text, "%d. ... %s", verse, + suppliedtext); + // use of ". ..." is to induce proper pauses. else g_string_printf(text, "%s", suppliedtext); XI_message(("ReadAloud: dirty: %s\n", text->str)); @@ -1712,8 +1677,7 @@ // clean: no surrounding strongs/morph. // i wish there was a regexp form of strstr(). for (s = strstr(text->str, ""); - s; - s = strstr(s, "")) { + s; s = strstr(s, "")) { if ((t = strstr(s, ""))) { t += 6; while (s <= t) @@ -1724,8 +1688,7 @@ } } for (s = strstr(text->str, ""); - s; - s = strstr(s, "")) { + s; s = strstr(s, "")) { if ((t = strstr(s, ""))) { t += 6; while (s <= t) @@ -1752,7 +1715,8 @@ } // clean: no <...> sequences. (Strong's ref, "<1234>".) - for (s = strstr(text->str, "<"); s; s = strstr(s, "<")) { + for (s = strstr(text->str, "<"); s; + s = strstr(s, "<")) { if ((t = strstr(s, ">"))) { t += 3; while (s <= t) @@ -1764,17 +1728,20 @@ } // clean: no unicode apostrophes and quotation marks. - for (s = strstr(text->str, "\342\200\231"); s; s = strstr(s, "\342\200\231")) { + for (s = strstr(text->str, "\342\200\231"); s; + s = strstr(s, "\342\200\231")) { *(s++) = '\''; *(s++) = '\''; *(s++) = '\''; } - for (s = strstr(text->str, "\342\200\234"); s; s = strstr(s, "\342\200\234")) { + for (s = strstr(text->str, "\342\200\234"); s; + s = strstr(s, "\342\200\234")) { *(s++) = ' '; *(s++) = ' '; *(s++) = ' '; } - for (s = strstr(text->str, "\342\200\235"); s; s = strstr(s, "\342\200\235")) { + for (s = strstr(text->str, "\342\200\235"); s; + s = strstr(s, "\342\200\235")) { *(s++) = ' '; *(s++) = ' '; *(s++) = ' '; @@ -1795,7 +1762,8 @@ for (s = strstr(text->str, "*n"); s; s = strstr(s, "*n")) { *(s++) = ' '; *(s++) = ' '; - while (isdigit(*s)) *(s++) = ' '; + while (isdigit(*s)) + *(s++) = ' '; } for (s = strstr(text->str, "*u"); s; s = strstr(s, "*u")) { *(s++) = ' '; @@ -1804,7 +1772,8 @@ for (s = strstr(text->str, "*x"); s; s = strstr(s, "*x")) { *(s++) = ' '; *(s++) = ' '; - while (isdigit(*s)) *(s++) = ' '; + while (isdigit(*s)) + *(s++) = ' '; } // festival *pronounces* brackets and asterisks -- idiots. @@ -1819,37 +1788,36 @@ // walk the string, looking for dislocated "LORD" as "LORD". // this occurs in "smallcaps" use in many bibles. - for (s = strchr(text->str, 'L'); s; s = strchr(s+1, 'L')) { + for (s = strchr(text->str, 'L'); s; s = strchr(s + 1, 'L')) { gchar *begin = s++; while (*s == ' ') ++s; if (!strncmp(s, "ORD", 3)) { *begin = ' '; - *(s-1) = 'L'; + *(s - 1) = 'L'; } } // same song, second verse: GOD. - for (s = strchr(text->str, 'G'); s; s = strchr(s+1, 'G')) { + for (s = strchr(text->str, 'G'); s; s = strchr(s + 1, 'G')) { gchar *begin = s++; while (*s == ' ') ++s; if (!strncmp(s, "OD", 2)) { *begin = ' '; - *(s-1) = 'G'; + *(s - 1) = 'G'; } } XI_message(("ReadAloud: clean: %s\n", text->str)); // scribble clean text to the socket. - if (FestivalSpeak(text->str, strlen(text->str), tts_socket) == FALSE) - { + if (FestivalSpeak(text->str, strlen(text->str), tts_socket) == FALSE) { char msg[256]; - sprintf(msg, "TTS disappeared?\nTTS write failed: %s", + sprintf(msg, + "TTS disappeared?\nTTS write failed: %s", strerror(errno)); StopFestival(&tts_socket); settings.readaloud = 0; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.readaloud_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.readaloud_item), settings.readaloud); gui_generic_warning(msg); } @@ -1873,16 +1841,18 @@ // // starts festival in a async process // -void -StartFestival(void) +void StartFestival(void) { #ifdef WIN32 //on windows, we will ship festival directly under Xiphos gchar *festival_args[5]; - gchar *festival_com = g_win32_get_package_installation_directory_of_module(NULL); + gchar *festival_com = + g_win32_get_package_installation_directory_of_module(NULL); festival_com = g_strconcat(festival_com, "\0", NULL); - gchar *festival_lib = g_build_filename(festival_com, "festival\\lib\0"); - festival_com = g_build_filename(festival_com, "festival\\festival.exe\0"); + gchar *festival_lib = + g_build_filename(festival_com, "festival\\lib\0"); + festival_com = + g_build_filename(festival_com, "festival\\festival.exe\0"); festival_args[0] = festival_com; festival_args[1] = g_strdup("--libdir"); festival_args[2] = festival_lib; @@ -1894,21 +1864,15 @@ festival_args[1] = g_strdup("--server"); festival_args[2] = NULL; #endif - g_spawn_async ( NULL, - festival_args, - NULL, - G_SPAWN_SEARCH_PATH, - NULL, - NULL, - NULL, - NULL); + g_spawn_async(NULL, + festival_args, + NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); } // // shuts down Festival // -void -StopFestival(int *tts_socket) +void StopFestival(int *tts_socket) { #ifdef WIN32 closesocket(*tts_socket); @@ -1922,17 +1886,19 @@ // // tells Festival to say the given text // -gboolean -FestivalSpeak(gchar *text, int length, int tts_socket) +gboolean FestivalSpeak(gchar *text, int length, int tts_socket) { #ifdef WIN32 - if ((send(tts_socket, "(SayText \"", 10, MSG_DONTROUTE) == INVALID_SOCKET) || - (send(tts_socket, text, length, MSG_DONTROUTE) == INVALID_SOCKET) || - (send(tts_socket, "\")\r\n", 4, MSG_DONTROUTE) == INVALID_SOCKET )) + if ((send(tts_socket, "(SayText \"", 10, MSG_DONTROUTE) == + INVALID_SOCKET) || + (send(tts_socket, text, length, MSG_DONTROUTE) == + INVALID_SOCKET) || + (send(tts_socket, "\")\r\n", 4, MSG_DONTROUTE) == + INVALID_SOCKET)) return FALSE; #else - if ((write(tts_socket, "(SayText \"", 10) < 0) || - (write(tts_socket, text, length ) < 0) || + if ((write(tts_socket, "(SayText \"", 10) < 0) || + (write(tts_socket, text, length) < 0) || (write(tts_socket, "\")\r\n", 4) < 0)) return FALSE; #endif @@ -1943,8 +1909,7 @@ /* * strcasestr() turns out to be nonstandard extension, but we need it. */ -const char * -strcasestr(const char *haystack, const char *needle) +const char *strcasestr(const char *haystack, const char *needle) { char *lower_haystack = g_strdup(haystack); char *lower_needle = g_strdup(needle); @@ -1967,33 +1932,30 @@ } #endif /* !HAVE_STRCASESTR */ -int -ImageDimensions(const char *path, int *x, int *y) +int ImageDimensions(const char *path, int *x, int *y) { - if (gdk_pixbuf_get_file_info (path, x, y)) + if (gdk_pixbuf_get_file_info(path, x, y)) return 0; else return -1; } -#define IMGSRC_STRING " 200) || (window_y > 200)) { window_x -= 23; window_y -= 23; } else { - window_x = (window_x * 93)/100; - window_y = (window_y * 93)/100; + window_x = (window_x * 93) / 100; + window_y = (window_y * 93) / 100; } } /* add the working segment, with annotation added */ /* to keep us from matching IMGSRC_STRING again. */ path += IMGSRC_LENGTH; - resized = g_string_append_len(resized, trail, path-trail-5); - resized = g_string_append(resized, "resized=\"yes\" "); - resized = g_string_append_len(resized, path-5, 5); + resized = + g_string_append_len(resized, trail, path - trail - 5); + resized = g_string_append(resized, "resized=\"yes\" "); + resized = g_string_append_len(resized, path - 5, 5); // some modules play fast-n-loose with proper file spec. if (strncmp(path, "file://", 7) == 0) { #ifdef WIN32 /* due to need for local soup server */ path += 5; - resized = g_string_append(resized, "http://127.0.0.1:7878/"); + resized = + g_string_append(resized, + "http://127.0.0.1:7878/"); #else path += 7; resized = g_string_append(resized, "file://"); @@ -2053,7 +2017,9 @@ } else if (strncmp(path, "file:", 5) == 0) { path += 5; #ifdef WIN32 - resized = g_string_append(resized, "http://127.0.0.1:7878/"); + resized = + g_string_append(resized, + "http://127.0.0.1:7878/"); #else resized = g_string_append(resized, "file:"); #endif @@ -2070,7 +2036,9 @@ *end = '\0'; #ifdef WIN32 - resized = g_string_append(resized, g_strdelimit(path, "\\", '/')); + resized = + g_string_append(resized, + g_strdelimit(path, "\\", '/')); #else resized = g_string_append(resized, path); #endif @@ -2078,37 +2046,81 @@ *end = '"'; resized = g_string_append_c(resized, '"'); - path = end+1; + path = end + 1; trail = path; if (image_retval != 0) { if (!warned_once) { - gui_generic_warning( - _("An image file's size could not be determined.\n" - "Xiphos cannot resize images to fit window.")); + gui_generic_warning(_("An image file's size could not be determined.\n" + "Xiphos cannot resize images to fit window.")); // settings.imageresize = 0; warned_once = TRUE; } continue; } - // knowing image size & window size, adjust to fit. if (image_x > window_x) { - float proportion = (float)window_x / (float)image_x; + float proportion = + (float)window_x / (float)image_x; image_x = window_x; image_y = (int)((float)image_y * proportion); } if (image_y > window_y) { - float proportion = (float)window_y / (float)image_y; + float proportion = + (float)window_y / (float)image_y; image_y = window_y; image_x = (int)((float)image_x * proportion); } - sprintf(buf, " width=\"%d\" height=\"%d\"", image_x, image_y); + sprintf(buf, " width=\"%d\" height=\"%d\"", image_x, + image_y); resized = g_string_append(resized, buf); - } + } - resized = g_string_append(resized, trail); // remainder of text appended. + resized = g_string_append(resized, trail); // remainder of text appended. return resized->str; } +/****************************************************************************** + * Name + * inhale_text_from_file + * + * Synopsis + * char *inhale_text_from_file(const char *filename) + * + * Description + * reads content from a file using stdio, for use anywhere. + * + * Return value + * char * + * to be freed by caller. + */ + +char *inhale_text_from_file(const char *filename) +{ + FILE *handle; + size_t length; + gchar *blob = NULL; + + if ((handle = g_fopen(filename, "r")) == NULL) + return NULL; + + (void)fseek(handle, 0L, SEEK_END); + length = ftell(handle); + rewind(handle); + + if ((length != 0) && + ((blob = (gchar *)g_malloc(length + 2)) != NULL) && + (fread(blob, 1, length, handle) == length)) { + /* success. bound the text as a C string. */ + *(blob + length) = '\0'; + } else { + if (blob) + g_free(blob); + blob = NULL; + } + + fclose(handle); + return blob; +} + /****** end of file ******/ diff -Nru xiphos-4.0.0+dfsg1/src/gnome2/xiphos.c xiphos-4.0.4+dfsg1/src/gnome2/xiphos.c --- xiphos-4.0.0+dfsg1/src/gnome2/xiphos.c 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gnome2/xiphos.c 2015-08-25 01:24:17.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.c - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -88,7 +88,6 @@ * void */ - void frontend_init(void) { XI_print(("%s\n", "Initiating Xiphos")); @@ -105,9 +104,9 @@ */ if (settings.havebible) { main_check_parallel_modules(); - main_init_parallel_view(); + main_init_parallel_view(); gui_create_parallel_page(); - gtk_widget_realize(widgets.html_parallel); + gtk_widget_realize(widgets.html_parallel); main_set_parallel_options_at_start(); } @@ -135,7 +134,6 @@ main_init_previewer(); } - /****************************************************************************** * Name * @@ -152,27 +150,22 @@ * void */ - void frontend_display(const char *tabs) { - GdkScreen *screen = gdk_screen_get_default(); - gint screen_width = gdk_screen_get_width(screen); + GdkScreen *screen = gdk_screen_get_default(); + gint screen_width = gdk_screen_get_width(screen); gint screen_height = gdk_screen_get_height(screen); XI_print(("%s\n", "Displaying Xiphos")); gui_show_main_window(); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewtexts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), settings.showtexts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewcomms_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), settings.showcomms); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewdicts_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), settings.showdicts); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.viewpreview_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewpreview_item), settings.showpreview); gui_show_hide_preview(settings.showpreview); gui_show_hide_texts(settings.showtexts); @@ -186,23 +179,26 @@ * especially if it's due to just shutting linux down. */ if (settings.app_x < 0) - settings.app_x = 10; + settings.app_x = 0; if (settings.app_x > (screen_width - 100)) settings.app_x = screen_width - 100; if (settings.app_y < 0) - settings.app_y = 10; + settings.app_y = 0; if (settings.app_y > (screen_height - 100)) settings.app_y = screen_height - 100; + if (settings.maximized) + gtk_window_maximize(GTK_WINDOW(widgets.app)); - gtk_window_move(GTK_WINDOW(widgets.app),settings.app_x,settings.app_y); + gtk_window_move(GTK_WINDOW(widgets.app), settings.app_x, + settings.app_y); /* gecko needs the widgets to be visible before writing */ sync_windows(); // setup passage notebook -// if (settings.browsing) { - gui_notebook_main_setup (settings.browsing, tabs); -/* } else { + // if (settings.browsing) { + gui_notebook_main_setup(settings.browsing, tabs); + /* } else { url = g_strdup_printf("sword://%s/%s",settings.DictWindowModule, settings.dictkey); main_url_handler(url); @@ -222,13 +218,11 @@ } */ /* must be set after tab stuff is done */ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (widgets.parallel_tab_item), + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.parallel_tab_item), settings.showparatab); g_signal_connect(G_OBJECT(widgets.parallel_tab_item), - "toggled", - G_CALLBACK(gui_parallel_tab_activate), - NULL ); + "toggled", + G_CALLBACK(gui_parallel_tab_activate), NULL); gui_show_previewer_in_sidebar(settings.show_previewer_in_sidebar); /* open saved windows as needed */ @@ -245,12 +239,11 @@ main_display_devotional(); else main_init_previewer(); - gtk_widget_grab_focus (sidebar.module_list); + gtk_widget_grab_focus(sidebar.module_list); XI_print(("%s\n\n", "done")); } - /****************************************************************************** * Name * shutdown_xiphos @@ -269,19 +262,18 @@ void shutdown_frontend(void) { - RESULTS *list_item; - if(pixbufs->pixbuf_closed) + if (pixbufs->pixbuf_closed) g_object_unref(pixbufs->pixbuf_closed); - if(pixbufs->pixbuf_opened) + if (pixbufs->pixbuf_opened) g_object_unref(pixbufs->pixbuf_opened); - if(pixbufs->pixbuf_helpdoc) + if (pixbufs->pixbuf_helpdoc) g_object_unref(pixbufs->pixbuf_helpdoc); /* free verse list used for saving search results */ if (list_of_verses) { GList *chaser = list_of_verses; while (chaser) { - list_item = (RESULTS*)chaser->data; + RESULTS *list_item = (RESULTS *)chaser->data; g_free(list_item->module); g_free(list_item->key); g_free(list_item); @@ -295,7 +287,6 @@ /* if study pad file has changed since last save */ - xml_save_settings_doc(settings.fnconfigure); xml_free_settings_doc(); @@ -303,7 +294,7 @@ XIPHOS_HTML_SHUTDOWN(); - gui_notebook_main_shutdown (settings.browsing); + gui_notebook_main_shutdown(settings.browsing); /* free dir and file stuff */ g_free(settings.gSwordDir); @@ -314,8 +305,8 @@ main_delete_sidebar_search_backend(); main_delete_parallel_view(); - g_string_free(navbar_versekey.module_name,TRUE); - g_string_free(navbar_versekey.key,TRUE); + g_string_free(navbar_versekey.module_name, TRUE); + g_string_free(navbar_versekey.key, TRUE); XI_print(("\n%s\n", "Xiphos is shutdown")); } diff -Nru xiphos-4.0.0+dfsg1/src/gui/about_modules.h xiphos-4.0.4+dfsg1/src/gui/about_modules.h --- xiphos-4.0.0+dfsg1/src/gui/about_modules.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/about_modules.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * about_modules.h - About dialogs for Xiphos + * about_modules.h - About dialogs for modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,17 +28,15 @@ #include -void gui_display_about_module_dialog(gchar * modname); +void gui_display_about_module_dialog(gchar *modname); void gui_core_display_about_dialog(const gchar *desc, - gchar *abouttext, - const gchar *version, - gchar *modname); -void about_module_display(GString * str, - gchar * text, - gboolean tooltip); + const gchar *abouttext, + const gchar *modname); +void about_module_display(GString *str, + const gchar *text, + const gboolean tooltip); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/about_sword.h xiphos-4.0.4+dfsg1/src/gui/about_sword.h --- xiphos-4.0.0+dfsg1/src/gui/about_sword.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/about_sword.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * about_sword.h - About dialogs for Xiphos + * about_sword.h - About dialogs for Sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -33,5 +33,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/about_trans.h xiphos-4.0.4+dfsg1/src/gui/about_trans.h --- xiphos-4.0.0+dfsg1/src/gui/about_trans.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/about_trans.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_trans.h - About Translation * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * 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 @@ -33,5 +33,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/about_xiphos.h xiphos-4.0.4+dfsg1/src/gui/about_xiphos.h --- xiphos-4.0.0+dfsg1/src/gui/about_xiphos.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/about_xiphos.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_xiphos.h - About dialogs for Xiphos * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -33,5 +33,4 @@ #ifdef __cplusplus } #endif - #endif /* __ABOUT_XIPHOS_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/bibletext_dialog.h xiphos-4.0.4+dfsg1/src/gui/bibletext_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/bibletext_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bibletext_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext_dialog.h - view Bible text module in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,19 +22,18 @@ #ifndef __BIBLETEXT_DIALOG_H__ #define __BIBLETEXT_DIALOG_H__ - #ifdef __cplusplus extern "C" { #endif #include "main/module_dialogs.h" -void gui_bible_dialog_sync_toggled(GtkToggleButton * button, DIALOG_DATA * c); -void gui_create_bibletext_dialog(DIALOG_DATA * vt); -void gui_text_dialog_create_menu(DIALOG_DATA * d); +void gui_bible_dialog_sync_toggled(GtkToggleButton *button, + DIALOG_DATA *c); +void gui_create_bibletext_dialog(DIALOG_DATA *vt); +void gui_text_dialog_create_menu(DIALOG_DATA *d); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/bibletext.h xiphos-4.0.4+dfsg1/src/gui/bibletext.h --- xiphos-4.0.0+dfsg1/src/gui/bibletext.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bibletext.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext.h - gui for Bible text modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,12 +22,11 @@ #ifndef ___BIBLETEXT_H_ #define ___BIBLETEXT_H_ - #include void gui_setup_bibletext(void); -gboolean gui_text_button_release_event(GtkWidget * widget, - GdkEventButton * event, +gboolean gui_text_button_release_event(GtkWidget *widget, + GdkEventButton *event, gpointer data); void gui_popup_pm_text(void); GtkWidget *gui_create_bible_pane(void); diff -Nru xiphos-4.0.0+dfsg1/src/gui/bookmark_dialog.h xiphos-4.0.4+dfsg1/src/gui/bookmark_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/bookmark_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bookmark_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmark_dialog.h - gui to popup a dialog for adding a bookmark * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,28 +19,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - - #ifndef _BOOKMARK_DIALOG_H #define _BOOKMARK_DIALOG_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -void on_dialog_response(GtkDialog * dialog, - gint response_id, - gpointer user_data); -void gui_bookmark_dialog(gchar * label, gchar * module_name, gchar * key); -void gui_mark_verse_dialog(gchar * module_name, gchar * key); -void on_buffer_changed (GtkTextBuffer *textbuffer, gpointer user_data); -void on_mark_verse_response(GtkDialog * dialog, gint response_id, gpointer user_data); +void on_dialog_response(GtkDialog *dialog, + gint response_id, gpointer user_data); +void gui_bookmark_dialog(gchar *label, gchar *module_name, + gchar *key); +void gui_mark_verse_dialog(gchar *module_name, gchar *key); +void on_buffer_changed(GtkTextBuffer *textbuffer, + gpointer user_data); +void on_mark_verse_response(GtkDialog *dialog, gint response_id, + gpointer user_data); void on_dialog_enter(void); void on_mark_verse_enter(void); -gboolean on_treeview_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data); +gboolean on_treeview_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); #ifdef __cplusplus } #endif - #endif /* _BOOKMARK_DIALOG_H */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/bookmarks.h xiphos-4.0.4+dfsg1/src/gui/bookmarks.h --- xiphos-4.0.0+dfsg1/src/gui/bookmarks.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bookmarks.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks.h - gui for bookmarks * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -32,10 +32,9 @@ void gui_load_bookmark_tree(void); void create_bookmark_menu(void); void gui_save_old_bookmarks_to_new(GNode *gnode); -void gui_verselist_2_bookmarks(GList *list, gchar * module_name); +void gui_verselist_2_bookmarks(GList *list, gchar *module_name); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/bookmarks_menu.h xiphos-4.0.4+dfsg1/src/gui/bookmarks_menu.h --- xiphos-4.0.0+dfsg1/src/gui/bookmarks_menu.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bookmarks_menu.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * bookmarks_menu.h - gui for bookmarks + * bookmarks_menu.h - gui for bookmarks in a menu * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,8 @@ #ifdef __cplusplus extern "C" { #endif -struct _bookmark_menu { +struct _bookmark_menu +{ GtkWidget *menu; GtkWidget *in_tab; GtkWidget *in_dialog; @@ -48,24 +49,36 @@ extern gboolean use_dialog; extern gboolean bookmarks_changed; -void gui_save_bookmarks(GtkMenuItem * menuitem, gpointer user_data); +void gui_save_bookmarks(GtkMenuItem *menuitem, + gpointer user_data); void gui_create_bookmark_menu(void); void gui_save_bookmarks_treeview(void); -void bibletime_bookmarks_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_allow_reordering_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_dialog_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_edit_item_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_add_bookmark_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_insert_bookmark_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_new_folder_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_open_in_tab_activate(GtkMenuItem * menuitem, gpointer user_data); +void bibletime_bookmarks_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_allow_reordering_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_dialog_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_edit_item_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_export_folder_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_delete_item_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_expand_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_collapse_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_add_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_insert_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_new_folder_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_open_in_tab_activate(GtkMenuItem *menuitem, + gpointer user_data); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/bookmarks_treeview.h xiphos-4.0.4+dfsg1/src/gui/bookmarks_treeview.h --- xiphos-4.0.0+dfsg1/src/gui/bookmarks_treeview.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/bookmarks_treeview.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * bookmarks_treeview.h - gui for bookmarks + * bookmarks_treeview.h - gui for bookmarks in treeview * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * 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 @@ -38,14 +38,15 @@ N_COLUMNS }; - -typedef struct { +typedef struct +{ GdkPixbuf *pixbuf_opened; GdkPixbuf *pixbuf_closed; GdkPixbuf *pixbuf_helpdoc; } BookMarksPixbufs; -struct _bookmark_data { +struct _bookmark_data +{ xmlNodePtr parent; gchar *caption; gchar *key; @@ -61,19 +62,20 @@ extern BookMarksPixbufs *bm_pixbufs; extern GtkTreeView *bookmark_tree; -void gui_load_removed(const xmlChar * file); -void gui_add_columns(GtkTreeView * tree); -void gui_add_item_to_tree(GtkTreeIter * iter, GtkTreeIter * parent, - BOOKMARK_DATA * data); -void gui_verselist_to_bookmarks(GList * verses, gint save_as_single); +void gui_load_removed(const xmlChar *file); +void gui_add_columns(GtkTreeView *tree); +void gui_add_item_to_tree(GtkTreeIter *iter, GtkTreeIter *parent, + BOOKMARK_DATA *data); +void gui_verselist_to_bookmarks(GList *verses, + gint save_as_single); GtkWidget *gui_create_bookmark_tree(void); -void gui_parse_bookmarks(GtkTreeView *tree, const xmlChar * file, - GtkTreeIter *parent); -GtkWidget* gui_create_dialog_add_bookmark(gchar * label, - gchar * module_name, gchar * key); +void gui_parse_bookmarks(GtkTreeView *tree, const xmlChar *file, + GtkTreeIter *parent); +GtkWidget *gui_create_dialog_add_bookmark(gchar *label, + gchar *module_name, + gchar *key); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/cipher_key_dialog.h xiphos-4.0.4+dfsg1/src/gui/cipher_key_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/cipher_key_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/cipher_key_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * cipher_key_dialog.h - asks for key to unlock sword module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,10 +26,10 @@ extern "C" { #endif -gchar * gui_add_cipher_key(const char *mod_name, gchar *cipher_old); +gchar *gui_add_cipher_key(const char *mod_name, + gchar *cipher_old); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/commentary_dialog.h xiphos-4.0.4+dfsg1/src/gui/commentary_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/commentary_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/commentary_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary_dialog.h - dialog for a commentary module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,13 +28,15 @@ #include "main/module_dialogs.h" -void gui_commentary_dialog_sync_toggled(GtkToggleButton * button, DIALOG_DATA * c); -void gui_create_commentary_dialog(DIALOG_DATA * d, gboolean do_edit); -void gui_display_commentary_with_struct(DIALOG_DATA *d, gchar *key); -void gui_close_comm_dialog(DIALOG_DATA * d); +void gui_commentary_dialog_sync_toggled(GtkToggleButton *button, + DIALOG_DATA *c); +void gui_create_commentary_dialog(DIALOG_DATA *d, + gboolean do_edit); +void gui_display_commentary_with_struct(DIALOG_DATA *d, + gchar *key); +void gui_close_comm_dialog(DIALOG_DATA *d); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/commentary.h xiphos-4.0.4+dfsg1/src/gui/commentary.h --- xiphos-4.0.0+dfsg1/src/gui/commentary.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/commentary.h 2015-02-04 01:50:49.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary.h - gui for commentary modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru xiphos-4.0.0+dfsg1/src/gui/debug_glib_null.h xiphos-4.0.4+dfsg1/src/gui/debug_glib_null.h --- xiphos-4.0.0+dfsg1/src/gui/debug_glib_null.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/debug_glib_null.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * utilities.h - support functions + * debug_glib_null.h - support to find NULL parms in glib printf() calls. * - * Copyright (C) 2010-2014 Xiphos Developer Team + * Copyright (C) 2010-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,18 +30,13 @@ extern "C" { #endif -#define g_strdup_printf(f, ...) XI_g_strdup_printf(__FILE__, __LINE__, f, __VA_ARGS__) -#define g_string_printf(s, f, ...) XI_g_string_printf(__FILE__, __LINE__, s, f, __VA_ARGS__) +#define g_strdup_printf(f, ...) XI_g_strdup_printf(__FILE__, __LINE__, f, __VA_ARGS__) +#define g_string_printf(s, f, ...) XI_g_string_printf(__FILE__, __LINE__, s, f, __VA_ARGS__) #include "gui.h" #ifdef __cplusplus } #endif - -/* the code implementing our versions of these is in src/gnome2/gui.c, */ -/* expressly because gui.c does not need these functions; ergo, gui.c */ -/* does not #include this file: it gets access to real glib functions. */ -/* all other source files include this file to get the replacements. */ - -#endif /* DEBUG */ +/* the code implementing our versions of these is in src/gnome2/gui.c, */ /* expressly because gui.c does not need these functions; ergo, gui.c */ /* does not #include this file: it gets access to real glib functions. */ /* all other source files include this file to get the replacements. */ +#endif /* DEBUG */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/dialog.h xiphos-4.0.4+dfsg1/src/gui/dialog.h --- xiphos-4.0.0+dfsg1/src/gui/dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dialog.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -34,7 +34,8 @@ #define GS_CANCEL 3 typedef struct _gs_dialog GS_DIALOG; -struct _gs_dialog { +struct _gs_dialog +{ GtkWidget *dialog; @@ -71,13 +72,12 @@ GS_DIALOG *gui_new_dialog(void); void gui_generic_warning(const char *); void gui_generic_warning_modal(const char *); -gint gui_gs_dialog(GS_DIALOG * info); -gint gui_alert_dialog(GS_DIALOG * info); +gint gui_gs_dialog(GS_DIALOG *info); +gint gui_alert_dialog(GS_DIALOG *info); gint gui_yes_no_dialog(char *, char *); -gint gui_close_confirmation_dialog(GS_DIALOG * info); +gint gui_close_confirmation_dialog(GS_DIALOG *info); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/dictlex_dialog.h xiphos-4.0.4+dfsg1/src/gui/dictlex_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/dictlex_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/dictlex_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex_dialog.h - dialog for displaying a dictlex module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -29,10 +29,9 @@ #include "main/module_dialogs.h" void gui_create_dictlex_dialog(DIALOG_DATA *dlg); -void on_btnSyncDL_clicked(GtkButton * button, DIALOG_DATA * d); +void on_btnSyncDL_clicked(GtkButton *button, DIALOG_DATA *d); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/dictlex.h xiphos-4.0.4+dfsg1/src/gui/dictlex.h --- xiphos-4.0.0+dfsg1/src/gui/dictlex.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/dictlex.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * _dictlex.h - gui for dictionary/lexicon modules + * dictlex.h - gui for dictionary/lexicon modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,25 +22,25 @@ #ifndef ___DICTLEX_H_ #define ___DICTLEX_H_ - - #ifdef __cplusplus extern "C" { #endif -void gui_get_clipboard_text_for_lookup (GtkClipboard *clipboard, - const gchar *text, - gpointer data); +void gui_get_clipboard_text_for_lookup(GtkClipboard *clipboard, + const gchar *text, + gpointer data); void gui_create_pm_dictionary(void); -void gui_lookup_dictlex_selection(GtkMenuItem * menuitem, - gchar * dict_mod_description); +void gui_lookup_dictlex_selection(GtkMenuItem *menuitem, + gchar *dict_mod_description); void gui_set_dictlex_mod_and_key(gchar *mod, gchar *key); -void gui_display_dictlex(gchar * key); +void gui_display_dictlex(gchar *key); GtkWidget *gui_create_dictionary_pane(void); -void on_entryDictLookup_changed(GtkEditable * editable, gpointer data); -void dict_key_entry_changed(GtkEntry * entry, gpointer data); -void button_back_clicked(GtkButton * button, gpointer user_data); -void button_forward_clicked(GtkButton * button, gpointer user_data); +void on_entryDictLookup_changed(GtkEditable *editable, + gpointer data); +void dict_key_entry_changed(GtkEntry *entry, gpointer data); +void button_back_clicked(GtkButton *button, gpointer user_data); +void button_forward_clicked(GtkButton *button, + gpointer user_data); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/gui/display_info.h xiphos-4.0.4+dfsg1/src/gui/display_info.h --- xiphos-4.0.0+dfsg1/src/gui/display_info.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/display_info.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display_info.h - display information (ie strongs) in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,12 +28,12 @@ extern GtkWidget *dialog_display_info; -void gui_display_text_information(gchar * information); -void gui_display_mod_and_key(const gchar * mod_name, const gchar * key); +void gui_display_text_information(gchar *information); +void gui_display_mod_and_key(const gchar *mod_name, + const gchar *key); GtkWidget *gui_create_display_informtion_dialog(void); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/export_bookmarks.h xiphos-4.0.4+dfsg1/src/gui/export_bookmarks.h --- xiphos-4.0.0+dfsg1/src/gui/export_bookmarks.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/export_bookmarks.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_bookmarks.h - * - * Copyright (C) 2003-2014 Xiphos Developer Team + * Copyright (C) 2003-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,14 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef ___EXPORT_BOOKMARKS_H_ +#ifndef ___EXPORT_BOOKMARKS_H_ #define ___EXPORT_BOOKMARKS_H_ #ifdef __cplusplus extern "C" { #endif -struct _export_bookmarks { +struct _export_bookmarks +{ gboolean as_bookmarks; gboolean as_html; gboolean as_plain; @@ -40,9 +41,9 @@ GtkWidget *filechooserwidget; gchar *filename; gchar *verselist_name; - GList * verses; + GList *verses; }; -typedef struct _export_bookmarks BK_EXPORT; +typedef struct _export_bookmarks BK_EXPORT; enum { BOOKMARKS_EXPORT, @@ -51,23 +52,22 @@ ADV_SEARCH_RESULTS_EXPORT }; -void gui_set_html_item (GString * str, - const gchar * description, - const gchar * module, - const gchar * key, - gboolean with_scripture); -void gui_set_plain_text_item (GString * str, - const gchar * description, - const gchar * module, - const gchar * key, - gboolean with_scripture); -void gui_export_bookmarks_dialog(gint is_verselist, GList * verses); -gboolean dialog_vbox1_key_press_event_cb(GtkWidget * widget, - GdkEventKey * event, - gpointer user_data); +void gui_set_html_item(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, gboolean with_scripture); +void gui_set_plain_text_item(GString *str, + const gchar *description, + const gchar *module, + const gchar *key, + gboolean with_scripture); +void gui_export_bookmarks_dialog(gint is_verselist, + GList *verses); +gboolean dialog_vbox1_key_press_event_cb(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); #ifdef __cplusplus } #endif - #endif /* ___EXPORT_BOOKMARKS_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/export_dialog.h xiphos-4.0.4+dfsg1/src/gui/export_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/export_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/export_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_dialog.h - * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * 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 @@ -29,11 +29,12 @@ gchar *gui_get_export_filename(void); void gui_export_dialog(void); void _get_export_filename(void); -void on_dialog_export_passage_response(GtkDialog * dialog, gint response_id, gpointer user_data); -gint _check_for_distribution_license(gchar * mod_name); +void on_dialog_export_passage_response(GtkDialog *dialog, + gint response_id, + gpointer user_data); +gint _check_for_distribution_license(gchar *mod_name); #ifdef __cplusplus } #endif - #endif /* _EXPORT_DIALOG_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/find_dialog.h xiphos-4.0.4+dfsg1/src/gui/find_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/find_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/find_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * find_dialog.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru xiphos-4.0.0+dfsg1/src/gui/font_dialog.h xiphos-4.0.4+dfsg1/src/gui/font_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/font_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/font_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * font_dialog.h - dialog to set module font * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ extern "C" { #endif -void gui_set_module_font(gchar * mod_name); +void gui_set_module_font(gchar *mod_name); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/gui/gbs_dialog.h xiphos-4.0.4+dfsg1/src/gui/gbs_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/gbs_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/gbs_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs_dialog.h - dialog for displaying a gbs module * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,11 +28,10 @@ #include "main/module_dialogs.h" -void gui_create_gbs_dialog(DIALOG_DATA * dlg); -void gui_close_gbs_dialog(DIALOG_DATA * dlg); +void gui_create_gbs_dialog(DIALOG_DATA *dlg); +void gui_close_gbs_dialog(DIALOG_DATA *dlg); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/gbs.h xiphos-4.0.4+dfsg1/src/gui/gbs.h --- xiphos-4.0.0+dfsg1/src/gui/gbs.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/gbs.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs.h - generic book support - the gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,8 +23,8 @@ #define ___GBS_H_ GtkWidget *gui_create_book_pane(void); -void gui_update_gbs_global_ops(gchar * option, gboolean choice); -void gui_set_book_page_and_key(gchar * mod_name, gchar * key); -void gui_set_book_mod_and_key(gchar * mod_name, gchar * key); +void gui_update_gbs_global_ops(gchar *option, gboolean choice); +void gui_set_book_page_and_key(gchar *mod_name, gchar *key); +void gui_set_book_mod_and_key(gchar *mod_name, gchar *key); #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/gui.h xiphos-4.0.4+dfsg1/src/gui/gui.h --- xiphos-4.0.0+dfsg1/src/gui/gui.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/gui.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef _GUI_H_ #define _GUI_H_ -void gui_init(int argc, char*argv[]); +void gui_init(int argc, char *argv[]); void gui_main(void); #ifndef WIN32 @@ -9,21 +9,19 @@ void gconf_setup(void); #endif -#define GS_GCONF_MAX 6 +#define GS_GCONF_MAX 6 #ifdef DEBUG - -gchar* XI_g_strdup_printf (const char *filename, - int linenumber, - const char *format, - ...) G_GNUC_PRINTF (3, 4) G_GNUC_MALLOC; - -void XI_g_string_printf (const char *filename, - int linenumber, - GString *string, - const char *format, - ...) G_GNUC_PRINTF (4, 5); +gchar *XI_g_strdup_printf(const char *filename, + int linenumber, + const char *format, + ...) G_GNUC_PRINTF(3, 4) G_GNUC_MALLOC; + +void XI_g_string_printf(const char *filename, + int linenumber, + GString *string, + const char *format, ...) G_GNUC_PRINTF(4, 5); #endif /* DEBUG */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/ipc.h xiphos-4.0.4+dfsg1/src/gui/ipc.h --- xiphos-4.0.0+dfsg1/src/gui/ipc.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/ipc.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * ipc.h - Interprocess Communication - dbus integration * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifndef __XIPHOS_IPC_H__ #define __XIPHOS_IPC_H__ @@ -27,24 +26,22 @@ #include G_BEGIN_DECLS - -#define IPC_TYPE_OBJECT (ipc_object_get_type()) -#define IPC_OBJECT(object) \ - (G_TYPE_CHECK_INSTANCE_CAST ((object), \ - IPC_TYPE_OBJECT, IpcObject)) -#define IPC_OBJECT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IPC_TYPE_OBJECT, IpcObjectClass)) -#define IPC_IS_OBJECT(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IPC_TYPE_OBJECT)) -#define IPC_IS_OBJECT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IPC_TYPE_OBJECT)) -#define IPC_OBJECT_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IPC_TYPE_OBJECT, IpcObjectClass)) - +#define IPC_TYPE_OBJECT (ipc_object_get_type()) +#define IPC_OBJECT(object) \ + (G_TYPE_CHECK_INSTANCE_CAST((object), \ + IPC_TYPE_OBJECT, IpcObject)) +#define IPC_OBJECT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + IPC_TYPE_OBJECT, IpcObjectClass)) +#define IPC_IS_OBJECT(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), \ + IPC_TYPE_OBJECT)) +#define IPC_IS_OBJECT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), \ + IPC_TYPE_OBJECT)) +#define IPC_OBJECT_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj), \ + IPC_TYPE_OBJECT, IpcObjectClass)) typedef enum { SEARCH_PERFORMED, NAVIGATION, @@ -54,30 +51,30 @@ typedef struct _IpcObject IpcObject; typedef struct _IpcObjectClass IpcObjectClass; -struct _IpcObject { +struct _IpcObject +{ GObject parent; GList *references; gchar *current_ref; }; -struct _IpcObjectClass { +struct _IpcObjectClass +{ GObjectClass parent; guint signals[LAST_SIGNAL]; }; GType ipc_object_get_type(void); -gboolean ipc_object_search_performed (IpcObject* obj, - const gchar* search_term, - const int* hits, - GError** error); -gboolean ipc_object_navigation_signal (IpcObject* obj, - const gchar* reference, - GError** error); +gboolean ipc_object_search_performed(IpcObject *obj, + const gchar *search_term, + const int *hits, GError **error); +gboolean ipc_object_navigation_signal(IpcObject *obj, + const gchar *reference, + GError **error); -IpcObject* ipc_init_dbus_connection(IpcObject* obj); -IpcObject* ipc_get_main_ipc(void); +IpcObject *ipc_init_dbus_connection(IpcObject *obj); +IpcObject *ipc_get_main_ipc(void); G_END_DECLS - #endif /* __XIPHOS_IPC_H__ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/main_menu.h xiphos-4.0.4+dfsg1/src/gui/main_menu.h --- xiphos-4.0.0+dfsg1/src/gui/main_menu.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/main_menu.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_menu.h - creation of and call backs for xiphos main menu * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,38 +26,66 @@ extern "C" { #endif - -GtkWidget * gui_create_main_menu(void); -void gui_parallel_tab_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_module_manager_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_preferences_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_help_contents_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_live_chat_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_report_bug_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_about_the_sword_project_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_about_translation_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_daily_devotion_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_search_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_linked_tabs_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_read_aloud_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_show_verse_numbers_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_versehighlight_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_side_preview_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_quit_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_about_xiphos_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_save_session_activate(GtkMenuItem * menuitem, gpointer user_data); +GtkWidget *gui_create_main_menu(void); +void gui_parallel_tab_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_module_manager_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_preferences_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_help_contents_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_mailing_list_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_live_chat_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_report_bug_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_about_the_sword_project_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_about_translation_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_daily_devotion_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_search_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_linked_tabs_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_read_aloud_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_show_verse_numbers_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_versehighlight_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_side_preview_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_quit_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_about_xiphos_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_save_session_activate(GtkMenuItem *menuitem, + gpointer user_data); void redisplay_to_realign(void); -void on_open_session_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_show_bible_text_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_preview_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_show_commentary_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_show_dictionary_lexicon_activate(GtkCheckMenuItem * menuitem, gpointer user_data); -void on_open_studypad_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_advanced_search_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_attach_detach_sidebar_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_sidebar_showhide_activate(GtkMenuItem *menuitem, gpointer user_data); -void link_uri_hook(GtkLinkButton *button, const gchar *link, gpointer user_data); +void on_open_session_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_show_bible_text_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_preview_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_show_commentary_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_show_dictionary_lexicon_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data); +void on_open_studypad_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_advanced_search_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_attach_detach_sidebar_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_sidebar_showhide_activate(GtkMenuItem *menuitem, + gpointer user_data); +void link_uri_hook(GtkLinkButton *button, const gchar *link, + gpointer user_data); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/gui/main_window.h xiphos-4.0.4+dfsg1/src/gui/main_window.h --- xiphos-4.0.0+dfsg1/src/gui/main_window.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/main_window.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_window.h - main window gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -31,7 +31,8 @@ #include "main/navbar_versekey.h" typedef struct _tab_page TAB_PAGE; -struct _tab_page { +struct _tab_page +{ GtkWidget *vbox; GtkWidget *paned_text_preview; GtkWidget *paned_text; @@ -63,7 +64,7 @@ void gui_show_hide_comms(int choice); void gui_show_hide_dicts(int choice); void gui_set_bible_comm_layout(void); -void gui_change_window_title(char * module_name); +void gui_change_window_title(char *module_name); void create_mainwindow(void); void gui_show_main_window(void); void final_pane_sizes(void); @@ -71,5 +72,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/menu_popup.h xiphos-4.0.4+dfsg1/src/gui/menu_popup.h --- xiphos-4.0.0+dfsg1/src/gui/menu_popup.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/menu_popup.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * menu_popup.h - creation of (and call backs) for xiphos popup menus * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,67 +25,116 @@ #ifdef __cplusplus extern "C" { #endif - + #ifndef USE_GTKBUILDER - #include +#include #endif #include "main/module_dialogs.h" -void gui_menu_popup (XiphosHtml *html, const gchar * mod_name, - DIALOG_DATA * d); +void gui_menu_popup(XiphosHtml *html, const gchar *mod_name, + DIALOG_DATA *d); -gint _get_type_mod_list (void); -gchar * _get_key (gchar * mod_name); -GtkWidget * _get_html (void); -void on_popup_about_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_popup_bookmark_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_popup_export_passage_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_popup_print_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_close_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_popup_copy_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_popup_find_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_popup_font_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_verse_per_line_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_words_of_christ_in_red_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_strong_s_numbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_morphological_tags_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_footnotes_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_greek_accents_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_lemmas_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_xlit_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_enumerated_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_scripture_cross_references_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_hebrew_vowel_points_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_hebrew_cantillation_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_headings_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_transliteration_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_commentary_by_chapter_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_doublespace_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_xrefnotenumbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_primary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_secondary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_all_readings_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_image_content_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_respect_font_faces_activate (GtkCheckMenuItem * menuitem, gpointer user_data); -void on_unlock_this_module_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_display_book_heading_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_display_chapter_heading_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_use_current_dictionary_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_rename_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_dump_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_read_selection_aloud_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_mark_verse_activate (GtkMenuItem * menuitem, gpointer user_data); +gint _get_type_mod_list(void); +gchar *_get_key(gchar *mod_name); +GtkWidget *_get_html(void); +void on_popup_about_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_popup_bookmark_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_popup_export_passage_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_popup_print_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_close_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_popup_copy_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_popup_find_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_popup_font_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_verse_per_line_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_words_of_christ_in_red_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data); +void on_strong_s_numbers_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_morphological_tags_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_footnotes_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_greek_accents_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_lemmas_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_xlit_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_enumerated_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_glosses_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_morphseg_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_scripture_cross_references_activate(GtkCheckMenuItem * + menuitem, + gpointer user_data); +void on_hebrew_vowel_points_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_hebrew_cantillation_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_headings_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_transliteration_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_commentary_by_chapter_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_doublespace_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_xrefnotenumbers_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_primary_reading_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_secondary_reading_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_all_readings_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_image_content_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_respect_font_faces_activate(GtkCheckMenuItem *menuitem, + gpointer user_data); +void on_unlock_this_module_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_display_book_heading_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_display_chapter_heading_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_use_current_dictionary_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_lookup_google_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_rename_perscomm_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_dump_perscomm_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_read_selection_aloud_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_mark_verse_activate(GtkMenuItem *menuitem, + gpointer user_data); #ifdef USE_GTKBUILDER -void _add_and_check_global_opts (GtkBuilder *gxml, const gchar * mod_name, GtkWidget * submenu, DIALOG_DATA * d); +void _add_and_check_global_opts(GtkBuilder *gxml, + const gchar *mod_name, + GtkWidget *submenu, + DIALOG_DATA *d); #else -void _add_and_check_global_opts (GladeXML *gxml, const gchar * mod_name, GtkWidget * submenu, DIALOG_DATA * d); +void _add_and_check_global_opts(GladeXML *gxml, + const gchar *mod_name, + GtkWidget *submenu, + DIALOG_DATA *d); #endif #ifdef __cplusplus } #endif - #endif /* __MENU_POPUP__H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/mod_mgr.h xiphos-4.0.4+dfsg1/src/gui/mod_mgr.h --- xiphos-4.0.0+dfsg1/src/gui/mod_mgr.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/mod_mgr.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_mgr.h * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,8 @@ #include "main/mod_mgr.h" #include -void gui_update_install_status(glong total, glong done, const gchar *message); +void gui_update_install_status(glong total, glong done, + const gchar *message); void gui_update_install_progressbar(gdouble fraction); void gui_open_mod_mgr(void); void gui_open_mod_mgr_initial_run(void); @@ -36,40 +37,51 @@ #ifdef USE_GTK_3 void -on_notebook1_switch_page(GtkNotebook * notebook, +on_notebook1_switch_page(GtkNotebook *notebook, gpointer arg, - guint page_num, - gpointer user_data); + guint page_num, gpointer user_data); #else void -on_notebook1_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, - guint page_num, - gpointer user_data); +on_notebook1_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, + guint page_num, gpointer user_data); #endif //void on_notebook1_switch_page(GtkNotebook * notebook, guint page_num, gpointer user_data); -void on_radiobutton2_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_radiobutton4_toggled(GtkToggleButton * togglebutton, gpointer user_data); +void on_radiobutton2_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_radiobutton4_toggled(GtkToggleButton *togglebutton, + gpointer user_data); void save_sources(void); -void on_refresh_clicked(GtkButton * button, gpointer user_data); -void on_install_clicked(GtkButton * button, gpointer user_data); -void on_remove_clicked(GtkButton * button, gpointer user_data); -void on_archive_clicked(GtkButton * button, gpointer user_data); -void on_index_clicked(GtkButton * button, gpointer user_data); -void on_delete_index_clicked(GtkButton * button, gpointer user_data); -void on_load_sources_clicked(GtkButton * button, gpointer user_data); -void on_mod_mgr_intro_clicked(GtkButton * button, gpointer user_data); -void on_cancel_clicked(GtkButton * button, gpointer user_data); -void on_mod_mgr_response(GtkDialog * dialog, gint response_id, gpointer user_data); -void on_button_add_local_clicked(GtkButton * button, gpointer user_data); -void on_button_remove_local_clicked(GtkButton * button, gpointer user_data); -void on_button_add_remote_clicked(GtkButton * button, gpointer user_data); -void on_button_remove_remote_clicked(GtkButton * button, gpointer user_data); -gboolean on_treeview1_button_release_event(GtkWidget * widget, GdkEventButton * event, gpointer user_data); +void on_refresh_clicked(GtkButton *button, gpointer user_data); +void on_install_clicked(GtkButton *button, gpointer user_data); +void on_remove_clicked(GtkButton *button, gpointer user_data); +void on_archive_clicked(GtkButton *button, gpointer user_data); +void on_index_clicked(GtkButton *button, gpointer user_data); +void on_delete_index_clicked(GtkButton *button, + gpointer user_data); +void on_load_sources_clicked(GtkButton *button, + gpointer user_data); +void on_mod_mgr_intro_clicked(GtkButton *button, + gpointer user_data); +void delete_obsolete(char *module, int *counter); +void on_scan_obsolete(GtkButton *button, gpointer user_data); +void on_cancel_clicked(GtkButton *button, gpointer user_data); +void on_mod_mgr_response(GtkDialog *dialog, gint response_id, + gpointer user_data); +void on_button_add_local_clicked(GtkButton *button, + gpointer user_data); +void on_button_remove_local_clicked(GtkButton *button, + gpointer user_data); +void on_button_add_remote_clicked(GtkButton *button, + gpointer user_data); +void on_button_remove_remote_clicked(GtkButton *button, + gpointer user_data); +gboolean on_treeview1_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_book_dialog.h xiphos-4.0.4+dfsg1/src/gui/navbar_book_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_book_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_book_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.h - navigation bar for genbook dialog modules * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,6 @@ #define ___NAVBAR_BOOK_DIALOG_H_ #include "main/module_dialogs.h" -GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA * d); +GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d); #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_book.h xiphos-4.0.4+dfsg1/src/gui/navbar_book.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_book.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_book.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.h - navigation bar for genbook modules * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,6 @@ #define ___NAVBAR_BOOK_H_ GtkWidget *gui_navbar_book_new(void); -void on_entry_activate (GtkEntry *entry, gpointer user_data); +void on_entry_activate(GtkEntry *entry, gpointer user_data); #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_dialog.h xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar_versekey_dialog.h - navigation bar for genbook modules + * navbar_versekey_dialog.h - navigation bar for bible references * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,6 @@ #include "main/module_dialogs.h" -GtkWidget *gui_navbar_versekey_dialog_new(DIALOG_DATA * dialog); +GtkWidget *gui_navbar_versekey_dialog_new(DIALOG_DATA *dialog); #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_editor.h xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_editor.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_editor.h 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_editor.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar_book_dialog.h - navigation bar for genbook dialog modules + * navbar_versekey_editor.h - navigation bar for bible references in editor * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,6 @@ #include "editor/slib-editor.h" -GtkWidget *gui_navbar_versekey_editor_new(EDITOR * editor); +GtkWidget *gui_navbar_versekey_editor_new(EDITOR *editor); #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_versekey.h xiphos-4.0.4+dfsg1/src/gui/navbar_versekey.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_versekey.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_versekey.h 2015-02-04 01:50:49.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar_versekey.h - navigation bar for genbook modules + * navbar_versekey.h - navigation bar for bible references * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_parallel.h xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_parallel.h --- xiphos-4.0.0+dfsg1/src/gui/navbar_versekey_parallel.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/navbar_versekey_parallel.h 2015-02-04 01:50:49.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_parallel.h - navigation bar for the parallel dialog * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru xiphos-4.0.0+dfsg1/src/gui/parallel_dialog.h xiphos-4.0.4+dfsg1/src/gui/parallel_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/parallel_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/parallel_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.h - dialog for detached parallel * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,13 +27,13 @@ #endif void gui_undock_parallel_page(void); -void gui_btnDockInt_clicked(GtkButton *button, gpointer user_data); +void gui_btnDockInt_clicked(GtkButton *button, + gpointer user_data); GtkWidget *gui_create_parallel_dialog(void); -void gui_set_parallel_navbar(const char * key); +void gui_set_parallel_navbar(const char *key); void gui_keep_parallel_dialog_in_sync(void); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/parallel_tab.h xiphos-4.0.4+dfsg1/src/gui/parallel_tab.h --- xiphos-4.0.0+dfsg1/src/gui/parallel_tab.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/parallel_tab.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_tab.h - view parallel passages in a tab * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,17 +26,16 @@ extern "C" { #endif - -void gui_parallel_tab_sync(const gchar * key); +void gui_parallel_tab_sync(const gchar *key); GtkWidget *gui_create_parallel_tab(void); void gui_keep_parallel_tab_in_sync(void); void gui_force_parallel_tab_sync(void); void gui_destroy_parallel_tab(void); -void gui_parallel_close_tab(GtkButton * button, gpointer user_data); +void gui_parallel_close_tab(GtkButton *button, + gpointer user_data); GtkWidget *_create_parallel_tab(void); #ifdef __cplusplus } #endif - -#endif /* __parallel_TAB_H__ */ +#endif /* __parallel_TAB_H__ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/parallel_view.h xiphos-4.0.4+dfsg1/src/gui/parallel_view.h --- xiphos-4.0.0+dfsg1/src/gui/parallel_view.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/parallel_view.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.h - support for displaying multiple modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -29,11 +29,10 @@ void gui_create_parallel_page(void); void gui_create_parallel_popup(void); void gui_popup_menu_parallel(void); -void on_undockInt_activate(GtkMenuItem * menuitem); -void on_paratab_activate(GtkMenuItem * menuitem); +void on_undockInt_activate(GtkMenuItem *menuitem); +void on_paratab_activate(GtkMenuItem *menuitem); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/preferences_dialog.h xiphos-4.0.4+dfsg1/src/gui/preferences_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/preferences_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/preferences_dialog.h 2015-02-17 02:57:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * preferences_dialog.h - get user preferences * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,52 +26,86 @@ extern "C" { #endif -#define NONE _("None") +#define NONE _("None") extern char *locale_set[]; /* for selecting special locale */ /* autogenerated from po/LINGUAS */ /* see src/gnome2/Makefile.am */ -void on_checkbutton1_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton2_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton3_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton4_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton6_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton7_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton8_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton9_toggled(GtkToggleButton * togglebutton, gpointer user_data); - -void on_folder_changed(GtkFileChooser *filechooser, gpointer user_data); - -void on_combobox1_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox2_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox4_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox5_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox6_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox7_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox8_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox9_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox10_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox11_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox12_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox13_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox14_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox15_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox16_changed(GtkComboBox * combobox, gpointer user_data); -void on_combobox17_changed(GtkComboBox * combobox, gpointer user_data); -void on_colorbutton1_color_set(GtkColorButton *colorbutton, gpointer user_data); -void on_colorbutton2_color_set(GtkColorButton * colorbutton, gpointer user_data); -void on_colorbutton3_color_set(GtkColorButton * colorbutton, gpointer user_data); -void on_colorbutton4_color_set(GtkColorButton * colorbutton, gpointer user_data); -void on_colorbutton5_color_set(GtkColorButton * colorbutton, gpointer user_data); -void on_colorbutton6_color_set(GtkColorButton * colorbutton, gpointer user_data); -void on_colorbutton7_color_set(GtkColorButton * colorbutton, gpointer user_data); +void on_checkbutton1_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton2_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton3_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton4_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton6_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton7_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton8_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton9_toggled(GtkToggleButton *togglebutton, + gpointer user_data); + +void on_folder_changed(GtkFileChooser *filechooser, + gpointer user_data); + +void on_combobox1_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox2_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox4_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox5_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox6_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox7_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox8_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox9_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox10_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox11_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox12_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox13_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox14_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox15_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox16_changed(GtkComboBox *combobox, + gpointer user_data); +void on_combobox17_changed(GtkComboBox *combobox, + gpointer user_data); +void on_colorbutton1_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton2_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton3_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton4_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton5_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton6_color_set(GtkColorButton *colorbutton, + gpointer user_data); +void on_colorbutton7_color_set(GtkColorButton *colorbutton, + gpointer user_data); void setup_color_pickers(void); void apply_color_settings(void); -void invert_colors(char **color1, char *label1, char **color2, char *label2); -void on_invert(GtkWidget * button, gchar * user_data); +void invert_colors(char **color1, char *label1, char **color2, + char *label2); +void on_invert(GtkWidget *button, gchar *user_data); -void on_dialog_prefs_response(GtkDialog * dialog, gint response_id, gpointer user_data); +void on_dialog_prefs_response(GtkDialog *dialog, gint response_id, + gpointer user_data); void gui_setup_preferences_dialog(void); void setup_locale_combobox(void); @@ -81,27 +115,52 @@ gchar *on_biblesync_obtain_passphrase(void); extern GtkWidget *speaker_window, *speaker_list; -void on_checkbutton10_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton11_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton12_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_verse_num_bold_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_verse_num_bracket_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_scroll_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_imageresize_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_versehighlight_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_annotate_highlight_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_xrefs_in_verse_list_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_checkbutton_prayerlist_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_basecombobox1_changed(GtkComboBox * combobox, gpointer user_data); - -void ps_close(GtkButton * button, gpointer user_data); -void ps_button_clear(GtkButton * button, gpointer user_data); -void ps_button_cut(GtkButton * button, gpointer user_data); -void ps_button_add(GtkButton * button, gpointer user_data); +void on_checkbutton10_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton11_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton12_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton_verse_num_bold_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_verse_num_bracket_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * + togglebutton, + gpointer + user_data); +void on_checkbutton_scroll_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_checkbutton_imageresize_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_versehighlight_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_annotate_highlight_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_xrefs_in_verse_list_toggled(GtkToggleButton * + togglebutton, + gpointer + user_data); +void on_checkbutton_prayerlist_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_checkbutton_statusbar_toggled(GtkToggleButton * + togglebutton, + gpointer user_data); +void on_basecombobox1_changed(GtkComboBox *combobox, + gpointer user_data); + +void ps_close(GtkButton *button, gpointer user_data); +void ps_button_clear(GtkButton *button, gpointer user_data); +void ps_button_cut(GtkButton *button, gpointer user_data); +void ps_button_add(GtkButton *button, gpointer user_data); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/search_dialog.h xiphos-4.0.4+dfsg1/src/gui/search_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/search_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/search_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.h - gui for searching Sword modules * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ #endif #include - typedef struct _search_dialog1 SEARCH_DIALOG1; -struct _search_dialog1 { +struct _search_dialog1 +{ GtkWidget *dialog; GtkWidget *mod_sel_dialog; GtkWidget *label_search_module; GtkWidget *notebook; GtkWidget *togglebutton_show_main; GtkWidget *combo_list; -// GtkWidget *combo_entry_list; + // GtkWidget *combo_entry_list; GtkWidget *module_lists; GtkWidget *listview_modules; GtkWidget *entry_list_name; @@ -50,13 +50,13 @@ GtkWidget *rb_no_scope; GtkToggleButton *which_scope; GtkWidget *combo_range; -// GtkWidget *combo_entry_range; + // GtkWidget *combo_entry_range; GtkWidget *list_range_name; GtkWidget *list_ranges; GtkWidget *entry_range_name; GtkWidget *entry_range_text; -// GtkWidget *results_html; -// GtkWidget *report_html; + // GtkWidget *results_html; + // GtkWidget *report_html; GtkWidget *preview_html; GtkWidget *search_entry; GtkWidget *rb_words; @@ -81,8 +81,8 @@ GtkWidget *listview_results; GtkWidget *listview_verses; GtkWidget *menu_item_send_search; -// GtkWidget *textview_preview; -// GtkTextBuffer *text_buffer; + // GtkWidget *textview_preview; + // GtkTextBuffer *text_buffer; GSList *_201_group; gint text_group; @@ -105,45 +105,61 @@ extern SEARCH_DIALOG1 search1; extern gchar *verse_selected; - void gui_create_search_dialog(void); -void gui_set_drop_target(GtkWidget * target); -void on_comboboxentry2_changed(GtkComboBox * combobox, gpointer user_data); -void button_clean(GtkButton * button, gpointer user_data); -void button_save(GtkButton * button, gpointer user_data); -void button_export(GtkButton * button, gpointer user_data); -void _on_destroy(GtkWidget * dialog, gpointer user_data); -void on_button_begin_search(GtkButton * button, gpointer user_data); -void on_togglebutton_show_main(GtkToggleButton * togglebutton, gpointer user_data); -void list_name_changed(GtkEditable * editable, gpointer user_data); -void range_name_changed(GtkEditable * editable, gpointer user_data); -void range_text_changed(GtkEditable * editable, gpointer user_data); -void new_modlist(GtkButton * button, gpointer user_data); -void clear_modules(GtkButton * button, gpointer user_data); -void delete_module(GtkButton * button, gpointer user_data); -void save_modlist(GtkButton * button, gpointer user_data); -void new_range(GtkButton * button, gpointer user_data); -void save_range(GtkButton * button, gpointer user_data); -void delete_range(GtkButton * button, gpointer user_data); -void delete_list(GtkButton * button, gpointer user_data); -void scope_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void mod_list_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void optimized_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_lucene_intro_clicked(GtkButton * button, gpointer user_data); -void attributes_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_attributes_intro_clicked(GtkButton * button, gpointer user_data); -void current_module_toggled(GtkToggleButton * togglebutton, gpointer user_data); -void on_closebutton2_clicked(GtkButton * button, gpointer user_data); -void _on_dialog2_response(GtkDialog * dialog, gint response_id, gpointer user_data); -void on_toolbutton12_clicked(GtkToolButton * toolbutton, gpointer user_data); -void _on_dialog_response(GtkDialog * dialog, gint response_id, gpointer user_data); +void gui_set_drop_target(GtkWidget *target); +void on_comboboxentry2_changed(GtkComboBox *combobox, + gpointer user_data); +void button_clean(GtkButton *button, gpointer user_data); +void button_save(GtkButton *button, gpointer user_data); +void button_export(GtkButton *button, gpointer user_data); +void _on_destroy(GtkWidget *dialog, gpointer user_data); +void on_button_begin_search(GtkButton *button, + gpointer user_data); +void on_togglebutton_show_main(GtkToggleButton *togglebutton, + gpointer user_data); +void list_name_changed(GtkEditable *editable, gpointer user_data); +void range_name_changed(GtkEditable *editable, + gpointer user_data); +void range_text_changed(GtkEditable *editable, + gpointer user_data); +void new_modlist(GtkButton *button, gpointer user_data); +void clear_modules(GtkButton *button, gpointer user_data); +void delete_module(GtkButton *button, gpointer user_data); +void save_modlist(GtkButton *button, gpointer user_data); +void new_range(GtkButton *button, gpointer user_data); +void save_range(GtkButton *button, gpointer user_data); +void delete_range(GtkButton *button, gpointer user_data); +void delete_list(GtkButton *button, gpointer user_data); +void scope_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void mod_list_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void optimized_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_lucene_intro_clicked(GtkButton *button, + gpointer user_data); +void attributes_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_attributes_intro_clicked(GtkButton *button, + gpointer user_data); +void current_module_toggled(GtkToggleButton *togglebutton, + gpointer user_data); +void on_closebutton2_clicked(GtkButton *button, + gpointer user_data); +void _on_dialog2_response(GtkDialog *dialog, gint response_id, + gpointer user_data); +void on_toolbutton12_clicked(GtkToolButton *toolbutton, + gpointer user_data); +void _on_dialog_response(GtkDialog *dialog, gint response_id, + gpointer user_data); GtkWidget *create_results_menu_advsearch(void); -void on_send_list_via_biblesync_advsearch_activate(GtkMenuItem * menuitem, - gpointer user_data); +void on_send_list_via_biblesync_advsearch_activate(GtkMenuItem * + menuitem, + gpointer + user_data); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/search_sidebar.h xiphos-4.0.4+dfsg1/src/gui/search_sidebar.h --- xiphos-4.0.0+dfsg1/src/gui/search_sidebar.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/search_sidebar.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.h - sidebar search gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,23 +27,24 @@ #endif typedef struct _sidebar_search SIDESEARCH; -struct _sidebar_search { +struct _sidebar_search +{ GtkWidget *rrbUseBounds; - GtkWidget *entrySearch; + GtkWidget *entrySearch; GtkWidget *advanced_search; - GtkWidget *entryLower; - GtkWidget *entryUpper; + GtkWidget *entryLower; + GtkWidget *entryUpper; GtkWidget *rbMultiword; - GtkWidget *rbRegExp; + GtkWidget *rbRegExp; GtkWidget *rbNoScope; - GtkWidget *rbLastSearch; - GtkWidget *rbPhraseSearch; - GtkWidget *ckbCaseSensitive; - GtkWidget *progressbar_search; - GtkWidget *frame5; - GtkWidget *frame_module; - GtkWidget *radiobutton_search_text; - GtkWidget *radiobutton_search_comm; + GtkWidget *rbLastSearch; + GtkWidget *rbPhraseSearch; + GtkWidget *ckbCaseSensitive; + GtkWidget *progressbar_search; + GtkWidget *frame5; + GtkWidget *frame_module; + GtkWidget *radiobutton_search_text; + GtkWidget *radiobutton_search_comm; }; extern SIDESEARCH ss; @@ -53,5 +54,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/sidebar_dialog.h xiphos-4.0.4+dfsg1/src/gui/sidebar_dialog.h --- xiphos-4.0.0+dfsg1/src/gui/sidebar_dialog.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/sidebar_dialog.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar_dialog.h - dialog for detached sidebar * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -31,5 +31,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/sidebar.h xiphos-4.0.4+dfsg1/src/gui/sidebar.h --- xiphos-4.0.0+dfsg1/src/gui/sidebar.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/sidebar.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.h - create and maintain the sidebar * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -31,7 +31,8 @@ #endif #include typedef struct _sidebar SIDEBAR; -struct _sidebar { +struct _sidebar +{ GtkWidget *module_list; GtkWidget *menu_modules; GtkWidget *menu_prayerlist; @@ -46,12 +47,13 @@ GtkWidget *html_viewer_widget; GtkWidget *optionmenu1; GtkWidget *menu_item_save_search; - gchar mod_name[80]; + gchar mod_name[80]; }; extern SIDEBAR sidebar; typedef struct _search_results RESULTS; -struct _search_results { +struct _search_results +{ gchar *module; gchar *key; }; @@ -61,46 +63,66 @@ extern gboolean is_search_result; #ifdef USE_TREEVIEW_PATH -void gui_collapse_treeview_to_book (GtkTreeView * tree, const gchar * book_name); -void gui_save_treeview_path_string (const gchar * path_str, const gchar * book_name); -gboolean gui_expand_treeview_to_path (GtkTreeView * tree, const gchar * book_name); +void gui_collapse_treeview_to_book(GtkTreeView *tree, + const gchar *book_name); +void gui_save_treeview_path_string(const gchar *path_str, + const gchar *book_name); +gboolean gui_expand_treeview_to_path(GtkTreeView *tree, + const gchar *book_name); #endif void gui_set_sidebar_program_start(void); void gui_sidebar_showhide(void); //gboolean main_sidebar_display_dictlex(char *mod_name, char *key); -GtkWidget *gui_create_sidebar(GtkWidget * paned); -gboolean gui_verselist_button_release_event(GtkWidget * widget, - GdkEventButton * event, - gpointer user_data); -gboolean vpaned_srch_rslt_button_release_event(GtkWidget * widget, - GdkEventButton * event, +GtkWidget *gui_create_sidebar(GtkWidget *paned); +gboolean gui_verselist_button_release_event(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +gboolean vpaned_srch_rslt_button_release_event(GtkWidget *widget, + GdkEventButton * + event, gpointer user_data); void gui_show_previewer_in_sidebar(gint choice); -void gui_sync_module_treeview(gint direction); -void on_save_list_as_a_single_bookmark_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_save_list_as_a_series_of_bookmarks_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_populate_verse_list_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_preload_history_from_verse_list_activate (GtkMenuItem * menuitem, gpointer user_data); -void on_send_list_via_biblesync_activate (GtkMenuItem * menuitem, gpointer user_data); +void gui_sync_module_treeview(gint direction); +void on_save_list_as_a_single_bookmark_activate(GtkMenuItem * + menuitem, + gpointer + user_data); +void on_save_list_as_a_series_of_bookmarks_activate(GtkMenuItem * + menuitem, + gpointer + user_data); +void on_populate_verse_list_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_preload_history_from_verse_list_activate(GtkMenuItem * + menuitem, + gpointer + user_data); +void on_send_list_via_biblesync_activate(GtkMenuItem *menuitem, + gpointer user_data); GtkWidget *create_results_menu(void); -void on_open_in_dialog_activate(GtkMenuItem * menuitem, +void on_open_in_dialog_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_open_in_tab_activate2(GtkMenuItem * menuitem, - gpointer user_data); -void on_about2_activate(GtkMenuItem * menuitem, +void on_open_in_tab_activate2(GtkMenuItem *menuitem, + gpointer user_data); +void on_about2_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_simple_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_subject_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_monthly_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_journal_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_outlined_topic_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_simple_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_subject_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_monthly_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_journal_activate(GtkMenuItem *menuitem, + gpointer user_data); +void on_outlined_topic_activate(GtkMenuItem *menuitem, + gpointer user_data); GtkWidget *create_menu_prayerlist(void); void on_edit_activate(GtkMenuItem *menuitem, gpointer user_data); GtkWidget *create_menu_prayerlist_mod(void); -void gui_menu_prayerlist_popup(GtkMenuItem *menuitem, gpointer user_data); +void gui_menu_prayerlist_popup(GtkMenuItem *menuitem, + gpointer user_data); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/splash.h xiphos-4.0.4+dfsg1/src/gui/splash.h --- xiphos-4.0.0+dfsg1/src/gui/splash.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/splash.h 2015-02-11 23:48:32.000000000 +0000 @@ -1,45 +1,31 @@ #ifndef _GUI_SPLASH_H_ #define _GUI_SPLASH_H_ - #ifndef USE_GTK_3 -#define E_MAKE_TYPE(l,str,t,ci,i,parent) \ -GType l##_get_type(void)\ -{\ - static GType type = 0; \ - if (!type){ \ - static GTypeInfo const object_info = { \ - sizeof (t##Class), \ - \ - (GBaseInitFunc) NULL, \ - (GBaseFinalizeFunc) NULL, \ - \ - (GClassInitFunc) ci, \ - (GClassFinalizeFunc) NULL, \ - NULL, \ - \ - sizeof (t), \ - 0, \ - (GInstanceInitFunc) i, \ - }; \ - type = g_type_register_static (parent, str, &object_info, 0); \ - } \ - return type; \ -} +#define E_MAKE_TYPE(l, str, t, ci, i, parent) \ + GType l##_get_type(void) \ + { \ + static GType type = 0; \ + if (!type) { \ + static GTypeInfo const object_info = {sizeof(t##Class), (GBaseInitFunc)NULL, (GBaseFinalizeFunc)NULL, (GClassInitFunc)ci, (GClassFinalizeFunc)NULL, NULL, sizeof(t), 0, (GInstanceInitFunc)i, }; \ + type = g_type_register_static(parent, str, &object_info, 0); \ + } \ + return type; \ + } void gui_splash_init(void); gboolean gui_splash_done(void); void gui_splash_step(gchar *text, gdouble progress, gint step); -gboolean expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data); +gboolean expose_event_callback(GtkWidget *widget, GdkEventExpose *event, + gpointer data); #else - + gboolean gui_splash_done(void); void gui_splash_step(gchar *text, gdouble progress, gint step); -void gui_splash_init (void); +void gui_splash_init(void); #endif /* !USE_GTK_3 */ - #endif /* !_GUI_SPLASH_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/tabbed_browser.h xiphos-4.0.4+dfsg1/src/gui/tabbed_browser.h --- xiphos-4.0.0+dfsg1/src/gui/tabbed_browser.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/tabbed_browser.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tabbed_browser.h - functions to facilitate tabbed browsing of different passages at once * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,14 +22,14 @@ #ifndef __TABBED_BROWSER_H__ #define __TABBED_BROWSER_H__ - #ifdef __cplusplus extern "C" { #endif #include #include "main/tab_history.h" -struct _passage_tab_info { +struct _passage_tab_info +{ GtkWidget *page_widget; GtkLabel *tab_label; GtkWidget *button_close; @@ -65,22 +65,23 @@ void gui_load_tabs(const gchar *filename); void gui_select_nth_tab(gint page_num); void gui_set_tab_label(const gchar *key, gboolean one_tab); -void gui_set_named_tab_label(const gchar *key, PASSAGE_TAB_INFO *pt, gboolean update); +void gui_set_named_tab_label(const gchar *key, + PASSAGE_TAB_INFO *pt, + gboolean update); void gui_open_module_in_new_tab(gchar *module); void gui_open_passage_in_new_tab(gchar *key); void gui_open_parallel_view_in_new_tab(void); void gui_close_passage_tab(gint pagenum); -void gui_update_tab_struct(const gchar * text_mod, - const gchar * commentary_mod, - const gchar * dictlex_mod, - const gchar * book_mod, - const gchar * dictlex_key, - const gchar * book_offset, +void gui_update_tab_struct(const gchar *text_mod, + const gchar *commentary_mod, + const gchar *dictlex_mod, + const gchar *book_mod, + const gchar *dictlex_key, + const gchar *book_offset, gboolean comm_showing, gboolean showtexts, gboolean showpreview, - gboolean showcomms, - gboolean showdicts); + gboolean showcomms, gboolean showdicts); void gui_close_all_tabs(void); void gui_open_tabs(void); @@ -93,7 +94,8 @@ void gui_tab_set_showdicts(int show); void gui_tabs_on_off(int on); -void on_notebook_main_new_tab_clicked(GtkButton *button, gpointer user_data); +void on_notebook_main_new_tab_clicked(GtkButton *button, + gpointer user_data); extern gboolean change_tabs_no_redisplay; @@ -102,16 +104,16 @@ void setup_book_editor_tab(PASSAGE_TAB_INFO *pt); GString *pick_tab_label(PASSAGE_TAB_INFO *pt); #ifdef USE_GTK_3 -void gui_notebook_main_switch_page(GtkNotebook * notebook, - gpointer arg1, gint page_num, GList **tl); +void gui_notebook_main_switch_page(GtkNotebook *notebook, + gpointer arg1, gint page_num, + GList **tl); #else -void gui_notebook_main_switch_page(GtkNotebook * notebook, - GtkNotebookPage * page, +void gui_notebook_main_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, gint page_num, GList **tl); #endif #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/treekey-editor.h xiphos-4.0.4+dfsg1/src/gui/treekey-editor.h --- xiphos-4.0.0+dfsg1/src/gui/treekey-editor.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/treekey-editor.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * treekey-editor.h - * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,15 +23,13 @@ #define _TREEKEY_EDITOR_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -GtkWidget *gui_create_editor_tree(EDITOR * editor); -GtkWidget *create_edit_tree_menu (EDITOR * editor); +GtkWidget *gui_create_editor_tree(EDITOR *editor); +GtkWidget *create_edit_tree_menu(EDITOR *editor); #ifdef __cplusplus } #endif - #endif /* _TREEKEY_EDITOR_H */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/utilities.h xiphos-4.0.4+dfsg1/src/gui/utilities.h --- xiphos-4.0.0+dfsg1/src/gui/utilities.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/utilities.h 2015-08-18 02:12:55.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * utilities.h - support functions * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -34,34 +34,37 @@ extern gint stop_window_sync; void sync_windows(void); -gint gui_of2tf(const gchar * on_off); +gint gui_of2tf(const gchar *on_off); gchar *gui_tf2of(gint true_false); void gui_reassign_strdup(gchar **where, gchar *what); -void gui_set_statusbar (const gchar * message); -void gui_set_progressbar_text(GtkWidget * pb, gchar * text); -void gui_set_progressbar_fraction(GtkWidget * pb, gdouble fraction); -void gui_set_combo_index(GtkWidget * combo, gint index); -void gui_clear_combo(GtkWidget * combo); -void gui_add_item_to_combo(GtkWidget * combo, gchar * item); -void gui_glade_signal_connect_func (const gchar *cb_name, GObject *obj, - const gchar *signal_name, const gchar *signal_data, - GObject *conn_obj, gboolean conn_after, - gpointer user_data); -gchar *gui_general_user_file (const char *fname, gboolean critical); -void gui_load_module_tree(GtkWidget * tree, gboolean limited); -MOD_FONT *get_font(const gchar * mod_name); +void gui_set_statusbar(const gchar *message); +void gui_set_progressbar_text(GtkWidget *pb, gchar *text); +void gui_set_progressbar_fraction(GtkWidget *pb, + gdouble fraction); +void gui_set_combo_index(GtkWidget *combo, gint index); +void gui_clear_combo(GtkWidget *combo); +void gui_add_item_to_combo(GtkWidget *combo, gchar *item); +void gui_glade_signal_connect_func(const gchar *cb_name, + GObject *obj, + const gchar *signal_name, + const gchar *signal_data, + GObject *conn_obj, + gboolean conn_after, + gpointer user_data); +gchar *gui_general_user_file(const char *fname, gboolean critical); +void gui_load_module_tree(GtkWidget *tree, gboolean limited); +MOD_FONT *get_font(const gchar *mod_name); void free_font(MOD_FONT *mf); -gchar * remove_linefeeds(gchar * buf); -void gui_add_mods_to_menus(GList * modlist, gchar * menu, - GCallback callback); -void gui_add_mods_2_gtk_menu(gint mod_type, GtkWidget * menu, - GCallback callback); -gchar *ncr_to_utf8(gchar * text); +gchar *remove_linefeeds(gchar *buf); +void gui_add_mods_to_menus(GList *modlist, gchar *menu, + GCallback callback); +void gui_add_mods_2_gtk_menu(gint mod_type, GtkWidget *menu, + GCallback callback); +gchar *ncr_to_utf8(gchar *text); void reading_selector(char *modname, char *key, DIALOG_DATA *dialog, - GtkMenuItem *menuitem, - gpointer user_data); + GtkMenuItem *menuitem, gpointer user_data); void language_init(); void language_make_list(GList *modlist, @@ -77,42 +80,50 @@ GtkTreeIter cult, GtkTreeIter *update, GtkTreeIter *uninstalled, - void (*add)(GtkTreeModel *, GtkTreeIter, gchar **), + void (*add)(GtkTreeModel *, GtkTreeIter, + gchar **), gboolean limited); GList *get_current_list(GtkTreeView *treeview); -gchar *get_modlist_string(GList * mods); +gchar *get_modlist_string(GList *mods); char *image_locator(const char *image); GtkWidget *pixmap_finder(char *image); -GdkPixbuf *pixbuf_finder(const char *image, int size, GError **error); +GdkPixbuf *pixbuf_finder(const char *image, int size, + GError **error); -void HtmlOutput(char *text, GtkWidget *gtkText, MOD_FONT *mf, char *anchor); +void HtmlOutput(char *text, GtkWidget *gtkText, MOD_FONT *mf, + char *anchor); void set_window_icon(GtkWindow *window); gboolean xiphos_open_default(const gchar *file); -void archive_addfile(GsfOutfile *output, const gchar *file, const gchar *name); -void archive_adddir(GsfOutfile *output, gchar *path, const gchar *name); -void xiphos_create_archive(gchar* conf_file, gchar* datapath, gchar *zip, - const gchar *destination); +void archive_addfile(GsfOutfile *output, const gchar *file, + const gchar *name); +void archive_adddir(GsfOutfile *output, gchar *path, + const gchar *name); +void xiphos_create_archive(gchar *conf_file, gchar *datapath, + gchar *zip, const gchar *destination); void ReadAloud(unsigned int verse, const char *suppliedtext); void StartFestival(void); void StopFestival(int *tts_socket); gboolean FestivalSpeak(gchar *text, int length, int tts_socket); +char *inhale_text_from_file(const char *filename); + #ifndef HAVE_STRCASESTR const char *strcasestr(const char *haystack, const char *needle); #endif int ImageDimensions(const char *path, int *x, int *y); -const char *AnalyzeForImageSize(const char *origtext, GdkWindow *window); +const char *AnalyzeForImageSize(const char *origtext, + GdkWindow *window); #ifdef WIN32 -gchar* xiphos_win32_get_subdir(const gchar *subdir); +gchar *xiphos_win32_get_subdir(const gchar *subdir); #endif void utilities_parse_treeview(xmlNodePtr parent, - GtkTreeIter * tree_parent, - GtkTreeModel *model); + GtkTreeIter *tree_parent, + GtkTreeModel *model); enum { LANGSET_BIBLE, @@ -135,43 +146,43 @@ UTIL_N_COLUMNS }; -#define LANGSET_COUNT 200 +#define LANGSET_STRIDE 100 void language_init(void); #ifdef __cplusplus } #endif - /* visually simplify some code that needs to pick out UI details */ #ifdef USE_GTKBUILDER -#define UI_GET_ITEM(ui,label) GTK_WIDGET(gtk_builder_get_object(ui, label)) -#define UI_SUFFIX ".gtkbuilder" +#define UI_GET_ITEM(ui, label) GTK_WIDGET(gtk_builder_get_object(ui, label)) +#ifdef HAVE_GTK_314 +#define UI_SUFFIX ".gtkbuilder" #else -#define UI_GET_ITEM(ui,label) glade_xml_get_widget(ui, label) -#define UI_SUFFIX ".glade" +#define UI_SUFFIX "_old.gtkbuilder" +#endif +#else +#define UI_GET_ITEM(ui, label) glade_xml_get_widget(ui, label) +#define UI_SUFFIX ".glade" #endif - #ifdef USE_GTK_3 -#define UI_VBOX(item,tf,spacing) \ - item = gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); \ - if (tf == TRUE) \ - gtk_box_set_homogeneous(GTK_BOX(item), TRUE) -#define UI_HBOX(item,tf,spacing) \ - item = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing);\ - if (tf == TRUE) \ - gtk_box_set_homogeneous(GTK_BOX(item), TRUE) -#define UI_HPANE() gtk_paned_new(GTK_ORIENTATION_HORIZONTAL) -#define UI_VPANE() gtk_paned_new(GTK_ORIENTATION_VERTICAL) +#define UI_VBOX(item, tf, spacing) \ + item = gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); \ + if (tf == TRUE) \ + gtk_box_set_homogeneous(GTK_BOX(item), TRUE) +#define UI_HBOX(item, tf, spacing) \ + item = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); \ + if (tf == TRUE) \ + gtk_box_set_homogeneous(GTK_BOX(item), TRUE) +#define UI_HPANE() gtk_paned_new(GTK_ORIENTATION_HORIZONTAL) +#define UI_VPANE() gtk_paned_new(GTK_ORIENTATION_VERTICAL) #else -#define UI_VBOX(item,tf,spacing) item = gtk_vbox_new(tf, spacing) -#define UI_HBOX(item,tf,spacing) item = gtk_hbox_new(tf, spacing) -#define UI_HPANE() gtk_hpaned_new() -#define UI_VPANE() gtk_vpaned_new() +#define UI_VBOX(item, tf, spacing) item = gtk_vbox_new(tf, spacing) +#define UI_HBOX(item, tf, spacing) item = gtk_hbox_new(tf, spacing) +#define UI_HPANE() gtk_hpaned_new() +#define UI_VPANE() gtk_vpaned_new() #endif - -/* for daily devotional */ -extern int month_day_counts[]; +/* for daily devotional */ extern int month_day_counts[]; extern char *(month_names[]); #endif /* GS_UTILITIES_H */ diff -Nru xiphos-4.0.0+dfsg1/src/gui/widgets.h xiphos-4.0.4+dfsg1/src/gui/widgets.h --- xiphos-4.0.0+dfsg1/src/gui/widgets.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/widgets.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * widgets.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -25,107 +25,73 @@ #ifdef __cplusplus extern "C" { #endif - typedef struct _app_widgets WIDGETS; - struct _app_widgets { - GtkWidget - *app, /* main form */ -*appbar, /* gtk status/progress bar */ - *vboxMain, /* */ - *page, /* */ - *epaned, /* sidebar bar and main panel */ - *paned_sidebar, /*pane to show previewer in sidebar bar */ - *box_side_preview, /* box for packing previewer in side bar */ - *vpaned, /* bible/previewer paned */ - *vpaned2, /* commentary/dictionary paned */ - *hpaned, /* bible/commentary paned */ - *bible_info_paned, /* shortcut bar and main panle */ - *shortcutbar, /* the shortcut bar widget */ - *bookmark_tree, /* bookmarks tree */ - *ctree_widget_books, /* books tree */ - *workbook_lower, /* notebook - dict/lex, gbs, and interlinear */ - *notebook_gbs, /* notebook - gbs */ - *notebook_dict, /* notebook - dict/lex */ - *box_comm, /* notebook - commentaries */ - *notebook_bible_parallel,/* notebook - */ - *notebook_text, /* notebook - bible texts */ - *notebook_percomm, /* notebook - personal comments */ - *notebook_sidebar, /* notebook - sidebar */ - *notebook_comm_book, - *notebook_main, /* main notebook to have multiple passages open at once */ - *vbox_text, /* vbox for bible + simple parallel */ - *box_dict, - *vbox_previewer, - *parallel_tab, - - /* dock/undock stuff */ - *dock_sb, /* dock for shortcut bar */ - *frame_parallel, /* frame for interlinear html */ - - /* editor_dialog */ - *studypad_dialog, - - /* entry widgets */ - *entry_dict, - - /* toolbars */ - *toolbar_comments, - *toolbar_studypad, - - /* html widgets */ - *eventbox1, - *html_search_report, /* html widget for serch report shortcut bar */ - *html_parallel, /* parallel html widget */ - *html_parallel_dialog, /* undocked parallel html widget */ - *html_text, /* texts html widget */ - *html_comm, /* html commentary widget */ - *html_percomm, /* html personal commentary widget */ - *html_dict, /* html dictionary widget */ - *html_book, /* gbs html widget */ - *html_studypad, /* studypad html widget */ - *html_previewer, /* to display information (ie strongs) at +typedef struct _app_widgets WIDGETS; +struct _app_widgets +{ + GtkWidget *app, /* main form */ + *appbar, /* gtk status/progress bar */ + *vboxMain, /* */ + *page, /* */ + *epaned, /* sidebar bar and main panel */ + *paned_sidebar, /*pane to show previewer in sidebar bar */ + *box_side_preview, /* box for packing previewer in side bar */ + *vpaned, /* bible/previewer paned */ + *vpaned2, /* commentary/dictionary paned */ + *hpaned, /* bible/commentary paned */ + *bible_info_paned, /* shortcut bar and main panle */ + *shortcutbar, /* the shortcut bar widget */ + *bookmark_tree, /* bookmarks tree */ + *ctree_widget_books, /* books tree */ + *workbook_lower, /* notebook - dict/lex, gbs, and interlinear */ + *notebook_gbs, /* notebook - gbs */ + *notebook_dict, /* notebook - dict/lex */ + *box_comm, /* notebook - commentaries */ + *notebook_bible_parallel, /* notebook - */ + *notebook_text, /* notebook - bible texts */ + *notebook_percomm, /* notebook - personal comments */ + *notebook_sidebar, /* notebook - sidebar */ + *notebook_comm_book, *notebook_main, /* main notebook to have multiple passages open at once */ + *vbox_text, /* vbox for bible + simple parallel */ + *box_dict, *vbox_previewer, *parallel_tab, + /* dock/undock stuff */ + *dock_sb, /* dock for shortcut bar */ + *frame_parallel, /* frame for interlinear html */ + /* editor_dialog */ + *studypad_dialog, + /* entry widgets */ + *entry_dict, + /* toolbars */ + *toolbar_comments, *toolbar_studypad, + /* html widgets */ + *eventbox1, *html_search_report, /* html widget for serch report shortcut bar */ + *html_parallel, /* parallel html widget */ + *html_parallel_dialog, /* undocked parallel html widget */ + *html_text, /* texts html widget */ + *html_comm, /* html commentary widget */ + *html_percomm, /* html personal commentary widget */ + *html_dict, /* html dictionary widget */ + *html_book, /* gbs html widget */ + *html_studypad, /* studypad html widget */ + *html_previewer, /* to display information (ie strongs) at bottom of text pane */ - *html_previewer_text, - - /* book of the Bible combo */ - *cb_books, - - /* listview widget */ - *listview_dict, - *store, - - /* label widgets */ - *label_comm, - *label_dict, - - /* comboboxentry widgets */ - *comboboxentry_dict, - - /* popup menu submenu widgets */ - *add_bookmark_submenu, - - /* popup menu item widgets */ - *viewtexts_item, - *viewpreview_item, - *parallel_tab_item, - *side_preview_item, - *viewcomms_item, - *viewdicts_item, - *linkedtabs_item, - *showversenum_item, - *readaloud_item, - *versehighlight_item, - *annotate_highlight_item, - *xrefs_in_verse_list_item, - *new_journal_item, - *button_dict_book, - - *button_new_tab, /* creates a new passage tab */ - *hboxtb; /* container for browsing notebook and button */ - }; - extern WIDGETS widgets; + *html_previewer_text, + /* book of the Bible combo */ + *cb_books, + /* listview widget */ + *listview_dict, *store, + /* label widgets */ + *label_comm, *label_dict, + /* comboboxentry widgets */ + *comboboxentry_dict, + /* popup menu submenu widgets */ + *add_bookmark_submenu, + /* popup menu item widgets */ + *viewtexts_item, *viewpreview_item, *parallel_tab_item, *side_preview_item, *viewcomms_item, *viewdicts_item, *linkedtabs_item, *showversenum_item, *readaloud_item, *versehighlight_item, *annotate_highlight_item, *xrefs_in_verse_list_item, *new_journal_item, *button_dict_book, *button_new_tab, /* creates a new passage tab */ + *hboxtb; /* container for browsing notebook and button */ +}; +extern WIDGETS widgets; #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/gui/xiphos.h xiphos-4.0.4+dfsg1/src/gui/xiphos.h --- xiphos-4.0.0+dfsg1/src/gui/xiphos.h 2014-12-18 19:34:39.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/gui/xiphos.h 2015-02-11 23:48:32.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ extern "C" { #endif - #define MAIN_TEXT_WINDOW 0 #define parallel_WINDOW 1 #define COMMENTARY_WINDOW 2 @@ -48,5 +47,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/biblesync_glue.cc xiphos-4.0.4+dfsg1/src/main/biblesync_glue.cc --- xiphos-4.0.0+dfsg1/src/main/biblesync_glue.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/biblesync_glue.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * biblesync_glue.cc * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -51,7 +51,7 @@ BSP_SpeakerMap speakers; -#define BSP (string)"BibleSync: " +#define BSP (string) "BibleSync: " /****************************************************************************** * Name @@ -73,237 +73,199 @@ biblesync_navigate(char cmd, string speaker_uuid, string bible, string ref, string alt, string group, string domain, - string info, string dump) + string info, string dump) { - bool speaker_display_update = false; - bool is_module; - string message; - - // parameter overload usage. - string &presence = alt; - string &user = bible, &ipaddr = ref, &app = group, &device = domain; - - // lockout: prevent re-xmit of what we're processing. - settings.bs_receiving = TRUE; - - switch (cmd) - { - - // error - case 'E': - if (settings.bs_debug) - { - // recv error occurred: explanation in info, pkt in dump. - message = info + "\n\n" + dump; - gui_generic_warning((char *)message.c_str()); - } - break; - - // mismatch - case 'M': - if (settings.bs_mismatch) - { - message = BSP - + (string)_("Mismatched packet\n\n") - + info - + ((info.substr(0,8) == "announce") - ? ("\nMessage: " + presence) - : ("\nBible: " + bible + "; Ref: " + ref + "; Alt: " + alt - + "\nGroup: " + group + "; Domain: " + domain)) - + (settings.bs_debug - ? ("\n\n" + (string)dump) - : ""); - gui_generic_warning((char *)message.c_str()); - } - break; + bool speaker_display_update = false; + bool is_module; + string message; + const char *real_name = NULL; + + // parameter overload usage. + string &presence = alt; + string &user = bible, &ipaddr = ref, &app = group, &device = domain; + + // lockout: prevent re-xmit of what we're processing. + settings.bs_receiving = TRUE; + + switch (cmd) { + + // error + case 'E': + if (settings.bs_debug) { + // recv error occurred: explanation in info, pkt in dump. + message = info + "\n\n" + dump; + gui_generic_warning((char *)message.c_str()); + } + break; - // announce - case 'A': - if (settings.bs_presence) - { - if (settings.bs_debug) - { - message = _("Presence announcement:\n\n") + dump; - gui_generic_warning((char *)message.c_str()); - } - gui_generic_warning((char *)presence.c_str()); - } - break; + // mismatch + case 'M': + if (settings.bs_mismatch) { + message = BSP + (string)_("Mismatched packet\n\n") + info + ((info.substr(0, 8) == "announce") + ? ("\nMessage: " + presence) + : ("\nBible: " + bible + "; Ref: " + ref + "; Alt: " + alt + "\nGroup: " + group + "; Domain: " + domain)) + + (settings.bs_debug + ? ("\n\n" + (string)dump) + : ""); + gui_generic_warning((char *)message.c_str()); + } + break; - // navigation - case 'N': - if (settings.bs_debug) - { - message = _("Navigation packet:\n\n") + dump; - gui_generic_warning((char *)message.c_str()); - } + // announce + case 'A': + if (settings.bs_presence) { + if (settings.bs_debug) { + message = _("Presence announcement:\n\n") + dump; + gui_generic_warning((char *)message.c_str()); + } + gui_generic_warning((char *)presence.c_str()); + } + break; - // Xiphos does nothing with "alt", the alternate reference. + // navigation + case 'N': + if (settings.bs_debug) { + message = _("Navigation packet:\n\n") + dump; + gui_generic_warning((char *)message.c_str()); + } - is_module = backend->is_module(bible.c_str()); + is_module = backend->is_module(bible.c_str()); + real_name = main_get_name(bible.c_str()); - // direct navigation, or via verse list? - if (is_module && - settings.bs_navdirect && - (strpbrk(ref.c_str(), "-;,") == NULL)) // not a multi-ref - { - speakers[speaker_uuid].direct = "D"; + // if the offered name isn't known, + // maybe it's an abbreviation for something we do know. + if (!is_module && real_name) { + bible = real_name; + is_module = backend->is_module(bible.c_str()); + } - // by default, Xiphos can interpret param "group" as tab#. - if (settings.bs_group_tab) - { - char tab = group.c_str()[0]; - if ((group.length() == 1) && // 1-char string - (tab >= '1') && (tab <= '9')) + // direct navigation, or via verse list? + if (is_module && + settings.bs_navdirect && + (strpbrk(ref.c_str(), "-;,") == NULL)) // not a multi-ref { - tab -= '1'; // 0-based list + speakers[speaker_uuid].direct = "D"; - // select tab if not already current, avoid screen flash. - if (cur_passage_tab && - (tab != gtk_notebook_page_num( - GTK_NOTEBOOK(widgets.notebook_main), - cur_passage_tab->page_widget))) - { - gui_select_nth_tab(tab); - } - settings.showtexts = 1; // make panes visible - settings.showcomms = 1; - settings.comm_showing = 1; - gui_recompute_shows(FALSE); - } - } + // by default, Xiphos can interpret param "group" as tab#. + if (settings.bs_group_tab) { + char tab = group.c_str()[0]; + if ((group.length() == 1) && // 1-char string + (tab >= '1') && (tab <= '9')) { + tab -= '1'; // 0-based list + + // select tab if not already current, avoid screen flash. + if (cur_passage_tab && + (tab != gtk_notebook_page_num( + GTK_NOTEBOOK(widgets.notebook_main), + cur_passage_tab->page_widget))) { + gui_select_nth_tab(tab); + } + settings.showtexts = 1; // make panes visible + settings.showcomms = 1; + settings.comm_showing = 1; + gui_recompute_shows(FALSE); + } + } - main_url_handler(((string)"sword://" - + bible - + "/" - + ref).c_str(), TRUE); - } - else // use verse list: unknown bible, user pref, or multi-ref. - { - speakers[speaker_uuid].direct = "I"; + main_url_handler(((string) "sword://" + bible + "/" + ref).c_str(), TRUE); + } else // use verse list: unknown bible, user pref, or multi-ref. + { + speakers[speaker_uuid].direct = "I"; - main_display_verse_list_in_sidebar - (settings.currentverse, - (gchar*)bible.c_str(), (gchar*)ref.c_str()); - - if (!is_module) - { - message = BSP + _("Unknown module ") + bible - + _(".\nNavigated indirectly using verse list."); - gui_generic_warning((char *)message.c_str()); - } - } + main_display_verse_list_in_sidebar(settings.currentverse, + (gchar *)bible.c_str(), (gchar *)ref.c_str()); - speakers[speaker_uuid].ref = bible + " " + ref; - speaker_display_update = true; + if (!is_module) { + message = BSP + _("Unknown module ") + bible + _(".\nNavigated indirectly using verse list."); + gui_generic_warning((char *)message.c_str()); + } + } - gui_set_statusbar((BSP + speakers[speaker_uuid].user + ": " - + speakers[speaker_uuid].ref).c_str()); - break; - - // new speaker discovery. - case 'S': - XI_message(("new speaker: key [%s], u [%s], ip [%s], a [%s], d [%s]", - speaker_uuid.c_str(), user.c_str(), - ipaddr.c_str(), app.c_str(), device.c_str())); - - unsigned int old_speakers_size, new_speakers_size; - - old_speakers_size = speakers.size(); - - speakers[speaker_uuid].uuid = speaker_uuid; - speakers[speaker_uuid].user = user; - speakers[speaker_uuid].direct = ""; - speakers[speaker_uuid].ref = ""; - speakers[speaker_uuid].ipaddr = ipaddr; - speakers[speaker_uuid].app = app; - speakers[speaker_uuid].device = device; + speakers[speaker_uuid].ref = bible + " " + ref; + speaker_display_update = true; - new_speakers_size = speakers.size(); + gui_set_statusbar((BSP + speakers[speaker_uuid].user + ": " + speakers[speaker_uuid].ref).c_str()); + break; - if (biblesync->getMode() == BSP_MODE_SPEAKER) - { - speakers[speaker_uuid].listen = false; - } - else - { - switch (settings.bs_listen_set) - { - case 0: - // listen to the 1st, initially ignore later ones. - if ((old_speakers_size == 0) && (new_speakers_size == 1)) - { - speakers[speaker_uuid].listen = true; - gui_generic_warning - (_((BSP + "Listening to " + user + ".").c_str())); - } - else - { - speakers[speaker_uuid].listen = false; - if ((old_speakers_size == 1) && (new_speakers_size == 2)) - { - gui_generic_warning - (_((BSP + "More than 1 speaker.").c_str())); - } - // but we stop announcing after the 2nd. + // new speaker discovery. + case 'S': + XI_message(("new speaker: key [%s], u [%s], ip [%s], a [%s], d [%s]", + speaker_uuid.c_str(), user.c_str(), + ipaddr.c_str(), app.c_str(), device.c_str())); + + unsigned int old_speakers_size, new_speakers_size; + + old_speakers_size = speakers.size(); + + speakers[speaker_uuid].uuid = speaker_uuid; + speakers[speaker_uuid].user = user; + speakers[speaker_uuid].direct = ""; + speakers[speaker_uuid].ref = ""; + speakers[speaker_uuid].ipaddr = ipaddr; + speakers[speaker_uuid].app = app; + speakers[speaker_uuid].device = device; + + new_speakers_size = speakers.size(); + + if (biblesync->getMode() == BSP_MODE_SPEAKER) { + speakers[speaker_uuid].listen = false; + } else { + switch (settings.bs_listen_set) { + case 0: + // listen to the 1st, initially ignore later ones. + if ((old_speakers_size == 0) && (new_speakers_size == 1)) { + speakers[speaker_uuid].listen = true; + gui_generic_warning(_((BSP + "Listening to " + user + ".").c_str())); + } else { + speakers[speaker_uuid].listen = false; + if ((old_speakers_size == 1) && (new_speakers_size == 2)) { + gui_generic_warning(_((BSP + "More than 1 speaker.").c_str())); + } + // but we stop announcing after the 2nd. + } + break; + + case 1: + // listen to all. announce only the first. + speakers[speaker_uuid].listen = true; + if ((old_speakers_size == 0) && (new_speakers_size == 1)) { + gui_generic_warning(_((BSP + "Listening to " + user + ".").c_str())); + } + break; + + case 2: + // listen to none. announce none. + speakers[speaker_uuid].listen = false; + break; + } } + + biblesync->listenToSpeaker(speakers[speaker_uuid].listen, speaker_uuid); + speaker_display_update = true; break; - case 1: - // listen to all. announce only the first. - speakers[speaker_uuid].listen = true; - if ((old_speakers_size == 0) && (new_speakers_size == 1)) - { - gui_generic_warning - (_((BSP + "Listening to " + user + ".").c_str())); - } + // dead speaker -- timed out from lack of beacons. + case 'D': + XI_message(("dead speaker: key [%s]", speaker_uuid.c_str())); + speakers.erase(speaker_uuid); + speaker_display_update = true; break; - case 2: - // listen to none. announce none. - speakers[speaker_uuid].listen = false; + default: + message = _("ERROR: unknown BibleSync indicator: ") + cmd + (string) ".\n" + (string)_("Other indications are:") + "\nbible: " + bible + "\nref: " + ref + "\nalt: " + alt + "\ngroup: " + group + "\ndomain: " + domain + "\ninfo: " + info + "\ndump:\n" + dump; + gui_generic_warning((char *)message.c_str()); break; - } } - biblesync->listenToSpeaker(speakers[speaker_uuid].listen, speaker_uuid); - speaker_display_update = true; - break; - - // dead speaker -- timed out from lack of beacons. - case 'D': - XI_message(("dead speaker: key [%s]", speaker_uuid.c_str())); - speakers.erase(speaker_uuid); - speaker_display_update = true; - break; - - default: - message = _("ERROR: unknown BibleSync indicator: ") - + cmd - + (string)".\n" - + (string)_("Other indications are:") - + "\nbible: " + bible - + "\nref: " + ref - + "\nalt: " + alt - + "\ngroup: " + group - + "\ndomain: " + domain - + "\ninfo: " + info - + "\ndump:\n" + dump; - gui_generic_warning((char *)message.c_str()); - break; - } - - // speakers change && preferences are open => re-display speakers. - if (speaker_display_update && settings.display_prefs) - { - biblesync_update_speaker(); - } + // speakers change && preferences are open => re-display speakers. + if (speaker_display_update && settings.display_prefs) { + biblesync_update_speaker(); + } - // unlock. - settings.bs_receiving = FALSE; + // unlock. + settings.bs_receiving = FALSE; } - /****************************************************************************** * Name * biblesync_compare_speaker @@ -322,33 +284,32 @@ */ int biblesync_compare_speaker(const void *Lvoid, const void *Rvoid) { - const BSP_Speaker *L = *(const BSP_Speaker **)Lvoid; - const BSP_Speaker *R = *(const BSP_Speaker **)Rvoid; - int retval; - - if ((retval = L->user.compare(R->user)) == 0) - if ((retval = L->ipaddr.compare(R->ipaddr)) == 0) - if ((retval = L->app.compare(R->app)) == 0) - if ((retval = L->device.compare(R->device)) == 0) - retval = L->uuid.compare(R->uuid); - return retval; + const BSP_Speaker *L = *(const BSP_Speaker **)Lvoid; + const BSP_Speaker *R = *(const BSP_Speaker **)Rvoid; + int retval; + + if ((retval = L->user.compare(R->user)) == 0) + if ((retval = L->ipaddr.compare(R->ipaddr)) == 0) + if ((retval = L->app.compare(R->app)) == 0) + if ((retval = L->device.compare(R->device)) == 0) + retval = L->uuid.compare(R->uuid); + return retval; } // // enumerator for column identification in speaker list // enum { - COLUMN_LISTEN, // checkbox - COLUMN_USER, // user - COLUMN_DIRECT, // directly/indirectly navigated - COLUMN_NAV, // last navigation reference received - COLUMN_ABOUT, // invisible: other identifying info (tooltip) - COLUMN_UUID, // invisible: uuid - COLUMN_VISIBLE, // gtk magic? - NUM_COLUMNS + COLUMN_LISTEN, // checkbox + COLUMN_USER, // user + COLUMN_DIRECT, // directly/indirectly navigated + COLUMN_NAV, // last navigation reference received + COLUMN_ABOUT, // invisible: other identifying info (tooltip) + COLUMN_UUID, // invisible: uuid + COLUMN_VISIBLE, // gtk magic? + NUM_COLUMNS }; - /****************************************************************************** * Name * listen_toggled @@ -370,47 +331,43 @@ gchar *path_str, gpointer data) { - if (biblesync->getMode() == BSP_MODE_SPEAKER) - { - gui_generic_warning(_((BSP + "Speaker listens to none.").c_str())); - } - else if (settings.bs_listen_set == 0) // selective - { - GtkTreeView *treeview = (GtkTreeView *)data; - GtkTreeModel *model = gtk_tree_view_get_model(treeview); - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string(path_str); - gboolean listen = 27; - gchar *uuid = NULL; - - // get toggled iter - gtk_tree_model_get_iter(model, &iter, path); - gtk_tree_model_get(model, &iter, - COLUMN_LISTEN, &listen, - COLUMN_UUID, &uuid, - -1); - - // negate - listen ^= 1; - - // set new value - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COLUMN_LISTEN, listen, - -1); - speakers[(string)uuid].listen = listen; - biblesync->listenToSpeaker(listen, (string)uuid); - g_free(uuid); - - // clean up - gtk_tree_path_free(path); - } - else // all or nothing - { - gui_generic_warning(_((BSP + "Not listening selectively.").c_str())); - } + if (biblesync->getMode() == BSP_MODE_SPEAKER) { + gui_generic_warning(_((BSP + "Speaker listens to none.").c_str())); + } else if (settings.bs_listen_set == 0) // selective + { + GtkTreeView *treeview = (GtkTreeView *)data; + GtkTreeModel *model = gtk_tree_view_get_model(treeview); + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string(path_str); + gboolean listen = 27; + gchar *uuid = NULL; + + // get toggled iter + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, + COLUMN_LISTEN, &listen, + COLUMN_UUID, &uuid, + -1); + + // negate + listen ^= 1; + + // set new value + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + COLUMN_LISTEN, listen, + -1); + speakers[(string)uuid].listen = listen; + biblesync->listenToSpeaker(listen, (string)uuid); + g_free(uuid); + + // clean up + gtk_tree_path_free(path); + } else // all or nothing + { + gui_generic_warning(_((BSP + "Not listening selectively.").c_str())); + } } - /****************************************************************************** * Name * query_tooltip @@ -425,42 +382,39 @@ * Return value * void */ -static -gboolean query_tooltip(GtkWidget *widget, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - gpointer user_data) -{ - GtkTreeModel *model; - GtkTreePath *path; - GtkTreeIter iter; - gchar *about; - - if (!gtk_tree_view_get_tooltip_context((GtkTreeView *)widget, - &x, &y, - keyboard_mode, - &model, &path, &iter)) - return FALSE; +static gboolean query_tooltip(GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + gpointer user_data) +{ + GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; + gchar *about; - if (gtk_tree_model_iter_has_child(model, &iter)) - { + if (!gtk_tree_view_get_tooltip_context((GtkTreeView *)widget, + &x, &y, + keyboard_mode, + &model, &path, &iter)) + return FALSE; + + if (gtk_tree_model_iter_has_child(model, &iter)) { + gtk_tree_path_free(path); + return FALSE; + } + + gtk_tree_model_get(model, &iter, COLUMN_ABOUT, &about, -1); + gtk_tooltip_set_text(tooltip, about); + gtk_tree_view_set_tooltip_cell((GtkTreeView *)widget, + tooltip, path, + NULL, NULL); gtk_tree_path_free(path); - return FALSE; - } - - gtk_tree_model_get(model, &iter, COLUMN_ABOUT, &about, -1); - gtk_tooltip_set_text(tooltip, about); - gtk_tree_view_set_tooltip_cell((GtkTreeView *)widget, - tooltip, path, - NULL, NULL); - gtk_tree_path_free (path); - g_free(about); - return TRUE; + g_free(about); + return TRUE; } - /****************************************************************************** * Name * biblesync_set_clear_all_listen @@ -478,19 +432,17 @@ */ void biblesync_set_clear_all_listen(gboolean listen) { - BSP_SpeakerMapIterator object; + BSP_SpeakerMapIterator object; - for (object = speakers.begin(); object != speakers.end(); ++object) - { - // update our app status, and tell the underlying protocol class. - object->second.listen = listen; - biblesync->listenToSpeaker(listen, object->second.uuid); - } + for (object = speakers.begin(); object != speakers.end(); ++object) { + // update our app status, and tell the underlying protocol class. + object->second.listen = listen; + biblesync->listenToSpeaker(listen, object->second.uuid); + } - biblesync_update_speaker(); + biblesync_update_speaker(); } - /****************************************************************************** * Name * biblesync_update_speaker @@ -507,177 +459,170 @@ */ void biblesync_update_speaker() { - // need the widget in which the list should appear. - if (speaker_window == NULL) - return; - - unsigned int size = speakers.size(); - BSP_Speaker **array = g_new(BSP_Speaker *, size); - unsigned int i = 0; - - // extract map entries into a new array that's more accessible. - // what comes from the std::map is probably UUID-sorted, yuck. - // this provides re-sort in user|ipaddr|app|device order: human-useful. - for (BSP_SpeakerMapIterator object = speakers.begin(); - object != speakers.end(); - ++object) - { - array[i++] = &(object->second); - } - qsort(array, size, sizeof(BSP_Speaker *), biblesync_compare_speaker); - - // - // window setup borrowed/modified from sidebar search results creation. - // - - // GtkTreeSelection *selection; - GtkListStore *model_speakers = - gtk_list_store_new(NUM_COLUMNS, - // listen user - G_TYPE_BOOLEAN, G_TYPE_STRING, - // direct ref - G_TYPE_STRING, G_TYPE_STRING, - // information uuid - G_TYPE_STRING, G_TYPE_STRING, - // visibility - G_TYPE_BOOLEAN); - - if (speaker_list) - gtk_widget_destroy(speaker_list); // destroy old to create new. - - speaker_list = - gtk_tree_view_new_with_model(GTK_TREE_MODEL(model_speakers)); - gtk_widget_show(speaker_list); - gtk_container_add(GTK_CONTAINER(speaker_window), speaker_list); + // need the widget in which the list should appear. + if (speaker_window == NULL) + return; + + unsigned int size = speakers.size(); + BSP_Speaker **array = g_new(BSP_Speaker *, size); + unsigned int i = 0; + + // extract map entries into a new array that's more accessible. + // what comes from the std::map is probably UUID-sorted, yuck. + // this provides re-sort in user|ipaddr|app|device order: human-useful. + for (BSP_SpeakerMapIterator object = speakers.begin(); + object != speakers.end(); + ++object) { + array[i++] = &(object->second); + } + qsort(array, size, sizeof(BSP_Speaker *), biblesync_compare_speaker); + + // + // window setup borrowed/modified from sidebar search results creation. + // + + // GtkTreeSelection *selection; + GtkListStore *model_speakers = + gtk_list_store_new(NUM_COLUMNS, + // listen user + G_TYPE_BOOLEAN, G_TYPE_STRING, + // direct ref + G_TYPE_STRING, G_TYPE_STRING, + // information uuid + G_TYPE_STRING, G_TYPE_STRING, + // visibility + G_TYPE_BOOLEAN); + + if (speaker_list) + gtk_widget_destroy(speaker_list); // destroy old to create new. + + speaker_list = + gtk_tree_view_new_with_model(GTK_TREE_MODEL(model_speakers)); + gtk_widget_show(speaker_list); + gtk_container_add(GTK_CONTAINER(speaker_window), speaker_list); #ifndef HAVE_GTK_310 - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(speaker_list), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(speaker_list), TRUE); #endif - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(speaker_list), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(speaker_list), TRUE); - // - // column setup - // borrowed/modified from mod.mgr module list creation. - // - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkWidget *image; - - /* -- toggle choice -- */ - renderer = gtk_cell_renderer_toggle_new(); - g_signal_connect(renderer, "toggled", G_CALLBACK(listen_toggled), speaker_list); + // + // column setup + // borrowed/modified from mod.mgr module list creation. + // + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkWidget *image; + + /* -- toggle choice -- */ + renderer = gtk_cell_renderer_toggle_new(); + g_signal_connect(renderer, "toggled", G_CALLBACK(listen_toggled), speaker_list); - column = gtk_tree_view_column_new(); - image = + column = gtk_tree_view_column_new(); + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name("gtk-apply", GTK_ICON_SIZE_MENU); + gtk_image_new_from_icon_name("emblem-ok-symbolic", GTK_ICON_SIZE_MENU); #else - gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU); -#endif - - gtk_widget_show(image); - gtk_widget_set_tooltip_text(image, - _("Check the box to listen to this Speaker")); - gtk_tree_view_column_set_widget(column, image); - gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_set_attributes(column, renderer, - "active", COLUMN_LISTEN, - "visible", COLUMN_VISIBLE, NULL); - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - - /* -- column for user name -- */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("Available Speakers"), renderer, - "text", COLUMN_USER, NULL); - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_GROW_ONLY); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 200); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - - /* -- column for direct/indirect -- */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("D/I"), renderer, - "text", COLUMN_DIRECT, NULL); - image = + gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU); +#endif + + gtk_widget_show(image); + gtk_widget_set_tooltip_text(image, + _("Check the box to listen to this Speaker")); + gtk_tree_view_column_set_widget(column, image); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, + "active", COLUMN_LISTEN, + "visible", COLUMN_VISIBLE, NULL); + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + + /* -- column for user name -- */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("Available Speakers"), renderer, + "text", COLUMN_USER, NULL); + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_GROW_ONLY); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 200); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + + /* -- column for direct/indirect -- */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("D/I"), renderer, + "text", COLUMN_DIRECT, NULL); + image = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name("gtk-yes", GTK_ICON_SIZE_MENU); + gtk_image_new_from_icon_name("emblem-default", GTK_ICON_SIZE_MENU); #else - gtk_image_new_from_stock("gtk-yes", GTK_ICON_SIZE_MENU); // XXX -#endif - gtk_widget_show(image); - gtk_widget_set_tooltip_text(image, - _("Last navigation was Direct or Indirect")); - gtk_tree_view_column_set_widget(column, image); - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - - /* -- column for recent nav -- */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("Last Navigation"), renderer, - "text", COLUMN_NAV, NULL); - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_GROW_ONLY); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 100); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - - /* -- identifying info (invisible) -- */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("About"), renderer, - "text", COLUMN_ABOUT, NULL); - gtk_tree_view_column_set_visible(column, FALSE); // not shown - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 2); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - - /* -- uuid (invisible) -- */ - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("UUID"), renderer, - "text", COLUMN_UUID, NULL); - gtk_tree_view_column_set_visible(column, FALSE); // not shown - gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 2); - gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); - // end of column setup. - - gtk_widget_set_has_tooltip(speaker_list, TRUE); - g_signal_connect((gpointer)speaker_list, - "query-tooltip", - G_CALLBACK(query_tooltip), NULL); - - GtkTreeIter iter; - BSP_Speaker *object; - string identifying_info; - - // fill it with the user list. - for (i = 0; i < size; ++i) - { - object = array[i]; - identifying_info = (string)_("IP address: ") + object->ipaddr - + (string)_("\nApplication: ") + object->app - + (string)_("\nDevice: ") + object->device - + (string)_("\nUUID: ") + object->uuid; - - gtk_list_store_append(model_speakers, &iter); - gtk_list_store_set(model_speakers, &iter, - COLUMN_LISTEN, object->listen, - COLUMN_USER, object->user.c_str(), - COLUMN_DIRECT, object->direct.c_str(), - COLUMN_NAV, object->ref.c_str(), - COLUMN_ABOUT, identifying_info.c_str(), - COLUMN_UUID, object->uuid.c_str(), - COLUMN_VISIBLE, TRUE, - -1); - } + gtk_image_new_from_stock("gtk-yes", GTK_ICON_SIZE_MENU); // XXX +#endif + gtk_widget_show(image); + gtk_widget_set_tooltip_text(image, + _("Last navigation was Direct or Indirect")); + gtk_tree_view_column_set_widget(column, image); + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 25); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + + /* -- column for recent nav -- */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("Last Navigation"), renderer, + "text", COLUMN_NAV, NULL); + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_GROW_ONLY); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 100); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + + /* -- identifying info (invisible) -- */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("About"), renderer, + "text", COLUMN_ABOUT, NULL); + gtk_tree_view_column_set_visible(column, FALSE); // not shown + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 2); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + + /* -- uuid (invisible) -- */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("UUID"), renderer, + "text", COLUMN_UUID, NULL); + gtk_tree_view_column_set_visible(column, FALSE); // not shown + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(GTK_TREE_VIEW_COLUMN(column), 2); + gtk_tree_view_append_column(GTK_TREE_VIEW(speaker_list), column); + // end of column setup. + + gtk_widget_set_has_tooltip(speaker_list, TRUE); + g_signal_connect((gpointer)speaker_list, + "query-tooltip", + G_CALLBACK(query_tooltip), NULL); - g_free(array); -} + GtkTreeIter iter; + string identifying_info; + // fill it with the user list. + for (i = 0; i < size; ++i) { + BSP_Speaker *object = array[i]; + identifying_info = (string)_("IP address: ") + object->ipaddr + (string)_("\nApplication: ") + object->app + (string)_("\nDevice: ") + object->device + (string)_("\nUUID: ") + object->uuid; + + gtk_list_store_append(model_speakers, &iter); + gtk_list_store_set(model_speakers, &iter, + COLUMN_LISTEN, object->listen, + COLUMN_USER, object->user.c_str(), + COLUMN_DIRECT, object->direct.c_str(), + COLUMN_NAV, object->ref.c_str(), + COLUMN_ABOUT, identifying_info.c_str(), + COLUMN_UUID, object->uuid.c_str(), + COLUMN_VISIBLE, TRUE, + -1); + } + + g_free(array); +} /****************************************************************************** * Name @@ -697,51 +642,55 @@ int biblesync_mode_select(int m, char *p) { - BibleSync_mode mode, old_mode = biblesync->getMode(); + BibleSync_mode mode, old_mode = biblesync->getMode(); - switch (m) - { - case 0: - mode = BSP_MODE_DISABLE; break; - case 1: - mode = BSP_MODE_PERSONAL; break; - case 2: - mode = BSP_MODE_SPEAKER; break; - case 3: - mode = BSP_MODE_AUDIENCE; break; - default: - mode = N_BSP_MODE; break; // error - } - if (mode != N_BSP_MODE) - { - if (((mode = biblesync->setMode(mode, biblesync_navigate, p)) - != BSP_MODE_DISABLE) && - (old_mode == BSP_MODE_DISABLE)) - { - // whenever we move to any active mode, we must start receiver. - // glib will stop it on its own any time we go back to disable. - g_timeout_add(1000, (GSourceFunc)BibleSync::Receive, biblesync); + switch (m) { + case 0: + mode = BSP_MODE_DISABLE; + break; + case 1: + mode = BSP_MODE_PERSONAL; + break; + case 2: + mode = BSP_MODE_SPEAKER; + break; + case 3: + mode = BSP_MODE_AUDIENCE; + break; + default: + mode = N_BSP_MODE; + break; // error } + if (mode != N_BSP_MODE) { + if (((mode = biblesync->setMode(mode, biblesync_navigate, p)) != BSP_MODE_DISABLE) && + (old_mode == BSP_MODE_DISABLE)) { + // whenever we move to any active mode, we must start receiver. + // glib will stop it on its own any time we go back to disable. + g_timeout_add(1000, (GSourceFunc)BibleSync::Receive, biblesync); + } - switch (mode) - { - case BSP_MODE_DISABLE: - m = 0; break; - case BSP_MODE_PERSONAL: - m = 1; break; - case BSP_MODE_SPEAKER: - m = 2; break; - case BSP_MODE_AUDIENCE: - m = 3; break; - default: - m = 99; break; + switch (mode) { + case BSP_MODE_DISABLE: + m = 0; + break; + case BSP_MODE_PERSONAL: + m = 1; + break; + case BSP_MODE_SPEAKER: + m = 2; + break; + case BSP_MODE_AUDIENCE: + m = 3; + break; + default: + m = 99; + break; + } } - } - return m; + return m; } - /****************************************************************************** * Name * biblesync_personal @@ -758,10 +707,11 @@ */ int biblesync_personal() { - return biblesync->getMode() == BSP_MODE_PERSONAL; + return biblesync->getMode() == BSP_MODE_PERSONAL; } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * biblesync_active @@ -778,9 +728,9 @@ */ int biblesync_active() { - return biblesync->getMode() != BSP_MODE_DISABLE; + return biblesync->getMode() != BSP_MODE_DISABLE; } - +#endif /****************************************************************************** * Name @@ -798,11 +748,10 @@ */ int biblesync_active_xmit_allowed() { - return biblesync->getMode() == BSP_MODE_PERSONAL || - biblesync->getMode() == BSP_MODE_SPEAKER; + return biblesync->getMode() == BSP_MODE_PERSONAL || + biblesync->getMode() == BSP_MODE_SPEAKER; } - /****************************************************************************** * Name * biblesync_get_passphrase @@ -819,10 +768,9 @@ */ const char *biblesync_get_passphrase() { - return biblesync->getPassphrase().c_str(); + return biblesync->getPassphrase().c_str(); } - /****************************************************************************** * Name * biblesync_transmit_verse_list @@ -839,10 +787,16 @@ */ void biblesync_transmit_verse_list(char *modname, char *vlist) { - biblesync->Transmit(BSP_SYNC, (string)modname, (string)vlist); - // remaining args irrelevant => defaulted. -} + // see comment below in biblesync_prep_and_xmit() on abbreviation use. + const char *abbreviation = main_get_abbreviation(modname); + biblesync->Transmit(BSP_SYNC, + (abbreviation + ? (string)abbreviation + : (string)modname), + (string)vlist); + // alt, group, & domain defaulted. +} /****************************************************************************** * Name @@ -860,10 +814,9 @@ */ void biblesync_privacy(gboolean privacy) { - biblesync->setPrivate(privacy); + biblesync->setPrivate(privacy); } - /****************************************************************************** * Name * biblesync_prep_and_xmit() @@ -880,30 +833,46 @@ */ void biblesync_prep_and_xmit(const char *mod_name, const char *key) { - if (!settings.bs_receiving && // no re-xmit of recv'd nav. - ((biblesync->getMode() == BSP_MODE_PERSONAL) || - (biblesync->getMode() == BSP_MODE_SPEAKER))) + if (!settings.bs_receiving && // no re-xmit of recv'd nav. + ((biblesync->getMode() == BSP_MODE_PERSONAL) || + (biblesync->getMode() == BSP_MODE_SPEAKER))) // audience does not xmit nav. - { - string group = "1"; // default if determination fails. - char pchar[2]; - gint pagenum = (cur_passage_tab - ? gtk_notebook_page_num( - GTK_NOTEBOOK(widgets.notebook_main), - cur_passage_tab->page_widget) - : 1); - - if ((pagenum != -1) && (pagenum < 9)) { - pchar[0] = pagenum + '1'; // 0-based list. - pchar[1] = '\0'; - group = (string)pchar; - } + string group = "1"; // default if determination fails. + gint pagenum = (cur_passage_tab + ? gtk_notebook_page_num( + GTK_NOTEBOOK(widgets.notebook_main), + cur_passage_tab->page_widget) + : 1); + + if ((pagenum != -1) && (pagenum < 9)) { + char pchar[2]; + pchar[0] = pagenum + '1'; // 0-based list. + pchar[1] = '\0'; + group = (string)pchar; + } - // ** this key is not to be freed. ** - char *osis_key = (char *)main_get_osisref_from_key(mod_name, key); - biblesync->Transmit(BSP_SYNC, - (string)mod_name, (string)osis_key, - (string)"", group); - } + // ** this key is not to be freed. ** + char *osis_key = (char *)main_get_osisref_from_key(mod_name, key); + const char *abbreviation = main_get_abbreviation(mod_name); + + // => longstanding behavioral premise of the Internet: + // - be conservative in what you xmit. + // - be liberal in what you recv. + + // offer a common Bible abbreviation if it's available. + // this is because we in Sword have very inconvenient + // module names for what are, in non-English locales, + // perfectly ordinary, locally common Bible names. + // interoperability with non-Sword apps requires that + // we attempt to be locally friendly in name use. + + biblesync->Transmit(BSP_SYNC, + (string)(abbreviation + ? abbreviation + : mod_name), + (string)osis_key, + (string) "", + group); + } } diff -Nru xiphos-4.0.0+dfsg1/src/main/biblesync_glue.h xiphos-4.0.4+dfsg1/src/main/biblesync_glue.h --- xiphos-4.0.0+dfsg1/src/main/biblesync_glue.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/biblesync_glue.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * biblesync_glue.h * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -36,21 +36,23 @@ extern "C" { -typedef struct _speaker { - string uuid; - string user; - string ipaddr; - string app; - string device; - string ref; - string direct; - bool listen; +typedef struct _speaker +{ + string uuid; + string user; + string ipaddr; + string app; + string device; + string ref; + string direct; + bool listen; } BSP_Speaker; -typedef std::map < string, BSP_Speaker > BSP_SpeakerMap; +typedef std::map BSP_SpeakerMap; typedef BSP_SpeakerMap::iterator BSP_SpeakerMapIterator; -int biblesync_compare_speaker(const void *Lvoid, const void *Rvoid); +int biblesync_compare_speaker(const void *Lvoid, + const void *Rvoid); #endif // __cplusplus @@ -66,11 +68,11 @@ const char *biblesync_get_passphrase(); void biblesync_transmit_verse_list(char *modname, char *vlist); void biblesync_privacy(gboolean privacy); -void biblesync_prep_and_xmit(const char *mod_name, const char *key); +void biblesync_prep_and_xmit(const char *mod_name, + const char *key); void biblesync_set_clear_all_listen(gboolean listen); #ifdef __cplusplus } #endif - #endif /* _BIBLESYNC_GLUE_H__ */ diff -Nru xiphos-4.0.0+dfsg1/src/main/configs.cc xiphos-4.0.4+dfsg1/src/main/configs.cc --- xiphos-4.0.0+dfsg1/src/main/configs.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/configs.cc 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * configs.c - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -45,12 +45,11 @@ * */ -char *get_conf_file_item(const char * file, const char * mod_name, const char * item) +char *get_conf_file_item(const char *file, const char *mod_name, const char *item) { return backend->get_conf_file_item(file, mod_name, item); } - /****************************************************************************** * Name * save_conf_file_item @@ -68,13 +67,12 @@ * void */ -void save_conf_file_item(const char * file, const char * mod_name, const char * item, - const char * value) +void save_conf_file_item(const char *file, const char *mod_name, const char *item, + const char *value) { backend->save_conf_file_item(file, mod_name, item, value); } - /****************************************************************************** * Name * save_module_key @@ -91,7 +89,7 @@ * void */ -void save_module_key(char * mod_name, char * key) +void save_module_key(char *mod_name, char *key) { backend->save_module_key(mod_name, key); diff -Nru xiphos-4.0.0+dfsg1/src/main/configs.h xiphos-4.0.4+dfsg1/src/main/configs.h --- xiphos-4.0.0+dfsg1/src/main/configs.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/configs.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * configs.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,8 @@ #endif typedef struct _mod_font MOD_FONT; -struct _mod_font { +struct _mod_font +{ const char *mod_name; char *old_font; const char *new_font; @@ -37,11 +38,11 @@ int no_font; }; -char *get_conf_file_item(const char * file, const char * mod_name, const char * item); -void save_conf_file_item(const char * file, const char * mod_name, const char * item, - const char * value); +char *get_conf_file_item(const char *file, const char *mod_name, + const char *item); +void save_conf_file_item(const char *file, const char *mod_name, + const char *item, const char *value); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/display.cc xiphos-4.0.4+dfsg1/src/main/display.cc --- xiphos-4.0.0+dfsg1/src/main/display.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/display.cc 2015-08-21 12:08:46.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display.cc - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,15 +64,16 @@ extern ModuleCache::CacheMap ModuleMap; // for tracking personal annotations. -typedef struct { - gchar *module; - gchar *book; - int chapter; - int verse; - GString *annotation; +typedef struct +{ + gchar *module; + gchar *book; + int chapter; + int verse; + GString *annotation; } marked_element; -typedef std::map MC; +typedef std::map MC; MC marked_cache; gchar *marked_cache_modname = NULL, *marked_cache_book = NULL; @@ -87,8 +88,8 @@ const gchar *no_content = N_("

        This module has no content at this point.
        "); -#define HTML_START \ -" \ +#define HTML_START \ + " \ " +#define HTML_START "" enum { - TARGET_HTML, - TARGET_UTF8_STRING, - TARGET_COMPOUND_TEXT, - TARGET_STRING, - TARGET_TEXT + TARGET_HTML, + TARGET_UTF8_STRING, + TARGET_COMPOUND_TEXT, + TARGET_STRING, + TARGET_TEXT }; /* these targets allow fallback to plain text if the target doesn't want html */ GtkTargetEntry selection_targets[] = { - { (gchar *) "text/html", 0, TARGET_HTML }, - { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, - { (gchar *) "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, - { (gchar *) "STRING", 0, TARGET_STRING }, - { (gchar *) "TEXT", 0, TARGET_TEXT} -}; + {(gchar *)"text/html", 0, TARGET_HTML}, + {(gchar *)"UTF8_STRING", 0, TARGET_UTF8_STRING}, + {(gchar *)"COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT}, + {(gchar *)"STRING", 0, TARGET_STRING}, + {(gchar *)"TEXT", 0, TARGET_TEXT}}; /* there is probably a better way to do this */ -static gchar* copy_text; +static gchar *copy_text; /** * clipboardreq_get: @@ -69,31 +67,28 @@ * * This function is called every time a user pastes in another application **/ -static void clipboardreq_get (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, gpointer user_data) +static void clipboardreq_get(GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint info, gpointer user_data) { - gchar* text = g_strdup(copy_text); - if (info == TARGET_HTML) - { - gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), - 16, (const guchar*)text, strlen(text)); - } - else - { - gtk_selection_data_set_text(selection_data, text, strlen(text)); - } + gchar *text = g_strdup(copy_text); + if (info == TARGET_HTML) { + gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), + 16, (const guchar *)text, strlen(text)); + } else { + gtk_selection_data_set_text(selection_data, text, strlen(text)); + } - g_free (text); + g_free(text); - return; + return; } - int main_get_max_verses(const char *name) { SWModule *mod = backend->get_SWModule(name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *key = (VerseKey *)mod->createKey(); key->setText(settings.currentverse); @@ -105,7 +100,8 @@ int main_get_current_verse(const char *name) { SWModule *mod = backend->get_SWModule(name); - if (!mod) return 1; + if (!mod) + return 1; VerseKey *key = (VerseKey *)mod->createKey(); key->setText(settings.currentverse); @@ -123,18 +119,18 @@ * so that smart word processors such as OO.o will preserve markup; at this point, * the HTML is *not* preserving the font. **/ -static void _copy_to_clipboard (EXPORT_DATA data, char* text,int len) +static void _copy_to_clipboard(EXPORT_DATA data, char *text, int len) { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); if (copy_text) - g_free (copy_text); - copy_text = g_strdup (text); - gtk_clipboard_set_with_data (clipboard, selection_targets, - G_N_ELEMENTS (selection_targets), - (GtkClipboardGetFunc)clipboardreq_get, - NULL, - NULL); + g_free(copy_text); + copy_text = g_strdup(text); + gtk_clipboard_set_with_data(clipboard, selection_targets, + G_N_ELEMENTS(selection_targets), + (GtkClipboardGetFunc)clipboardreq_get, + NULL, + NULL); if (data.bookheader) g_free(data.bookheader); if (data.chapterheader_book) @@ -151,9 +147,9 @@ g_free(data.verse_range_verse); } -static void _save(EXPORT_DATA data, char* text,int len) +static void _save(EXPORT_DATA data, char *text, int len) { - XI_message(("%s",data.filename)); + XI_message(("%s", data.filename)); g_file_set_contents(data.filename, text, len, NULL); if (data.filename) g_free(data.filename); @@ -182,22 +178,22 @@ mod->setKey(settings.currentverse); VerseKey *key = (VerseKey *)(SWKey *)(*mod); int curChapter = 1; - int curBook = key->getBook(); + int curBook = key->getBook(); int mychapter = 1; int myverse = 1; - - key->setChapter(1); - key->setVerse(1); + + key->setChapter(1); + key->setVerse(1); if (type == HTML) g_string_append_printf(str, data.bookheader, HTML_START, - (data.version ? mod->getDescription() : ""), + (data.version ? mod->getDescription() : ""), 1); else - g_string_append_printf(str,data.plain_bookheader, - mod->getDescription(), + g_string_append_printf(str, data.plain_bookheader, + mod->getDescription(), 1); //g_free(buf); while (key->getBook() == curBook && !mod->popError()) { @@ -206,16 +202,16 @@ myverse = 1; curChapter = key->getChapter(); if (type == HTML) - g_string_append_printf(str,data.chapterheader_book, curChapter); + g_string_append_printf(str, data.chapterheader_book, curChapter); else - g_string_append_printf(str,data.plain_chapterheader_book, curChapter); + g_string_append_printf(str, data.plain_chapterheader_book, curChapter); } if (data.verse_num) g_string_append_printf(str, ((type == HTML) - ? data.versenumber - : data.plain_versenumber), + ? data.versenumber + : data.plain_versenumber), myverse); if (type == HTML) @@ -224,25 +220,25 @@ (settings.versestyle ? "
        " : "")); else g_string_append_printf(str, " %s%s", - (char*)mod->stripText(), + (char *)mod->stripText(), (settings.versestyle ? "\n" : "")); ++myverse; (*mod)++; } if (type == HTML) - g_string_append_printf(str,"%s",""); + g_string_append_printf(str, "%s", ""); if (data.filename) - _save(data, str->str,str->len); + _save(data, str->str, str->len); else - _copy_to_clipboard (data, str->str, str->len); - g_string_free(str,TRUE); + _copy_to_clipboard(data, str->str, str->len); + g_string_free(str, TRUE); } static void _export_chapter(EXPORT_DATA data, int type) { GString *str = g_string_new(NULL); - char* book; + char *book; SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[settings.MainWindowModule]; mod->setKey(settings.currentverse); @@ -273,36 +269,36 @@ if (data.verse_num) g_string_append_printf(str, ((type == HTML) - ? data.versenumber - : data.plain_versenumber), myverse); + ? data.versenumber + : data.plain_versenumber), + myverse); if (type == HTML) - g_string_append_printf(str," %s%s", + g_string_append_printf(str, " %s%s", mod->renderText().c_str(), (settings.versestyle ? "
        " : "")); else - g_string_append_printf(str," %s%s", - (char*)mod->stripText(), + g_string_append_printf(str, " %s%s", + (char *)mod->stripText(), (settings.versestyle ? "\n" : "")); ++myverse; } if (type == HTML) - g_string_append_printf(str,"%s",""); + g_string_append_printf(str, "%s", ""); if (data.filename) - _save(data, str->str,str->len); + _save(data, str->str, str->len); else - _copy_to_clipboard (data, str->str, str->len); - g_string_free(str,TRUE); + _copy_to_clipboard(data, str->str, str->len); + g_string_free(str, TRUE); if (book) g_free(book); } - static void _export_verse(EXPORT_DATA data, int type) { GString *str = g_string_new(NULL); - char* book; - char *modstr = g_strdup_printf(" [%s]",settings.MainWindowModule); + char *book; + char *modstr = g_strdup_printf(" [%s]", settings.MainWindowModule); SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[settings.MainWindowModule]; mod->setKey(settings.currentverse); @@ -310,7 +306,7 @@ book = backend->key_get_book(settings.MainWindowModule, settings.currentverse); if (type == HTML) - if (data.reference_last) + if (data.reference_last) g_string_append_printf(str, data.verselayout_single_verse_ref_last, HTML_START, @@ -319,7 +315,7 @@ key->getChapter(), key->getVerse(), (data.version ? modstr : "")); - else + else g_string_append_printf(str, data.verselayout_single_verse_ref_first, HTML_START, @@ -328,49 +324,47 @@ key->getVerse(), (data.version ? modstr : ""), mod->renderText().c_str()); + else if (data.reference_last) + g_string_append_printf(str, + data.plain_verselayout_single_verse_ref_last, + (char *)mod->stripText(), + book, + key->getChapter(), + key->getVerse(), + (data.version ? modstr : "")); else - if (data.reference_last) - g_string_append_printf(str, - data.plain_verselayout_single_verse_ref_last, - (char*)mod->stripText(), - book, - key->getChapter(), - key->getVerse(), - (data.version ? modstr : "")); - else - g_string_append_printf(str, - data.plain_verselayout_single_verse_ref_first, - book, - key->getChapter(), - key->getVerse(), - (data.version ? modstr : ""), - (char*)mod->stripText()); - + g_string_append_printf(str, + data.plain_verselayout_single_verse_ref_first, + book, + key->getChapter(), + key->getVerse(), + (data.version ? modstr : ""), + (char *)mod->stripText()); if (data.filename) - _save(data, str->str,str->len); + _save(data, str->str, str->len); else - _copy_to_clipboard (data, str->str, str->len); + _copy_to_clipboard(data, str->str, str->len); - g_string_free(str,TRUE); + g_string_free(str, TRUE); if (book) g_free(book); - if(modstr) + if (modstr) g_free(modstr); } -static void _export_verse_range (EXPORT_DATA data, int type) +static void _export_verse_range(EXPORT_DATA data, int type) { GString *str = g_string_new(NULL); - char* book; + char *book; SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[settings.MainWindowModule]; mod->setKey(settings.currentverse); VerseKey *key = (VerseKey *)(SWKey *)(*mod); - int curChapter = key->getChapter(); - int curBook = key->getBook(); - char *modstr = g_strdup_printf(" [%s]",settings.MainWindowModule); + int curChapter = key->getChapter(); + int curBook = key->getBook(); + char *modstr = g_strdup_printf(" [%s]", settings.MainWindowModule); //int myverse = 1; // special case: one verse range => single verse export. @@ -386,36 +380,36 @@ if (!data.reference_last) g_string_append_printf(str, - ((type == HTML) - ? data.verse_range_ref_first - : data.plain_verse_range_ref_first), + ((type == HTML) + ? data.verse_range_ref_first + : data.plain_verse_range_ref_first), book, key->getChapter(), data.start_verse, data.end_verse, (data.version ? modstr : "")); - + for (key->setVerse(data.start_verse); (key->getVerse() <= data.end_verse) && - (key->getBook() == curBook) && - (key->getChapter() == curChapter) && - !mod->popError(); + (key->getBook() == curBook) && + (key->getChapter() == curChapter) && + !mod->popError(); (*mod)++) { if (data.verse_num) - g_string_append_printf(str, - ((type == HTML) - ? data.versenumber - : data.plain_versenumber), - key->getVerse()); + g_string_append_printf(str, + ((type == HTML) + ? data.versenumber + : data.plain_versenumber), + key->getVerse()); if (type == HTML) - g_string_append_printf(str,data.verse_range_verse, + g_string_append_printf(str, data.verse_range_verse, mod->renderText().c_str(), (settings.versestyle ? "
        " : " ")); else - g_string_append_printf(str,data.verse_range_verse, - (char*)mod->stripText(), + g_string_append_printf(str, data.verse_range_verse, + (char *)mod->stripText(), (settings.versestyle ? "\n" : " ")); } // back up one verse. @@ -425,8 +419,8 @@ if (data.reference_last) g_string_append_printf(str, - ((type == HTML) ? data.verse_range_ref_last - : data.plain_verse_range_ref_last), + ((type == HTML) ? data.verse_range_ref_last + : data.plain_verse_range_ref_last), ((type == HTML) ? "
        " : "\n"), book, key->getChapter(), @@ -439,15 +433,14 @@ if (data.filename) _save(data, str->str, str->len); else - _copy_to_clipboard (data, str->str, str->len); - g_string_free(str,TRUE); + _copy_to_clipboard(data, str->str, str->len); + g_string_free(str, TRUE); if (book) g_free(book); - if(modstr) + if (modstr) g_free(modstr); } - void main_export_content(EXPORT_DATA data, gint format) { int style = (format ? HTML : PLAIN); @@ -457,17 +450,17 @@ _set_global_textual("Footnotes", "Off"); switch (data.passage_type) { - case BOOK: - _export_book(data, style); - break; - case CHAPTER: - _export_chapter(data, style); - break; - case VERSE: - _export_verse(data, style); - break; - case VERSE_RANGE: - _export_verse_range(data, style); - break; + case BOOK: + _export_book(data, style); + break; + case CHAPTER: + _export_chapter(data, style); + break; + case VERSE: + _export_verse(data, style); + break; + case VERSE_RANGE: + _export_verse_range(data, style); + break; } } diff -Nru xiphos-4.0.0+dfsg1/src/main/export_passage.h xiphos-4.0.4+dfsg1/src/main/export_passage.h --- xiphos-4.0.0+dfsg1/src/main/export_passage.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/export_passage.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_passage.h - * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,13 +22,13 @@ #ifndef ___EXPORT_PASSAGE_H_ #define ___EXPORT_PASSAGE_H_ - #ifdef __cplusplus extern "C" { #endif typedef struct _export_data EXPORT_DATA; -struct _export_data { +struct _export_data +{ char *filename; char *bookheader; char *chapterheader_book; @@ -37,7 +37,7 @@ char *verselayout_single_verse_ref_last; char *verselayout_single_verse_ref_first; char *verse_range_ref_last; - char *verse_range_ref_first; + char *verse_range_ref_first; char *plain_bookheader; char *plain_chapterheader_book; char *plain_chapterheader_chapter; @@ -46,7 +46,7 @@ char *plain_verselayout_single_verse_ref_first; char *plain_verse_range_ref_last; char *plain_verse_range_ref_first; - char *verse_range_verse; + char *verse_range_verse; int passage_type; int start_verse; int end_verse; @@ -71,5 +71,4 @@ #ifdef __cplusplus } #endif - #endif /* ___EXPORT_PASSAGE_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/main/global_ops.cc xiphos-4.0.4+dfsg1/src/main/global_ops.cc --- xiphos-4.0.0+dfsg1/src/main/global_ops.cc 2014-12-18 23:22:23.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/global_ops.cc 2015-02-11 23:48:33.000000000 +0000 @@ -3,7 +3,7 @@ * mod_global_ops.c - setup for SWORD global options and * a few of our own in the gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -43,7 +43,6 @@ #include "gui/debug_glib_null.h" - static void _set_global_option(const char *option, gboolean choice) { @@ -54,16 +53,13 @@ mgr->setGlobalOption(option, on_off); } - void _set_global_textual(const char *option, const char *choice) { SWMgr *mgr = backend->get_mgr(); mgr->setGlobalOption(option, choice); - } - /****************************************************************************** * Name * main_save_module_options @@ -97,7 +93,6 @@ return true; } - /****************************************************************************** * Name * main_get_option @@ -126,7 +121,6 @@ return gui_of2tf(module_options[mod_name][op].c_str()); } - /****************************************************************************** * Name * main_set_global_options @@ -143,7 +137,7 @@ * void */ -void main_set_global_options(GLOBAL_OPS * ops) +void main_set_global_options(GLOBAL_OPS *ops) { _set_global_option("Strong's Numbers", ops->strongs); _set_global_option("Morphological Tags", ops->morphs); @@ -161,9 +155,12 @@ _set_global_option("Words of Christ in Red", ops->words_in_red); _set_global_option("Transliterated Forms", ops->xlit); _set_global_option("Enumerations", ops->enumerated); + _set_global_option("Glosses", ops->glosses); + _set_global_option("Morpheme Segmentation", ops->morphseg); _set_global_textual("Transliteration", (ops->transliteration - ? "Latin" : "Off")); + ? "Latin" + : "Off")); if (ops->variants_primary) _set_global_textual("Textual Variants", "Primary Reading"); @@ -173,7 +170,6 @@ _set_global_textual("Textual Variants", "All Readings"); } - /****************************************************************************** * Name * main_new_globals @@ -190,7 +186,7 @@ * GLOBAL_OPS * */ -GLOBAL_OPS *main_new_globals(const gchar * mod_name) +GLOBAL_OPS *main_new_globals(const gchar *mod_name) { GLOBAL_OPS *ops; gchar *buf = g_strdup_printf("%s/modops.conf", settings.gSwordDir); @@ -212,6 +208,10 @@ gui_of2tf(module_options[mod_name]["Transliterated Forms"].c_str()); ops->enumerated = gui_of2tf(module_options[mod_name]["Enumerations"].c_str()); + ops->glosses = + gui_of2tf(module_options[mod_name]["Glosses"].c_str()); + ops->morphseg = + gui_of2tf(module_options[mod_name]["Morpheme Segmentation"].c_str()); ops->variants_all = gui_of2tf(module_options[mod_name]["All Readings"].c_str()); @@ -248,25 +248,25 @@ // we prefer and assume paragraph layout. // we take user preference, and alter our default for // those modules showing proper configuration for it. - ops->verse_per_line = + ops->verse_per_line = ((*(module_options[mod_name]["style"].c_str()) == 'v') - ? 1 - : ((*(module_options[mod_name]["style"].c_str()) == 'p') - ? 0 - : (main_check_for_option(mod_name, "Feature", "NoParagraphs") - ? 1 - : 0))); // default to paragraph style. + ? 1 + : ((*(module_options[mod_name]["style"].c_str()) == 'p') + ? 0 + : (main_check_for_option(mod_name, "Feature", "NoParagraphs") + ? 1 + : 0))); // default to paragraph style. // options not from configuration: xiphos-specific capability. ops->image_content = (*(module_options[mod_name]["Image Content"].c_str()) == '\0') - ? -1 // "unknown"; otherwise, it's like the others. - : gui_of2tf(module_options[mod_name]["Image Content"].c_str()); + ? -1 // "unknown"; otherwise, it's like the others. + : gui_of2tf(module_options[mod_name]["Image Content"].c_str()); ops->respect_font_faces = (*(module_options[mod_name]["Respect Font Faces"].c_str()) == '\0') - ? -1 // "unknown"; otherwise, it's like the others. - : gui_of2tf(module_options[mod_name]["Respect Font Faces"].c_str()); + ? -1 // "unknown"; otherwise, it's like the others. + : gui_of2tf(module_options[mod_name]["Respect Font Faces"].c_str()); ops->commentary_by_chapter = gui_of2tf(module_options[mod_name]["Commentary by Chapter"].c_str()); diff -Nru xiphos-4.0.0+dfsg1/src/main/global_ops.hh xiphos-4.0.4+dfsg1/src/main/global_ops.hh --- xiphos-4.0.0+dfsg1/src/main/global_ops.hh 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/global_ops.hh 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_global_ops.h - setup for SWORD global options in the gui * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifndef ___MOD_GLOBAL_OPS_H_ #define ___MOD_GLOBAL_OPS_H_ @@ -27,10 +26,10 @@ extern "C" { #endif - typedef struct _global_ops GLOBAL_OPS; #include "main/module_dialogs.h" -struct _global_ops { +struct _global_ops +{ gboolean words_in_red; gboolean strongs; gboolean morphs; @@ -45,22 +44,26 @@ gboolean variants_secondary; gboolean variants_all; gboolean transliteration; + gboolean xlit; + gboolean enumerated; + gboolean glosses; + gboolean morphseg; + gboolean commentary_by_chapter; gboolean doublespace; gboolean verse_per_line; gboolean xrefnotenumbers; - gboolean xlit; - gboolean enumerated; + gint image_content; gint respect_font_faces; }; void _set_global_textual(const char *option, const char *choice); -GLOBAL_OPS *main_new_globals(const gchar * mod_name); -int main_save_module_options(const char * mod_name, const char * option, int choice); +GLOBAL_OPS *main_new_globals(const gchar *mod_name); +int main_save_module_options(const char *mod_name, const char *option, int choice); int main_get_one_option(const char *mod_name, const char *op); -void main_set_global_options(GLOBAL_OPS * ops); +void main_set_global_options(GLOBAL_OPS *ops); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/main/gtk_compat.h xiphos-4.0.4+dfsg1/src/main/gtk_compat.h --- xiphos-4.0.0+dfsg1/src/main/gtk_compat.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/gtk_compat.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gtk_compat.h - * - * Copyright (C) 2011-2014 Xiphos Developer Team + * Copyright (C) 2011-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,10 +27,11 @@ #include #if !GTK_CHECK_VERSION(2, 20, 0) - inline gboolean xi_gtk_widget_get_realized(GtkWidget *widget) - { - return GTK_WIDGET_REALIZED(widget); - } -# define gtk_widget_get_realized xi_gtk_widget_get_realized +inline gboolean xi_gtk_widget_get_realized(GtkWidget *widget) +{ + return GTK_WIDGET_REALIZED(widget); +} + +#define gtk_widget_get_realized xi_gtk_widget_get_realized #endif #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/lists.cc xiphos-4.0.4+dfsg1/src/main/lists.cc --- xiphos-4.0.0+dfsg1/src/main/lists.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/lists.cc 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * lists.c - glists of module names and descriptions, bible books etc. * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -32,7 +32,6 @@ #include "main/xml.h" #include "backend/sword_main.hh" - /****************************************************************************** * lists to keep for the life of the program */ @@ -88,7 +87,6 @@ return NULL; } - void main_init_lists(void) { gboolean start_backend = FALSE; @@ -142,8 +140,8 @@ settings.haveprayerlist = g_list_length(mods.prayermods); - if (g_list_length(mods.devotionmods)== 1) { - xml_set_value("Xiphos", "modules", "devotional",(char*)mods.devotionmods->data ); + if (g_list_length(mods.devotionmods) == 1) { + xml_set_value("Xiphos", "modules", "devotional", (char *)mods.devotionmods->data); settings.devotionalmod = xml_get_value("modules", "devotional"); } @@ -161,83 +159,84 @@ void main_shutdown_list(void) { /* free lists */ - if (!mod_lists) return; + if (!mod_lists) + return; while (mod_lists->options != NULL) { - g_free((char *) mod_lists->options->data); + g_free((char *)mod_lists->options->data); mod_lists->options = g_list_next(mod_lists->options); } g_list_free(mod_lists->options); while (mod_lists->biblemods != NULL) { - g_free((char *) mod_lists->biblemods->data); + g_free((char *)mod_lists->biblemods->data); mod_lists->biblemods = g_list_next(mod_lists->biblemods); } g_list_free(mod_lists->biblemods); while (mod_lists->commentarymods != NULL) { - g_free((char *) mod_lists->commentarymods->data); + g_free((char *)mod_lists->commentarymods->data); mod_lists->commentarymods = g_list_next(mod_lists->commentarymods); } g_list_free(mod_lists->commentarymods); while (mod_lists->dictionarymods != NULL) { - g_free((char *) mod_lists->dictionarymods->data); + g_free((char *)mod_lists->dictionarymods->data); mod_lists->dictionarymods = g_list_next(mod_lists->dictionarymods); } g_list_free(mod_lists->dictionarymods); while (mod_lists->bookmods != NULL) { - g_free((char *) mod_lists->bookmods->data); + g_free((char *)mod_lists->bookmods->data); mod_lists->bookmods = g_list_next(mod_lists->bookmods); } g_list_free(mod_lists->bookmods); while (mod_lists->percommods != NULL) { - g_free((char *) mod_lists->percommods->data); + g_free((char *)mod_lists->percommods->data); mod_lists->percommods = g_list_next(mod_lists->percommods); } g_list_free(mod_lists->percommods); while (mod_lists->prayermods != NULL) { - g_free((char *) mod_lists->prayermods->data); + g_free((char *)mod_lists->prayermods->data); mod_lists->prayermods = g_list_next(mod_lists->prayermods); } g_list_free(mod_lists->prayermods); while (mod_lists->text_descriptions != NULL) { - g_free((char *) mod_lists->text_descriptions->data); + g_free((char *)mod_lists->text_descriptions->data); mod_lists->text_descriptions = g_list_next(mod_lists->text_descriptions); } g_list_free(mod_lists->text_descriptions); while (mod_lists->dict_descriptions != NULL) { - g_free((char *) mod_lists->dict_descriptions->data); + g_free((char *)mod_lists->dict_descriptions->data); mod_lists->dict_descriptions = g_list_next(mod_lists->dict_descriptions); } g_list_free(mod_lists->dict_descriptions); while (mod_lists->comm_descriptions != NULL) { - g_free((char *) mod_lists->comm_descriptions->data); + g_free((char *)mod_lists->comm_descriptions->data); mod_lists->comm_descriptions = g_list_next(mod_lists->comm_descriptions); } g_list_free(mod_lists->comm_descriptions); while (mod_lists->book_descriptions != NULL) { - g_free((char *) mod_lists->book_descriptions->data); + g_free((char *)mod_lists->book_descriptions->data); mod_lists->book_descriptions = g_list_next(mod_lists->book_descriptions); } g_list_free(mod_lists->book_descriptions); while (mod_lists->devotionmods != NULL) { - g_free((char *) mod_lists->devotionmods->data); + g_free((char *)mod_lists->devotionmods->data); mod_lists->devotionmods = g_list_next(mod_lists->devotionmods); } diff -Nru xiphos-4.0.0+dfsg1/src/main/lists.h xiphos-4.0.4+dfsg1/src/main/lists.h --- xiphos-4.0.0+dfsg1/src/main/lists.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/lists.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * lists.h glists of module names and descriptions, bible books etc. * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,17 +23,15 @@ #define _LISTS_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - #include typedef struct _module_lists MOD_LISTS; -struct _module_lists { - GList - *biblemods, +struct _module_lists +{ + GList *biblemods, *commentarymods, *dictionarymods, *bookmods, @@ -45,9 +43,7 @@ *text_descriptions, *dict_descriptions, *comm_descriptions, - *book_descriptions, - *prayer_descriptions, - *options; + *book_descriptions, *prayer_descriptions, *options; }; /* list types */ @@ -66,13 +62,11 @@ #define MAP_LIST 12 #define IMAGE_LIST 13 - -GList * get_list(gint type); +GList *get_list(gint type); void main_init_lists(void); void main_shutdown_list(void); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/main.c xiphos-4.0.4+dfsg1/src/main/main.c --- xiphos-4.0.0+dfsg1/src/main/main.c 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/main.c 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main.c - In the beginning... ;o) * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ #include #endif - #include #include #include @@ -61,12 +60,11 @@ #include static void -server_callback_media (SoupServer *server, - SoupMessage *msg, - const char *path, - GHashTable *query, - SoupClientContext *client, - gpointer user_data) +server_callback_media(SoupServer *server, + SoupMessage *msg, + const char *path, + GHashTable *query, + SoupClientContext *client, gpointer user_data) { char *contents; gsize length; @@ -115,24 +113,22 @@ double d; #endif - // g_thread_init(NULL); +// g_thread_init(NULL); #if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); // g_type_init has been deprecated since version 2.36 - // Since GLib 2.36, the type system is initialised - // automatically and this function does nothing. + // Since GLib 2.36, the type system is initialised + // automatically and this function does nothing. #endif - + #ifdef CHATTY total = g_timer_new(); #endif /* get this error check out of the way before risking leaking win32 resources */ if (argc > 2) { - gui_generic_warning_modal - (_("Xiphos does not understand more than one argument.")); + gui_generic_warning_modal(_("Xiphos does not understand more than one argument.")); exit(1); } - #ifdef WIN32 /* * WIN32 perversity: We very much want to be *in* the @@ -141,26 +137,26 @@ * to determine where we are (we can't depend on argv). */ gchar *bin_dir = xiphos_win32_get_subdir("bin"); - g_chdir (bin_dir); + g_chdir(bin_dir); /* add this directory to $PATH for other stuff, e.g. zip */ g_setenv("PATH", g_strdup_printf("%s;%s", bin_dir, - g_getenv("PATH")), - TRUE); + g_getenv("PATH")), + TRUE); /* This will not overwrite SWORD_PATH in case it has been set by some other program or set manually. In the case that it hasn't been set, it is set to the localized equivalent of C:/Documents and Settings/All Users/Application Data/Sword */ - const gchar * const * strings; + const gchar *const *strings; strings = g_get_system_data_dirs(); g_setenv("SWORD_PATH", g_strdup_printf("%s\\Sword", //g_getenv("ALLUSERSPROFILE"), strings[0]), - FALSE); + FALSE); /*it is necessary to explicitly set LANG, because we depend on that - variable to set the SWORD locale */ + variable to set the SWORD locale */ g_setenv("LANG", g_win32_getlocale(), FALSE); /* we need an idea of $HOME that's convenient. */ @@ -178,10 +174,12 @@ /* on windows, we will ship dbus along with Xiphos */ gchar *dbus_args[4]; - gchar *dbus_com = g_win32_get_package_installation_directory_of_module(NULL); + gchar *dbus_com = + g_win32_get_package_installation_directory_of_module(NULL); dbus_com = g_strconcat(dbus_com, "\0", NULL); - gchar *dbus_conf = g_build_filename(dbus_com, "etc\\dbus-session.conf\0", NULL); + gchar *dbus_conf = + g_build_filename(dbus_com, "etc\\dbus-session.conf\0", NULL); dbus_conf = g_build_filename("--config-file=\0", dbus_conf, NULL); dbus_com = g_build_filename(dbus_com, "dbus.exe\0", NULL); @@ -193,13 +191,9 @@ g_spawn_async(NULL, dbus_args, NULL, - G_SPAWN_SEARCH_PATH, - NULL, - NULL, - &dbus_pid, - NULL); - Sleep(2); // give dbus a moment to init. -#endif /* HAVE_DBUS */ + G_SPAWN_SEARCH_PATH, NULL, NULL, &dbus_pid, NULL); + Sleep(2); // give dbus a moment to init. +#endif /* HAVE_DBUS */ #endif /* WIN32 */ @@ -237,7 +231,7 @@ /* * check for directories and files */ - settings_init(argc, argv, newconfigs, newbookmarks); + settings_init(argc, argv, newconfigs, newbookmarks); gui_init(argc, argv); @@ -266,8 +260,8 @@ if (have_sword_url) { if (!strncmp(argv[1], "sword:/", 7)) { - char *key = strchr(argv[1]+8, '/'); - if (key && *(key+1) != '\0') + char *key = strchr(argv[1] + 8, '/'); + if (key && *(key + 1) != '\0') key++; else key = "Gen 1:1"; @@ -275,13 +269,12 @@ } main_url_handler(argv[1], TRUE); } - #ifdef CHATTY g_timer_stop(total); d = g_timer_elapsed(total, NULL); printf("total time is %f\n", d); #endif - g_idle_add ((GSourceFunc)gui_splash_done, NULL); + g_idle_add((GSourceFunc)gui_splash_done, NULL); gui_recompute_shows(FALSE); diff -Nru xiphos-4.0.0+dfsg1/src/main/mod_mgr.cc xiphos-4.0.4+dfsg1/src/main/mod_mgr.cc --- xiphos-4.0.0+dfsg1/src/main/mod_mgr.cc 2014-12-24 03:04:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/mod_mgr.cc 2015-02-21 02:22:53.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * mod_mgr.c + * mod_mgr.cc * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -36,13 +36,12 @@ #include "backend/module_manager.hh" #include "backend/sword_main.hh" - -int main_module_mgr_index_mod(char * module_name) +int main_module_mgr_index_mod(char *module_name) { return backend->do_module_index(module_name); } -int main_module_mgr_delete_index_mod(char * module_name) +int main_module_mgr_delete_index_mod(char *module_name) { return backend->do_module_delete_index(module_name); } @@ -76,7 +75,6 @@ main_init_parallel_view(); } - /****************************************************************************** * Name * update_install_status @@ -100,7 +98,6 @@ gui_update_install_status(total, done, message); } - /****************************************************************************** * Name * update_install_progress @@ -122,19 +119,17 @@ gui_update_install_progressbar(fraction); } - void main_index_percent_update(char percent, void *userData) { - char maxHashes = *((char *) userData); - float num; + char maxHashes = *((char *)userData); char buf[80]; static char printed = 0; /* update search dialog progress */ - while ((((float) percent) / 100) * maxHashes > printed) { - sprintf(buf, "%f", (((float) percent) / 100)); - num = (float) percent / 100; + while ((((float)percent) / 100) * maxHashes > printed) { + sprintf(buf, "%f", (((float)percent) / 100)); + float num = (float)percent / 100; gui_update_install_progressbar((gdouble)num); printed++; } @@ -162,7 +157,6 @@ return backend_module_mgr_list_remote_sources(); } - /****************************************************************************** * Name * mod_mgr_list_local_sources @@ -184,7 +178,6 @@ return backend_module_mgr_list_local_sources(); } - /****************************************************************************** * Name * mod_mgr_uninstall @@ -206,7 +199,6 @@ return backend_uninstall_module(dir, mod_name); } - /****************************************************************************** * Name * mod_mgr_remote_install @@ -230,7 +222,6 @@ return backend_remote_install_module(dir, source_name, mod_name); } - /****************************************************************************** * Name * mod_mgr_local_install_module @@ -254,7 +245,6 @@ return backend_local_install_module(destdir, srcdir, mod_name); } - /****************************************************************************** * Name * mod_mgr_list_local_modules @@ -281,12 +271,11 @@ backend_module_mgr_list_local_modules_init(!augment); while ((mod_info = backend_module_mgr_get_next_module()) != NULL) { - list = g_list_append(list, (MOD_MGR*) mod_info); + list = g_list_append(list, (MOD_MGR *)mod_info); } return list; } - /****************************************************************************** * Name * mod_mgr_remote_list_modules @@ -310,12 +299,11 @@ backend_module_mgr_remote_list_modules_init(source_name); while ((mod_info = backend_module_mgr_get_next_module()) != NULL) { - list = g_list_append(list, (MOD_MGR*) mod_info); + list = g_list_append(list, (MOD_MGR *)mod_info); } return list; } - /****************************************************************************** * Name * mod_mgr_refresh_remote_source @@ -337,7 +325,6 @@ return backend_module_mgr_refresh_remote_source(source_name); } - /****************************************************************************** * Name * mod_mgr_init_config @@ -374,14 +361,14 @@ backend_module_mgr_reread_config(); } -void mod_mgr_add_source(const char * vtype, - const char * type, - const char * caption, - const char * source, - const char * directory, - const char * user, - const char * pass, - const char * uid) +void mod_mgr_add_source(const char *vtype, + const char *type, + const char *caption, + const char *source, + const char *directory, + const char *user, + const char *pass, + const char *uid) { backend_module_mgr_add_source(vtype, type, @@ -393,7 +380,6 @@ uid); } - /****************************************************************************** * Name * mod_mgr_init @@ -438,7 +424,6 @@ backend_terminate_module_mgr(); } - /****************************************************************************** * Name * mod_mgr_shut_down diff -Nru xiphos-4.0.0+dfsg1/src/main/mod_mgr.h xiphos-4.0.4+dfsg1/src/main/mod_mgr.h --- xiphos-4.0.0+dfsg1/src/main/mod_mgr.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/mod_mgr.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_mgr.h * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -33,8 +33,10 @@ #include typedef struct _mm MOD_MGR; -struct _mm { +struct _mm +{ char *name; + char *abbreviation; char *type; const char *language; char *old_version; @@ -52,7 +54,8 @@ }; typedef struct _mms MOD_MGR_SOURCE; -struct _mms { +struct _mms +{ const char *caption; const char *type; const char *source; @@ -61,22 +64,19 @@ const char *pass; const char *uid; }; -int main_module_mgr_index_mod(char * module_name); -int main_module_mgr_delete_index_mod(char * module_name); -void main_index_percent_update(char percent, - void *userData); +int main_module_mgr_index_mod(char *module_name); +int main_module_mgr_delete_index_mod(char *module_name); +void main_index_percent_update(char percent, void *userData); void main_update_module_lists(void); MOD_MGR *mod_mgr_get_next_module(void); void update_install_status(long total, - long done, - const char *message); + long done, const char *message); void update_install_progress(double fraction); GList *mod_mgr_list_local_modules(const char *dir, gboolean augment); GList *mod_mgr_list_remote_sources(void); GList *mod_mgr_list_local_sources(void); -int mod_mgr_uninstall(const char *dir, - const char *mod_name); +int mod_mgr_uninstall(const char *dir, const char *mod_name); int mod_mgr_remote_install(const char *dir, const char *source_name, const char *mod_name); @@ -89,22 +89,19 @@ int mod_mgr_init_config_extras(void); void mod_mgr_clear_config(void); void mod_mgr_reread_config(void); -void mod_mgr_add_source(const char * vtype, - const char * type, - const char * caption, - const char * source, - const char * directory, - const char * user, - const char * pass, - const char * uid); +void mod_mgr_add_source(const char *vtype, + const char *type, + const char *caption, + const char *source, + const char *directory, + const char *user, + const char *pass, const char *uid); void mod_mgr_init(const char *dir, - gboolean augment, - gboolean regular); + gboolean augment, gboolean regular); void mod_mgr_shut_down(void); void mod_mgr_terminate(void); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/modulecache.cc xiphos-4.0.4+dfsg1/src/main/modulecache.cc --- xiphos-4.0.0+dfsg1/src/main/modulecache.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/modulecache.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * modulecache.cc - * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * 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 @@ -42,27 +42,31 @@ ConstructFlags(GLOBAL_OPS *ops) { int flags = 0; - flags |= (ops->footnotes ? Footnotes : 0); - flags |= (ops->greekaccents ? GreekAccents : 0); - flags |= (ops->headings ? Headings : 0); - flags |= (ops->hebrewcant ? HebrewCantillation : 0); - flags |= (ops->hebrewpoints ? HebrewVowels : 0); - flags |= (ops->lemmas ? Lemmas : 0); - flags |= (ops->morphs ? Morphology : 0); - flags |= (ops->words_in_red ? RedWordsOfChrist : 0); - flags |= (ops->strongs ? StrongsNumbers : 0); - flags |= (ops->scripturerefs ? Xrefs : 0); - flags |= (ops->image_content ? Images : 0); - flags |= (ops->respect_font_faces ? RespectFontFaces : 0); - flags |= (ops->variants_all ? VariantsAll : 0); - flags |= (ops->variants_primary ? VariantsPrimary : 0); - flags |= (ops->variants_secondary ? VariantsSecondary : 0); - flags |= (ops->transliteration ? Transliteration : 0); + flags |= (ops->footnotes ? Footnotes : 0); + flags |= (ops->greekaccents ? GreekAccents : 0); + flags |= (ops->headings ? Headings : 0); + flags |= (ops->hebrewcant ? HebrewCantillation : 0); + flags |= (ops->hebrewpoints ? HebrewVowels : 0); + flags |= (ops->lemmas ? Lemmas : 0); + flags |= (ops->morphs ? Morphology : 0); + flags |= (ops->words_in_red ? RedWordsOfChrist : 0); + flags |= (ops->strongs ? StrongsNumbers : 0); + flags |= (ops->scripturerefs ? Xrefs : 0); + flags |= (ops->image_content ? Images : 0); + flags |= (ops->respect_font_faces ? RespectFontFaces : 0); + flags |= (ops->variants_all ? VariantsAll : 0); + flags |= (ops->variants_primary ? VariantsPrimary : 0); + flags |= (ops->variants_secondary ? VariantsSecondary : 0); + flags |= (ops->transliteration ? Transliteration : 0); + flags |= (ops->xlit ? Xlit : 0); + flags |= (ops->enumerated ? Enumerated : 0); + flags |= (ops->glosses ? Glosses : 0); + flags |= (ops->morphseg ? MorphSegmentation : 0); + flags |= (ops->commentary_by_chapter ? CommentaryChapter : 0); - flags |= (ops->doublespace ? Doublespace : 0); - flags |= (ops->xrefnotenumbers ? XrefNoteNumbers : 0); - flags |= (ops->xlit ? Xlit : 0); - flags |= (ops->enumerated ? Enumerated : 0); + flags |= (ops->doublespace ? Doublespace : 0); + flags |= (ops->xrefnotenumbers ? XrefNoteNumbers : 0); + return flags; } @@ -77,6 +81,8 @@ // or just ModuleMap.erase(modname), i guess. } +#if 0 +// unused at this time -- we don't cache book content. void BookModuleCacheErase(const char *modname) { @@ -85,3 +91,4 @@ if (itr != BookModuleMap.end()) BookModuleMap.erase(itr); } +#endif diff -Nru xiphos-4.0.0+dfsg1/src/main/modulecache.hh xiphos-4.0.4+dfsg1/src/main/modulecache.hh --- xiphos-4.0.0+dfsg1/src/main/modulecache.hh 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/modulecache.hh 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * modulecache.hh - * - * Copyright (C) 2007-2014 Xiphos Developer Team + * Copyright (C) 2007-2015 Xiphos Developer Team * * 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 @@ -45,89 +45,97 @@ #include #include -namespace ModuleCache { +namespace ModuleCache +{ + +// bitwise cache type indicators: +// if flags change (=> new display choice), text becomes invalid. - // bitwise cache type indicators: - // if flags change (=> new display choice), text becomes invalid. - static const int Footnotes = (1<<0); - static const int GreekAccents = (1<<1); - static const int Headings = (1<<2); - static const int HebrewCantillation = (1<<3); - static const int HebrewVowels = (1<<4); - static const int Lemmas = (1<<5); - static const int Morphology = (1<<6); - static const int RedWordsOfChrist = (1<<7); - static const int StrongsNumbers = (1<<8); - static const int Xrefs = (1<<9); - static const int Images = (1<<10); - static const int RespectFontFaces = (1<<11); - static const int VariantsAll = (1<<12); - static const int VariantsPrimary = (1<<13); - static const int VariantsSecondary = (1<<14); - static const int Transliteration = (1<<15); - static const int CommentaryChapter = (1<<16); - static const int Doublespace = (1<<17); - static const int XrefNoteNumbers = (1<<18); - static const int Xlit = (1<<19); - static const int Enumerated = (1<<20); - - class CacheVerse { - public: - CacheVerse(); - CacheVerse(int flags, - const char *text, - const char *header = NULL); - ~CacheVerse(); - - bool TextIsValid(); - bool HeaderIsValid(); - bool CacheIsValid(int flags); - - int GetFlags(); - void SetFlags(int flags = 0); - void AddFlag(int flag); - void DelFlag(int flag); - - const char * GetText(); - void SetText(const char *text, int flags); - void AppendText(const char *text, int flags); - - const char * GetHeader(); - void SetHeader(const char *text); - void AppendHeader(const char *text); - - void Invalidate(); - void InvalidateHeader(); - - private: - char * _text; - char * _header; - int _flags; // bitmask - }; - - // In precision order. - typedef std::map < int, CacheVerse > CacheChapter; - typedef std::map < int, CacheChapter > CacheBook; - typedef std::map < int, CacheBook > CacheTestament; - typedef std::map < int, CacheTestament > CacheModule; - - // Index by module name => Cache for that module. - typedef std::map < const std::string, CacheModule > CacheMap; - - // Textually: - // CacheMap contains modules of testaments of books of chapters of - // verses, subscriptable at any stage to get the subordinate content. - - // Similar concept for genbooks and lexdicts. - typedef std::map < const char *, CacheVerse > BookCacheMap; - // a "verse" is just a section entry, textually keyed. +// options known to Sword. +static const int Footnotes = (1 << 0); +static const int GreekAccents = (1 << 1); +static const int Headings = (1 << 2); +static const int HebrewCantillation = (1 << 3); +static const int HebrewVowels = (1 << 4); +static const int Lemmas = (1 << 5); +static const int Morphology = (1 << 6); +static const int RedWordsOfChrist = (1 << 7); +static const int StrongsNumbers = (1 << 8); +static const int Xrefs = (1 << 9); +static const int Images = (1 << 10); +static const int RespectFontFaces = (1 << 11); +static const int VariantsAll = (1 << 12); +static const int VariantsPrimary = (1 << 13); +static const int VariantsSecondary = (1 << 14); +static const int Transliteration = (1 << 15); +static const int Xlit = (1 << 16); +static const int Enumerated = (1 << 17); +static const int Glosses = (1 << 18); +static const int MorphSegmentation = (1 << 19); +// 20-23 yet to be assigned. + +// options known only within Xiphos. +static const int CommentaryChapter = (1 << 24); +static const int Doublespace = (1 << 25); +static const int XrefNoteNumbers = (1 << 26); + +class CacheVerse +{ + public: + CacheVerse(); + CacheVerse(int flags, + const char *text, + const char *header = NULL); + ~CacheVerse(); + + bool TextIsValid(); + bool HeaderIsValid(); + bool CacheIsValid(int flags); + + int GetFlags(); + void SetFlags(int flags = 0); + void AddFlag(int flag); + void DelFlag(int flag); + + const char *GetText(); + void SetText(const char *text, int flags); + void AppendText(const char *text, int flags); + + const char *GetHeader(); + void SetHeader(const char *text); + void AppendHeader(const char *text); + + void Invalidate(); + void InvalidateHeader(); + + private: + char *_text; + char *_header; + int _flags; // bitmask +}; + +// In precision order. +typedef std::map CacheChapter; +typedef std::map CacheBook; +typedef std::map CacheTestament; +typedef std::map CacheModule; + +// Index by module name => Cache for that module. +typedef std::map CacheMap; + +// Textually: +// CacheMap contains modules of testaments of books of chapters of +// verses, subscriptable at any stage to get the subordinate content. + +// Similar concept for genbooks and lexdicts. +typedef std::map BookCacheMap; +// a "verse" is just a section entry, textually keyed. } // Lifecycle. -inline -ModuleCache::CacheVerse:: -CacheVerse() +inline ModuleCache::CacheVerse:: + CacheVerse() : _text(NULL), _header(NULL), _flags(0) @@ -135,19 +143,17 @@ // just initializers preceding } -inline -ModuleCache::CacheVerse:: -CacheVerse(int flags, const char *text, const char *header) - : _text(text ? g_strdup(text) : NULL), +inline ModuleCache::CacheVerse:: + CacheVerse(int flags, const char *text, const char *header) + : _text(text ? g_strdup(text) : NULL), _header(header ? g_strdup(header) : NULL), _flags(flags) { // just initializers preceding } -inline -ModuleCache::CacheVerse:: -~CacheVerse() +inline ModuleCache::CacheVerse:: + ~CacheVerse() { if (_text) g_free(_text); @@ -157,70 +163,61 @@ // Access. -inline -bool ModuleCache::CacheVerse:: -TextIsValid() +inline bool ModuleCache::CacheVerse:: + TextIsValid() { return _text != NULL; } -inline -bool ModuleCache::CacheVerse:: -HeaderIsValid() +inline bool ModuleCache::CacheVerse:: + HeaderIsValid() { return _header != NULL; } -inline -bool ModuleCache::CacheVerse:: -CacheIsValid(int flags) +inline bool ModuleCache::CacheVerse:: + CacheIsValid(int flags) { return TextIsValid() && (flags == GetFlags()); } -inline -int ModuleCache::CacheVerse:: -GetFlags() +inline int ModuleCache::CacheVerse:: + GetFlags() { return _flags; } -inline -void ModuleCache::CacheVerse:: -SetFlags(int flags) +inline void ModuleCache::CacheVerse:: + SetFlags(int flags) { _flags = flags; } -inline -void ModuleCache::CacheVerse:: -AddFlag(int flag) +inline void ModuleCache::CacheVerse:: + AddFlag(int flag) { _flags |= flag; } -inline -void ModuleCache::CacheVerse:: -DelFlag(int flag) +inline void ModuleCache::CacheVerse:: + DelFlag(int flag) { _flags &= ~flag; } -inline -const char *ModuleCache::CacheVerse:: -GetText() +inline const char *ModuleCache::CacheVerse:: + GetText() { assert(_text); return _text; } -inline -void ModuleCache::CacheVerse:: -SetText(const char *text, int flags) +inline void ModuleCache::CacheVerse:: + SetText(const char *text, int flags) { if (_text) g_free(_text); - _text = g_strdup(text); + _text = g_strdup(text); _flags = flags; // we are setting from scratch: neutralize header. if (_header) { @@ -229,16 +226,15 @@ } } -inline -void ModuleCache::CacheVerse:: -AppendText(const char *text, int flags) +inline void ModuleCache::CacheVerse:: + AppendText(const char *text, int flags) { if (_text) { char *new_text = g_strconcat(_text, text, NULL); g_free(_text); _text = new_text; } else - _text = g_strdup(text); + _text = g_strdup(text); _flags = flags; } @@ -248,37 +244,33 @@ // a few lines of straight line code we will also assign text+flags. // also, a null header is legit. -inline -const char *ModuleCache::CacheVerse:: -GetHeader() +inline const char *ModuleCache::CacheVerse:: + GetHeader() { return (_header ? _header : ""); } -inline -void ModuleCache::CacheVerse:: -SetHeader(const char *text) +inline void ModuleCache::CacheVerse:: + SetHeader(const char *text) { if (_header) g_free(_header); - _header = g_strdup(text); + _header = g_strdup(text); } -inline -void ModuleCache::CacheVerse:: -AppendHeader(const char *text) +inline void ModuleCache::CacheVerse:: + AppendHeader(const char *text) { if (_header) { char *new_text = g_strconcat(_header, text, NULL); g_free(_header); _header = new_text; } else - _header = g_strdup(text); + _header = g_strdup(text); } -inline -void ModuleCache::CacheVerse:: -Invalidate() +inline void ModuleCache::CacheVerse:: + Invalidate() { _flags = 0; if (_text) @@ -288,9 +280,8 @@ _text = _header = NULL; } -inline -void ModuleCache::CacheVerse:: -InvalidateHeader() +inline void ModuleCache::CacheVerse:: + InvalidateHeader() { if (_header) g_free(_header); @@ -298,12 +289,12 @@ } extern "C" { -#endif /* __cplusplus */ +#endif /* __cplusplus */ // namespace-free routines. // utility function to give our bitset. -int ConstructFlags(GLOBAL_OPS * ops); +int ConstructFlags(GLOBAL_OPS *ops); // access from plain C to eliminate a module's entire cache (mod_mgr.c). void ModuleCacheErase(const char *modname); diff -Nru xiphos-4.0.0+dfsg1/src/main/module_dialogs.cc xiphos-4.0.4+dfsg1/src/main/module_dialogs.cc --- xiphos-4.0.0+dfsg1/src/main/module_dialogs.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/module_dialogs.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_dialogs.cc - view module in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -44,7 +44,6 @@ #include "gui/widgets.h" #include "gui/about_modules.h" - #include "main/navbar_book_dialog.h" #include "main/module_dialogs.h" #include "main/navbar_versekey.h" @@ -61,17 +60,18 @@ #include "gui/debug_glib_null.h" -#define HTML_START "" +#define HTML_START "" typedef struct _treeitem TreeItem; -struct _treeitem { +struct _treeitem +{ gchar *module_name; gchar *item_name; gchar *offset; gboolean is_leaf; gboolean expanded; - GdkPixbuf *pixbuf_opened; - GdkPixbuf *pixbuf_closed; + GdkPixbuf *pixbuf_opened; + GdkPixbuf *pixbuf_closed; }; enum { @@ -97,7 +97,7 @@ /****************************************************************************** * externs */ -extern gboolean gsI_isrunning; /* information dialog */ +extern gboolean gsI_isrunning; /* information dialog */ extern gboolean do_display; extern gboolean valid_scripture_key; @@ -118,9 +118,9 @@ * void */ -void main_dialogs_book_heading(DIALOG_DATA * d) +void main_dialogs_book_heading(DIALOG_DATA *d) { - BackEnd* be = (BackEnd*)d->backend; + BackEnd *be = (BackEnd *)d->backend; SWMgr *mgr = be->get_mgr(); be->display_mod = mgr->Modules[d->mod_name]; @@ -133,7 +133,6 @@ be->display_mod->display(); } - /****************************************************************************** * Name * main_dialogs_chapter_heading @@ -150,9 +149,9 @@ * void */ -void main_dialogs_chapter_heading(DIALOG_DATA * d) +void main_dialogs_chapter_heading(DIALOG_DATA *d) { - BackEnd* be = (BackEnd*)d->backend; + BackEnd *be = (BackEnd *)d->backend; SWMgr *mgr = be->get_mgr(); be->display_mod = mgr->Modules[d->mod_name]; @@ -165,7 +164,6 @@ be->display_mod->display(); } - /****************************************************************************** * Name * main_dialogs_clear_viewer @@ -202,7 +200,6 @@ g_string_free(str, TRUE); } - /****************************************************************************** * Name * main_dialogs_information_viewer @@ -220,81 +217,79 @@ * void */ -void main_dialogs_information_viewer(DIALOG_DATA * d, gchar * mod_name, - gchar * text, gchar * key, - gchar * action ,gchar * type , - gchar * morph_text, gchar * morph) +void main_dialogs_information_viewer(DIALOG_DATA *d, gchar *mod_name, + gchar *text, gchar *key, + gchar *action, gchar *type, + gchar *morph_text, gchar *morph) { GString *tmp_str = g_string_new(NULL); GString *str; MOD_FONT *mf = get_font(mod_name); g_string_printf(tmp_str, - HTML_START - "", - settings.bible_bg_color, settings.bible_text_color, - settings.link_color); + HTML_START + "", + settings.bible_bg_color, settings.bible_text_color, + settings.link_color); str = g_string_new(tmp_str->str); if (type) { - if (!strcmp(type,"n")) { + if (!strcmp(type, "n")) { g_string_printf(tmp_str, - "%s

        ", + "%s

        ", _("Footnote")); str = g_string_append(str, tmp_str->str); } - if (!strcmp(type,"x")) { + if (!strcmp(type, "x")) { g_string_printf(tmp_str, - "%s

        ", + "%s

        ", _("Cross Reference")); str = g_string_append(str, tmp_str->str); } - if (!strcmp(action ,"showStrongs")) { //&& !strcmp(type,"Greek") + if (!strcmp(action, "showStrongs")) { //&& !strcmp(type,"Greek") g_string_printf(tmp_str, - "%s: %s

        ", - _("Strongs"),key); + "%s: %s

        ", + _("Strongs"), key); str = g_string_append(str, tmp_str->str); } - if (!strcmp(action ,"showMorph")) { //&& !strcmp(type,"Greek") + if (!strcmp(action, "showMorph")) { //&& !strcmp(type,"Greek") g_string_printf(tmp_str, - "%s: %s

        ", - _("Morphology"),key); + "%s: %s

        ", + _("Morphology"), key); str = g_string_append(str, tmp_str->str); } } - if (!strcmp(action ,"showStrongsMorph")) { //&& !strcmp(type,"Greek") + if (!strcmp(action, "showStrongsMorph")) { //&& !strcmp(type,"Greek") g_string_printf(tmp_str, - "%s: %s

        ", - _("Strongs"),key); + "%s: %s

        ", + _("Strongs"), key); str = g_string_append(str, tmp_str->str); g_string_printf(tmp_str, "", - (mf->old_font)?mf->old_font:"none", - (mf->old_font_size)?mf->old_font_size:"+0"); + (mf->old_font) ? mf->old_font : "none", + (mf->old_font_size) ? mf->old_font_size : "+0"); str = g_string_append(str, tmp_str->str); str = g_string_append(str, text); g_string_printf(tmp_str, - "

        %s: %s

        ", - _("Morphology"),morph); + "

        %s: %s

        ", + _("Morphology"), morph); str = g_string_append(str, tmp_str->str); str = g_string_append(str, morph_text); g_string_printf(tmp_str, " %s
        ", "        "); str = g_string_append(str, tmp_str->str); - } else { g_string_printf(tmp_str, "", - (mf->old_font)?mf->old_font:"none", - (mf->old_font_size)?mf->old_font_size:"+0"); + (mf->old_font) ? mf->old_font : "none", + (mf->old_font_size) ? mf->old_font_size : "+0"); str = g_string_append(str, tmp_str->str); str = g_string_append(str, text); g_string_printf(tmp_str, " %s", ""); str = g_string_append(str, tmp_str->str); - } HtmlOutput(str->str, sidebar.html_viewer_widget, NULL, NULL); @@ -303,11 +298,6 @@ g_string_free(tmp_str, TRUE); } - - - - - /****************************************************************************** * Name * main_dialog_information_viewer @@ -325,82 +315,80 @@ * void */ -void main_dialog_information_viewer(const gchar * mod_name, - const gchar * text, - const gchar * key, - const gchar * action, - const gchar * type, - const gchar * morph_text, - const gchar * morph, - DIALOG_DATA * d) +void main_dialog_information_viewer(const gchar *mod_name, + const gchar *text, + const gchar *key, + const gchar *action, + const gchar *type, + const gchar *morph_text, + const gchar *morph, + DIALOG_DATA *d) { GString *tmp_str = g_string_new(NULL); GString *str; - MOD_FONT *mf = get_font((gchar*)mod_name); + MOD_FONT *mf = get_font((gchar *)mod_name); if (!d->previewer) return; g_string_printf(tmp_str, - HTML_START - "", - settings.bible_bg_color, settings.bible_text_color, - settings.link_color); + HTML_START + "", + settings.bible_bg_color, settings.bible_text_color, + settings.link_color); str = g_string_new(tmp_str->str); if (type) { - if (!strcmp(type,"n")) { - g_string_printf(tmp_str,"%s

        ", + if (!strcmp(type, "n")) { + g_string_printf(tmp_str, "%s

        ", _("Footnote")); str = g_string_append(str, tmp_str->str); } - if (!strcmp(type,"x")) { - g_string_printf(tmp_str,"%s

        ", + if (!strcmp(type, "x")) { + g_string_printf(tmp_str, "%s

        ", _("Cross Reference")); str = g_string_append(str, tmp_str->str); } - if (!strcmp(action ,"showStrongs")) { //&& !strcmp(type,"Greek") - g_string_printf(tmp_str,"%s: %s

        ", - _("Strongs"),key); + if (!strcmp(action, "showStrongs")) { //&& !strcmp(type,"Greek") + g_string_printf(tmp_str, "%s: %s

        ", + _("Strongs"), key); str = g_string_append(str, tmp_str->str); } - if (!strcmp(action ,"showMorph")) { //&& !strcmp(type,"Greek") - g_string_printf(tmp_str,"%s: %s

        ", - _("Morphology"),key); + if (!strcmp(action, "showMorph")) { //&& !strcmp(type,"Greek") + g_string_printf(tmp_str, "%s: %s

        ", + _("Morphology"), key); str = g_string_append(str, tmp_str->str); } } - if (!strcmp(action ,"showStrongsMorph")) { //&& !strcmp(type,"Greek") - g_string_printf(tmp_str,"%s: %s

        ", - _("Strongs"),key); + if (!strcmp(action, "showStrongsMorph")) { //&& !strcmp(type,"Greek") + g_string_printf(tmp_str, "%s: %s

        ", + _("Strongs"), key); str = g_string_append(str, tmp_str->str); g_string_printf(tmp_str, "", - (mf->old_font)?mf->old_font:"none", - (mf->old_font_size)?mf->old_font_size:"+0"); + (mf->old_font) ? mf->old_font : "none", + (mf->old_font_size) ? mf->old_font_size : "+0"); str = g_string_append(str, tmp_str->str); str = g_string_append(str, text); - g_string_printf(tmp_str,"

        %s: %s

        ", - _("Morphology"),morph); + g_string_printf(tmp_str, "

        %s: %s

        ", + _("Morphology"), morph); str = g_string_append(str, tmp_str->str); str = g_string_append(str, morph_text); g_string_printf(tmp_str, " %s
        ", "        "); str = g_string_append(str, tmp_str->str); - } else { g_string_printf(tmp_str, "", - (mf->old_font)?mf->old_font:"none", - (mf->old_font_size)?mf->old_font_size:"+0"); + (mf->old_font) ? mf->old_font : "none", + (mf->old_font_size) ? mf->old_font_size : "+0"); str = g_string_append(str, tmp_str->str); str = g_string_append(str, text); g_string_printf(tmp_str, " %s", ""); str = g_string_append(str, tmp_str->str); - } HtmlOutput(str->str, d->previewer, NULL, NULL); @@ -425,20 +413,19 @@ * GtkCTreeNode* */ -static void add_tree_item(GtkTreeModel * model, TreeItem *item, GtkTreeIter parent) +static void add_tree_item(GtkTreeModel *model, TreeItem *item, GtkTreeIter parent) { GtkTreeIter iter; gtk_tree_store_append(GTK_TREE_STORE(model), &iter, &parent); gtk_tree_store_set(GTK_TREE_STORE(model), &iter, - COL_OPEN_PIXBUF,item->pixbuf_opened, - COL_CLOSED_PIXBUF,item->pixbuf_closed, - COL_TITLE, item->item_name, - COL_BOOK, item->module_name, - COL_OFFSET, item->offset, - -1); - + COL_OPEN_PIXBUF, item->pixbuf_opened, + COL_CLOSED_PIXBUF, item->pixbuf_closed, + COL_TITLE, item->item_name, + COL_BOOK, item->module_name, + COL_OFFSET, item->offset, + -1); } /****************************************************************************** @@ -458,8 +445,8 @@ * void */ -void main_dialogs_add_children_to_tree(GtkTreeModel * model, GtkTreeIter iter, - unsigned long offset, gboolean is_dialog, DIALOG_DATA * d) +void main_dialogs_add_children_to_tree(GtkTreeModel *model, GtkTreeIter iter, + unsigned long offset, gboolean is_dialog, DIALOG_DATA *d) { gchar buf[256]; gchar *tmpbuf; @@ -479,7 +466,7 @@ sprintf(buf, "%lu", offset); p_treeitem->offset = buf; tmpbuf = be->treekey_get_local_name(offset); - p_treeitem->item_name = (gchar*)tmpbuf; + p_treeitem->item_name = (gchar *)tmpbuf; if (be->treekey_has_children(offset)) { p_treeitem->pixbuf_opened = pixbufs->pixbuf_closed; p_treeitem->pixbuf_closed = pixbufs->pixbuf_opened; @@ -500,7 +487,7 @@ sprintf(buf, "%lu", offset); p_treeitem->offset = buf; tmpbuf = be->treekey_get_local_name(offset); - p_treeitem->item_name = (gchar*)tmpbuf; + p_treeitem->item_name = (gchar *)tmpbuf; if (be->treekey_has_children(offset)) { p_treeitem->pixbuf_opened = pixbufs->pixbuf_closed; p_treeitem->pixbuf_closed = pixbufs->pixbuf_opened; @@ -517,7 +504,6 @@ } } - /****************************************************************************** * Name * add_book_to_tree @@ -534,30 +520,28 @@ * void */ -void main_dialogs_add_book_to_tree(GtkWidget * tree, gchar * mod_name, - gboolean is_dialog, DIALOG_DATA * d) +void main_dialogs_add_book_to_tree(GtkWidget *tree, gchar *mod_name, + gboolean is_dialog, DIALOG_DATA *d) { GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tree)); - BackEnd *be = (BackEnd *) d->backend; + BackEnd *be = (BackEnd *)d->backend; gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL); gtk_tree_store_set(GTK_TREE_STORE(model), &iter, - COL_OPEN_PIXBUF, pixbufs->pixbuf_opened, - COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_TITLE,d->mod_name, - COL_BOOK,d->mod_name, - COL_OFFSET,NULL, - -1); + COL_OPEN_PIXBUF, pixbufs->pixbuf_opened, + COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, + COL_TITLE, d->mod_name, + COL_BOOK, d->mod_name, + COL_OFFSET, NULL, + -1); be->set_module(d->mod_name); be->set_treekey(0); main_dialogs_add_children_to_tree(model, iter, be->get_treekey_offset(), - is_dialog, d); - + is_dialog, d); } - /****************************************************************************** * Name * tree_selection_changed @@ -575,37 +559,35 @@ * void */ -void main_dialogs_tree_selection_changed(GtkTreeModel * model, - GtkTreeSelection * selection, gboolean is_dialog, DIALOG_DATA * g) +void main_dialogs_tree_selection_changed(GtkTreeModel *model, + GtkTreeSelection *selection, gboolean is_dialog, DIALOG_DATA *g) { GtkTreeIter selected; - GtkTreePath *path; gchar *name = NULL; gchar *book = NULL; gchar *offset = NULL; - unsigned long l_offset; - BackEnd *be = (BackEnd *) g->backend; + BackEnd *be = (BackEnd *)g->backend; if (gtk_tree_selection_get_selected(selection, NULL, &selected)) { - path = gtk_tree_model_get_path(model, &selected); + GtkTreePath *path = gtk_tree_model_get_path(model, &selected); //tree_level = gtk_tree_path_get_depth(path); gtk_tree_model_get(GTK_TREE_MODEL(model), &selected, - 2,&name, - 3,&book, - 4,&offset, - -1); + 2, &name, + 3, &book, + 4, &offset, + -1); gtk_tree_path_free(path); if (offset) { - l_offset = strtoul(offset, NULL, 0); + unsigned long l_offset = strtoul(offset, NULL, 0); g->offset = l_offset; be->set_module(book); be->set_treekey(l_offset); settings.book_key = be->treekey_get_local_name(l_offset); - if ( !gtk_tree_model_iter_has_child(model, &selected) && - be->treekey_has_children(l_offset)) { + if (!gtk_tree_model_iter_has_child(model, &selected) && + be->treekey_has_children(l_offset)) { main_dialogs_add_children_to_tree(model, selected, - l_offset, is_dialog, g); + l_offset, is_dialog, g); } //is_leaf = gtk_tree_model_iter_has_child(model, &selected); be->display_mod->display(); @@ -616,7 +598,6 @@ } } - /****************************************************************************** * Name * main_dialogs_dictionary_entry_changed @@ -633,18 +614,17 @@ * void */ -void main_dialogs_dictionary_entry_changed(DIALOG_DATA * d) +void main_dialogs_dictionary_entry_changed(DIALOG_DATA *d) { gint count = 10, i; - gchar *new_key; gchar *key = NULL; static gboolean firsttime = TRUE; GtkTreeModel *model; GtkListStore *list_store; GtkTreeIter iter; gint height; - gchar * mod_name = d->mod_name; - BackEnd *be = (BackEnd*)d->backend; + gchar *mod_name = d->mod_name; + BackEnd *be = (BackEnd *)d->backend; if (!backend->is_module(mod_name)) return; @@ -653,9 +633,8 @@ be->set_module_key(mod_name, d->key); key = be->get_module_key(); - -// xml_set_value("Xiphos", "keys", "dictionary", key); -// settings.dictkey = xml_get_value("keys", "dictionary"); + // xml_set_value("Xiphos", "keys", "dictionary", key); + // settings.dictkey = xml_get_value("keys", "dictionary"); be->set_module_key(mod_name, key); be->display_mod->display(); @@ -663,20 +642,21 @@ model = gtk_tree_view_get_model(GTK_TREE_VIEW(d->listview)); list_store = GTK_LIST_STORE(model); - if (!firsttime) { + if (!firsttime) { #ifdef USE_GTK_3 height = gdk_window_get_height(GDK_WINDOW(d->listview)); -#else - gdk_drawable_get_size ((GdkDrawable *)d->listview->window, - NULL, - &height); +#else + gdk_drawable_get_size((GdkDrawable *)d->listview->window, + NULL, + &height); #endif count = height / settings.cell_height; } if (count) { + gchar *new_key = be->navigate_module(-1); + gtk_list_store_clear(list_store); - new_key = be->navigate_module(-1); for (i = 0; i < (count / 2); i++) { free(new_key); @@ -695,7 +675,6 @@ firsttime = FALSE; } - /****************************************************************************** * Name * main_free_on_destroy @@ -713,27 +692,26 @@ * void */ -void main_free_on_destroy(DIALOG_DATA * d) +void main_free_on_destroy(DIALOG_DATA *d) { - list_dialogs = g_list_remove(list_dialogs, (DIALOG_DATA*) d); -// g_free(d->ops); + list_dialogs = g_list_remove(list_dialogs, (DIALOG_DATA *)d); + // g_free(d->ops); g_free(d->key); g_free(d->mod_name); - if (d->navbar.module_name) - g_string_free(d->navbar.module_name,TRUE); - if (d->navbar.key) - g_string_free(d->navbar.key,TRUE); + if (d->navbar.module_name) + g_string_free(d->navbar.module_name, TRUE); + if (d->navbar.key) + g_string_free(d->navbar.key, TRUE); - if ((BackEnd*)d->backend) { - BackEnd* be = (BackEnd*)d->backend; + if ((BackEnd *)d->backend) { + BackEnd *be = (BackEnd *)d->backend; delete be; be = NULL; } g_free(d); } - /****************************************************************************** * Name * gui_bibletext_dialog_goto_bookmark @@ -750,16 +728,16 @@ * void */ -void main_dialog_goto_bookmark(const gchar * module, const gchar * key) +void main_dialog_goto_bookmark(const gchar *module, const gchar *key) { DIALOG_DATA *t = NULL; GList *tmp = NULL; tmp = g_list_first(list_dialogs); while (tmp != NULL) { - t = (DIALOG_DATA *) tmp->data; + t = (DIALOG_DATA *)tmp->data; if (!strcmp(t->mod_name, module)) { - BackEnd* be = (BackEnd*)t->backend; + BackEnd *be = (BackEnd *)t->backend; if (t->mod_type == BOOK_TYPE) { t->offset = atoi(key); be->set_treekey(t->offset); @@ -769,7 +747,7 @@ t->key = g_strdup(key); be->set_key(t->key); } - if (t->mod_type == TEXT_TYPE || t->mod_type == COMMENTARY_TYPE) + if (t->mod_type == TEXT_TYPE || t->mod_type == COMMENTARY_TYPE) be->display_mod->display(); gdk_window_raise(GDK_WINDOW(t->dialog)); return; @@ -777,8 +755,8 @@ tmp = g_list_next(tmp); } - t = main_dialogs_open((gchar*)module,key); - BackEnd* be = (BackEnd*)t->backend; + t = main_dialogs_open((gchar *)module, key); + BackEnd *be = (BackEnd *)t->backend; if (t->mod_type == BOOK_TYPE) { t->offset = atoi(key); be->set_treekey(t->offset); @@ -791,7 +769,6 @@ be->display_mod->display(); } - /****************************************************************************** * Name * main_dialogs_setup @@ -817,7 +794,6 @@ dlg_percom = NULL; } - /****************************************************************************** * Name * main_keep_bibletext_dialog_in_sync @@ -834,16 +810,16 @@ * void */ -void main_keep_bibletext_dialog_in_sync(gchar * key) +void main_keep_bibletext_dialog_in_sync(gchar *key) { GList *tmp = NULL; - gchar * url; + gchar *url; tmp = g_list_first(list_dialogs); stop_window_sync++; while (tmp != NULL) { - DIALOG_DATA * t = (DIALOG_DATA*) tmp->data; + DIALOG_DATA *t = (DIALOG_DATA *)tmp->data; if (t->sync) { - url = g_strdup_printf("sword://%s/%s",t->mod_name, key); + url = g_strdup_printf("sword://%s/%s", t->mod_name, key); main_dialogs_url_handler(t, url, TRUE); g_free(url); } @@ -852,7 +828,6 @@ stop_window_sync--; } - /****************************************************************************** * Name * main_dialogs_shutdown @@ -872,9 +847,9 @@ void main_dialogs_shutdown(void) { GList *tmp = list_dialogs; - XI_warning(("items = %d",g_list_length(tmp))); + XI_warning(("items = %d", g_list_length(tmp))); while (tmp != NULL) { - DIALOG_DATA *t = (DIALOG_DATA*) tmp->data; + DIALOG_DATA *t = (DIALOG_DATA *)tmp->data; bible_freed = TRUE; dialog_freed = TRUE; /* @@ -885,12 +860,12 @@ /* * free each DIALOG_DATA item created */ - if ((BackEnd*)t->backend) { - BackEnd* be = (BackEnd*)t->backend; + if ((BackEnd *)t->backend) { + BackEnd *be = (BackEnd *)t->backend; delete be; } - g_string_free(t->navbar.module_name,TRUE); - g_string_free(t->navbar.key,TRUE); + g_string_free(t->navbar.module_name, TRUE); + g_string_free(t->navbar.key, TRUE); g_free(t->mod_name); g_free(t->key); g_free(t); @@ -899,7 +874,6 @@ g_list_free(list_dialogs); } - /****************************************************************************** * Name * show_note @@ -917,65 +891,64 @@ * gint */ -static gint show_note(DIALOG_DATA * d,const gchar * module, const gchar * passage, - const gchar * type, const gchar * value, gboolean clicked) +static gint show_note(DIALOG_DATA *d, const gchar *module, const gchar *passage, + const gchar *type, const gchar *value, gboolean clicked) { gchar *tmpbuf = NULL; gchar *buf = NULL; GString *str = g_string_new(NULL); GList *tmp = NULL; gint i = 0; - BackEnd* be = (BackEnd*)d->backend; + BackEnd *be = (BackEnd *)d->backend; RESULTS *list_item; - - if (!be->is_module((gchar*)module)) + if (!be->is_module((gchar *)module)) module = settings.MainWindowModule; if (passage && (strlen(passage) < 5)) passage = d->key; - if (strstr(type,"x") && clicked) { - be->set_module_key((gchar*)module, (gchar*)passage); + if (strstr(type, "x") && clicked) { + be->set_module_key((gchar *)module, (gchar *)passage); tmpbuf = be->get_entry_attribute("Footnote", - (gchar*)value, - "refList"); + (gchar *)value, + "refList"); if (tmpbuf) { main_display_verse_list_in_sidebar(d->key, - (gchar*)module, - tmpbuf); + (gchar *)module, + tmpbuf); g_free(tmpbuf); } - } else if (strstr(type,"n") && !clicked) { - be->set_module_key((gchar*)module, (gchar*)passage); + } else if (strstr(type, "n") && !clicked) { + be->set_module_key((gchar *)module, (gchar *)passage); tmpbuf = be->get_entry_attribute("Footnote", - (gchar*)value, - "body"); - buf = be->render_this_text((gchar*)module,(gchar*)tmpbuf); - if (tmpbuf) g_free(tmpbuf); + (gchar *)value, + "body"); + buf = be->render_this_text((gchar *)module, (gchar *)tmpbuf); + if (tmpbuf) + g_free(tmpbuf); if (buf) { main_dialog_information_viewer(module, - buf, - value, - "showNote", - type, - NULL, - NULL, - d); + buf, + value, + "showNote", + type, + NULL, + NULL, + d); g_free(buf); } - } else if (strstr(type,"x") && !clicked) { - be->set_module_key((gchar*)module, (gchar*)passage); + } else if (strstr(type, "x") && !clicked) { + be->set_module_key((gchar *)module, (gchar *)passage); tmpbuf = be->get_entry_attribute("Footnote", - (gchar*)value, - "refList"); - + (gchar *)value, + "refList"); list_of_verses = g_list_first(list_of_verses); if (list_of_verses) { GList *chaser = list_of_verses; while (chaser) { - list_item = (RESULTS*)chaser->data; + list_item = (RESULTS *)chaser->data; g_free(list_item->module); g_free(list_item->key); g_free(list_item); @@ -988,49 +961,51 @@ tmp = be->parse_verse_list(d->mod_name, tmpbuf, d->key); while (tmp != NULL) { buf = g_strdup_printf( - "" - "%s,
        ", - (gchar*)module, - (const char *) tmp->data, - settings.bible_text_color, - (const char *) tmp->data); - str = g_string_append(str,buf); - if (buf) g_free(buf); + "" + "%s,
        ", + (gchar *)module, + (const char *)tmp->data, + settings.bible_text_color, + (const char *)tmp->data); + str = g_string_append(str, buf); + if (buf) + g_free(buf); buf = NULL; ++i; - g_free((char *) tmp->data); + g_free((char *)tmp->data); tmp = g_list_next(tmp); } g_list_free(tmp); buf = g_strdup_printf( - "" - "%s%s
        ", - (gchar*)module, - d->key, - settings.bible_text_color, - _("Back to "), - d->key); - str = g_string_append(str,buf); - if (buf) g_free(buf); + "" + "%s%s
        ", + (gchar *)module, + d->key, + settings.bible_text_color, + _("Back to "), + d->key); + str = g_string_append(str, buf); + if (buf) + g_free(buf); - if (tmpbuf) g_free(tmpbuf); + if (tmpbuf) + g_free(tmpbuf); if (str) { main_dialog_information_viewer(module, - str->str, - value, - "showNote", - type, - NULL, - NULL, - d); + str->str, + value, + "showNote", + type, + NULL, + NULL, + d); } } g_string_free(str, 1); return 1; } - /****************************************************************************** * Name * show_morph @@ -1048,21 +1023,20 @@ * gint */ - static gint show_morph(DIALOG_DATA * d, const gchar * type, - const gchar * value, gboolean clicked) +static gint show_morph(DIALOG_DATA *d, const gchar *type, + const gchar *value, gboolean clicked) { gchar *modbuf = NULL; - gchar *mybuf = NULL; - static GtkWidget *dlg; - - BackEnd* be = (BackEnd*)d->backend; + BackEnd *be = (BackEnd *)d->backend; - if (!strcmp(type,"Greek") || strstr(type,"x-Robinson") || strstr(type,"robinson")) { + if (!strcmp(type, "Greek") || strstr(type, "x-Robinson") || strstr(type, "robinson")) { if (be->is_module("Robinson")) - modbuf = (char*)"Robinson"; + modbuf = (char *)"Robinson"; } if (clicked) { + static GtkWidget *dlg; + if (!gsI_isrunning) dlg = gui_create_display_informtion_dialog(); else @@ -1070,27 +1044,25 @@ gui_display_mod_and_key(modbuf, value); gtk_window_set_title(GTK_WINDOW(dialog_display_info), - modbuf); + modbuf); } else { - mybuf = main_get_rendered_text(modbuf, (gchar*)value); + gchar *mybuf = main_get_rendered_text(modbuf, (gchar *)value); if (mybuf) { main_dialog_information_viewer(modbuf, - mybuf, - value, - "showMorph", - type, - NULL, - NULL, - d); + mybuf, + value, + "showMorph", + type, + NULL, + NULL, + d); g_free(mybuf); } } return 1; - } - - /****************************************************************************** +/****************************************************************************** * Name * show_strongs * @@ -1107,27 +1079,27 @@ * gint */ -static gint show_strongs(DIALOG_DATA * t, const gchar * type, - const gchar * value, gboolean clicked) +static gint show_strongs(DIALOG_DATA *t, const gchar *type, + const gchar *value, gboolean clicked) { const gchar *modbuf = NULL; - gchar *mybuf = NULL; - static GtkWidget *dlg; - if (!strncmp(t->mod_name,"NASB",4)) { - if (!strcmp(type,"Greek")) + if (!strncmp(t->mod_name, "NASB", 4)) { + if (!strcmp(type, "Greek")) modbuf = "NASGreek"; else modbuf = "NASHebrew"; } else { - if (!strcmp(type,"Greek")) + if (!strcmp(type, "Greek")) modbuf = settings.lex_greek; - else if (!strcmp(type,"Hebrew")) + else if (!strcmp(type, "Hebrew")) modbuf = settings.lex_hebrew; } if (clicked) { + static GtkWidget *dlg; + if (!gsI_isrunning) dlg = gui_create_display_informtion_dialog(); else @@ -1136,24 +1108,23 @@ gui_display_mod_and_key(modbuf, value); gtk_window_set_title(GTK_WINDOW(dialog_display_info), modbuf); } else { - mybuf = main_get_rendered_text((gchar*)modbuf, (gchar*)value); + gchar *mybuf = main_get_rendered_text((gchar *)modbuf, (gchar *)value); if (mybuf) { main_dialog_information_viewer( - modbuf, - mybuf, - value, - "showStrongs", - type, - NULL, - NULL, - t); + modbuf, + mybuf, + value, + "showStrongs", + type, + NULL, + NULL, + t); g_free(mybuf); } } return 1; } - /****************************************************************************** * Name * sword_uri @@ -1173,19 +1144,18 @@ * gint */ -static gint sword_uri(DIALOG_DATA * t, const gchar * url, gboolean clicked) +static gint sword_uri(DIALOG_DATA *t, const gchar *url, gboolean clicked) { gchar *module = NULL; gchar *key = NULL; gchar **work_buf = NULL; - BackEnd* be = (BackEnd*)t->backend; + BackEnd *be = (BackEnd *)t->backend; if (!clicked) return 0; - - work_buf = g_strsplit (url,"/",4); + work_buf = g_strsplit(url, "/", 4); if (!work_buf[MODULE] && !work_buf[KEY]) { g_strfreev(work_buf); return 0; @@ -1199,7 +1169,7 @@ if (strlen(work_buf[KEY]) < 5) key = g_strdup(t->key); else - key =g_strdup( work_buf[KEY]); + key = g_strdup(work_buf[KEY]); if (t->key) g_free(t->key); @@ -1212,11 +1182,11 @@ int mtype = be->module_type(t->mod_name); if ((mtype == TEXT_TYPE) || (mtype == COMMENTARY_TYPE)) { t->navbar.valid_key = valid_scripture_key = - main_is_Bible_key(t->mod_name, key); + main_is_Bible_key(t->mod_name, key); } be->set_module_key(t->mod_name, t->key); be->display_mod->display(); - valid_scripture_key = TRUE; // leave nice for future use. + valid_scripture_key = TRUE; // leave nice for future use. if (t->navbar.module_name) main_navbar_versekey_set(t->navbar, t->key); @@ -1224,25 +1194,21 @@ g_free(key); g_strfreev(work_buf); return 1; - } -static gint show_strongs_morph(DIALOG_DATA * d,const gchar * type, const gchar * value, - const gchar * morph, gboolean clicked) +static gint show_strongs_morph(DIALOG_DATA *d, const gchar *type, const gchar *value, + const gchar *morph, gboolean clicked) { const gchar *modbuf = NULL; const gchar *morph_mod = NULL; - gchar *strongs_buf = NULL; - gchar *morph_buf = NULL; - static GtkWidget *dlg; - if (!strncmp(d->mod_name,"NASB",4)) { - if (!strcmp(type,"Greek")) + if (!strncmp(d->mod_name, "NASB", 4)) { + if (!strcmp(type, "Greek")) modbuf = "NASGreek"; else modbuf = "NASHebrew"; } else { - if (!strcmp(type,"Greek")) { + if (!strcmp(type, "Greek")) { modbuf = settings.lex_greek; if (backend->is_module("Robinson")) morph_mod = "Robinson"; @@ -1251,37 +1217,41 @@ } if (clicked) { + static GtkWidget *dlg; + if (!gsI_isrunning) dlg = gui_create_display_informtion_dialog(); else gtk_widget_show(dlg); - gui_display_mod_and_key(modbuf, (gchar*)value); + gui_display_mod_and_key(modbuf, (gchar *)value); gtk_window_set_title(GTK_WINDOW(dialog_display_info), - modbuf); + modbuf); } else { + gchar *strongs_buf, *morph_buf; + strongs_buf = - main_get_rendered_text((gchar*)modbuf, (gchar*)value); + main_get_rendered_text((gchar *)modbuf, (gchar *)value); morph_buf = - main_get_rendered_text((gchar*)morph_mod, (gchar*)morph); + main_get_rendered_text((gchar *)morph_mod, (gchar *)morph); if (strongs_buf) { main_dialog_information_viewer( - modbuf, - strongs_buf, - value, - "showStrongs", - type, - morph_buf, - morph, - d); + modbuf, + strongs_buf, + value, + "showStrongs", + type, + morph_buf, + morph, + d); g_free(strongs_buf); - if (morph_buf) g_free(morph_buf); + if (morph_buf) + g_free(morph_buf); } } return 1; } - /****************************************************************************** * Name * show_mod_info @@ -1299,23 +1269,22 @@ * gint */ - static gint show_mod_info(const gchar * module, const gchar * description, - gboolean clicked) +static gint show_mod_info(const gchar *module, const gchar *description, + gboolean clicked) { if (clicked) { - XI_print(("module = %s\n",module)); - gui_display_about_module_dialog((gchar*)module); + XI_print(("module = %s\n", module)); + gui_display_about_module_dialog((gchar *)module); } else { /* some mod descriptions contain fun(ny) characters */ GString *desc_clean = hex_decode(description); XI_print(("description = %s\n", desc_clean->str)); - gui_set_statusbar (desc_clean->str); + gui_set_statusbar(desc_clean->str); g_string_free(desc_clean, TRUE); } return 1; } - /****************************************************************************** * Name * reference_uri @@ -1332,7 +1301,7 @@ * gint */ -static gint show_ref(const gchar * module, const gchar * list, gboolean clicked) +static gint show_ref(const gchar *module, const gchar *list, gboolean clicked) { if (!clicked) return 1; @@ -1340,73 +1309,75 @@ if (!backend->is_module(module)) module = settings.MainWindowModule; main_display_verse_list_in_sidebar(settings.currentverse, - (gchar*)module, - (gchar*)list); + (gchar *)module, + (gchar *)list); return 1; } -static gint new_url_handler(DIALOG_DATA * t, const gchar * url, gboolean clicked) +static gint new_url_handler(DIALOG_DATA *t, const gchar *url, gboolean clicked) { - gchar* action = NULL; - gchar* type = NULL; - gchar* value = NULL; - gchar* module = NULL; - gchar* passage = NULL; - gchar* strongs = NULL; - gchar* morph = NULL; - URL* m_url; + gchar *action = NULL; + gchar *type = NULL; + gchar *value = NULL; + gchar *module = NULL; + gchar *strongs = NULL; + gchar *morph = NULL; + URL *m_url; - XI_message(("new_url_handler url = %s",url)); - m_url = new URL((const char*)url); + XI_message(("new_url_handler url = %s", url)); + m_url = new URL((const char *)url); action = g_strdup(m_url->getParameterValue("action")); - type = g_strdup((gchar*)m_url->getParameterValue("type")); - value = g_strdup((gchar*)m_url->getParameterValue("value")); - morph = g_strdup((gchar*)m_url->getParameterValue("morph")); - strongs = g_strdup((gchar*)m_url->getParameterValue("lemma")); - - XI_message(("action = %s",action)); - XI_message(("type = %s",type)); - XI_message(("value = %s",value)); + type = g_strdup((gchar *)m_url->getParameterValue("type")); + value = g_strdup((gchar *)m_url->getParameterValue("value")); + morph = g_strdup((gchar *)m_url->getParameterValue("morph")); + strongs = g_strdup((gchar *)m_url->getParameterValue("lemma")); + + XI_message(("action = %s", action)); + XI_message(("type = %s", type)); + XI_message(("value = %s", value)); - if (strlen(strongs) >= 1 && strlen(morph) >= 1 ) { - show_strongs_morph(t, type,strongs,morph,clicked); + if (strlen(strongs) >= 1 && strlen(morph) >= 1) { + show_strongs_morph(t, type, strongs, morph, clicked); } else if (strlen(strongs) >= 1 && strlen(morph) < 1) { - show_strongs(t, type,strongs,clicked); + show_strongs(t, type, strongs, clicked); } - if (!strcmp(action,"showStrongs")) { + if (!strcmp(action, "showStrongs")) { show_strongs(t, type, value, clicked); } if (!strcmp(action, "showModInfo")) { - module = g_strdup(m_url->getParameterValue("module")); - show_mod_info(module, value, clicked); - if (module) g_free(module); + module = g_strdup(m_url->getParameterValue("module")); + show_mod_info(module, value, clicked); + if (module) + g_free(module); } - - if (!strcmp(action,"showMorph")) { + if (!strcmp(action, "showMorph")) { show_morph(t, type, value, clicked); } - if (!strcmp(action,"showNote")) { + if (!strcmp(action, "showNote")) { + gchar *passage = g_strdup((gchar *)m_url->getParameterValue("passage")); module = g_strdup(m_url->getParameterValue("module")); - passage = g_strdup((gchar*)m_url->getParameterValue("passage")); show_note(t, module, passage, type, value, clicked); - if (module) g_free(module); - if (passage) g_free(passage); + if (module) + g_free(module); + if (passage) + g_free(passage); } - if (!strcmp(action,"showRef")) { + if (!strcmp(action, "showRef")) { module = g_strdup(m_url->getParameterValue("module")); - show_ref (module,value,clicked); - if (module) g_free(module); + show_ref(module, value, clicked); + if (module) + g_free(module); } - if (action) g_free(action); - if (type) g_free(type); - if (value) g_free(value); + g_free(action); + g_free(type); + g_free(value); return 1; } @@ -1426,20 +1397,21 @@ * gint */ -gint main_dialogs_url_handler(DIALOG_DATA * t, const gchar * url, gboolean clicked) +gint main_dialogs_url_handler(DIALOG_DATA *t, const gchar *url, gboolean clicked) { static int handling_url = FALSE; gint retval = 0; - if (handling_url) return retval; + if (handling_url) + return retval; handling_url = TRUE; - XI_message(("main_dialogs_url_handler url = %s",url)); + XI_message(("main_dialogs_url_handler url = %s", url)); if (strstr(url, "sword://") || strstr(url, "bible://")) { - if ((settings.special_anchor = strchr((gchar*)url, '#')) || /* thml */ - (settings.special_anchor = strchr((gchar*)url, '!'))) /* osisref */ + if ((settings.special_anchor = strchr((gchar *)url, '#')) || /* thml */ + (settings.special_anchor = strchr((gchar *)url, '!'))) /* osisref */ *(settings.special_anchor++) = '\0'; GString *url_clean = hex_decode(url); @@ -1448,9 +1420,9 @@ retval = sword_uri(t, url_clean->str, clicked); g_string_free(url_clean, TRUE); } - if (strstr(url,"passagestudy.jsp") || strstr(url,"xiphos.url")) { + if (strstr(url, "passagestudy.jsp") || strstr(url, "xiphos.url")) { handling_url = FALSE; - return new_url_handler(t,url,clicked); + return new_url_handler(t, url, clicked); } /*if (strstr(url,"sword://")) return sword_uri(t, url, clicked);*/ @@ -1459,7 +1431,6 @@ return retval; } - /****************************************************************************** * Name * main_dialogs_open @@ -1476,7 +1447,7 @@ * void */ -DIALOG_DATA *main_dialogs_open(const gchar * mod_name , const gchar * key) +DIALOG_DATA *main_dialogs_open(const gchar *mod_name, const gchar *key) { BackEnd *be; DIALOG_DATA *t = NULL; @@ -1489,8 +1460,8 @@ type = backend->module_type(mod_name); t = g_new0(DIALOG_DATA, 1); - t->backend = (BackEnd*) new BackEnd(); - be = (BackEnd*)t->backend; + t->backend = (BackEnd *)new BackEnd(); + be = (BackEnd *)t->backend; t->navbar.module_name = NULL; t->editor = NULL; @@ -1500,8 +1471,7 @@ t->is_dialog = TRUE; t->mod_name = g_strdup(mod_name); t->is_rtol = FALSE; - if ((direction = be->get_config_entry(t->mod_name, (char*)"Direction")) - != NULL) { + if ((direction = be->get_config_entry(t->mod_name, (char *)"Direction")) != NULL) { if (!strcmp(direction, "RtoL")) t->is_rtol = TRUE; } @@ -1519,27 +1489,27 @@ t->key = g_strdup(settings.currentverse); dlg_bible = t; t->navbar.module_name = g_string_new(mod_name); - t->navbar.key = g_string_new(settings.currentverse); + t->navbar.key = g_string_new(settings.currentverse); break; case COMMENTARY_TYPE: case PERCOM_TYPE: t->mod_type = COMMENTARY_TYPE; gui_create_commentary_dialog(t, FALSE); - be->entryDisplay = new DialogEntryDisp(t->html, t, be); + be->entryDisplay = new DialogEntryDisp(t->html, t, be); be->init_SWORD(1); if (key) t->key = g_strdup(key); else t->key = g_strdup(settings.currentverse); t->navbar.module_name = g_string_new(mod_name); - t->navbar.key = g_string_new(settings.currentverse); + t->navbar.key = g_string_new(settings.currentverse); break; case DICTIONARY_TYPE: t->mod_type = DICTIONARY_TYPE; gui_create_dictlex_dialog(t); - be->entryDisplay = new DialogEntryDisp(t->html, t, be); + be->entryDisplay = new DialogEntryDisp(t->html, t, be); be->init_SWORD(1); if (key) @@ -1551,18 +1521,17 @@ gchar buf[10]; time_t curtime; - struct tm *loctime; char *feature; - if ((feature = (char *)be->get_mgr()-> - getModule(mod_name)-> - getConfigEntry("Feature")) && + if ((feature = (char *)be->get_mgr()->getModule(mod_name)->getConfigEntry("Feature")) && !strcmp(feature, "DailyDevotion")) { - if ((strlen(t->key) != 5) || // blunt tests. + if ((strlen(t->key) != 5) || // blunt tests. (t->key[0] < '0') || (t->key[0] > '9') || (t->key[1] < '0') || (t->key[1] > '9') || - (t->key[2] != '.') || + (t->key[2] != '.') || (t->key[3] < '0') || (t->key[3] > '9') || - (t->key[4] < '0') || (t->key[4] > '9')) { // not MM.DD + (t->key[4] < '0') || (t->key[4] > '9')) { // not MM.DD + struct tm *loctime; + curtime = time(NULL); loctime = localtime(&curtime); strftime(buf, 10, "%m.%d", loctime); @@ -1576,7 +1545,7 @@ case PRAYERLIST_TYPE: t->mod_type = BOOK_TYPE; gui_create_gbs_dialog(t); - be->entryDisplay = new DialogEntryDisp(t->html, t, be); + be->entryDisplay = new DialogEntryDisp(t->html, t, be); be->init_SWORD(1); t->key = NULL; if (key) @@ -1587,19 +1556,19 @@ } gtk_widget_show(t->dialog); - list_dialogs = g_list_append(list_dialogs, (DIALOG_DATA *) t); + list_dialogs = g_list_append(list_dialogs, (DIALOG_DATA *)t); be->set_module(t->mod_name); if (type == BOOK_TYPE) { main_dialogs_add_book_to_tree(t->tree, t->mod_name, - TRUE, t); + TRUE, t); be->set_treekey(t->offset); main_setup_navbar_book_dialog(t); - XI_message(("offset = %ld",t->offset)); + XI_message(("offset = %ld", t->offset)); } else be->set_key(t->key); - if (be->get_config_entry(t->mod_name, (char*)"CipherKey")) { - t->cipher_old = be->get_config_entry(t->mod_name, (char*)"CipherKey"); + if (be->get_config_entry(t->mod_name, (char *)"CipherKey")) { + t->cipher_old = be->get_config_entry(t->mod_name, (char *)"CipherKey"); t->is_locked = strlen(t->cipher_old); } else { t->is_locked = 0; @@ -1611,7 +1580,7 @@ (type != DICTIONARY_TYPE)) { valid_scripture_key = main_is_Bible_key(t->mod_name, t->key); be->display_mod->display(); - valid_scripture_key = TRUE; // leave nice for future use. + valid_scripture_key = TRUE; // leave nice for future use. bible_apply_change = TRUE; } if (type == TEXT_TYPE) @@ -1620,10 +1589,10 @@ if ((type == COMMENTARY_TYPE) || (type == PERCOM_TYPE) || (type == TEXT_TYPE)) - main_navbar_versekey_set(t->navbar, (char*)t->key); + main_navbar_versekey_set(t->navbar, (char *)t->key); if (type == DICTIONARY_TYPE) - gtk_entry_set_text(GTK_ENTRY(t->entry),t->key); + gtk_entry_set_text(GTK_ENTRY(t->entry), t->key); return t; } diff -Nru xiphos-4.0.0+dfsg1/src/main/module_dialogs.h xiphos-4.0.4+dfsg1/src/main/module_dialogs.h --- xiphos-4.0.0+dfsg1/src/main/module_dialogs.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/module_dialogs.h 2015-02-11 23:48:33.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * bibletext_dialog.h - view Bible text module in a dialog + * module_dialog.h - view module in a dialog * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -33,7 +33,8 @@ #include "main/navbar_book.h" #include "main/navbar_versekey.h" -struct _dialog_data { +struct _dialog_data +{ /* dialog widgets */ GtkWidget *dialog; GtkWidget *toolbar_nav; @@ -42,7 +43,7 @@ GtkWidget *spb_verse; GtkWidget *freeform_lookup; GtkWidget *statusbar; - GtkWidget *listview; + GtkWidget *listview; GtkWidget *tree; /* widgets for text panes */ GtkWidget *vbox; @@ -50,7 +51,7 @@ GtkWidget *previewer; GtkWidget *text; GtkWidget *frame; - GtkWidget *entry; + GtkWidget *entry; GtkWidget *showtabs; GtkWidget *module_options_menu; @@ -77,46 +78,57 @@ gpointer backend; gpointer editor; - GObject *mod_selection; + GObject *mod_selection; NAVBAR_VERSEKEY navbar; NAVBAR_BOOK navbar_book; }; -void main_dialogs_book_heading(DIALOG_DATA * d); -void main_dialogs_chapter_heading(DIALOG_DATA * d); -void main_dialogs_information_viewer(DIALOG_DATA * d, gchar * mod_name, - gchar * text, gchar * key, - gchar * action ,gchar * type , - gchar * morph_text, gchar * morph); +void main_dialogs_book_heading(DIALOG_DATA *d); +void main_dialogs_chapter_heading(DIALOG_DATA *d); +void main_dialogs_information_viewer(DIALOG_DATA *d, + gchar *mod_name, + gchar *text, gchar *key, + gchar *action, gchar *type, + gchar *morph_text, + gchar *morph); void main_dialogs_clear_viewer(DIALOG_DATA *d); -void main_dialogs_add_children_to_tree(GtkTreeModel * model, GtkTreeIter iter, - unsigned long offset, gboolean is_dialog, DIALOG_DATA * d); -void main_dialogs_add_book_to_tree(GtkWidget * tree, gchar * mod_name, - gboolean is_dialog, DIALOG_DATA * d); -void main_dialogs_tree_selection_changed(GtkTreeModel * model, - GtkTreeSelection * selection, gboolean is_dialog, DIALOG_DATA * g); +void main_dialogs_add_children_to_tree(GtkTreeModel *model, + GtkTreeIter iter, + unsigned long offset, + gboolean is_dialog, + DIALOG_DATA *d); +void main_dialogs_add_book_to_tree(GtkWidget *tree, + gchar *mod_name, + gboolean is_dialog, + DIALOG_DATA *d); +void main_dialogs_tree_selection_changed(GtkTreeModel *model, + GtkTreeSelection * + selection, + gboolean is_dialog, + DIALOG_DATA *g); -void main_dialogs_dictionary_entry_changed(DIALOG_DATA * d); +void main_dialogs_dictionary_entry_changed(DIALOG_DATA *d); //void main_dialog_save_note(gpointer data); //void main_dialog_delete_note(gpointer data); //void main_dialog_update_controls(DIALOG_DATA * vt); //void main_bible_dialog_display(DIALOG_DATA * t); //void main_bible_dialog_passage_changed(DIALOG_DATA * t, gchar * passage); -void main_keep_bibletext_dialog_in_sync(gchar * key); +void main_keep_bibletext_dialog_in_sync(gchar *key); void main_dialogs_setup(void); void main_dialogs_shutdown(void); -void main_free_on_destroy(DIALOG_DATA * vt); -void main_dialog_goto_bookmark(const gchar * module, const gchar * key); +void main_free_on_destroy(DIALOG_DATA *vt); +void main_dialog_goto_bookmark(const gchar *module, + const gchar *key); //void main_dialog_set_global_opt(gpointer backend, gboolean choice); -gint main_dialogs_url_handler(DIALOG_DATA * t, const gchar * url, gboolean clicked); -DIALOG_DATA *main_dialogs_open( const gchar * mod_name, const gchar * key); +gint main_dialogs_url_handler(DIALOG_DATA *t, const gchar *url, + gboolean clicked); +DIALOG_DATA *main_dialogs_open(const gchar *mod_name, + const gchar *key); #ifdef __cplusplus } #endif - #endif - /* end of file */ diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_book.cc xiphos-4.0.4+dfsg1/src/main/navbar_book.cc --- xiphos-4.0.0+dfsg1/src/main/navbar_book.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_book.cc 2015-02-21 02:22:53.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar.cc - glue between all navbars and sword + * navbar_book.cc - glue between all navbar_book and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include @@ -37,7 +37,6 @@ #include "gui/debug_glib_null.h" - /****************************************************************************** * Name * check_for_parent @@ -54,8 +53,7 @@ * int */ -static -int check_for_parent(char *book, unsigned long offset) +static int check_for_parent(char *book, unsigned long offset) { unsigned long offset_save; @@ -70,7 +68,6 @@ return 0; } - /****************************************************************************** * Name * check_for_prev_sib @@ -87,8 +84,7 @@ * int */ -static -int check_for_prev_sib(char *book, unsigned long offset) +static int check_for_prev_sib(char *book, unsigned long offset) { unsigned long offset_save; @@ -102,8 +98,6 @@ return 0; } - - /****************************************************************************** * Name * check_for_next_sib @@ -120,8 +114,7 @@ * int */ -static -int check_for_next_sib(char *book, unsigned long offset) +static int check_for_next_sib(char *book, unsigned long offset) { unsigned long offset_save; @@ -135,7 +128,6 @@ return 0; } - /****************************************************************************** * Name * main_navbar_book_parent @@ -154,16 +146,13 @@ void main_navbar_book_parent(void) { - char *tmpbuf = NULL; - unsigned long offset; - backend->set_module(settings.book_mod); backend->set_treekey(settings.book_offset); if (backend->treekey_parent(settings.book_offset)) { - offset = backend->get_treekey_offset(); - tmpbuf = backend->treekey_get_local_name(offset); - gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), - tmpbuf); + unsigned long offset = backend->get_treekey_offset(); + char *tmpbuf = backend->treekey_get_local_name(offset); + + gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), tmpbuf); g_free(tmpbuf); tmpbuf = g_strdup_printf("%ld", offset); main_display_book(settings.book_mod, tmpbuf); @@ -171,7 +160,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_first_child @@ -190,16 +178,13 @@ void main_navbar_book_first_child(void) { - char *tmpbuf = NULL; - unsigned long offset; - backend->set_module(settings.book_mod); backend->set_treekey(settings.book_offset); if (backend->treekey_first_child(settings.book_offset)) { - offset = backend->get_treekey_offset(); - tmpbuf = backend->treekey_get_local_name(offset); - gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), - tmpbuf); + unsigned long offset = backend->get_treekey_offset(); + char *tmpbuf = backend->treekey_get_local_name(offset); + + gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), tmpbuf); g_free(tmpbuf); tmpbuf = g_strdup_printf("%ld", offset); main_display_book(settings.book_mod, tmpbuf); @@ -207,7 +192,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_prev @@ -226,16 +210,13 @@ void main_navbar_book_prev(void) { - char *tmpbuf = NULL; - unsigned long offset; - backend->set_module(settings.book_mod); backend->set_treekey(settings.book_offset); if (backend->treekey_prev_sibling(settings.book_offset)) { - offset = backend->get_treekey_offset(); - tmpbuf = backend->treekey_get_local_name(offset); - gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), - tmpbuf); + unsigned long offset = backend->get_treekey_offset(); + char *tmpbuf = backend->treekey_get_local_name(offset); + + gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), tmpbuf); g_free(tmpbuf); tmpbuf = g_strdup_printf("%ld", offset); main_display_book(settings.book_mod, tmpbuf); @@ -243,7 +224,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_next @@ -262,20 +242,13 @@ void main_navbar_book_next(void) { - char *tmpbuf = NULL; - unsigned long offset; - //const gchar *path; - - /*gchar *buf = g_strrstr_len (path, - sizeof (path), - ":");*/ backend->set_module(settings.book_mod); backend->set_treekey(settings.book_offset); if (backend->treekey_next_sibling(settings.book_offset)) { - offset = backend->get_treekey_offset(); - tmpbuf = backend->treekey_get_local_name(offset); - gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), - tmpbuf); + unsigned long offset = backend->get_treekey_offset(); + char *tmpbuf = backend->treekey_get_local_name(offset); + + gtk_entry_set_text(GTK_ENTRY(navbar_book.lookup_entry), tmpbuf); g_free(tmpbuf); tmpbuf = g_strdup_printf("%ld", offset); main_display_book(settings.book_mod, tmpbuf); @@ -283,7 +256,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_entry_activate @@ -300,12 +272,11 @@ * void */ -void main_navbar_book_entry_activate (const gchar* entry_text) +void main_navbar_book_entry_activate(const gchar *entry_text) { main_display_book(settings.book_mod, entry_text); } - /****************************************************************************** * Name * on_menu_select( @@ -323,8 +294,7 @@ * void */ -static -void on_menu_select(GtkMenuItem * menuitem, gpointer user_data) +static void on_menu_select(GtkMenuItem *menuitem, gpointer user_data) { char *tmpbuf = NULL; @@ -332,7 +302,6 @@ main_display_book(settings.book_mod, tmpbuf); } - /****************************************************************************** * Name * main_book_drop_down_new @@ -367,7 +336,7 @@ } /* add menu item for first sibling*/ tmpbuf = backend->treekey_get_local_name(offset); - item = gtk_menu_item_new_with_label((gchar *) tmpbuf); + item = gtk_menu_item_new_with_label((gchar *)tmpbuf); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(on_menu_select), @@ -379,7 +348,7 @@ offset = backend->get_treekey_offset(); /* add menu item */ tmpbuf = backend->treekey_get_local_name(offset); - item = gtk_menu_item_new_with_label((gchar *) tmpbuf); + item = gtk_menu_item_new_with_label((gchar *)tmpbuf); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(on_menu_select), @@ -390,7 +359,6 @@ return menu; } - /****************************************************************************** * Name * main_setup_navbar_book @@ -408,10 +376,10 @@ * void */ -void main_setup_navbar_book(gchar * book_name, unsigned long offset) +void main_setup_navbar_book(gchar *book_name, unsigned long offset) { gchar *tmpbuf = NULL; - XI_message(("offset: %ld",offset)); + XI_message(("offset: %ld", offset)); backend->set_module(book_name); backend->set_treekey(offset); diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_book_dialog.cc xiphos-4.0.4+dfsg1/src/main/navbar_book_dialog.cc --- xiphos-4.0.0+dfsg1/src/main/navbar_book_dialog.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_book_dialog.cc 2015-02-11 23:48:33.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar.cc - glue between all navbars and sword + * navbar_book_dialog.cc - glue between all navbar_book_dialog and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include @@ -37,7 +37,7 @@ #include "backend/sword_main.hh" -DIALOG_DATA * cur_d; +DIALOG_DATA *cur_d; /****************************************************************************** * Name @@ -55,11 +55,10 @@ * int */ -static -int check_for_parent(DIALOG_DATA * d) +static int check_for_parent(DIALOG_DATA *d) { unsigned long offset_save; - BackEnd *be = (BackEnd *) d->backend; + BackEnd *be = (BackEnd *)d->backend; offset_save = d->offset; be->set_treekey(d->offset); @@ -71,8 +70,6 @@ return 0; } - - /****************************************************************************** * Name * check_for_prev_sib @@ -89,11 +86,10 @@ * int */ -static -int check_for_prev_sib(DIALOG_DATA * d) +static int check_for_prev_sib(DIALOG_DATA *d) { unsigned long offset_save; - BackEnd *be = (BackEnd *) d->backend; + BackEnd *be = (BackEnd *)d->backend; offset_save = d->offset; be->set_treekey(d->offset); @@ -105,8 +101,6 @@ return 0; } - - /****************************************************************************** * Name * check_for_next_sib @@ -123,11 +117,10 @@ * int */ -static -int check_for_next_sib(DIALOG_DATA * d) +static int check_for_next_sib(DIALOG_DATA *d) { unsigned long offset_save; - BackEnd *be = (BackEnd *) d->backend; + BackEnd *be = (BackEnd *)d->backend; offset_save = d->offset; be->set_treekey(d->offset); @@ -139,7 +132,6 @@ return 0; } - /****************************************************************************** * Name * main_navbar_book_dialog_parent @@ -158,8 +150,8 @@ void main_navbar_book_dialog_parent(gpointer data) { - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; be->set_treekey(d->offset); if (be->treekey_parent(d->offset)) { @@ -168,7 +160,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_dialog_first_child @@ -187,8 +178,8 @@ void main_navbar_book_dialog_first_child(gpointer data) { - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; be->set_treekey(d->offset); if (be->treekey_first_child(d->offset)) { @@ -197,7 +188,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_dialog_prev @@ -216,8 +206,8 @@ void main_navbar_book_dialog_prev(gpointer data) { - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; be->set_treekey(d->offset); if (be->treekey_prev_sibling(d->offset)) { @@ -226,7 +216,6 @@ } } - /****************************************************************************** * Name * main_navbar_book_dialog_next @@ -245,8 +234,8 @@ void main_navbar_book_dialog_next(gpointer data) { - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; be->set_treekey(d->offset); if (be->treekey_next_sibling(d->offset)) { @@ -255,7 +244,6 @@ } } - /****************************************************************************** * Name * on_menu_select( @@ -273,14 +261,12 @@ * void */ -static -void on_menu_select(GtkMenuItem * menuitem, gpointer data) +static void on_menu_select(GtkMenuItem *menuitem, gpointer data) { cur_d->offset = GPOINTER_TO_INT(data); main_setup_navbar_book_dialog(cur_d); } - /****************************************************************************** * Name * main_book_dialog_drop_down_new @@ -304,8 +290,8 @@ GtkWidget *menu; GtkWidget *item; unsigned long offset; - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; cur_d = d; be->set_treekey(d->offset); @@ -317,11 +303,11 @@ } /* add menu item for first sibling*/ tmpbuf = be->treekey_get_local_name(offset); - item = gtk_menu_item_new_with_label((gchar *) tmpbuf); + item = gtk_menu_item_new_with_label((gchar *)tmpbuf); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(on_menu_select), - GINT_TO_POINTER(offset) ); + GINT_TO_POINTER(offset)); gtk_container_add(GTK_CONTAINER(menu), item); g_free(tmpbuf); @@ -329,7 +315,7 @@ offset = be->get_treekey_offset(); /* add menu item */ tmpbuf = be->treekey_get_local_name(offset); - item = gtk_menu_item_new_with_label((gchar *) tmpbuf); + item = gtk_menu_item_new_with_label((gchar *)tmpbuf); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(on_menu_select), @@ -340,7 +326,6 @@ return menu; } - /****************************************************************************** * Name * main_setup_navbar_book_dialog @@ -361,8 +346,8 @@ void main_setup_navbar_book_dialog(gpointer data) { gchar *tmpbuf = NULL; - DIALOG_DATA * d = (DIALOG_DATA *) data; - BackEnd *be = (BackEnd *) d->backend; + DIALOG_DATA *d = (DIALOG_DATA *)data; + BackEnd *be = (BackEnd *)d->backend; be->set_treekey(d->offset); tmpbuf = be->get_key_from_offset(d->offset); diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_book_dialog.h xiphos-4.0.4+dfsg1/src/main/navbar_book_dialog.h --- xiphos-4.0.0+dfsg1/src/main/navbar_book_dialog.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_book_dialog.h 2015-02-11 23:48:33.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar_book.h - glue between all navbar_book and sword + * navbar_book_dialog.h - glue between all navbar_book and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,12 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _NAVBAR_BOOK_DIALOG_H +#ifndef _NAVBAR_BOOK_DIALOG_H #define _NAVBAR_BOOK_DIALOG_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif GtkWidget *main_navbar_book_dialog_drop_down_new(gpointer data); @@ -34,9 +33,7 @@ void main_navbar_book_dialog_next(gpointer data); void main_setup_navbar_book_dialog(gpointer data); - #ifdef __cplusplus } #endif - #endif /* _NAVBAR_BOOK_DIALOG_H */ diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_book.h xiphos-4.0.4+dfsg1/src/main/navbar_book.h --- xiphos-4.0.0+dfsg1/src/main/navbar_book.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_book.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.h - glue between all navbar_book and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,11 +23,11 @@ #define _NAVBAR_BOOK_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif typedef struct _navbar_book NAVBAR_BOOK; -struct _navbar_book { +struct _navbar_book +{ GtkWidget *button_up; GtkWidget *button_down; GtkWidget *button_left; @@ -45,11 +45,10 @@ void main_navbar_book_first_child(void); void main_navbar_book_prev(void); void main_navbar_book_next(void); -void main_setup_navbar_book(char * book_name, unsigned long offset); -void main_navbar_book_entry_activate (const gchar* entry_text); +void main_setup_navbar_book(char *book_name, unsigned long offset); +void main_navbar_book_entry_activate(const gchar *entry_text); #ifdef __cplusplus } #endif - #endif /* _NAVBAR_BOOK_H */ diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar.cc xiphos-4.0.4+dfsg1/src/main/navbar.cc --- xiphos-4.0.0+dfsg1/src/main/navbar.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar.cc - glue between all navbars and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,21 +20,19 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include #include #include - #include "main/module_dialogs.h" #include "main/navbar.h" #include "main/settings.h" #include "main/sword.h" #include "main/url.hh" - //#include "gui/toolbar_nav.h" #include "gui/commentary_dialog.h" #include "gui/bibletext_dialog.h" @@ -48,31 +46,29 @@ gboolean do_display; gboolean do_display_dict; - -void main_navbar_set(NAVBAR navbar, const char * key) +void main_navbar_set(NAVBAR navbar, const char *key) { char *gkey = NULL; int book; GtkTreeIter iter; - gint i,x; + gint i, x; if (!navbar.module_name) return; SWModule *mod = backend->get_SWModule(navbar.module_name); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); navbar.key = backend->get_valid_key(navbar.module_name, key); if (!navbar.is_dialog) { - - } - GtkTreeModel* chapter_store = gtk_combo_box_get_model( - GTK_COMBO_BOX(navbar.comboboxentry_chapter)); - GtkTreeModel* verse_store = gtk_combo_box_get_model( - GTK_COMBO_BOX(navbar.comboboxentry_verse)); + GtkTreeModel *chapter_store = gtk_combo_box_get_model( + GTK_COMBO_BOX(navbar.comboboxentry_chapter)); + GtkTreeModel *verse_store = gtk_combo_box_get_model( + GTK_COMBO_BOX(navbar.comboboxentry_verse)); do_display = FALSE; @@ -82,24 +78,23 @@ vkey->setText(key); // we need the book index to highlight "active" in the pulldown. - if ((backend->module_has_testament(navbar.module_name, 1)) - && (vkey->getTestament() == 2)) - book = vkey->BMAX[0] + vkey->getBook(); + if ((backend->module_has_testament(navbar.module_name, 1)) && (vkey->getTestament() == 2)) + book = vkey->BMAX[0] + vkey->getBook(); else - book = vkey->getBook(); + book = vkey->getBook(); gtk_combo_box_set_active((GtkComboBox *)navbar.comboboxentry_book, - book-1); + book - 1); gtk_list_store_clear(GTK_LIST_STORE(chapter_store)); - //char xtestament = vkey->Testament() ; - //char xbook = vkey->Book(); + int xchapter = vkey->getChapter(); int xverse = vkey->getVerse(); + x = (vkey->getChapterMax()); - for(i=1; i <= x; i++) { + for (i = 1; i <= x; i++) { char *num = main_format_number(i); - gtk_list_store_append (GTK_LIST_STORE(chapter_store), &iter); + gtk_list_store_append(GTK_LIST_STORE(chapter_store), &iter); gtk_list_store_set(GTK_LIST_STORE(chapter_store), &iter, 0, @@ -108,17 +103,14 @@ g_free(num); } gtk_combo_box_set_active((GtkComboBox *)navbar.comboboxentry_chapter, - xchapter-1); + xchapter - 1); gtk_list_store_clear(GTK_LIST_STORE(verse_store)); - //xtestament = vkey->Testament() ; - //xbook = vkey->Book(); - xchapter = vkey->getChapter(); - xverse = vkey->getVerse(); + x = (vkey->getVerseMax()); - for(i=1; i <= x; i++) { + for (i = 1; i <= x; i++) { char *num = main_format_number(i); - gtk_list_store_append (GTK_LIST_STORE(verse_store), &iter); + gtk_list_store_append(GTK_LIST_STORE(verse_store), &iter); gtk_list_store_set(GTK_LIST_STORE(verse_store), &iter, 0, @@ -127,23 +119,25 @@ g_free(num); } gtk_combo_box_set_active((GtkComboBox *)navbar.comboboxentry_verse, - xverse-1); + xverse - 1); gtk_entry_set_text(GTK_ENTRY(navbar.lookup_entry), - navbar.key); + navbar.key); do_display = TRUE; g_free(gkey); delete vkey; } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. void main_navbar_fill_book_combo(NAVBAR navbar) { if (!navbar.module_name) return; SWModule *mod = backend->get_SWModule(navbar.module_name); - if (!mod) return; + if (!mod) + return; VerseKey *key = (VerseKey *)mod->createKey(); char *book = NULL; @@ -157,17 +151,17 @@ do_display = FALSE; - GtkTreeModel* book_model = gtk_combo_box_get_model( - GTK_COMBO_BOX(navbar.comboboxentry_book)); + GtkTreeModel *book_model = gtk_combo_box_get_model( + GTK_COMBO_BOX(navbar.comboboxentry_book)); gtk_list_store_clear(GTK_LIST_STORE(book_model)); if (backend->module_has_testament(navbar.module_name, 1)) { while (i < key->BMAX[0]) { key->setTestament(1); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); - XI_message(("book: %s",book)); - gtk_list_store_append (GTK_LIST_STORE(book_model), &iter); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); + XI_message(("book: %s", book)); + gtk_list_store_append(GTK_LIST_STORE(book_model), &iter); gtk_list_store_set(GTK_LIST_STORE(book_model), &iter, 0, @@ -183,10 +177,10 @@ if (backend->module_has_testament(navbar.module_name, 2)) { while (i < key->BMAX[1]) { key->setTestament(2); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); - XI_message(("book: %s",book)); - gtk_list_store_append (GTK_LIST_STORE(book_model), &iter); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); + XI_message(("book: %s", book)); + gtk_list_store_append(GTK_LIST_STORE(book_model), &iter); gtk_list_store_set(GTK_LIST_STORE(book_model), &iter, 0, @@ -201,3 +195,4 @@ delete key; } +#endif diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar.h xiphos-4.0.4+dfsg1/src/main/navbar.h --- xiphos-4.0.0+dfsg1/src/main/navbar.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar.h - glue between all navbars and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,24 +22,23 @@ #ifndef _NAVBAR_H #define _NAVBAR_H - #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #include typedef struct _navbar NAVBAR; -struct _navbar { +struct _navbar +{ GtkWidget *button_back; GtkWidget *button_forward; GtkWidget *comboboxentry_book; -// SPINBUTTONS book; + // SPINBUTTONS book; GtkWidget *comboboxentry_chapter; -// SPINBUTTONS chapter; + // SPINBUTTONS chapter; GtkWidget *comboboxentry_verse; -// SPINBUTTONS verse; + // SPINBUTTONS verse; GtkWidget *lookup_entry; gchar *key; gchar *module_name; @@ -48,11 +47,10 @@ }; extern NAVBAR navbar_main; -void main_navbar_set(NAVBAR navbar, const char * key); +void main_navbar_set(NAVBAR navbar, const char *key); void main_navbar_fill_book_combo(NAVBAR navbar); #ifdef __cplusplus } #endif - #endif /* _NAVBAR_H */ diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_versekey.cc xiphos-4.0.4+dfsg1/src/main/navbar_versekey.cc --- xiphos-4.0.0+dfsg1/src/main/navbar_versekey.cc 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_versekey.cc 2015-02-21 02:22:53.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * navbar.cc - glue between all navbars and sword + * navbar_versekey.cc - glue between all navbar_versekey and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include @@ -48,9 +48,8 @@ extern gboolean do_display; extern gboolean do_display_dict; - -static DIALOG_DATA * c_dialog; -static EDITOR * c_editor; +static DIALOG_DATA *c_dialog; +static EDITOR *c_editor; static gint c_type; /****************************************************************************** @@ -69,12 +68,11 @@ * void */ -const char *main_get_valid_key(const char *module_name, const char * key) +const char *main_get_valid_key(const char *module_name, const char *key) { return backend->get_valid_key(module_name, key); } - /****************************************************************************** * Name * main_navbar_versekey_spin_book @@ -100,7 +98,8 @@ return; SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); tmpkey = backend->get_valid_key(navbar.module_name->str, navbar.key->str); @@ -118,7 +117,6 @@ delete vkey; } - /****************************************************************************** * Name * main_navbar_versekey_spin_chapter @@ -144,7 +142,8 @@ return; SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); tmpkey = backend->get_valid_key(navbar.module_name->str, navbar.key->str); @@ -162,7 +161,6 @@ delete vkey; } - /****************************************************************************** * Name * main_navbar_versekey_spin_verse @@ -189,7 +187,8 @@ return; SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); tmpkey = backend->get_valid_key(navbar.module_name->str, navbar.key->str); @@ -208,7 +207,6 @@ delete vkey; } - /****************************************************************************** * Name * on_nt_book_menu_select @@ -226,52 +224,52 @@ * void */ -static -void on_nt_book_menu_select(GtkMenuItem * menuitem, gpointer user_data) +static void on_nt_book_menu_select(GtkMenuItem *menuitem, gpointer user_data) { - SWModule *mod; GtkWidget *entry = NULL; int book = GPOINTER_TO_INT(user_data); gchar *name, *key; switch (c_type) { - case NB_MAIN: - name = navbar_versekey.module_name->str; - key = navbar_versekey.key->str; - entry = navbar_versekey.lookup_entry; - break; - - case NB_PARALLEL: - name = navbar_parallel.module_name->str; - key = navbar_parallel.key->str; - entry = navbar_parallel.lookup_entry; - break; - - case NB_DIALOG: - if (!c_dialog) return; - name = c_dialog->navbar.module_name->str; - key = c_dialog->navbar.key->str; - entry = c_dialog->navbar.lookup_entry; - break; - - case NB_EDITOR: - if (!c_editor) return; - name = c_editor->navbar.module_name->str; - key = c_editor->navbar.key->str; - entry = c_editor->navbar.lookup_entry; - break; + case NB_MAIN: + name = navbar_versekey.module_name->str; + key = navbar_versekey.key->str; + entry = navbar_versekey.lookup_entry; + break; + + case NB_PARALLEL: + name = navbar_parallel.module_name->str; + key = navbar_parallel.key->str; + entry = navbar_parallel.lookup_entry; + break; + + case NB_DIALOG: + if (!c_dialog) + return; + name = c_dialog->navbar.module_name->str; + key = c_dialog->navbar.key->str; + entry = c_dialog->navbar.lookup_entry; + break; + + case NB_EDITOR: + if (!c_editor) + return; + name = c_editor->navbar.module_name->str; + key = c_editor->navbar.key->str; + entry = c_editor->navbar.lookup_entry; + break; } if (entry) { - mod = backend->get_SWModule(name); + SWModule *mod = backend->get_SWModule(name); if (mod) { VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); vkey->setText(key); vkey->setTestament(2); - vkey->setBook(book+1); + vkey->setBook(book + 1); - gtk_entry_set_text(GTK_ENTRY(entry),vkey->getText()); + gtk_entry_set_text(GTK_ENTRY(entry), vkey->getText()); gtk_widget_activate(entry); delete vkey; @@ -279,7 +277,6 @@ } } - /****************************************************************************** * Name * on_ot_book_menu_select @@ -297,52 +294,52 @@ * void */ -static -void on_ot_book_menu_select(GtkMenuItem * menuitem, gpointer user_data) +static void on_ot_book_menu_select(GtkMenuItem *menuitem, gpointer user_data) { - SWModule *mod; GtkWidget *entry = NULL; int book = GPOINTER_TO_INT(user_data); gchar *name, *key; switch (c_type) { - case NB_MAIN: - name = navbar_versekey.module_name->str; - key = navbar_versekey.key->str; - entry = navbar_versekey.lookup_entry; - break; - - case NB_PARALLEL: - name = navbar_parallel.module_name->str; - key = navbar_parallel.key->str; - entry = navbar_parallel.lookup_entry; - break; - - case NB_DIALOG: - if (!c_dialog) return; - name = c_dialog->navbar.module_name->str; - key = c_dialog->navbar.key->str; - entry = c_dialog->navbar.lookup_entry; - break; - - case NB_EDITOR: - if (!c_editor) return; - name = c_editor->navbar.module_name->str; - key = c_editor->navbar.key->str; - entry = c_editor->navbar.lookup_entry; - break; + case NB_MAIN: + name = navbar_versekey.module_name->str; + key = navbar_versekey.key->str; + entry = navbar_versekey.lookup_entry; + break; + + case NB_PARALLEL: + name = navbar_parallel.module_name->str; + key = navbar_parallel.key->str; + entry = navbar_parallel.lookup_entry; + break; + + case NB_DIALOG: + if (!c_dialog) + return; + name = c_dialog->navbar.module_name->str; + key = c_dialog->navbar.key->str; + entry = c_dialog->navbar.lookup_entry; + break; + + case NB_EDITOR: + if (!c_editor) + return; + name = c_editor->navbar.module_name->str; + key = c_editor->navbar.key->str; + entry = c_editor->navbar.lookup_entry; + break; } if (entry) { - mod = backend->get_SWModule(name); + SWModule *mod = backend->get_SWModule(name); if (mod) { VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); vkey->setText(key); vkey->setTestament(1); - vkey->setBook(book+1); + vkey->setBook(book + 1); - gtk_entry_set_text(GTK_ENTRY(entry),vkey->getText()); + gtk_entry_set_text(GTK_ENTRY(entry), vkey->getText()); gtk_widget_activate(entry); delete vkey; @@ -350,7 +347,6 @@ } } - /****************************************************************************** * Name * on_chapter_menu_select @@ -368,50 +364,50 @@ * void */ -static -void on_chapter_menu_select(GtkMenuItem * menuitem, gpointer user_data) +static void on_chapter_menu_select(GtkMenuItem *menuitem, gpointer user_data) { - SWModule *mod; GtkWidget *entry = NULL; int chapter = GPOINTER_TO_INT(user_data); gchar *name, *key; switch (c_type) { - case NB_MAIN: - name = navbar_versekey.module_name->str; - key = navbar_versekey.key->str; - entry = navbar_versekey.lookup_entry; - break; - - case NB_PARALLEL: - name = navbar_parallel.module_name->str; - key = navbar_parallel.key->str; - entry = navbar_parallel.lookup_entry; - break; - - case NB_DIALOG: - if (!c_dialog) return; - name = c_dialog->navbar.module_name->str; - key = c_dialog->navbar.key->str; - entry = c_dialog->navbar.lookup_entry; - break; - - case NB_EDITOR: - if (!c_editor) return; - name = c_editor->navbar.module_name->str; - key = c_editor->navbar.key->str; - entry = c_editor->navbar.lookup_entry; - break; + case NB_MAIN: + name = navbar_versekey.module_name->str; + key = navbar_versekey.key->str; + entry = navbar_versekey.lookup_entry; + break; + + case NB_PARALLEL: + name = navbar_parallel.module_name->str; + key = navbar_parallel.key->str; + entry = navbar_parallel.lookup_entry; + break; + + case NB_DIALOG: + if (!c_dialog) + return; + name = c_dialog->navbar.module_name->str; + key = c_dialog->navbar.key->str; + entry = c_dialog->navbar.lookup_entry; + break; + + case NB_EDITOR: + if (!c_editor) + return; + name = c_editor->navbar.module_name->str; + key = c_editor->navbar.key->str; + entry = c_editor->navbar.lookup_entry; + break; } if (entry) { - mod = backend->get_SWModule(name); + SWModule *mod = backend->get_SWModule(name); if (mod) { VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); vkey->setText(key); vkey->setChapter(chapter); - gtk_entry_set_text(GTK_ENTRY(entry),vkey->getText()); + gtk_entry_set_text(GTK_ENTRY(entry), vkey->getText()); gtk_widget_activate(entry); delete vkey; @@ -419,7 +415,6 @@ } } - /****************************************************************************** * Name * on_verse_menu_select @@ -437,50 +432,50 @@ * void */ -static -void on_verse_menu_select(GtkMenuItem * menuitem, gpointer user_data) +static void on_verse_menu_select(GtkMenuItem *menuitem, gpointer user_data) { - SWModule *mod; GtkWidget *entry = NULL; int verse = GPOINTER_TO_INT(user_data); gchar *name, *key; switch (c_type) { - case NB_MAIN: - name = navbar_versekey.module_name->str; - key = navbar_versekey.key->str; - entry = navbar_versekey.lookup_entry; - break; - - case NB_PARALLEL: - name = navbar_parallel.module_name->str; - key = navbar_parallel.key->str; - entry = navbar_parallel.lookup_entry; - break; - - case NB_DIALOG: - if (!c_dialog) return; - name = c_dialog->navbar.module_name->str; - key = c_dialog->navbar.key->str; - entry = c_dialog->navbar.lookup_entry; - break; - - case NB_EDITOR: - if (!c_editor) return; - name = c_editor->navbar.module_name->str; - key = c_editor->navbar.key->str; - entry = c_editor->navbar.lookup_entry; - break; + case NB_MAIN: + name = navbar_versekey.module_name->str; + key = navbar_versekey.key->str; + entry = navbar_versekey.lookup_entry; + break; + + case NB_PARALLEL: + name = navbar_parallel.module_name->str; + key = navbar_parallel.key->str; + entry = navbar_parallel.lookup_entry; + break; + + case NB_DIALOG: + if (!c_dialog) + return; + name = c_dialog->navbar.module_name->str; + key = c_dialog->navbar.key->str; + entry = c_dialog->navbar.lookup_entry; + break; + + case NB_EDITOR: + if (!c_editor) + return; + name = c_editor->navbar.module_name->str; + key = c_editor->navbar.key->str; + entry = c_editor->navbar.lookup_entry; + break; } if (entry) { - mod = backend->get_SWModule(name); + SWModule *mod = backend->get_SWModule(name); if (mod) { VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); vkey->setText(key); vkey->setVerse(verse); - gtk_entry_set_text(GTK_ENTRY(entry),vkey->getText()); + gtk_entry_set_text(GTK_ENTRY(entry), vkey->getText()); gtk_widget_activate(entry); delete vkey; @@ -488,7 +483,6 @@ } } - /****************************************************************************** * Name * main_navbar_versekey_set @@ -506,16 +500,16 @@ * void */ -void main_navbar_versekey_set(NAVBAR_VERSEKEY navbar, const char * key) +void main_navbar_versekey_set(NAVBAR_VERSEKEY navbar, const char *key) { char *tmpbuf = NULL; - char *num; if (!navbar.module_name->len) return; SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return; + if (!mod) + return; // previously, we set and normalized the key, but we also // kept a record of whether that key made sense. @@ -528,7 +522,7 @@ gtk_label_set_label(GTK_LABEL(navbar.label_book_menu), tmpbuf); g_free(tmpbuf); - num = main_format_number(vkey->getChapter()); + gchar *num = main_format_number(vkey->getChapter()); tmpbuf = g_strdup_printf("%s", num); g_free(num); gtk_label_set_label(GTK_LABEL(navbar.label_chapter_menu), tmpbuf); @@ -540,13 +534,11 @@ gtk_label_set_label(GTK_LABEL(navbar.label_verse_menu), tmpbuf); g_free(tmpbuf); - navbar.key = g_string_assign(navbar.key, (char*)vkey->getText()); + navbar.key = g_string_assign(navbar.key, (char *)vkey->getText()); gtk_entry_set_text(GTK_ENTRY(navbar.lookup_entry), navbar.key->str); delete vkey; - } - else - { + } else { tmpbuf = g_strdup(" "); gtk_label_set_label(GTK_LABEL(navbar.label_book_menu), tmpbuf); gtk_label_set_label(GTK_LABEL(navbar.label_chapter_menu), tmpbuf); @@ -556,7 +548,6 @@ } } - /****************************************************************************** * Name * main_versekey_drop_down_verse_menu @@ -578,21 +569,21 @@ gpointer dialog, gpointer editor) { - char *num; gint i, x; GtkWidget *menu; GtkMenuShell *menu_shell; GtkWidget *item; GtkWidget *select_item = NULL; - c_dialog = (DIALOG_DATA *) dialog; - c_editor = (EDITOR *) editor; + c_dialog = (DIALOG_DATA *)dialog; + c_editor = (EDITOR *)editor; c_type = nb_type; menu = gtk_menu_new(); menu_shell = GTK_MENU_SHELL(menu); SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return menu; + if (!mod) + return menu; VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); @@ -603,13 +594,12 @@ delete vkey; for (i = 1; i <= x; i++) { - num = main_format_number(i); + gchar *num = main_format_number(i); item = gtk_menu_item_new_with_label(num); gtk_widget_show(item); gtk_menu_shell_append(menu_shell, item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (on_verse_menu_select), + G_CALLBACK(on_verse_menu_select), GINT_TO_POINTER(i)); if (i == xverse) @@ -623,7 +613,6 @@ return menu; } - /****************************************************************************** * Name * main_versekey_drop_down_chapter_menu @@ -645,21 +634,21 @@ gpointer dialog, gpointer editor) { - char *num; gint i, x; GtkWidget *menu; GtkMenuShell *menu_shell; GtkWidget *item; GtkWidget *select_item = NULL; - c_dialog = (DIALOG_DATA *) dialog; - c_editor = (EDITOR *) editor; + c_dialog = (DIALOG_DATA *)dialog; + c_editor = (EDITOR *)editor; c_type = nb_type; menu = gtk_menu_new(); menu_shell = GTK_MENU_SHELL(menu); SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return menu; + if (!mod) + return menu; VerseKey *vkey = (VerseKey *)mod->createKey(); vkey->setAutoNormalize(1); @@ -670,13 +659,12 @@ delete vkey; for (i = 1; i <= x; i++) { - num = main_format_number(i); + gchar *num = main_format_number(i); item = gtk_menu_item_new_with_label(num); gtk_widget_show(item); gtk_menu_shell_append(menu_shell, item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (on_chapter_menu_select), + G_CALLBACK(on_chapter_menu_select), GINT_TO_POINTER(i)); if (i == xchapter) @@ -690,7 +678,6 @@ return menu; } - /****************************************************************************** * Name * main_versekey_drop_down_book_menu @@ -708,9 +695,9 @@ */ GtkWidget *main_versekey_drop_down_book_menu(NAVBAR_VERSEKEY navbar, - gint nb_type, - gpointer dialog, - gpointer editor) + gint nb_type, + gpointer dialog, + gpointer editor) { GtkWidget *menu; GtkMenuShell *menu_shell; @@ -720,38 +707,38 @@ char *current_book = NULL; int i = 0; - c_dialog = (DIALOG_DATA *) dialog; - c_editor = (EDITOR *) editor; + c_dialog = (DIALOG_DATA *)dialog; + c_editor = (EDITOR *)editor; c_type = nb_type; menu = gtk_menu_new(); menu_shell = GTK_MENU_SHELL(menu); SWModule *mod = backend->get_SWModule(navbar.module_name->str); - if (!mod) return menu; + if (!mod) + return menu; VerseKey *key = (VerseKey *)mod->createKey(); VerseKey *key_current = (VerseKey *)mod->createKey(); key->setAutoNormalize(1); key_current->setAutoNormalize(1); key_current->setText(navbar.key->str); - current_book = strdup((const char *) key_current->getBookName()); + current_book = strdup((const char *)key_current->getBookName()); if (backend->module_has_testament(navbar.module_name->str, 1)) { while (i < key->BMAX[0]) { key->setTestament(1); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); item = gtk_menu_item_new_with_label(book); gtk_widget_show(item); gtk_menu_shell_append(menu_shell, item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (on_ot_book_menu_select), + G_CALLBACK(on_ot_book_menu_select), GINT_TO_POINTER(i)); if (!strcmp(book, current_book)) - select_item = item; + select_item = item; ++i; g_free(book); } @@ -761,18 +748,17 @@ if (backend->module_has_testament(navbar.module_name->str, 2)) { while (i < key->BMAX[1]) { key->setTestament(2); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); item = gtk_menu_item_new_with_label(book); gtk_widget_show(item); gtk_menu_shell_append(menu_shell, item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (on_nt_book_menu_select), + G_CALLBACK(on_nt_book_menu_select), GINT_TO_POINTER(i)); if (!strcmp(book, current_book)) - select_item = item; + select_item = item; ++i; g_free(book); } diff -Nru xiphos-4.0.0+dfsg1/src/main/navbar_versekey.h xiphos-4.0.4+dfsg1/src/main/navbar_versekey.h --- xiphos-4.0.0+dfsg1/src/main/navbar_versekey.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/navbar_versekey.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey.h - glue between all navbar_versekey and sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,15 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _NAVBAR_VERSEKEY_H_ +#ifndef _NAVBAR_VERSEKEY_H_ #define _NAVBAR_VERSEKEY_H_ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -enum { +enum { BOOK_BUTTON, CHAPTER_BUTTON, VERSE_BUTTON @@ -41,7 +40,8 @@ }; typedef struct _navbar_versekey NAVBAR_VERSEKEY; -struct _navbar_versekey { +struct _navbar_versekey +{ GtkWidget *navbar; GtkWidget *button_sync; GtkWidget *button_history_back; @@ -79,7 +79,7 @@ GtkWidget *verse_menu; GtkWidget *lookup_entry; - //GtkTooltips *tooltips; + //GtkTooltips *tooltips; GString *key; gchar *book; GString *module_name; @@ -92,36 +92,44 @@ extern NAVBAR_VERSEKEY navbar_versekey; extern NAVBAR_VERSEKEY navbar_parallel; -const char *main_get_valid_key(const char *module_name, const char * key); -GtkWidget *main_versekey_drop_down_book_menu(NAVBAR_VERSEKEY navbar, - gint nb_type, - gpointer dialog, - gpointer editor); -GtkWidget *main_versekey_drop_down_verse_menu(NAVBAR_VERSEKEY navbar, +const char *main_get_valid_key(const char *module_name, + const char *key); +GtkWidget *main_versekey_drop_down_book_menu(NAVBAR_VERSEKEY + navbar, + gint nb_type, + gpointer dialog, + gpointer editor); +GtkWidget *main_versekey_drop_down_verse_menu(NAVBAR_VERSEKEY + navbar, + gint nb_type, + gpointer dialog, + gpointer editor); +GtkWidget *main_versekey_drop_down_chapter_menu(NAVBAR_VERSEKEY + navbar, gint nb_type, gpointer dialog, gpointer editor); -GtkWidget *main_versekey_drop_down_chapter_menu(NAVBAR_VERSEKEY navbar, - gint nb_type, - gpointer dialog, - gpointer editor); -void main_navbar_versekey_spin_book(NAVBAR_VERSEKEY navbar, int direction); -void main_navbar_versekey_spin_chapter(NAVBAR_VERSEKEY navbar, int direction); -void main_navbar_versekey_spin_verse(NAVBAR_VERSEKEY navbar, int direction); +void main_navbar_versekey_spin_book(NAVBAR_VERSEKEY navbar, + int direction); +void main_navbar_versekey_spin_chapter(NAVBAR_VERSEKEY navbar, + int direction); +void main_navbar_versekey_spin_verse(NAVBAR_VERSEKEY navbar, + int direction); void main_navbar_versekey_book_prev(void); void main_navbar_versekey_book_next(void); void main_navbar_versekey_chapter_prev(void); void main_navbar_versekey_chapter_next(void); void main_navbar_versekey_verse_prev(void); void main_navbar_versekey_verse_next(void); -void main_setup_navbar_versekey(char * module_name, char * key); -void main_navbar_versekey_set(NAVBAR_VERSEKEY navbar, const char * key); +void main_setup_navbar_versekey(char *module_name, char *key); +void main_navbar_versekey_set(NAVBAR_VERSEKEY navbar, + const char *key); gboolean access_on_up_eventbox_button_release_event(gint element); -gboolean access_on_down_eventbox_button_release_event(gint element); +gboolean access_on_down_eventbox_button_release_event(gint + element); #ifdef __cplusplus } #endif - #endif /* _NAVBAR_VERSEKEY_H_ */ diff -Nru xiphos-4.0.0+dfsg1/src/main/parallel_view.cc xiphos-4.0.4+dfsg1/src/main/parallel_view.cc --- xiphos-4.0.0+dfsg1/src/main/parallel_view.cc 2014-12-24 03:04:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/parallel_view.cc 2015-08-28 02:45:44.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.cc - support for displaying multiple modules * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * 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 @@ -51,7 +51,7 @@ #include "gui/debug_glib_null.h" -#define HTML_START "" +#define HTML_START "" extern GtkWidget *entrycbIntBook; extern GtkWidget *sbIntChapter; @@ -75,7 +75,6 @@ return "Off"; } - /****************************************************************************** * Name * set_global_option @@ -94,34 +93,33 @@ * void */ -static void set_global_option(char * option, gboolean choice) +static void set_global_option(char *option, gboolean choice) { const char *on_off = tf2of(choice); SWMgr *mgr = backend_p->get_mgr(); - char *buf= g_strdup (option); + char *buf = g_strdup(option); -// XI_message (("option://%s\n\n",option)); + // XI_message (("option://%s\n\n",option)); mgr->setGlobalOption(buf, on_off); xml_set_value("Xiphos", "parallel", - (char*)g_strdelimit (buf,"' ", '_'), - (char*)(choice ? "1" : "0")); - g_free (buf); + (char *)g_strdelimit(buf, "' ", '_'), + (char *)(choice ? "1" : "0")); + g_free(buf); } - -static void set_global_textual_reading (const char * option, int choice) +static void set_global_textual_reading(const char *option, int choice) { //gboolean primary = 0, secondary = 0, all = 0; - char *buf= g_strdup (option); + char *buf = g_strdup(option); SWMgr *mgr = backend_p->get_mgr(); xml_set_value("Xiphos", "parallel", - (char*)g_strdelimit (buf,"' ", '_'), - (char*)(choice ? "1" : "0")); + (char *)g_strdelimit(buf, "' ", '_'), + (char *)(choice ? "1" : "0")); /*switch (choice) { @@ -139,15 +137,15 @@ gui_generic_warning((char*)"Xiphos: invalid internal variant"); break; }*/ - XI_message (("set_global_textual_reading\noption://%s",option)); + XI_message(("set_global_textual_reading\noption://%s", option)); mgr->setGlobalOption("Textual Variants", option); - g_free (buf); - + g_free(buf); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * main_parallel_change_verse @@ -177,17 +175,15 @@ bookname = gtk_entry_get_text(GTK_ENTRY(entrycbIntBook)); chapter = - gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON - (sbIntChapter)); + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sbIntChapter)); verse = - gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON - (sbIntVerse)); + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sbIntVerse)); sprintf(buf, "%s %d:%d", bookname, chapter, verse); newbook = backend_p->key_get_book(settings.parallel_list[0], buf); chapter = backend_p->key_get_chapter(settings.parallel_list[0], buf); - verse = backend_p->key_get_verse(settings.parallel_list[0], buf); + verse = backend_p->key_get_verse(settings.parallel_list[0], buf); if (strcmp(bookname, newbook)) gtk_entry_set_text(GTK_ENTRY(entrycbIntBook), newbook); @@ -206,7 +202,7 @@ g_free(newbook); return retval; } - +#endif /****************************************************************************** * Name @@ -227,12 +223,11 @@ * void */ -void main_set_parallel_module_global_options(GtkCheckMenuItem * menuitem, - gpointer user_data) +void main_set_parallel_module_global_options(GtkCheckMenuItem *menuitem, + gpointer user_data) { - gchar *option = (gchar*) user_data; - gboolean choice = gtk_check_menu_item_get_active (menuitem); - + gchar *option = (gchar *)user_data; + gboolean choice = gtk_check_menu_item_get_active(menuitem); if (!strcmp(option, "Strong's Numbers")) { settings.parallel_strongs = choice; @@ -264,59 +259,68 @@ set_global_option(option, choice); } - if (!strcmp(option,"Cross-references")) { + if (!strcmp(option, "Cross-references")) { settings.parallel_crossref = choice; set_global_option(option, choice); } - if (!strcmp(option,"Transliteration")) { + if (!strcmp(option, "Transliteration")) { settings.parallel_transliteration = choice; set_global_option(option, choice); } - if (!strcmp(option,"Words of Christ in Red")) { + if (!strcmp(option, "Words of Christ in Red")) { settings.parallel_red_words = choice; set_global_option(option, choice); } - if (!strcmp(option,"Morpheme Segmentation")) { + if (!strcmp(option, "Morpheme Segmentation")) { settings.parallel_segmentation = choice; set_global_option(option, choice); } - if (!strcmp(option,"Headings")) { + if (!strcmp(option, "Headings")) { settings.parallel_headings = choice; set_global_option(option, choice); } - if (!strcmp(option,"Lemmas")) { + if (!strcmp(option, "Lemmas")) { settings.parallel_lemmas = choice; set_global_option(option, choice); } - if (!strcmp(option,"Primary Reading")) { + if (!strcmp(option, "Primary Reading")) { settings.parallel_variants_primary = choice; - set_global_textual_reading (option, choice); + set_global_textual_reading(option, choice); } - if (!strcmp(option,"Secondary Reading")) { + if (!strcmp(option, "Secondary Reading")) { settings.parallel_variants_secondary = choice; - set_global_textual_reading (option, choice); + set_global_textual_reading(option, choice); } - if (!strcmp(option,"All Readings")) { + if (!strcmp(option, "All Readings")) { settings.parallel_variants_all = choice; - set_global_textual_reading (option, choice); + set_global_textual_reading(option, choice); } - if (!strcmp(option,"Transliterated Forms")) { + if (!strcmp(option, "Transliterated Forms")) { settings.parallel_xlit = choice; set_global_option(option, choice); } - if (!strcmp(option,"Enumerations")) { + if (!strcmp(option, "Enumerations")) { settings.parallel_enumerated = choice; set_global_option(option, choice); } + if (!strcmp(option, "Glosses")) { + settings.parallel_glosses = choice; + set_global_option(option, choice); + } + + if (!strcmp(option, "Morpheme Segmentation")) { + settings.parallel_morphseg = choice; + set_global_option(option, choice); + } /* display change */ if (settings.dockedInt) { @@ -349,32 +353,28 @@ GList *tmp = backend->get_module_options(); while (tmp) { - char *option = g_strdup((char*)tmp->data); - g_strdelimit (option,"' ", '_'); + char *option = g_strdup((char *)tmp->data); + g_strdelimit(option, "' ", '_'); //XI_message(("\n\n%s\n%s\n", (char*)tmp->data, option)); value = xml_get_value("parallel", option); int choice = (value ? atoi(value) : 0); - if (!strcmp((char*)tmp->data,"Textual Variants")) { - if (atoi (xml_get_value("parallel", "Primary_Reading"))) - mgr->setGlobalOption ("Textual Variants", - "Primary Reading"); - else if (atoi (xml_get_value("parallel", "Secondary_Reading"))) - mgr->setGlobalOption ("Textual Variants", - "Secondary Reading"); + if (!strcmp((char *)tmp->data, "Textual Variants")) { + if (atoi(xml_get_value("parallel", "Primary_Reading"))) + mgr->setGlobalOption("Textual Variants", + "Primary Reading"); + else if (atoi(xml_get_value("parallel", "Secondary_Reading"))) + mgr->setGlobalOption("Textual Variants", + "Secondary Reading"); else - mgr->setGlobalOption ("Textual Variants", - "All Readings"); + mgr->setGlobalOption("Textual Variants", + "All Readings"); } else - mgr->setGlobalOption((char*)tmp->data, choice ? "On" : "Off"); + mgr->setGlobalOption((char *)tmp->data, choice ? "On" : "Off"); g_free(option); tmp = g_list_next(tmp); } - - } - - /****************************************************************************** * Name * main_load_g_ops_parallel @@ -393,99 +393,90 @@ void main_load_g_ops_parallel(GtkWidget *menu) { - GtkWidget * item; - GtkWidget * variants_menu; + GtkWidget *item; + GtkWidget *variants_menu; GSList *group = NULL; item = gtk_check_menu_item_new_with_label(_("Strong's Numbers")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item),settings.parallel_strongs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_strongs); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Strong's Numbers"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Strong's Numbers"); item = gtk_check_menu_item_new_with_label(_("Footnotes")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_footnotes); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_footnotes); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Footnotes"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Footnotes"); item = gtk_check_menu_item_new_with_label(_("Morphological Tags")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_morphs); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_morphs); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Morphological Tags"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Morphological Tags"); item = gtk_check_menu_item_new_with_label(_("Hebrew Vowel Points")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_hebrewpoints); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_hebrewpoints); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Hebrew Vowel Points"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Hebrew Vowel Points"); item = gtk_check_menu_item_new_with_label(_("Hebrew Cantillation")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_cantillationmarks); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_cantillationmarks); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Hebrew Cantillation"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Hebrew Cantillation"); item = gtk_check_menu_item_new_with_label(_("Greek Accents")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_greekaccents); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_greekaccents); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Greek Accents"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Greek Accents"); item = gtk_check_menu_item_new_with_label(_("Cross-references")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_crossref); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_crossref); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Cross-references"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Cross-references"); item = gtk_check_menu_item_new_with_label(_("Lemmas")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_lemmas); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_lemmas); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Lemmas"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Lemmas"); item = gtk_check_menu_item_new_with_label(_("Headings")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_headings); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_headings); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Headings"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Headings"); item = gtk_check_menu_item_new_with_label(_("Morpheme Segmentation")); #if 0 @@ -495,31 +486,28 @@ #endif gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_segmentation); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_segmentation); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Morpheme Segmentation" ); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Morpheme Segmentation"); item = gtk_check_menu_item_new_with_label(_("Words of Christ in Red")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_red_words); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_red_words); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Words of Christ in Red"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Words of Christ in Red"); item = gtk_check_menu_item_new_with_label(_("Transliteration")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_transliteration); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_transliteration); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Transliteration"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Transliteration"); item = gtk_menu_item_new_with_label(_("Textual Variants")); gtk_widget_show(item); @@ -529,55 +517,69 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), variants_menu); - item = gtk_radio_menu_item_new_with_mnemonic (group, _("Primary Reading" )); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); + item = gtk_radio_menu_item_new_with_mnemonic(group, _("Primary Reading")); + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(variants_menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_variants_primary); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_variants_primary); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Primary Reading"); + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Primary Reading"); - item = gtk_radio_menu_item_new_with_mnemonic (group, _("Secondary Reading" )); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); + item = gtk_radio_menu_item_new_with_mnemonic(group, _("Secondary Reading")); + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(variants_menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_variants_secondary); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_variants_secondary); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Secondary Reading"); + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Secondary Reading"); - item = gtk_radio_menu_item_new_with_mnemonic (group, _("All Readings" )); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); + item = gtk_radio_menu_item_new_with_mnemonic(group, _("All Readings")); + //group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(variants_menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), settings.parallel_variants_all); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_variants_all); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "All Readings"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"All Readings"); item = gtk_check_menu_item_new_with_label(_("Transliterated Forms")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_xlit); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_xlit); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Transliterated Forms"); - + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Transliterated Forms"); item = gtk_check_menu_item_new_with_label(_("Enumerations")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), settings.parallel_enumerated); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_enumerated); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(main_set_parallel_module_global_options), - (char*) "Enumerations"); -} + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Enumerations"); + + item = gtk_check_menu_item_new_with_label(_("Glosses")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_glosses); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Glosses"); + + item = gtk_check_menu_item_new_with_label(_("Morpheme Segmentation")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), settings.parallel_morphseg); + g_signal_connect(G_OBJECT(item), "activate", + G_CALLBACK(main_set_parallel_module_global_options), + (char *)"Morpheme Segmentation"); +} /****************************************************************************** * Name @@ -603,23 +605,24 @@ return; } - void get_heading(SWBuf &text, BackEnd *p, gint modidx) { - const gchar *preverse, *preverse2, *buf; + const gchar *preverse; gchar heading[8]; int x = 0; sprintf(heading, "%d", x); while ((preverse = p->get_entry_attribute("Heading", "Preverse", heading)) != NULL) { + const gchar *preverse2, *buf; + preverse2 = p->render_this_text( - settings.parallel_list[modidx], preverse); + settings.parallel_list[modidx], preverse); buf = g_strdup_printf("
        %s

        ", preverse2); text += buf; - g_free((gchar *)preverse2); + g_free((gchar *)preverse2); g_free((gchar *)preverse); g_free((gchar *)buf); ++x; @@ -645,27 +648,29 @@ void main_update_parallel_page(void) { - gchar *tmpBuf, *fontstring; - const gchar *rowcolor; - gchar *utf8str, *mod_name; + gchar *tmpBuf; gint modidx; gboolean is_rtol = FALSE; GString *data; - MOD_FONT *mf; settings.cvparallel = settings.currentverse; tmpBuf = g_strdup_printf(HTML_START - "", - settings.bible_bg_color, - settings.bible_text_color, settings.link_color); + "
        ", + settings.bible_bg_color, + settings.bible_text_color, settings.link_color); data = g_string_new(tmpBuf); g_free(tmpBuf); if (settings.parallel_list) { + gchar *mod_name; for (modidx = 0; - (mod_name = settings.parallel_list[modidx]); + mod_name = settings.parallel_list[modidx]; modidx++) { + const gchar *rowcolor; + const char *real_mod = main_get_name(mod_name); + if (real_mod) + mod_name = (gchar *)real_mod; // if a module was deleted, but still in parallels list, // we will segfault when looking for content for the @@ -678,38 +683,39 @@ is_rtol = main_is_mod_rtol(mod_name); - if (modidx % 2 == 1) /* alternating background color */ + if (modidx % 2 == 1) /* alternating background color */ rowcolor = "#c0c0c0"; else rowcolor = settings.bible_bg_color; if (modidx == 0) { tmpBuf = g_strdup_printf( - "", - settings.bible_verse_num_color, - settings.verse_num_font_size + settings.base_font_size, - settings.currentverse); + "", + settings.bible_verse_num_color, + settings.verse_num_font_size + settings.base_font_size, + settings.currentverse); g_string_append(data, tmpBuf); g_free(tmpBuf); } - mf = get_font(mod_name); - fontstring = g_strdup_printf((((strlen(mf->old_font) < 2) || - !strncmp(mf->old_font, "none", 4)) - ? "" - : ""), - mf->old_font_size_value, mf->old_font); + MOD_FONT *mf = get_font(mod_name); + gchar *fontstring = g_strdup_printf((((strlen(mf->old_font) < 2) || + !strncmp(mf->old_font, "none", 4)) + ? "" + : ""), + mf->old_font_size_value, mf->old_font); free_font(mf); + const char *abbreviation = main_get_abbreviation(mod_name); tmpBuf = g_strdup_printf( - "", - mod_name,_("view context")); + "
        [%s]        ", + mod_name, _("view context")); g_string_append(data, tmpBuf); g_free(tmpBuf); } @@ -750,14 +754,11 @@ g_string_append(data, "
        [%s]
        [%s]
        %s[%s]
        ", - rowcolor, - fontstring, - main_get_module_description(mod_name), - mod_name, - settings.bible_verse_num_color, - settings.verse_num_font_size + settings.base_font_size, - mod_name); + "
        %s[%s]
        ", + rowcolor, + fontstring, + main_get_module_description(mod_name), + mod_name, + settings.bible_verse_num_color, + settings.verse_num_font_size + settings.base_font_size, + (abbreviation ? abbreviation : mod_name)); g_free(fontstring); g_string_append(data, tmpBuf); g_free(tmpBuf); @@ -718,21 +724,19 @@ g_string_append(data, "
        "); // does this verse exist for this module? - if (!backend_p->is_Bible_key(settings.parallel_list[modidx], + if (!backend_p->is_Bible_key(mod_name, settings.cvparallel, settings.cvparallel)) { g_string_append(data, no_content); - } - else - { + } else { SWBuf text(""); - backend_p->set_module_key(settings.parallel_list[modidx], settings.cvparallel); + backend_p->set_module_key(mod_name, settings.cvparallel); get_heading(text, backend_p, modidx); g_string_append(data, text.c_str()); - utf8str = backend_p->get_render_text(mod_name, settings.currentverse); + gchar *utf8str = backend_p->get_render_text(mod_name, settings.currentverse); if (utf8str) { - g_string_append(data, utf8str); - g_free(utf8str); + g_string_append(data, utf8str); + g_free(utf8str); } } @@ -740,9 +744,9 @@ g_string_append(data, "

        "); tmpBuf = g_strdup_printf( - "
        [%s]
        "); HtmlOutput((char *)(settings.imageresize - ? AnalyzeForImageSize - (data->str, - GDK_WINDOW(gtk_widget_get_window(widgets.html_parallel))) - : data->str), + ? AnalyzeForImageSize(data->str, + GDK_WINDOW(gtk_widget_get_window(widgets.html_parallel))) + : data->str), widgets.html_parallel, NULL, NULL); g_string_free(data, TRUE); - - } /****************************************************************************** @@ -776,7 +777,7 @@ * void */ -static void interpolate_parallel_display(SWBuf& text, gchar *key, gint parallel_count, gint fraction) +static void interpolate_parallel_display(SWBuf &text, gchar *key, gint parallel_count, gint fraction) { // identify the module whose v11n will drive us. // should be 1st parallel module. @@ -784,11 +785,12 @@ char *module_name = (settings.parallel_list ? settings.parallel_list[0] : settings.MainWindowModule); + // might have an abbrev. get the real. + const char *real_mod = main_get_name(module_name); + if (real_mod) + module_name = (gchar *)real_mod; - gchar *utf8str, - *textColor, - *tmpkey, - tmpbuf[256]; + gchar *utf8str, *textColor, *tmpkey, tmpbuf[256]; const gchar *bgColor; gchar str[500]; gint cur_verse, cur_chapter, verse, modidx; @@ -796,11 +798,13 @@ MOD_FONT **mf; gboolean *is_rtol, *is_module, *is_bible_text; - if (!gtk_widget_get_realized(GTK_WIDGET(widgets.notebook_bible_parallel))) return; + if (!gtk_widget_get_realized(GTK_WIDGET(widgets.notebook_bible_parallel))) + return; // need #verses to process in this chapter. SWModule *mod = backend->get_SWModule(module_name); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); int xverses; @@ -810,27 +814,29 @@ xverses = (vkey->getVerseMax()); delete vkey; - is_module = g_new(gboolean, parallel_count); - is_rtol = g_new(gboolean, parallel_count); + is_module = g_new(gboolean, parallel_count); + is_rtol = g_new(gboolean, parallel_count); is_bible_text = g_new(gboolean, parallel_count); - mf = g_new(MOD_FONT *, parallel_count); + mf = g_new(MOD_FONT *, parallel_count); // quick cache of fonts/rtol/type info. for (modidx = 0; modidx < parallel_count; ++modidx) { + gchar *mod = settings.parallel_list[modidx]; + // might have an abbrev. get the real. + const char *real_mod = main_get_name(mod); + if (real_mod) + mod = (gchar *)real_mod; + // determine module presence once each. - is_module[modidx] = backend->is_module(settings.parallel_list[modidx]); + is_module[modidx] = backend->is_module(mod); if (is_module[modidx]) { - is_rtol[modidx] = main_is_mod_rtol(settings.parallel_list[modidx]); - mf[modidx] = get_font(settings.parallel_list[modidx]); + is_rtol[modidx] = main_is_mod_rtol(mod); + mf[modidx] = get_font(mod); is_bible_text[modidx] = - (main_get_mod_type(settings.parallel_list[modidx]) - == TEXT_TYPE); - } - else - { - gui_generic_warning((unknown_parallel + - (SWBuf)settings.parallel_list[modidx]).c_str()); + (main_get_mod_type(mod) == TEXT_TYPE); + } else { + gui_generic_warning((unknown_parallel + (SWBuf)mod).c_str()); } } @@ -842,9 +848,9 @@ // it's consistent, but very possibly wrong for all but the 1st. tmpkey = backend_p->get_valid_key(module_name, key); - cur_book = backend_p->key_get_book(module_name, tmpkey); + cur_book = backend_p->key_get_book(module_name, tmpkey); cur_chapter = backend_p->key_get_chapter(module_name, tmpkey); - cur_verse = backend_p->key_get_verse(module_name, tmpkey); + cur_verse = backend_p->key_get_verse(module_name, tmpkey); settings.intCurVerse = cur_verse; for (verse = 1; verse <= xverses; ++verse) { @@ -861,8 +867,14 @@ bgColor = settings.bible_bg_color; for (modidx = 0; modidx < parallel_count; modidx++) { - if (is_module[modidx]) { - + gchar *mod = settings.parallel_list[modidx]; + // might have an abbrev. get the real. + const char *real_mod = main_get_name(mod); + if (real_mod) + mod = (gchar *)real_mod; + + if (is_module[modidx]) { + // mark current verse properly. if ((verse == cur_verse) && is_bible_text[modidx]) textColor = settings.currentverse_color; @@ -887,18 +899,17 @@ mf[modidx]->old_font, mf[modidx]->old_font_size_value, textColor); - g_free((gchar*)newurl); + g_free((gchar *)newurl); g_free(num); text += str; if (is_rtol[modidx]) text += "
        "; - backend_p->set_module_key(settings.parallel_list[modidx], tmpkey); + backend_p->set_module_key(mod, tmpkey); get_heading(text, backend_p, modidx); - utf8str = backend_p->get_render_text - (settings.parallel_list[modidx], tmpkey); + utf8str = backend_p->get_render_text(mod, tmpkey); if (utf8str) { text += utf8str; g_free(utf8str); @@ -926,7 +937,6 @@ g_free(is_bible_text); } - /****************************************************************************** * Name * main_update_parallel_page_detached @@ -961,21 +971,22 @@ /* get the per-column percentage width. */ /* 2 => 50, 4 => 25, 5 => 20, 10 => 10, ... */ - fraction = (parallel_count ? (100/parallel_count) : 100); + fraction = (parallel_count ? (100 / parallel_count) : 100); snprintf(buf, 499, HTML_START - "", - settings.bible_bg_color, settings.bible_text_color, - settings.link_color); + "
        ", + settings.bible_bg_color, settings.bible_text_color, + settings.link_color); text += buf; for (modidx = 0; settings.parallel_list[modidx]; ++modidx) { + const char *abbreviation = main_get_abbreviation(settings.parallel_list[modidx]); snprintf(buf, 499, "", fraction, settings.bible_verse_num_color, settings.verse_num_font_size + settings.base_font_size, - settings.parallel_list[modidx]); + (abbreviation ? abbreviation : settings.parallel_list[modidx])); text += buf; } @@ -986,10 +997,9 @@ snprintf(buf, 499, "%d", settings.intCurVerse); HtmlOutput((char *)(settings.imageresize - ? AnalyzeForImageSize - ((char *)text.c_str(), - GDK_WINDOW(gtk_widget_get_window(widgets.html_parallel_dialog))) - : (char *)text.c_str()), + ? AnalyzeForImageSize((char *)text.c_str(), + GDK_WINDOW(gtk_widget_get_window(widgets.html_parallel_dialog))) + : (char *)text.c_str()), widgets.html_parallel_dialog, NULL, buf); } @@ -1016,7 +1026,8 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), 0); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * load_menu_formmod_list @@ -1034,11 +1045,10 @@ * void */ -void main_load_menu_form_mod_list(GtkWidget * pmInt, gchar * label, - GCallback mycallback) +void main_load_menu_form_mod_list(GtkWidget *pmInt, gchar *label, + GCallback mycallback) { GList *tmp = get_list(TEXT_DESC_LIST); - GtkWidget *item; GtkWidget *view_module; GtkWidget *view_module_menu; @@ -1049,16 +1059,16 @@ view_module_menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(view_module), view_module_menu); -/* view_module_menu_accels = + /* view_module_menu_accels = gtk_menu_ensure_uline_accel_group(GTK_MENU (view_module_menu));*/ while (tmp != NULL) { - item = - gtk_menu_item_new_with_label((gchar *) tmp->data); + GtkWidget *item = + gtk_menu_item_new_with_label((gchar *)tmp->data); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(mycallback), - g_strdup((gchar *) tmp->data)); + G_CALLBACK(mycallback), + g_strdup((gchar *)tmp->data)); gtk_container_add(GTK_CONTAINER(view_module_menu), item); @@ -1066,7 +1076,7 @@ } g_list_free(tmp); } - +#endif /****************************************************************************** * Name @@ -1091,7 +1101,6 @@ backend_p = new BackEnd(); } - /****************************************************************************** * Name * main_delete_parallel_view diff -Nru xiphos-4.0.0+dfsg1/src/main/parallel_view.h xiphos-4.0.4+dfsg1/src/main/parallel_view.h --- xiphos-4.0.0+dfsg1/src/main/parallel_view.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/parallel_view.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.h - support for displaying multiple modules * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * 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 @@ -29,20 +29,18 @@ gchar *main_parallel_change_verse(void); void main_load_g_ops_parallel(GtkWidget *menu); void main_set_parallel_options_at_start(void); -void main_load_menu_form_mod_list(GtkWidget * pmInt, gchar * label, - GCallback mycallback); +void main_load_menu_form_mod_list(GtkWidget *pmInt, gchar *label, + GCallback mycallback); void main_check_parallel_modules(void); void main_set_parallel_options_at_start(void); void main_update_parallel_page(void); void main_update_parallel_page_detached(void); void main_swap_parallel_with_main(char *intmod); -void main_init_parallel_view (void); +void main_init_parallel_view(void); void main_delete_parallel_view(void); - #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/prayerlists.cc xiphos-4.0.4+dfsg1/src/main/prayerlists.cc --- xiphos-4.0.0+dfsg1/src/main/prayerlists.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/prayerlists.cc 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * prayerlists.cc - code to create several different prayer lists * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include #endif @@ -36,7 +35,6 @@ #include #include - #include "main/mod_mgr.h" #include "main/prayerlists.h" #include "main/sword_treekey.h" @@ -59,8 +57,7 @@ using sword::SWModule; #endif -enum -{ +enum { COL_OPEN_PIXBUF, COL_CLOSED_PIXBUF, COL_CAPTION, @@ -76,28 +73,26 @@ /********************************* *************************************/ static void -setEntryText (RawGenBook * book, const gchar * text) +setEntryText(RawGenBook *book, const gchar *text) { - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); if (treeKey->getOffset()) { (*book) << text; } } - static void -appendChild (TreeKeyIdx * treeKey, const gchar * name) +appendChild(TreeKeyIdx *treeKey, const gchar *name) { treeKey->appendChild(); treeKey->setLocalName(name); treeKey->save(); XI_message(("name: %s\nlocalName: %s", name, - treeKey->getLocalName ())); + treeKey->getLocalName())); } - static void -appendSibling (TreeKeyIdx * treeKey, const gchar * name) +appendSibling(TreeKeyIdx *treeKey, const gchar *name) { if (treeKey->getOffset()) { treeKey->append(); @@ -107,7 +102,7 @@ } static void -add_prayer_list_sections (RawGenBook * book, TreeKeyIdx * treeKey) +add_prayer_list_sections(RawGenBook *book, TreeKeyIdx *treeKey) { appendChild(treeKey, _("Growth")); setEntryText(book, _("For Growth
        ")); @@ -122,7 +117,7 @@ } static void -add_outline_subsections (RawGenBook * book, TreeKeyIdx * treeKey) +add_outline_subsections(RawGenBook *book, TreeKeyIdx *treeKey) { appendChild(treeKey, _("Point x")); setEntryText(book, _("(x)
        ")); @@ -135,7 +130,7 @@ } static void -add_outline_sections (RawGenBook * book, TreeKeyIdx * treeKey) +add_outline_sections(RawGenBook *book, TreeKeyIdx *treeKey) { appendChild(treeKey, _("Minor Topic 1")); setEntryText(book, _("Subtopic 1
        ")); @@ -172,7 +167,7 @@ // configuration file generation. gchar *path = g_strdup_printf("%s/" DOTSWORD "/mods.d/%s.conf", settings.homedir, listname); - SWConfig config (path); + SWConfig config(path); g_free(path); // configuration file content. @@ -187,9 +182,9 @@ config[listname]["Lang"] = sword_locale; // set at startup. config[listname]["Version"] = "0.1"; config[listname]["MinimumVersion"] = "1.5.11"; - config[listname]["DisplayLevel"] = "2"; // ? + config[listname]["DisplayLevel"] = "2"; // ? config[listname]["Description"] = listname; - config[listname]["About"] = summary; // as provided. + config[listname]["About"] = summary; // as provided. config.Save(); // fundamentals are complete. update. @@ -198,7 +193,6 @@ settings.havebook = 1; } - /****************************************************************************** * Name * prayerlist_fundamentals @@ -218,19 +212,19 @@ prayerlist_fundamentals(gchar *summary, gchar *defaultname) { - char *listname = NULL; // assume failure. + char *listname = NULL; // assume failure. GS_DIALOG *info; gint test; GString *path = g_string_new(NULL); // name selection dialog. info = gui_new_dialog(); - info->stock_icon = (gchar *) + info->stock_icon = (gchar *) #ifdef HAVE_GTK_310 - "dialog-question"; + "dialog-question"; #else - GTK_STOCK_DIALOG_QUESTION; -#endif + GTK_STOCK_DIALOG_QUESTION; +#endif info->title = _("Prayer List/Journal"); info->label_top = _("Name for new prayer list or journal"); info->label1 = _("Name: "); @@ -241,20 +235,18 @@ // result of name selection. if (test != GS_OK) { - goto out; // cancelled. + goto out; // cancelled. } for (char *s = info->text1; *s; ++s) { if (!isalnum(*s) && (*s != '_')) { - gui_generic_warning - (_("Module names must contain [A-Za-z0-9_] only.")); + gui_generic_warning(_("Module names must contain [A-Za-z0-9_] only.")); goto out; } } if (main_is_module(info->text1)) { - gui_generic_warning - (_("Xiphos already knows a module by that name.")); + gui_generic_warning(_("Xiphos already knows a module by that name.")); goto out; } @@ -262,22 +254,20 @@ g_string_printf(path, "%s/" DOTSWORD "/modules/genbook/rawgenbook/%s", settings.homedir, info->text1); if (g_access(path->str, F_OK) == 0) { - gui_generic_warning - (_("Xiphos finds that prayer list already.")); + gui_generic_warning(_("Xiphos finds that prayer list already.")); goto out; } else { g_string_printf(path, "%s/" DOTSWORD "/modules/genbook", settings.homedir); - Mkdir(path->str, S_IRWXU); // ignore return value -- harmless + Mkdir(path->str, S_IRWXU); // ignore return value -- harmless g_string_append(path, "/rawgenbook"); - Mkdir(path->str, S_IRWXU); // ignore return value -- harmless + Mkdir(path->str, S_IRWXU); // ignore return value -- harmless g_string_append(path, "/"); g_string_append(path, info->text1); - if ((Mkdir(path->str, S_IRWXU)) != 0) { // this one matters. - char *msg = g_strdup_printf - (_("Xiphos cannot create module's path:\n%s"), - path->str); + if ((Mkdir(path->str, S_IRWXU)) != 0) { // this one matters. + char *msg = g_strdup_printf(_("Xiphos cannot create module's path:\n%s"), + path->str); gui_generic_warning(msg); g_free(msg); goto out; @@ -315,21 +305,19 @@ gboolean main_prayerlist_basic_create(void) { - char *listname = prayerlist_fundamentals - (_("A basic prayer list. \\par\\par Module created by Xiphos."), - _("BasicPrayerList")); + char *listname = prayerlist_fundamentals(_("A basic prayer list. \\par\\par Module created by Xiphos."), + _("BasicPrayerList")); if (listname == NULL) return FALSE; - gchar *path = g_strdup_printf - ("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", - settings.homedir, listname, listname); + gchar *path = g_strdup_printf("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", + settings.homedir, listname, listname); g_free(listname); - RawGenBook::createModule (path); - RawGenBook *book = new RawGenBook (path); + RawGenBook::createModule(path); + RawGenBook *book = new RawGenBook(path); - TreeKeyIdx root = *((TreeKeyIdx *) ((SWKey *) (*book))); - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); appendChild(treeKey, _("MyPrayerList")); setEntryText(book, _("People:
        Bob
        Sam
        Sue

        Church:
        pews
        fellowship
        Bibles for missionaries


        ")); @@ -338,7 +326,6 @@ return TRUE; } - /****************************************************************************** * Name * main_prayerlist_subject_create @@ -357,21 +344,19 @@ gboolean main_prayerlist_subject_create(void) { - char *listname = prayerlist_fundamentals - (_("A subject-based prayer list. \\par\\par Module created by Xiphos."), - _("SubjectPrayerList")); + char *listname = prayerlist_fundamentals(_("A subject-based prayer list. \\par\\par Module created by Xiphos."), + _("SubjectPrayerList")); if (listname == NULL) return FALSE; - gchar *path = g_strdup_printf - ("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", - settings.homedir, listname, listname); + gchar *path = g_strdup_printf("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", + settings.homedir, listname, listname); g_free(listname); - RawGenBook::createModule (path); - RawGenBook *book = new RawGenBook (path); + RawGenBook::createModule(path); + RawGenBook *book = new RawGenBook(path); - TreeKeyIdx root = *((TreeKeyIdx *) ((SWKey *) (*book))); - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); appendChild(treeKey, _("Salvation")); setEntryText(book, _("Bob
        Sam
        Sue
        John
        ")); @@ -384,7 +369,6 @@ return TRUE; } - /****************************************************************************** * Name * main_prayerlist_wild_create @@ -403,26 +387,23 @@ gboolean main_prayerlist_monthly_create(void) { - char *listname = prayerlist_fundamentals - (_("A monthly prayer list. \\par\\par Module created by Xiphos."), - _("MonthlyPrayerList")); + char *listname = prayerlist_fundamentals(_("A monthly prayer list. \\par\\par Module created by Xiphos."), + _("MonthlyPrayerList")); if (listname == NULL) return FALSE; - gchar *path = g_strdup_printf - ("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", - settings.homedir, listname, listname); + gchar *path = g_strdup_printf("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", + settings.homedir, listname, listname); g_free(listname); RawGenBook::createModule(path); - RawGenBook *book = new RawGenBook (path); + RawGenBook *book = new RawGenBook(path); - TreeKeyIdx root = *((TreeKeyIdx *) ((SWKey *) (*book))); - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); - for (int month = 0; month < 12; ++month) - { + for (int month = 0; month < 12; ++month) { char monthnum[4], monthstring[32]; - snprintf(monthnum, 3, "%02d", month+1); + snprintf(monthnum, 3, "%02d", month + 1); snprintf(monthstring, 31, "%s
        ", _(month_names[month])); if (month == 0) @@ -455,26 +436,23 @@ gboolean main_prayerlist_journal_create(void) { - char *listname = prayerlist_fundamentals - (_("A daily journal. \\par\\par Module created by Xiphos."), - _("DailyJournal")); + char *listname = prayerlist_fundamentals(_("A daily journal. \\par\\par Module created by Xiphos."), + _("DailyJournal")); if (listname == NULL) return FALSE; - gchar *path = g_strdup_printf - ("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", - settings.homedir, listname, listname); + gchar *path = g_strdup_printf("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", + settings.homedir, listname, listname); g_free(listname); RawGenBook::createModule(path); - RawGenBook *book = new RawGenBook (path); + RawGenBook *book = new RawGenBook(path); - TreeKeyIdx root = *((TreeKeyIdx *) ((SWKey *) (*book))); - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); - for (int month = 0; month < 12; ++month) - { + for (int month = 0; month < 12; ++month) { char monthnum[4], monthstring[32]; - snprintf(monthnum, 3, "%02d", month+1); + snprintf(monthnum, 3, "%02d", month + 1); snprintf(monthstring, 31, "%s
        ", _(month_names[month])); if (month == 0) @@ -485,8 +463,8 @@ for (int day = 0; day < month_day_counts[month]; ++day) { char daynum[4], monthday[32]; - snprintf(daynum, 3, "%02d", day+1); - snprintf(monthday, 31, "%s %d
        ", _(month_names[month]), day+1); + snprintf(daynum, 3, "%02d", day + 1); + snprintf(monthday, 31, "%s %d
        ", _(month_names[month]), day + 1); if (day == 0) appendChild(treeKey, daynum); @@ -520,21 +498,19 @@ gboolean main_prayerlist_outlined_topic_create(void) { - char *listname = prayerlist_fundamentals - (_("An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."), - _("OutlinedTopic")); + char *listname = prayerlist_fundamentals(_("An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."), + _("OutlinedTopic")); if (listname == NULL) return FALSE; - gchar *path = g_strdup_printf - ("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", - settings.homedir, listname, listname); + gchar *path = g_strdup_printf("%s/" DOTSWORD "/modules/genbook/rawgenbook/%s/%s", + settings.homedir, listname, listname); g_free(listname); RawGenBook::createModule(path); - RawGenBook *book = new RawGenBook (path); + RawGenBook *book = new RawGenBook(path); - TreeKeyIdx root = *((TreeKeyIdx *) ((SWKey *) (*book))); - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); + TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); appendChild(treeKey, _("Major Topic A")); setEntryText(book, _("Major Topic A
        ")); diff -Nru xiphos-4.0.0+dfsg1/src/main/prayerlists.h xiphos-4.0.4+dfsg1/src/main/prayerlists.h --- xiphos-4.0.0+dfsg1/src/main/prayerlists.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/prayerlists.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * prayerlists.h - code to create several different prayer lists * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,8 +23,7 @@ #define _PRAYERLISTS_H #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif gboolean main_prayerlist_basic_create(void); @@ -36,5 +35,4 @@ #ifdef __cplusplus } #endif - #endif /* _PRAYERLISTS_H */ diff -Nru xiphos-4.0.0+dfsg1/src/main/previewer.cc xiphos-4.0.4+dfsg1/src/main/previewer.cc --- xiphos-4.0.0+dfsg1/src/main/previewer.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/previewer.cc 2015-08-23 03:58:56.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * previewer.cc - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -48,7 +48,7 @@ #include "gui/debug_glib_null.h" -#define HTML_START "\ +#define HTML_START "\ " +#define HTML_START "" static BackEnd *backendSearch = NULL; static gboolean is_running = FALSE; extern int search_dialog; -static GList *get_custom_list_from_name(const gchar * label); +static GList *get_custom_list_from_name(const gchar *label); static void add_ranges(void); static void add_modlist(void); -gboolean terminate_search; // also accessed from search_dialog.c. -gboolean search_active; // also accessed from search_dialog.c. +gboolean terminate_search; // also accessed from search_dialog.c. +gboolean search_active; // also accessed from search_dialog.c. static GList *list_of_finds; static GList *list_for_bookmarking = NULL; - /****************************************************************************** * Name * main_export_current_adv_search @@ -86,9 +85,8 @@ * void */ -gboolean main_export_current_adv_search (GString * str, gboolean html, gboolean with_scripture) +gboolean main_export_current_adv_search(GString *str, gboolean html, gboolean with_scripture) { - GList *verses = NULL; GList *tmp = NULL; RESULTS *list_item; gboolean ret = FALSE; @@ -98,13 +96,13 @@ if (html) str = g_string_append(str, ""); while (tmp) { - verses = (GList*) tmp->data; + GList *verses = (GList *)tmp->data; GString *verse_string = g_string_new(""); gboolean first_entry = TRUE; while (verses) { - list_item = (RESULTS *) verses->data; + list_item = (RESULTS *)verses->data; if (main_is_Bible_key(list_item->module, list_item->key)) { ret = TRUE; if (first_entry) { @@ -116,21 +114,20 @@ str = g_string_append(str, verse_string->str); } else { desc = g_strdup_printf("%s %s", - list_item->key, - list_item->module); + list_item->key, + list_item->module); if (html) - gui_set_html_item ( str, - desc, - list_item->module, - list_item->key, - with_scripture); + gui_set_html_item(str, + desc, + list_item->module, + list_item->key, + with_scripture); else - gui_set_plain_text_item ( str, - desc, - list_item->module, - list_item->key, - with_scripture); - + gui_set_plain_text_item(str, + desc, + list_item->module, + list_item->key, + with_scripture); } } verses = g_list_next(verses); @@ -143,7 +140,6 @@ return ret; } - /****************************************************************************** * Name * main_save_current_adv_search_as_bookmarks @@ -161,22 +157,21 @@ * void */ -void main_save_current_adv_search_as_bookmarks (void) +void main_save_current_adv_search_as_bookmarks(void) { - GList *verses = NULL; RESULTS *list_item; gchar *module_name = NULL; list_for_bookmarking = g_list_first(list_for_bookmarking); while (list_for_bookmarking) { - verses = (GList*) list_for_bookmarking->data; + GList *verses = (GList *)list_for_bookmarking->data; GString *name = g_string_new(NULL); GString *verse_string = g_string_new(""); gboolean first_entry = TRUE; while (verses) { - list_item = (RESULTS *) verses->data; + list_item = (RESULTS *)verses->data; if (main_is_Bible_key(list_item->module, list_item->key)) { if (first_entry) { module_name = g_strdup(list_item->module); @@ -199,7 +194,6 @@ } } - /****************************************************************************** * Name * main_range_text_changed @@ -219,10 +213,9 @@ * void */ -void main_range_text_changed(GtkEditable * editable) +void main_range_text_changed(GtkEditable *editable) { const gchar *entry; - gchar *buf = NULL; GtkTreeModel *model; GtkListStore *list_store; GtkTreeModel *model_list_ranges; @@ -238,20 +231,17 @@ store_list_ranges = GTK_LIST_STORE(model_list_ranges); /* */ model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.list_range_name)); - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.list_range_name)); + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_list_store_clear(store_list_ranges); entry = gtk_entry_get_text(GTK_ENTRY(editable)); tmp = backend->parse_range_list(settings.MainWindowModule, entry); while (tmp) { - buf = (gchar*)tmp->data; + gchar *buf = (gchar *)tmp->data; if (!buf) break; gtk_list_store_append(store_list_ranges, &iter); @@ -264,8 +254,6 @@ gtk_list_store_set(list_store, &selected, 1, entry, -1); } - - /****************************************************************************** * Name * set_search_global_option @@ -282,7 +270,7 @@ * void */ -static void set_search_global_option(const gchar * option, gboolean choice) +static void set_search_global_option(const gchar *option, gboolean choice) { const char *on_off; SWMgr *mgr = backendSearch->get_mgr(); @@ -293,10 +281,9 @@ on_off = "Off"; } mgr->setGlobalOption(option, on_off); - XI_print(("option = %s is %s\n",option,on_off)); + XI_print(("option = %s is %s\n", option, on_off)); } - /****************************************************************************** * Name * save_modlist @@ -330,15 +317,13 @@ gtk_tree_model_get(model, &iter, 0, &text1, 1, &text2, -1); xml_set_list_item("modlists", "modlist", text1, text2); - XI_warning(("%s",text2)); + XI_warning(("%s", text2)); g_free(text1); g_free(text2); } while (gtk_tree_model_iter_next(model, &iter)); add_modlist(); } - - /****************************************************************************** * Name * save_range @@ -364,8 +349,7 @@ GtkTreeIter iter; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); //list_store = GTK_LIST_STORE(model); if (!gtk_tree_model_get_iter_first(model, &iter)) @@ -375,14 +359,13 @@ 0, &text1, 1, &text2, -1); xml_set_list_item("ranges", "range", text1, text2); - XI_warning(("%s",text2)); + XI_warning(("%s", text2)); g_free(text1); g_free(text2); } while (gtk_tree_model_iter_next(model, &iter)); add_ranges(); } - /****************************************************************************** * Name * delete_range @@ -409,14 +392,11 @@ gchar *str; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.list_range_name)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.list_range_name)); - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; gtk_tree_model_get(model, &selected, 0, &name_string, -1); @@ -425,13 +405,13 @@ _("Are you sure you want to delete this range?"), name_string); - if (gui_yes_no_dialog(str, (char *) -#ifdef HAVE_GTK_310 - "dialog-warning" + if (gui_yes_no_dialog(str, (char *) +#ifdef HAVE_GTK_310 + "dialog-warning" #else - GTK_STOCK_DIALOG_WARNING -#endif - )) { + GTK_STOCK_DIALOG_WARNING +#endif + )) { gtk_list_store_remove(list_store, &selected); xml_remove_node("ranges", "range", name_string); --search1.list_rows; @@ -442,7 +422,6 @@ g_free(str); } - /****************************************************************************** * Name * add_module_finds @@ -459,33 +438,30 @@ * void */ -static void add_module_finds(GList * versekeys) +static void add_module_finds(GList *versekeys) { - gchar *buf; GtkTreeModel *model; GtkListStore *list_store; GtkTreeIter iter; GList *tmp = g_list_first(versekeys); model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.listview_verses)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); while (tmp) { - buf = (char*) tmp->data; + gchar *buf = (char *)tmp->data; gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, - 0,buf, + 0, buf, -1); tmp = g_list_next(tmp); } } - /****************************************************************************** * Name * add_ranges @@ -504,19 +480,19 @@ static void add_ranges(void) { - gchar *buf[2]; GtkTreeModel *model; GtkListStore *list_store; GtkTreeIter iter; model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.list_range_name)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.list_range_name)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); if (xml_set_section_ptr("ranges")) { + gchar *buf[2]; + if (xml_get_label()) { buf[0] = xml_get_label(); buf[1] = xml_get_list(); @@ -544,16 +520,15 @@ 1, buf[1], -1); gui_add_item_to_combo(search1.combo_range, - buf[0]); + buf[0]); g_free(buf[0]); g_free(buf[1]); } } - gui_set_combo_index(search1.combo_range,0); + gui_set_combo_index(search1.combo_range, 0); } } - /****************************************************************************** * Name * add_modlist @@ -572,7 +547,6 @@ static void add_modlist(void) { - gchar *buf[2]; GtkTreeModel *model; GtkListStore *list_store; GtkTreeIter iter; @@ -583,6 +557,8 @@ gtk_list_store_clear(list_store); if (xml_set_section_ptr("modlists")) { + gchar *buf[2]; + if (xml_get_label()) { buf[0] = xml_get_label(); buf[1] = xml_get_list(); @@ -610,16 +586,15 @@ 1, buf[1], -1); gui_add_item_to_combo(search1.combo_list, - buf[0]); + buf[0]); g_free(buf[0]); g_free(buf[1]); } } - gui_set_combo_index(search1.combo_list,0); + gui_set_combo_index(search1.combo_list, 0); } } - /****************************************************************************** * Name * change_mods_select_label @@ -639,17 +614,14 @@ void main_change_mods_select_label(char *mod_name) { - gchar *str; - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_current_module))) { - str = g_strdup_printf("%s%s",Q_("Search: "),mod_name); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_current_module))) { + gchar *str = g_strdup_printf("%s%s", Q_("Search: "), mod_name); gtk_label_set_markup(GTK_LABEL(search1.label_mod_select), str); g_free(str); } else main_add_modlist_to_label(); } - /****************************************************************************** * Name * @@ -668,8 +640,6 @@ void main_delete_module(GtkTreeView *treeview) { - GList *mods = NULL; - gchar *mod_list; GtkTreeModel *model; GtkListStore *list_store; GtkTreeSelection *selection; @@ -679,31 +649,28 @@ model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); list_store = GTK_LIST_STORE(model); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(treeview)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; str = g_strdup_printf("%s\n\n%s", _("Remove Module?"), _("Are you sure you want to remove the selected module?")); - if (gui_yes_no_dialog(str, (char*) -#ifdef HAVE_GTK_310 - "dialog-warning" + if (gui_yes_no_dialog(str, (char *) +#ifdef HAVE_GTK_310 + "dialog-warning" #else - GTK_STOCK_DIALOG_WARNING -#endif - )) { + GTK_STOCK_DIALOG_WARNING +#endif + )) { gtk_list_store_remove(list_store, &selected); - mods = get_current_list(treeview); - mod_list = get_modlist_string(mods); + GList *mods = get_current_list(treeview); + gchar *mod_list = get_modlist_string(mods); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.module_lists)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); model = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); @@ -719,8 +686,7 @@ g_free(str); } - -void main_add_mod_to_list(GtkWidget * tree_widget, gchar * mod_name) +void main_add_mod_to_list(GtkWidget *tree_widget, gchar *mod_name) { GtkTreeModel *model_mods; GtkTreeModel *model_modules_lists; @@ -736,8 +702,7 @@ model_modules_lists = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); store_modules_lists = GTK_LIST_STORE(model_modules_lists); - selection_modules_lists = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.module_lists)); + selection_modules_lists = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); model_mods = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); list_store = GTK_LIST_STORE(model_mods); @@ -751,9 +716,8 @@ mod_list = get_modlist_string(mods); if (mod_list) { - gtk_tree_selection_get_selected - (selection_modules_lists, NULL, - &selected_modules_lists); + gtk_tree_selection_get_selected(selection_modules_lists, NULL, + &selected_modules_lists); gtk_list_store_set(store_modules_lists, &selected_modules_lists, @@ -763,7 +727,6 @@ ++search1.module_count; } - /****************************************************************************** * Name * mod_selection_changed @@ -781,13 +744,10 @@ * void */ -void main_mod_selection_changed(GtkTreeSelection * selection, - GtkWidget * tree_widget) +void main_mod_selection_changed(GtkTreeSelection *selection, + GtkWidget *tree_widget) { gchar *mod = NULL; - const gchar *mod_description = NULL; - gchar *mod_list = NULL; - GList *mods = NULL; GtkListStore *store_modules_lists; GtkListStore *list_store; GtkTreeSelection *selection_modules_lists; @@ -799,32 +759,28 @@ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tree_widget)); - if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; model_mods = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.listview_modules)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); list_store = GTK_LIST_STORE(model_mods); - model_modules_lists = gtk_tree_view_get_model(GTK_TREE_VIEW(search1.module_lists)); store_modules_lists = GTK_LIST_STORE(model_modules_lists); - selection_modules_lists = gtk_tree_view_get_selection - (GTK_TREE_VIEW(search1.module_lists)); + selection_modules_lists = gtk_tree_view_get_selection(GTK_TREE_VIEW(search1.module_lists)); if (gtk_tree_model_iter_has_child(model, &selected)) return; gtk_tree_model_get(model, &selected, UTIL_COL_MODULE, &mod, -1); if (mod) { - mod_description = - backendSearch->module_description(mod); + const gchar *mod_description = + backendSearch->module_description(mod); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_current_module))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_current_module))) { search1.search_mod = g_strdup(mod); search1.module_count = 1; } else { @@ -832,13 +788,13 @@ gtk_list_store_set(list_store, &iter, 0, mod_description, 1, mod, -1); - mods = get_current_list(GTK_TREE_VIEW(search1.listview_modules)); - mod_list = get_modlist_string(mods); + + GList *mods = get_current_list(GTK_TREE_VIEW(search1.listview_modules)); + gchar *mod_list = get_modlist_string(mods); if (mod_list) { - gtk_tree_selection_get_selected - (selection_modules_lists, NULL, - &selected_modules_lists); + gtk_tree_selection_get_selected(selection_modules_lists, NULL, + &selected_modules_lists); gtk_list_store_set(store_modules_lists, &selected_modules_lists, @@ -852,7 +808,6 @@ } } - /****************************************************************************** * Name * main_selection_finds_list_changed @@ -871,7 +826,8 @@ */ void main_selection_finds_list_changed(GtkTreeSelection * - selection, gpointer data) + selection, + gpointer data) { gchar *text, *path_str; GList *tmp = NULL; @@ -879,14 +835,14 @@ GtkTreeIter selected; GtkTreePath *path; - if (!gtk_tree_selection_get_selected (selection,&model,&selected)) + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return; gtk_tree_model_get(model, &selected, 0, &text, -1); - path = gtk_tree_model_get_path(model,&selected); + path = gtk_tree_model_get_path(model, &selected); path_str = gtk_tree_path_to_string(path); - XI_message(("\npath: %s\ntext: %s",path_str,text)); - tmp = g_list_nth(list_of_finds,atoi(path_str)); - tmp = (GList*)tmp->data; + XI_message(("\npath: %s\ntext: %s", path_str, text)); + tmp = g_list_nth(list_of_finds, atoi(path_str)); + tmp = (GList *)tmp->data; add_module_finds(tmp); if (text) @@ -894,10 +850,8 @@ if (path_str) g_free(path_str); gtk_tree_path_free(path); - } - /****************************************************************************** * Name * main_finds_verselist_selection_changed @@ -915,8 +869,8 @@ * void */ -void main_finds_verselist_selection_changed(GtkTreeSelection * selection, - GtkTreeModel * model, +void main_finds_verselist_selection_changed(GtkTreeSelection *selection, + GtkTreeModel *model, gboolean is_double_click) { gchar *text, *buf, *module, *key; @@ -925,7 +879,7 @@ //GtkTreeModel *model; GtkTreeIter selected; - if (!gtk_tree_selection_get_selected (selection, &model, &selected)) + if (!gtk_tree_selection_get_selected(selection, &model, &selected)) return; gtk_tree_model_get(model, &selected, 0, &text, -1); XI_message(("\ntext: %s", text)); @@ -934,7 +888,7 @@ // first `:' finds end of module name. buf = strchr(text, ':'); - *(module+(buf-text)) = '\0'; // strncpy unreliably terminates? + *(module + (buf - text)) = '\0'; // strncpy unreliably terminates? // key begins 2 chars after module. key = buf + 2; @@ -947,7 +901,7 @@ main_url_handler(verse_selected, TRUE); g_free((gchar *)temp_key); - text_str = g_string_new(backendSearch->get_render_text(module,key)); + text_str = g_string_new(backendSearch->get_render_text(module, key)); mark_search_words(text_str); GString *html_text = g_string_new(""); @@ -962,21 +916,19 @@ mf->old_font_size_value); free_font(mf); g_string_append(html_text, text_str->str); - g_string_append(html_text, ""); + g_string_append(html_text, ""); XIPHOS_HTML_OPEN_STREAM(search1.preview_html, "text/html"); XIPHOS_HTML_WRITE(search1.preview_html, - html_text->str, html_text->len); + html_text->str, html_text->len); XIPHOS_HTML_CLOSE(search1.preview_html); g_string_free(html_text, TRUE); XI_message(("main_finds_verselist_selection_changed: %s %s", module, key)); - if (text) - g_free(text); + g_free(text); g_string_free(text_str, TRUE); } - /****************************************************************************** * Name * @@ -994,7 +946,7 @@ * void */ -void main_selection_modules_lists_changed(GtkTreeSelection * selection, +void main_selection_modules_lists_changed(GtkTreeSelection *selection, gpointer data) { gchar *name, *modules; @@ -1004,8 +956,7 @@ GtkListStore *list_store; GtkTreeIter selected; - if (!gtk_tree_selection_get_selected - (selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; model = @@ -1013,38 +964,35 @@ gtk_tree_model_get(model, &selected, 0, &name, 1, &modules, -1); model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.listview_modules)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_modules)); list_store = GTK_LIST_STORE(model); gtk_entry_set_text(GTK_ENTRY(search1.entry_list_name), name); gtk_list_store_clear(list_store); tmp = - get_custom_list_from_name(gtk_entry_get_text - (GTK_ENTRY - (search1.entry_list_name))); + get_custom_list_from_name(gtk_entry_get_text(GTK_ENTRY(search1.entry_list_name))); tmp = tmp2 = g_list_first(tmp); while (tmp != NULL) { gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, - 0, - backendSearch->module_description((gchar *) - tmp->data), 1, - (gchar *) tmp->data, -1); - g_free((gchar *) tmp->data); + 0, + backendSearch->module_description((gchar *) + tmp->data), + 1, + (gchar *)tmp->data, -1); + g_free((gchar *)tmp->data); tmp = g_list_next(tmp); } g_list_free(tmp2); - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_current_module))) + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_current_module))) main_add_modlist_to_label(); g_free(name); g_free(modules); } - /****************************************************************************** * Name * add_modlist_to_label @@ -1079,16 +1027,14 @@ g_free(str); } - - -void main_comboboxentry2_changed(GtkComboBox * combobox, gpointer user_data) +void main_comboboxentry2_changed(GtkComboBox *combobox, gpointer user_data) { GList *mod_list = NULL; gchar *str = NULL; gchar *mod_list_str = NULL; const gchar *name = NULL; - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_custom_list))) + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_custom_list))) return; name = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combobox)))); mod_list = get_custom_list_from_name(name); @@ -1104,7 +1050,6 @@ g_free(str); } - /****************************************************************************** * Name * @@ -1124,19 +1069,15 @@ static void check_search_global_options(void) { set_search_global_option("Strong's Numbers", - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1. - cb_include_strongs))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.cb_include_strongs))); set_search_global_option("Morphological Tags", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1. - cb_include_morphs))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.cb_include_morphs))); set_search_global_option("Footnotes", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1. - cb_include_footnotes))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.cb_include_footnotes))); } - /****************************************************************************** * Name * get_current_search_mod @@ -1158,11 +1099,10 @@ GList *items = NULL; items = - g_list_append(items, (gchar *) g_strdup(search1.search_mod)); + g_list_append(items, (gchar *)g_strdup(search1.search_mod)); return items; } - /****************************************************************************** * Name * get_custom_list_from_name @@ -1179,7 +1119,7 @@ * gchar * */ -static GList *get_custom_list_from_name(const gchar * label) +static GList *get_custom_list_from_name(const gchar *label) { GList *items = NULL; gchar *mod_list = NULL; @@ -1190,8 +1130,8 @@ t = ","; mod_list = - (gchar *) xml_get_list_from_label("modlists", "modlist", - label); + (gchar *)xml_get_list_from_label("modlists", "modlist", + label); token = strtok(mod_list, t); ++search1.module_count; while (token != NULL) { @@ -1203,7 +1143,6 @@ return items; } - /****************************************************************************** * Name * set_up_search @@ -1222,12 +1161,9 @@ static void set_up_dialog_search(GList *modlist) { - const gchar *label; - gchar *range = NULL; - //gui_begin_html(search1.results_html, TRUE); backendSearch->clear_scope(); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_custom_range))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_custom_range))) { // if any non-bible, non-commentary modules are in use, // we must not respect this "custom range" selector. gboolean range_ok = TRUE; @@ -1235,8 +1171,8 @@ while (modlist) { if (name_for_range == NULL) - name_for_range = (char*)modlist->data; - int mod_type = backend->module_type((char*)modlist->data); + name_for_range = (char *)modlist->data; + int mod_type = backend->module_type((char *)modlist->data); if ((mod_type != TEXT_TYPE) && (mod_type != COMMENTARY_TYPE)) { range_ok = FALSE; @@ -1247,11 +1183,10 @@ if (range_ok) { backendSearch->clear_search_list(); - label = - gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child (GTK_BIN(search1.combo_range)))); - range = - (gchar *) xml_get_list_from_label("ranges", "range", - label); + const gchar *label = + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(search1.combo_range)))); + gchar *range = + (gchar *)xml_get_list_from_label("ranges", "range", label); if (range) { backendSearch->set_range(name_for_range, range); backendSearch->set_scope2range(); @@ -1259,7 +1194,7 @@ } } - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_last))) { + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_last))) { backendSearch->set_scope2last_search(); } @@ -1268,24 +1203,22 @@ } } - -static -void _clear_find_lists(void) +static void _clear_find_lists(void) { - GList *tmp, *base; - gchar *tmp_buf; + GList *base; base = list_of_finds = g_list_first(list_of_finds); while (list_of_finds) { - tmp = (GList*) list_of_finds->data; + GList *tmp = (GList *)list_of_finds->data; while (tmp) { - tmp_buf = (char*) tmp->data; - XI_message(("%s",tmp_buf)); - if (tmp_buf) g_free(tmp_buf); + gchar *tmp_buf = (gchar *)tmp->data; + XI_message(("%s", tmp_buf)); + if (tmp_buf) + g_free(tmp_buf); tmp = g_list_next(tmp); } if (list_of_finds->data) - g_list_free((GList*)list_of_finds->data); + g_list_free((GList *)list_of_finds->data); list_of_finds = g_list_next(list_of_finds); } if (base) @@ -1293,21 +1226,23 @@ list_of_finds = NULL; } -static -void _clear_bookmarking_lists(void) +static void _clear_bookmarking_lists(void) { - GList *tmp = NULL; RESULTS *results; list_for_bookmarking = g_list_first(list_for_bookmarking); while (list_for_bookmarking) { - tmp = (GList*) list_for_bookmarking->data; + GList *tmp = (GList *)list_for_bookmarking->data; + while (tmp) { - results = (RESULTS*) tmp->data; - XI_message(("%s://%s",results->module,results->key)); - if (results->module) g_free(results->module); - if (results->key) g_free(results->key); - if (results) g_free (results); + results = (RESULTS *)tmp->data; + XI_message(("%s://%s", results->module, results->key)); + if (results->module) + g_free(results->module); + if (results->key) + g_free(results->key); + if (results) + g_free(results); tmp = g_list_next(tmp); } list_for_bookmarking = g_list_next(list_for_bookmarking); @@ -1346,14 +1281,12 @@ _clear_bookmarking_lists(); model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.listview_results)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_results)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); model2 = - gtk_tree_view_get_model(GTK_TREE_VIEW - (search1.listview_verses)); + gtk_tree_view_get_model(GTK_TREE_VIEW(search1.listview_verses)); list_store2 = GTK_LIST_STORE(model2); gtk_list_store_clear(list_store2); @@ -1366,49 +1299,49 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(search1.notebook), 1); search_type = - (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_regexp)) - ? 0 - : (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_exact_phrase)) - ? -1 - : (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_words)) - ? -2 - : (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_optimized)) - ? -4 - : -3 /* fallthrough to attribute */ )))); + (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_regexp)) + ? 0 + : (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_exact_phrase)) + ? -1 + : (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_words)) + ? -2 + : (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_optimized)) + ? -4 + : -3 /* fallthrough to attribute */)))); XI_message(("search_type = %d", search_type)); search_params = - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.cb_case_sensitive)) ? 0 : REG_ICASE; + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.cb_case_sensitive)) ? 0 : REG_ICASE; // For attribute-based searches, e.g. "Word//Lemma/G140", // we must constrain the match to whole words. Otherwise, // we will inadvertently return e.g. 140 plus 1401 and 1404. if (search_type == -3) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_strongs))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_strongs))) { search_params |= SEARCHFLAG_MATCHWHOLEENTRY; attribute_search_string = g_strdup_printf( - "Word//Lemma./%s", - search_string); - } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_morphs))) { + "Word//Lemma./%s", + search_string); + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_morphs))) { search_params |= SEARCHFLAG_MATCHWHOLEENTRY; attribute_search_string = g_strdup_printf( - "Word//Morph/%s", - search_string); - } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_footnotes))) { + "Word//Morph/%s", + search_string); + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_footnotes))) { attribute_search_string = g_strdup_printf( - "Footnote//body/%s", - search_string); + "Footnote//body/%s", + search_string); } - XI_message(("%s",attribute_search_string)); + XI_message(("%s", attribute_search_string)); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_custom_list))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_custom_list))) { const gchar *name; name = gtk_entry_get_text(GTK_ENTRY( - gtk_bin_get_child (GTK_BIN(search1.combo_list)))); + gtk_bin_get_child(GTK_BIN(search1.combo_list)))); search_mods = get_custom_list_from_name(name); - } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(search1.rb_mod_list))) { + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search1.rb_mod_list))) { search_mods = get_current_list(GTK_TREE_VIEW(search1.listview_modules)); } else search_mods = get_current_search_mod(); @@ -1431,7 +1364,12 @@ mgr->setGlobalOption("Arabic Vowel Points", "Off"); while (search_mods != NULL) { - module = (gchar *) search_mods->data; + module = (gchar *)search_mods->data; + const char *real_mod = main_get_name(module); + if (real_mod) { + g_free(module); + module = g_strdup((gchar *)real_mod); + } if (terminate_search) { // we simply wrap through the remaining @@ -1465,14 +1403,12 @@ gui_generic_warning(msg); } } - XI_message(("search_type = %d",search_type)); + XI_message(("search_type = %d", search_type)); finds = backendSearch->do_module_search(module, (attribute_search_string - ? mgr->getModule(module)-> - stripText(attribute_search_string) - : mgr->getModule(module)-> - stripText(search_string)), + ? mgr->getModule(module)->stripText(attribute_search_string) + : mgr->getModule(module)->stripText(search_string)), search_type, search_params, TRUE); @@ -1488,17 +1424,17 @@ g_string_printf(str, "%s: %s %s", module, key_buf, backendSearch->get_strip_text(module, key_buf)); else - g_string_printf(str, "%s: %s", module, key_buf); - tmp_list = g_list_append(tmp_list, (char*) g_strdup(str->str)); + g_string_printf(str, "%s: %s", module, key_buf); + tmp_list = g_list_append(tmp_list, (char *)g_strdup(str->str)); - results = g_new(RESULTS,1); + results = g_new(RESULTS, 1); results->module = g_strdup(module); results->key = g_strdup(key_buf); tmp_bookmark_list = g_list_append(tmp_bookmark_list, - (RESULTS*) results); + (RESULTS *)results); } - list_of_finds = g_list_append(list_of_finds, (GList*)tmp_list); - list_for_bookmarking = g_list_append(list_for_bookmarking, (GList*)tmp_bookmark_list); + list_of_finds = g_list_append(list_of_finds, (GList *)tmp_list); + list_for_bookmarking = g_list_append(list_for_bookmarking, (GList *)tmp_bookmark_list); // add number of hits in each module to finds listview num = main_format_number(finds); @@ -1511,7 +1447,7 @@ -1); ++x; if (x == 1) { // add verse list for hits in first module to verse listview - tmp = (GList*) list_of_finds->data; + tmp = (GList *)list_of_finds->data; add_module_finds(g_list_first(tmp)); } @@ -1522,7 +1458,7 @@ search_active = FALSE; if (attribute_search_string) - g_free((gchar*)attribute_search_string); + g_free((gchar *)attribute_search_string); g_list_free(search_mods); gui_set_progressbar_text(search1.progressbar, _("Search finished")); gui_set_progressbar_fraction(search1.progressbar, 0); @@ -1607,9 +1543,7 @@ void main_dialog_search_percent_update(char percent, void *userData) { - char maxHashes = *((char *) userData); - float num; - static char printed = 0; + char maxHashes = *((char *)userData); if (terminate_search) { backendSearch->terminate_search(); @@ -1617,9 +1551,11 @@ // _clear_find_lists(); why would i have ever done this here? oy. is_running = FALSE; } else { + static char printed = 0; + /* update search dialog progress */ - while ((((float) percent) / 100) * maxHashes > printed) { - num = (float) percent / 100; + while ((((float)percent) / 100) * maxHashes > printed) { + float num = (float)percent / 100; gui_set_progressbar_fraction(search1.progressbar, (gdouble)num); printed++; } diff -Nru xiphos-4.0.0+dfsg1/src/main/search_dialog.h xiphos-4.0.4+dfsg1/src/main/search_dialog.h --- xiphos-4.0.0+dfsg1/src/main/search_dialog.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/search_dialog.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.h - glue * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,23 +26,39 @@ extern "C" { #endif -gboolean main_export_current_adv_search (GString * str, gboolean html, gboolean with_scripture); -void main_save_current_adv_search_as_bookmarks (void); -void main_add_mod_to_list(GtkWidget * tree_widget, gchar * mod_name); -void main_finds_verselist_selection_changed(GtkTreeSelection * selection, GtkTreeModel * model, gboolean is_double_click); -void main_selection_modules_lists_changed(GtkTreeSelection * selection, gpointer data); -void main_selection_finds_list_changed(GtkTreeSelection * selection, gpointer data); -void main_comboboxentry2_changed(GtkComboBox * combobox, gpointer user_data); -void main_dialog_search_percent_update(char percent, void *userData); -void main_range_text_changed(GtkEditable * editable); +gboolean main_export_current_adv_search(GString *str, + gboolean html, + gboolean with_scripture); +void main_save_current_adv_search_as_bookmarks(void); +void main_add_mod_to_list(GtkWidget *tree_widget, + gchar *mod_name); +void main_finds_verselist_selection_changed(GtkTreeSelection * + selection, + GtkTreeModel *model, + gboolean + is_double_click); +void main_selection_modules_lists_changed(GtkTreeSelection * + selection, + gpointer data); +void main_selection_finds_list_changed(GtkTreeSelection * + selection, + gpointer data); +void main_comboboxentry2_changed(GtkComboBox *combobox, + gpointer user_data); +void main_dialog_search_percent_update(char percent, + void *userData); +void main_range_text_changed(GtkEditable *editable); void main_save_modlist(void); void main_save_range(void); void main_delete_range(void); void main_add_modlist_to_label(void); void main_change_mods_select_label(char *mod_name); void main_delete_module(GtkTreeView *treeview); -void main_selection_modules_lists_changed(GtkTreeSelection * selection, gpointer data); -void main_mod_selection_changed(GtkTreeSelection * selection, GtkWidget * tree_widget); +void main_selection_modules_lists_changed(GtkTreeSelection * + selection, + gpointer data); +void main_mod_selection_changed(GtkTreeSelection *selection, + GtkWidget *tree_widget); void main_do_dialog_search(void); void main_open_search_dialog(void); void main_close_search_dialog(void); @@ -54,7 +70,7 @@ #endif -extern gboolean terminate_search; // def'd in search_dialog.cc. -extern gboolean search_active; // def'd in search_dialog.cc. +extern gboolean terminate_search; // def'd in search_dialog.cc. +extern gboolean search_active; // def'd in search_dialog.cc. #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/search_sidebar.cc xiphos-4.0.4+dfsg1/src/main/search_sidebar.cc --- xiphos-4.0.0+dfsg1/src/main/search_sidebar.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/search_sidebar.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.cc - glue (: very sticky :) * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,7 +79,6 @@ static void fill_search_results_list(int finds) { gchar buf[256]; - gchar *tmpbuf; const gchar *key_buf = NULL; GtkTreeModel *model; GtkListStore *list_store; @@ -98,7 +97,7 @@ if (list_of_verses) { GList *chaser = list_of_verses; while (chaser) { - list_item = (RESULTS*)chaser->data; + list_item = (RESULTS *)chaser->data; g_free(list_item->module); g_free(list_item->key); g_free(list_item); @@ -108,56 +107,54 @@ list_of_verses = NULL; } - gtk_widget_set_sensitive(sidebar.menu_item_save_search,FALSE); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(sidebar.results_list)); + gtk_widget_set_sensitive(sidebar.menu_item_save_search, FALSE); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sidebar.results_list)); list_store = gtk_list_store_new(1, G_TYPE_STRING); - backendSearch->set_listkey_position((char) 1); /* TOP */ + backendSearch->set_listkey_position((char)1); /* TOP */ while ((key_buf = backendSearch->get_next_listkey()) != NULL) { - tmpbuf = (gchar*) key_buf; + gchar *tmpbuf = (gchar *)key_buf; gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, 0, tmpbuf, -1); - list_item = g_new(RESULTS,1); + list_item = g_new(RESULTS, 1); list_item->module = g_strdup(settings.sb_search_mod); list_item->key = g_strdup(tmpbuf); list_of_verses = g_list_append(list_of_verses, - (RESULTS *) list_item); + (RESULTS *)list_item); } model = GTK_TREE_MODEL(list_store); - gtk_tree_view_set_model (GTK_TREE_VIEW(sidebar.results_list), model); + gtk_tree_view_set_model(GTK_TREE_VIEW(sidebar.results_list), model); num = main_format_number(finds); sprintf(buf, "%s %s", num, buf1); g_free(num); - gui_set_statusbar (buf); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar),3); + gui_set_statusbar(buf); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), 3); /* cleanup progress bar */ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ss.progressbar_search), - 0.0); + 0.0); /* display first item in list by selection row*/ - if (!gtk_tree_model_get_iter_first(model,&iter)) + if (!gtk_tree_model_get_iter_first(model, &iter)) return; - gtk_widget_set_sensitive(sidebar.menu_item_save_search,TRUE); - path = gtk_tree_model_get_path(model,&iter); + gtk_widget_set_sensitive(sidebar.menu_item_save_search, TRUE); + path = gtk_tree_model_get_path(model, &iter); gtk_tree_selection_select_path(selection, path); gtk_tree_path_free(path); - gui_verselist_button_release_event(NULL,NULL,NULL); + gui_verselist_button_release_event(NULL, NULL, NULL); return; } #ifdef HAVE_DBUS -GList* get_list_of_references() +GList *get_list_of_references() { - RESULTS* list_item; GList *tmp = list_of_verses; GList *references = NULL; while (tmp) { - list_item = (RESULTS*)tmp->data; + RESULTS *list_item = (RESULTS *)tmp->data; references = g_list_append(references, list_item->key); tmp = g_list_next(tmp); } @@ -189,7 +186,7 @@ if (!backendSearch) main_init_sidebar_search_backend(); - gtk_widget_set_sensitive(sidebar.menu_item_save_search,FALSE); + gtk_widget_set_sensitive(sidebar.menu_item_save_search, FALSE); search_dialog = FALSE; search_string = gtk_entry_get_text(GTK_ENTRY(ss.entrySearch)); @@ -197,51 +194,47 @@ return; /* text -vs- commentary search selection. */ - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.radiobutton_search_text))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.radiobutton_search_text))) { strcpy(settings.sb_search_mod, settings.MainWindowModule); - } - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.radiobutton_search_comm))) { + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.radiobutton_search_comm))) { if (!settings.CommWindowModule || (strlen(settings.CommWindowModule) == 0)) { gui_generic_warning(_("There is no commentary module.")); return; } - strcpy(settings.sb_search_mod,settings.CommWindowModule); + strcpy(settings.sb_search_mod, settings.CommWindowModule); } search_module = settings.sb_search_mod; backendSearch->clear_scope(); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.rrbUseBounds))) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.rrbUseBounds))) { gchar *str; - backendSearch->clear_search_list(); - str = g_strdup_printf("%s - %s", + backendSearch->clear_search_list(); + str = g_strdup_printf("%s - %s", #ifdef USE_GTK_3 - gtk_combo_box_text_get_active_text((GtkComboBoxText*) - ss.entryLower), - gtk_combo_box_text_get_active_text((GtkComboBoxText*) - ss.entryUpper)); -#else - gtk_combo_box_get_active_text(GTK_COMBO_BOX - (ss.entryLower)), - gtk_combo_box_get_active_text(GTK_COMBO_BOX - (ss.entryUpper))); + gtk_combo_box_text_get_active_text((GtkComboBoxText *) + ss.entryLower), + gtk_combo_box_text_get_active_text((GtkComboBoxText *) + ss.entryUpper)); +#else + gtk_combo_box_get_active_text(GTK_COMBO_BOX(ss.entryLower)), + gtk_combo_box_get_active_text(GTK_COMBO_BOX(ss.entryUpper))); #endif backendSearch->set_range(settings.MainWindowModule, str); backendSearch->set_scope2range(); g_free(str); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.rbLastSearch))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.rbLastSearch))) backendSearch->set_scope2last_search(); snprintf(settings.searchText, 255, "%s", search_string); settings.searchType = - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.rbRegExp)) ? 0 : - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.rbPhraseSearch)) ? -1 : -2; + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.rbRegExp)) ? 0 : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.rbPhraseSearch)) ? -1 : -2; if (settings.searchType == -2) settings.searchType = backendSearch->check_for_optimal_search(search_module); @@ -264,7 +257,7 @@ } search_params = - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ss.ckbCaseSensitive)) ? 0 : REG_ICASE; + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ss.ckbCaseSensitive)) ? 0 : REG_ICASE; terminate_search = FALSE; search_active = TRUE; @@ -276,8 +269,7 @@ mgr->setGlobalOption("Arabic Vowel Points", "Off"); finds = backendSearch->do_module_search(search_module, - mgr->getModule(search_module)-> - stripText(search_string), + mgr->getModule(search_module)->stripText(search_string), settings.searchType, search_params, FALSE); @@ -285,17 +277,16 @@ search_active = FALSE; - fill_search_results_list (finds); + fill_search_results_list(finds); #ifdef HAVE_DBUS IpcObject *obj = ipc_get_main_ipc(); - if (obj){ + if (obj) { obj->references = get_list_of_references(); ipc_object_search_performed(obj, settings.searchText, &finds, NULL); } #endif - } void main_sidebar_perscomm_dump(void) @@ -303,21 +294,20 @@ if (!backendSearch) main_init_sidebar_search_backend(); - strcpy(settings.sb_search_mod,settings.MainWindowModule); + strcpy(settings.sb_search_mod, settings.MainWindowModule); backendSearch->clear_scope(); backendSearch->clear_search_list(); fill_search_results_list(backendSearch->do_module_search - /* personal commentary */ (settings.CommWindowModule, - /* find two-plus characters */ "..+", - /* regexp */ 0, - /* case is irrelevant */ 0, - /* happening in sidebar */ FALSE)); + /* personal commentary */ (settings.CommWindowModule, + /* find two-plus characters */ "..+", + /* regexp */ 0, + /* case is irrelevant */ 0, + /* happening in sidebar */ FALSE)); } void main_init_sidebar_search_backend(void) { - if (!backendSearch) - { + if (!backendSearch) { backendSearch = new BackEnd(); main_search_sidebar_fill_bounds_combos(); } @@ -338,26 +328,27 @@ char *module_name = settings.MainWindowModule; SWModule *mod = backendSearch->get_SWModule(module_name); - if (!mod) return; + if (!mod) + return; VerseKey *key = (VerseKey *)mod->createKey(); - GtkTreeModel* upper_model = gtk_combo_box_get_model( - GTK_COMBO_BOX(ss.entryUpper)); + GtkTreeModel *upper_model = gtk_combo_box_get_model( + GTK_COMBO_BOX(ss.entryUpper)); gtk_list_store_clear(GTK_LIST_STORE(upper_model)); - GtkTreeModel* lower_model = gtk_combo_box_get_model( - GTK_COMBO_BOX(ss.entryLower)); + GtkTreeModel *lower_model = gtk_combo_box_get_model( + GTK_COMBO_BOX(ss.entryLower)); gtk_list_store_clear(GTK_LIST_STORE(lower_model)); if (backendSearch->module_has_testament(module_name, 1)) { while (i < key->BMAX[0]) { key->setTestament(1); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); #ifdef USE_GTK_3 - gtk_combo_box_text_append_text((GtkComboBoxText*)ss.entryUpper, book); - gtk_combo_box_text_append_text((GtkComboBoxText*)ss.entryLower, book); -#else + gtk_combo_box_text_append_text((GtkComboBoxText *)ss.entryUpper, book); + gtk_combo_box_text_append_text((GtkComboBoxText *)ss.entryLower, book); +#else gtk_combo_box_append_text(GTK_COMBO_BOX(ss.entryUpper), book); gtk_combo_box_append_text(GTK_COMBO_BOX(ss.entryLower), book); #endif @@ -370,12 +361,12 @@ if (backendSearch->module_has_testament(module_name, 2)) { while (i < key->BMAX[1]) { key->setTestament(2); - key->setBook(i+1); - book = strdup((const char *) key->getBookName()); + key->setBook(i + 1); + book = strdup((const char *)key->getBookName()); #ifdef USE_GTK_3 - gtk_combo_box_text_append_text((GtkComboBoxText*)ss.entryUpper, book); - gtk_combo_box_text_append_text((GtkComboBoxText*)ss.entryLower, book); -#else + gtk_combo_box_text_append_text((GtkComboBoxText *)ss.entryUpper, book); + gtk_combo_box_text_append_text((GtkComboBoxText *)ss.entryLower, book); +#else gtk_combo_box_append_text(GTK_COMBO_BOX(ss.entryUpper), book); gtk_combo_box_append_text(GTK_COMBO_BOX(ss.entryLower), book); #endif @@ -389,7 +380,6 @@ delete key; } - /****************************************************************************** * Name * search_percent_update @@ -408,9 +398,7 @@ void main_sidebar_search_percent_update(char percent, void *userData) { - char maxHashes = *((char *) userData); - float num; - char buf[80]; + char maxHashes = *((char *)userData); static char printed = 0; if (!backendSearch) main_init_sidebar_search_backend(); @@ -418,12 +406,15 @@ if (terminate_search) { backendSearch->terminate_search(); } else { - while ((((float) percent) / 100) * maxHashes > printed) { - sprintf(buf, "%f", (((float) percent) / 100)); - num = (float) percent / 100; - gtk_progress_bar_set_fraction((GtkProgressBar *) - ss.progressbar_search, num); - printed++; + while ((((float)percent) / 100) * maxHashes > printed) { + float num = (float)percent / 100; + gchar buf[80]; + + sprintf(buf, "%f", (((float)percent) / 100)); + gtk_progress_bar_set_fraction((GtkProgressBar *) + ss.progressbar_search, + num); + printed++; } } sync_windows(); diff -Nru xiphos-4.0.0+dfsg1/src/main/search_sidebar.h xiphos-4.0.4+dfsg1/src/main/search_sidebar.h --- xiphos-4.0.0+dfsg1/src/main/search_sidebar.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/search_sidebar.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.h - glue * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,8 @@ extern "C" { #endif -void main_sidebar_search_percent_update(char percent, void *userData); +void main_sidebar_search_percent_update(char percent, + void *userData); void main_do_sidebar_search(gpointer user_data); void main_sidebar_perscomm_dump(void); void main_init_sidebar_search_backend(void); @@ -36,5 +37,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/settings.c xiphos-4.0.4+dfsg1/src/main/settings.c --- xiphos-4.0.0+dfsg1/src/main/settings.c 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/settings.c 2015-08-25 01:24:17.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * settings.c - Guess what? * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include #endif @@ -54,7 +53,6 @@ #include "gui/debug_glib_null.h" #include - /****************************************************************************** * defines */ @@ -88,7 +86,8 @@ * gint */ -int settings_init(int argc, char **argv, int new_configs, int new_bookmarks) +int settings_init(int argc, char **argv, int new_configs, + int new_bookmarks) { int retval = 0; char *sword_dir = NULL; @@ -102,7 +101,7 @@ strcpy(settings.program_title, "Xiphos"); /* Get home dir */ - if ((settings.homedir = (char*) g_getenv(HOMEVAR)) == NULL) { + if ((settings.homedir = (char *)g_getenv(HOMEVAR)) == NULL) { gui_init(argc, argv); gui_generic_warning_modal(_("$HOME is not set!")); /* if not found in env exit */ @@ -110,15 +109,15 @@ } /* set gSwordDir to $home + .xiphos */ - settings.gSwordDir = g_build_filename(settings.homedir, XI_DIR, NULL); + settings.gSwordDir = + g_build_filename(settings.homedir, XI_DIR, NULL); /* if gSwordDir does not exist, create it. */ if (g_access(settings.gSwordDir, F_OK) == -1) { if ((Mkdir(settings.gSwordDir, S_IRWXU)) != 0) { char msg[300]; gui_init(argc, argv); - sprintf(msg, _("Xiphos can not create directory " - XI_DIR + sprintf(msg, _("Xiphos can not create directory " XI_DIR ":\n%s\n\nXiphos cannot continue."), strerror(errno)); gui_generic_warning_modal(msg); @@ -137,7 +136,8 @@ } g_free(sword_dir); /* if .sword/mods.d does not exist create it */ - sword_dir = g_strdup_printf("%s/%s", settings.homedir, DOTSWORD "/mods.d"); + sword_dir = + g_strdup_printf("%s/%s", settings.homedir, DOTSWORD "/mods.d"); if (g_access(sword_dir, F_OK) == -1) { if ((Mkdir(sword_dir, S_IRWXU)) != 0) { gui_init(argc, argv); @@ -146,7 +146,9 @@ } g_free(sword_dir); /* if .sword/modules does not exist create it */ - sword_dir = g_strdup_printf("%s/%s", settings.homedir, DOTSWORD "/modules"); + sword_dir = + g_strdup_printf("%s/%s", settings.homedir, + DOTSWORD "/modules"); if (g_access(sword_dir, F_OK) == -1) { if ((Mkdir(sword_dir, S_IRWXU)) != 0) { gui_init(argc, argv); @@ -167,12 +169,14 @@ main_init_lists(); /* set fnconfigure to gSwordDir and settings.xml */ - settings.fnconfigure = g_strdup_printf("%s/settings.xml", settings.gSwordDir); + settings.fnconfigure = + g_strdup_printf("%s/settings.xml", settings.gSwordDir); /* check for a bad settings file. */ - if ((stat(settings.fnconfigure, &buf) == 0) && /* exists... */ - (buf.st_size == 0)) { /* ...but empty? */ - char *backup_name = g_strdup_printf("%s.SAVE", settings.fnconfigure); + if ((stat(settings.fnconfigure, &buf) == 0) && /* exists... */ + (buf.st_size == 0)) { /* ...but empty? */ + char *backup_name = + g_strdup_printf("%s.SAVE", settings.fnconfigure); /* toss out the bad one and look for recovery. */ unlink(settings.fnconfigure); @@ -180,26 +184,21 @@ buf_says_empty = (buf.st_size == 0); rename(backup_name, settings.fnconfigure); gui_init(argc, argv); - gui_generic_warning_modal - (_("Empty settings file -- backup recovery attempted.\n" - "Some information may have been lost.")); - } - else - { - gui_generic_warning_modal - (_("Empty settings file -- no backup?!? Information lost!")); + gui_generic_warning_modal(_("Empty settings file -- backup recovery attempted.\n" + "Some information may have been lost.")); + } else { + gui_generic_warning_modal(_("Empty settings file -- no backup?!? Information lost!")); } g_free(backup_name); } /* if settings.xml does not exist create it */ if (buf_says_empty || - (g_access(settings.fnconfigure, F_OK) == -1) || - new_configs) { + (g_access(settings.fnconfigure, F_OK) == -1) || new_configs) { /* must be first run */ XI_print((buf_says_empty - ? "\nSETTINGS FILE EXISTS BUT IS EMPTY - RECREATING.\n" - : "\nFirst Run: need to create settings!\n")); + ? "\nSETTINGS FILE EXISTS BUT IS EMPTY - RECREATING.\n" + : "\nFirst Run: need to create settings!\n")); settings.first_run = TRUE; xml_create_settings_file(settings.fnconfigure); @@ -215,11 +214,10 @@ gui_open_mod_mgr_initial_run(); main_init_lists(); if (settings.havebible == 0) { - gui_generic_warning_modal - (_("There are no Bibles installed.\n" - "Evidently, you declined to install any.\n\n" - "Without any Bible modules to display,\n" - "Xiphos cannot proceed,\nand will now exit.")); + gui_generic_warning_modal(_("There are no Bibles installed.\n" + "Evidently, you declined to install any.\n\n" + "Without any Bible modules to display,\n" + "Xiphos cannot proceed,\nand will now exit.")); exit(1); } gui_generic_warning_modal(_("Bible module installation complete.")); @@ -231,10 +229,10 @@ g_file_set_contents(tmp, " ", 1, NULL); } g_free(tmp); - + /* check for studypad.spt template file for studypad */ - tmp = g_strdup_printf("%s/%s", settings.gSwordDir, "studypad.spt"); - if ((g_access(tmp, F_OK) == -1)) { + tmp = g_build_filename(settings.gSwordDir, "studypad.spt", NULL); + if (g_access(tmp, F_OK) == -1) { g_file_set_contents(tmp, studypad_template, -1, NULL); } g_free(tmp); @@ -242,15 +240,15 @@ load_settings_structure(); /* BibleSync */ - settings.bs_mode = 0; - settings.bs_privacy = FALSE; - settings.bs_navdirect = TRUE; - settings.bs_debug = FALSE; - settings.bs_presence = FALSE; - settings.bs_mismatch = FALSE; - settings.bs_group_tab = TRUE; - settings.bs_receiving = FALSE; - settings.bs_listen_set = 0; // selective + settings.bs_mode = 0; + settings.bs_privacy = FALSE; + settings.bs_navdirect = TRUE; + settings.bs_debug = FALSE; + settings.bs_presence = FALSE; + settings.bs_mismatch = FALSE; + settings.bs_group_tab = TRUE; + settings.bs_receiving = FALSE; + settings.bs_listen_set = 0; // selective settings.bs_passphrase = g_strdup("BibleSync"); /* if the user had forced a locale, we must set it now. */ @@ -264,22 +262,22 @@ } if (test != NULL) { g_setenv("LC_ALL", test, TRUE); - XI_message(("set locale to %s", settings.special_locale)); + XI_message(("set locale to %s", + settings.special_locale)); } } /* find out what kind of peculiar language environment we have */ re_encode_digits = FALSE; - if (((env = (char*) g_getenv("LANG")) != NULL) && + if (((env = (char *)g_getenv("LANG")) != NULL) && // for now, farsi-sensitive only - (strncmp (env, "fa", 2) == 0)) { + (strncmp(env, "fa", 2) == 0)) { re_encode_digits = TRUE; } return retval; } - /****************************************************************************** * Name * @@ -304,7 +302,8 @@ settings.load_xml_bookmarks = FALSE; /* set bookmarks dir to settings.gSwordDir + /bookmarks */ - settings.swbmDir = g_strdup_printf("%s/%s", settings.gSwordDir, "bookmarks"); + settings.swbmDir = + g_strdup_printf("%s/%s", settings.gSwordDir, "bookmarks"); /* if .xiphos/bookmarks does not exist create it */ if (g_access(settings.swbmDir, F_OK) == -1) { @@ -333,7 +332,6 @@ return 1; } - /****************************************************************************** * Name * @@ -355,9 +353,11 @@ char *buf = NULL, *parallels; settings.gs_version = VERSION; - if ((settings.MainWindowModule = xml_get_value("modules", "bible")) == NULL) { + if ((settings.MainWindowModule = + xml_get_value("modules", "bible")) == NULL) { /* by the time we are here, we *must* have at least 1 bible */ - settings.MainWindowModule = g_strdup(get_list(TEXT_LIST)->data); + settings.MainWindowModule = + g_strdup(get_list(TEXT_LIST)->data); } settings.CommWindowModule = xml_get_value("modules", "comm"); settings.DictWindowModule = xml_get_value("modules", "dict"); @@ -365,16 +365,17 @@ parallels = xml_get_value("modules", "parallels"); /* if no parallels are known, convert old fixed parallel set */ if (!parallels || (*parallels == '\0')) { - char intN[] = "intN", *oldparallel, i, *newhold; + char intN[] = "intN", i, *newhold; - g_free(parallels); /* in case it was real but empty */ + g_free(parallels); /* in case it was real but empty */ parallels = g_strdup(""); - for (i = '1'; i <= '5'; ++i) { /* the old set */ + for (i = '1'; i <= '5'; ++i) { /* the old set */ intN[3] = i; - oldparallel = xml_get_value("modules", intN); + char *oldparallel = xml_get_value("modules", intN); if (oldparallel && *oldparallel) { - newhold = g_strconcat(parallels, oldparallel, - ",", NULL); + newhold = + g_strconcat(parallels, oldparallel, + ",", NULL); g_free(parallels); parallels = newhold; g_free(oldparallel); @@ -385,7 +386,8 @@ /* trim off the last comma */ if (*parallels) { *(parallels + strlen(parallels) - 1) = '\0'; - xml_set_new_element("modules", "parallels", parallels); + xml_set_new_element("modules", "parallels", + parallels); } } if (parallels && *parallels) @@ -412,14 +414,17 @@ settings.lex_hebrew); } - settings.DefaultDict = xml_get_value("lexicons", "defaultdictionary"); + settings.DefaultDict = + xml_get_value("lexicons", "defaultdictionary"); if (!settings.DefaultDict) { settings.DefaultDict = g_strdup("WebstersDict"); xml_set_value("Xiphos", "lexicons", "defaultdictionary", settings.DefaultDict); } - settings.useDefaultDict = atoi((buf = xml_get_value("lexicons","usedefaultdict")) - ? buf : "0"); + settings.useDefaultDict = + atoi((buf = xml_get_value("lexicons", "usedefaultdict")) + ? buf + : "0"); /* unusual locale setting */ if ((buf = xml_get_value("locale", "special"))) @@ -435,25 +440,31 @@ settings.mod_mgr_source = atoi(buf); else { xml_add_new_section_to_settings_doc("modmgr"); - xml_add_new_item_to_section("modmgr", "mod_mgr_source", "1"); + xml_add_new_item_to_section("modmgr", "mod_mgr_source", + "1"); settings.mod_mgr_source = 1; } if ((buf = xml_get_value("modmgr", "mod_mgr_destination"))) settings.mod_mgr_destination = atoi(buf); else { - xml_add_new_item_to_section("modmgr", "mod_mgr_destination", "0"); + xml_add_new_item_to_section("modmgr", + "mod_mgr_destination", "0"); settings.mod_mgr_destination = 0; } if ((buf = xml_get_value("modmgr", "mod_mgr_local_source_index"))) settings.mod_mgr_local_source_index = atoi(buf); else { - xml_add_new_item_to_section("modmgr", "mod_mgr_local_source_index", "0"); + xml_add_new_item_to_section("modmgr", + "mod_mgr_local_source_index", + "0"); settings.mod_mgr_local_source_index = 0; } if ((buf = xml_get_value("modmgr", "mod_mgr_remote_source_index"))) settings.mod_mgr_remote_source_index = atoi(buf); else { - xml_add_new_item_to_section("modmgr", "mod_mgr_remote_source_index", "0"); + xml_add_new_item_to_section("modmgr", + "mod_mgr_remote_source_index", + "0"); settings.mod_mgr_remote_source_index = 0; } @@ -468,7 +479,8 @@ settings.book_key = xml_get_value("keys", "book"); } if (xml_get_value("keys", "offset")) - settings.book_offset = atol(xml_get_value("keys", "offset")); + settings.book_offset = + atol(xml_get_value("keys", "offset")); else { xml_add_new_item_to_section("keys", "offset", ""); settings.book_offset = 0; @@ -482,12 +494,15 @@ } /* layout */ - settings.sidebar_width = atoi((buf = xml_get_value("layout", "shortcutbar")) - ? buf : "100"); + settings.sidebar_width = + atoi((buf = xml_get_value("layout", "shortcutbar")) + ? buf + : "100"); if ((buf = xml_get_value("layout", "vltoppaneheight"))) settings.verselist_toppane_height = atoi(buf); else { - xml_add_new_item_to_section("layout", "vltoppaneheight", "210"); + xml_add_new_item_to_section("layout", "vltoppaneheight", + "210"); settings.verselist_toppane_height = 210; } if ((buf = xml_get_value("layout", "sidebar_notebook_height"))) @@ -495,11 +510,16 @@ else { if ((buf = xml_get_value("layout", "sidebar_notebook_hight"))) { /* backward compatible */ settings.sidebar_notebook_height = atoi(buf); - xml_remove_node("layout", "sidebar_notebook_hight", 0); + xml_remove_node("layout", "sidebar_notebook_hight", + 0); } else settings.sidebar_notebook_height = 250; - buf = g_strdup_printf("%d", settings.sidebar_notebook_height); - xml_add_new_item_to_section("layout", "sidebar_notebook_height", buf); + buf = + g_strdup_printf("%d", + settings.sidebar_notebook_height); + xml_add_new_item_to_section("layout", + "sidebar_notebook_height", + buf); g_free(buf); } @@ -521,7 +541,8 @@ if ((buf = xml_get_value("layout", "advsearchopen"))) settings.display_advsearch = atoi(buf); else { - xml_add_new_item_to_section("layout", "advsearchopen", "0"); + xml_add_new_item_to_section("layout", "advsearchopen", + "0"); settings.display_advsearch = 0; } @@ -536,7 +557,7 @@ if ((buf = xml_get_value("layout", "height"))) settings.gs_height = atoi(buf); else { - if ((buf = xml_get_value("layout", "hight"))) { /* backward compatible */ + if ((buf = xml_get_value("layout", "hight"))) { /* backward compatible */ settings.gs_height = atoi(buf); xml_remove_node("layout", "hight", 0); } else @@ -547,7 +568,7 @@ } if ((buf = xml_get_value("layout", "width"))) settings.gs_width = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "width", "500"); settings.gs_width = 500; } @@ -558,56 +579,70 @@ if ((buf = xml_get_value("layout", "parallel_height"))) settings.parallel_height = atoi(buf); else { - xml_add_new_item_to_section("layout", "parallel_height", "361"); + xml_add_new_item_to_section("layout", "parallel_height", + "361"); settings.parallel_height = 361; } if ((buf = xml_get_value("layout", "parallel_width"))) settings.parallel_width = atoi(buf); - else{ - xml_add_new_item_to_section("layout", "parallel_width", "657"); + else { + xml_add_new_item_to_section("layout", "parallel_width", + "657"); settings.parallel_width = 657; } if ((buf = xml_get_value("layout", "modmgr_height"))) settings.modmgr_height = atoi(buf); else { - xml_add_new_item_to_section("layout", "modmgr_height", "450"); + xml_add_new_item_to_section("layout", "modmgr_height", + "450"); settings.modmgr_height = 450; } if ((buf = xml_get_value("layout", "modmgr_width"))) settings.modmgr_width = atoi(buf); - else{ - xml_add_new_item_to_section("layout", "modmgr_width", "710"); + else { + xml_add_new_item_to_section("layout", "modmgr_width", + "710"); settings.modmgr_width = 710; } if ((buf = xml_get_value("layout", "advsearch_height"))) settings.advsearch_height = atoi(buf); else { - xml_add_new_item_to_section("layout", "advsearch_height", "465"); + xml_add_new_item_to_section("layout", "advsearch_height", + "465"); settings.advsearch_height = 465; } if ((buf = xml_get_value("layout", "advsearch_width"))) settings.advsearch_width = atoi(buf); - else{ - xml_add_new_item_to_section("layout", "advsearch_width", "665"); + else { + xml_add_new_item_to_section("layout", "advsearch_width", + "665"); settings.advsearch_width = 665; } if ((buf = xml_get_value("layout", "prefs_height"))) settings.prefs_height = atoi(buf); else { - xml_add_new_item_to_section("layout", "prefs_height", "300"); + xml_add_new_item_to_section("layout", "prefs_height", + "300"); settings.prefs_height = 300; } if ((buf = xml_get_value("layout", "prefs_width"))) settings.prefs_width = atoi(buf); - else{ - xml_add_new_item_to_section("layout", "prefs_width", "590"); + else { + xml_add_new_item_to_section("layout", "prefs_width", + "590"); settings.prefs_width = 590; } /* main window placement */ + if ((buf = xml_get_value("layout", "maximized"))) + settings.app_x = atoi(buf); + else { + xml_add_new_item_to_section("layout", "maximized", "0"); + settings.maximized = 0; + } if ((buf = xml_get_value("layout", "app_x"))) settings.app_x = atoi(buf); else { @@ -616,7 +651,7 @@ } if ((buf = xml_get_value("layout", "app_y"))) settings.app_y = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "app_y", "40"); settings.app_y = 40; } @@ -630,7 +665,7 @@ } if ((buf = xml_get_value("layout", "parallel_y"))) settings.parallel_y = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "parallel_y", "40"); settings.parallel_y = 40; } @@ -643,7 +678,7 @@ } if ((buf = xml_get_value("layout", "modmgr_y"))) settings.modmgr_y = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "modmgr_y", "40"); settings.modmgr_y = 40; } @@ -656,7 +691,7 @@ } if ((buf = xml_get_value("layout", "advsearch_y"))) settings.advsearch_y = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "advsearch_y", "40"); settings.advsearch_y = 40; } @@ -669,19 +704,21 @@ } if ((buf = xml_get_value("layout", "prefs_y"))) settings.prefs_y = atoi(buf); - else{ + else { xml_add_new_item_to_section("layout", "prefs_y", "40"); settings.prefs_y = 40; } /* random geometry stuff */ - settings.biblepane_width = atoi((buf = xml_get_value("layout", "textpane")) - ? buf : "0"); + settings.biblepane_width = + atoi((buf = xml_get_value("layout", "textpane")) + ? buf + : "0"); if ((buf = xml_get_value("layout", "bibleheight"))) settings.biblepane_height = atoi(buf); else { - if ((buf = xml_get_value("layout", "biblehight"))) { /* backward compatible */ + if ((buf = xml_get_value("layout", "biblehight"))) { /* backward compatible */ settings.biblepane_height = atoi(buf); xml_remove_node("layout", "biblehight", 0); } else @@ -700,7 +737,8 @@ } else settings.commpane_height = 240; buf = g_strdup_printf("%d", settings.commpane_height); - xml_add_new_item_to_section("layout", "commentaryheight", buf); + xml_add_new_item_to_section("layout", "commentaryheight", + buf); g_free(buf); } @@ -715,14 +753,17 @@ if ((buf = xml_get_value("fontsize", "basefontsize"))) { settings.base_font_size_str = buf; - settings.base_font_size = atoi(settings.base_font_size_str); + settings.base_font_size = + atoi(settings.base_font_size_str); } else { #ifndef WIN32 - xml_add_new_item_to_section("fontsize", "basefontsize", "+0"); + xml_add_new_item_to_section("fontsize", "basefontsize", + "+0"); settings.base_font_size_str = g_strdup("+0"); settings.base_font_size = 0; #else - xml_add_new_item_to_section("fontsize", "basefontsize", "+1"); + xml_add_new_item_to_section("fontsize", "basefontsize", + "+1"); settings.base_font_size_str = g_strdup("+1"); settings.base_font_size = 1; #endif /* WIN32 */ @@ -742,13 +783,15 @@ if ((buf = xml_get_value("HTMLcolors", "highlight_fg"))) settings.highlight_fg = g_strdup(buf); else { - xml_add_new_item_to_section("HTMLcolors", "highlight_fg", "#FFFF00"); + xml_add_new_item_to_section("HTMLcolors", "highlight_fg", + "#FFFF00"); settings.highlight_fg = g_strdup("#FFFF00"); } if ((buf = xml_get_value("HTMLcolors", "highlight_bg"))) settings.highlight_bg = g_strdup(buf); else { - xml_add_new_item_to_section("HTMLcolors", "highlight_bg", "#060680"); + xml_add_new_item_to_section("HTMLcolors", "highlight_bg", + "#060680"); settings.highlight_bg = g_strdup("#060680"); } @@ -756,28 +799,32 @@ if ((buf = xml_get_value("parallel", "Strong_s_Numbers"))) settings.parallel_strongs = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Strong_s_Numbers", "0"); + xml_add_new_item_to_section("parallel", "Strong_s_Numbers", + "0"); settings.parallel_strongs = 0; } if ((buf = xml_get_value("parallel", "Morphological_Tags"))) settings.parallel_morphs = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Morphological_Tags", "0"); + xml_add_new_item_to_section("parallel", + "Morphological_Tags", "0"); settings.parallel_morphs = 0; } if ((buf = xml_get_value("parallel", "Hebrew_Vowel_Points"))) settings.parallel_hebrewpoints = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Hebrew_Vowel_Points", "1"); + xml_add_new_item_to_section("parallel", + "Hebrew_Vowel_Points", "1"); settings.parallel_hebrewpoints = 1; } if ((buf = xml_get_value("parallel", "Hebrew_Cantillation"))) settings.parallel_cantillationmarks = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Hebrew_Cantillation", "0"); + xml_add_new_item_to_section("parallel", + "Hebrew_Cantillation", "0"); settings.parallel_cantillationmarks = 0; } @@ -791,28 +838,32 @@ if ((buf = xml_get_value("parallel", "Cross-references"))) settings.parallel_crossref = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Cross-references", "1"); + xml_add_new_item_to_section("parallel", "Cross-references", + "1"); settings.parallel_crossref = 1; } if ((buf = xml_get_value("parallel", "Transliteration"))) settings.parallel_transliteration = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Transliteration", "0"); + xml_add_new_item_to_section("parallel", "Transliteration", + "0"); settings.parallel_transliteration = 0; } if ((buf = xml_get_value("parallel", "Words_of_Christ_in_Red"))) settings.parallel_red_words = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Words_of_Christ_in_Red", "1"); + xml_add_new_item_to_section("parallel", + "Words_of_Christ_in_Red", "1"); settings.parallel_red_words = 1; } if ((buf = xml_get_value("parallel", "Morpheme_Segmentation"))) settings.parallel_segmentation = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Morpheme_Segmentation", "0"); + xml_add_new_item_to_section("parallel", + "Morpheme_Segmentation", "0"); settings.parallel_segmentation = 0; } @@ -833,75 +884,107 @@ if ((buf = xml_get_value("parallel", "Primary_Reading"))) settings.parallel_variants_primary = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Primary_Reading", "1"); + xml_add_new_item_to_section("parallel", "Primary_Reading", + "1"); settings.parallel_variants_primary = 1; } if ((buf = xml_get_value("parallel", "Secondary_Reading"))) settings.parallel_variants_secondary = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Secondary_Reading", "0"); + xml_add_new_item_to_section("parallel", + "Secondary_Reading", "0"); settings.parallel_variants_secondary = 0; } if ((buf = xml_get_value("parallel", "All_Readings"))) settings.parallel_variants_all = atoi(buf); else { - xml_add_new_item_to_section("parallel", "All_Readings", "0"); + xml_add_new_item_to_section("parallel", "All_Readings", + "0"); settings.parallel_variants_all = 0; } if ((buf = xml_get_value("parallel", "Greek_Accents"))) settings.parallel_greekaccents = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Greek_Accents", "1"); + xml_add_new_item_to_section("parallel", "Greek_Accents", + "1"); settings.parallel_greekaccents = 1; } if ((buf = xml_get_value("parallel", "Transliterated_Forms"))) settings.parallel_xlit = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Transliterated_Forms", "0"); + xml_add_new_item_to_section("parallel", + "Transliterated_Forms", "0"); settings.parallel_xlit = 0; } if ((buf = xml_get_value("parallel", "Enumerations"))) settings.parallel_enumerated = atoi(buf); else { - xml_add_new_item_to_section("parallel", "Enumerations", "0"); + xml_add_new_item_to_section("parallel", "Enumerations", + "0"); settings.parallel_enumerated = 0; } + if ((buf = xml_get_value("parallel", "Glosses"))) + settings.parallel_glosses = atoi(buf); + else { + xml_add_new_item_to_section("parallel", "Glosses", "0"); + settings.parallel_glosses = 0; + } + + if ((buf = xml_get_value("parallel", "Morpheme_Segmentation"))) + settings.parallel_morphseg = atoi(buf); + else { + xml_add_new_item_to_section("parallel", + "Morpheme_Segmentation", "0"); + settings.parallel_morphseg = 0; + } + /* Misc stuff */ - settings.showtexts = atoi((buf = xml_get_value("misc", "showtexts")) ? buf : "1"); - settings.showcomms = atoi((buf = xml_get_value("misc", "showcomms")) ? buf : "1"); - settings.showdicts = atoi((buf = xml_get_value("misc", "showdicts")) ? buf : "1"); + settings.showtexts = + atoi((buf = xml_get_value("misc", "showtexts")) ? buf : "1"); + settings.showcomms = + atoi((buf = xml_get_value("misc", "showcomms")) ? buf : "1"); + settings.showdicts = + atoi((buf = xml_get_value("misc", "showdicts")) ? buf : "1"); if (xml_get_value("misc", "showpreview")) - settings.showpreview = atol(xml_get_value("misc", "showpreview")); + settings.showpreview = + atol(xml_get_value("misc", "showpreview")); else { xml_add_new_item_to_section("misc", "showpreview", "1"); settings.showpreview = 1; } if (xml_get_value("misc", "show_side_preview")) - settings.show_previewer_in_sidebar = atol(xml_get_value("misc", "show_side_preview")); + settings.show_previewer_in_sidebar = + atol(xml_get_value("misc", "show_side_preview")); else { - xml_add_new_item_to_section("misc", "show_side_preview", "1"); + xml_add_new_item_to_section("misc", "show_side_preview", + "1"); settings.show_previewer_in_sidebar = 1; } if (xml_get_value("misc", "showparatab")) - settings.showparatab = atol(xml_get_value("misc", "showparatab")); + settings.showparatab = + atol(xml_get_value("misc", "showparatab")); else { xml_add_new_item_to_section("misc", "showparatab", "0"); settings.showparatab = 0; } - settings.showsplash = atoi((buf = xml_get_value("misc", "splash")) ? buf : "1"); + settings.showsplash = + atoi((buf = xml_get_value("misc", "splash")) ? buf : "1"); settings.showdevotional = - atoi((buf = xml_get_value("misc", "dailydevotional")) ? buf : "1"); + atoi((buf = + xml_get_value("misc", "dailydevotional")) + ? buf + : "1"); settings.versestyle = atoi((buf = xml_get_value("misc", "versestyle")) ? buf : "1"); @@ -936,14 +1019,16 @@ if ((buf = xml_get_value("misc", "verse_num_bracket"))) settings.verse_num_bracket = atoi(buf); else { - xml_add_new_item_to_section("misc", "verse_num_bracket", "0"); + xml_add_new_item_to_section("misc", "verse_num_bracket", + "0"); settings.verse_num_bracket = 0; } if ((buf = xml_get_value("misc", "verse_num_superscript"))) settings.verse_num_superscript = atoi(buf); else { - xml_add_new_item_to_section("misc", "verse_num_superscript", "0"); + xml_add_new_item_to_section("misc", + "verse_num_superscript", "0"); settings.verse_num_superscript = 0; } @@ -957,28 +1042,30 @@ if ((buf = xml_get_value("misc", "annotatehighlight"))) settings.annotate_highlight = atoi(buf); else { - xml_add_new_item_to_section("misc", "annotatehighlight", "1"); + xml_add_new_item_to_section("misc", "annotatehighlight", + "1"); settings.annotate_highlight = 1; } if ((buf = xml_get_value("misc", "xrefsinverselist"))) settings.xrefs_in_verse_list = atoi(buf); else { - xml_add_new_item_to_section("misc", "xrefsinverselist", "1"); + xml_add_new_item_to_section("misc", "xrefsinverselist", + "1"); settings.xrefs_in_verse_list = 1; } if ((buf = xml_get_value("misc", "chapter-scroll"))) { settings.chapter_scroll = atoi(buf); } else { - xml_add_new_item_to_section("misc","chapter-scroll","0"); + xml_add_new_item_to_section("misc", "chapter-scroll", "0"); settings.chapter_scroll = 0; } if ((buf = xml_get_value("misc", "imageresize"))) { settings.imageresize = atoi(buf); } else { - xml_add_new_item_to_section("misc","imageresize","1"); + xml_add_new_item_to_section("misc", "imageresize", "1"); settings.imageresize = 1; } #ifdef WIN32 @@ -989,41 +1076,48 @@ if ((buf = xml_get_value("editor", "spell_language"))) settings.spell_language = g_strdup(buf); else { - xml_add_new_item_to_section("editor","spell_language","unknown"); + xml_add_new_item_to_section("editor", "spell_language", + "unknown"); settings.spell_language = "unknown"; } - settings.studypadfilename = - xml_get_value("studypad", "lastfile"); + settings.studypadfilename = xml_get_value("studypad", "lastfile"); settings.studypaddir = xml_get_value("studypad", "directory"); if ((buf = xml_get_value("misc", "show_sidebar"))) { settings.showshortcutbar = atoi(buf); } else { - xml_add_new_item_to_section("misc","show_sidebar","1"); + xml_add_new_item_to_section("misc", "show_sidebar", "1"); settings.showshortcutbar = 1; } if ((buf = xml_get_value("misc", "sidebar_docked"))) { settings.docked = atoi(buf); } else { - xml_add_new_item_to_section("misc","sidebar_docked","1"); + xml_add_new_item_to_section("misc", "sidebar_docked", "1"); settings.docked = 1; } if ((buf = xml_get_value("misc", "prayerlist"))) { - settings.prayerlist = atoi(buf); + settings.prayerlist = atoi(buf); } else { - xml_add_new_item_to_section("misc","prayerlist","1"); + xml_add_new_item_to_section("misc", "prayerlist", "1"); settings.prayerlist = 1; } + if ((buf = xml_get_value("misc", "statusbar"))) { + settings.statusbar = atoi(buf); + } else { + xml_add_new_item_to_section("misc", "statusbar", "1"); + settings.statusbar = 1; + } + #if 1 - settings.browsing = 1; /* unconditional - no longer toggle-able. */ + settings.browsing = 1; /* unconditional - no longer toggle-able. */ #else if ((buf = xml_get_value("tabs", "browsing"))) { - settings.browsing = atoi(buf); + settings.browsing = atoi(buf); } else { - xml_add_new_item_to_section("tabs","browsing","1"); + xml_add_new_item_to_section("tabs", "browsing", "1"); settings.browsing = 1; } #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/settings.h xiphos-4.0.4+dfsg1/src/main/settings.h --- xiphos-4.0.0+dfsg1/src/main/settings.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/settings.h 2015-08-25 01:24:17.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * settings.h - SHORT DESCRIPTION + * settings.h - structure definitions * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,157 +27,126 @@ #endif typedef struct _settings SETTINGS; -struct _settings { - char - *gs_version, /* Xiphos version */ - *path_to_mods, /* one-time retrieval */ - *MainWindowModule, /* module to open at program startup */ - *CommWindowModule, /* module to open at program startup */ - *DictWindowModule, /* module to open at program startup */ - **parallel_list, /* strsplit result from xml parallels */ - *personalcommentsmod, /* module to open at program startup */ - sb_search_mod[80], /* module for sidebar search */ - *devotionalmod, /* module for devotional */ - *DefaultDict, /* module for default dict */ - *lex_greek, /* module for greek lexicon - strongs or thayers */ - *lex_hebrew, /* module for hebrew lexicon - strongs or BDB */ - *currentverse, /* where we are right now */ - *cvparallel, /* current verse for detached parallel */ - *dictkey, /* dictionary key to use at program startup */ - *studypadfilename, /* name of file in studypad when we closed */ - *studypaddir, /* directory for studypad files */ - searchText[256], /* search string used by sidebar search */ - findText[256], /* string used by find dialog */ - *spell_language, - - /* fonts names/colors/sizes */ - *bible_text_color, /* color for text */ - *bible_bg_color, /* color for background */ - *currentverse_color, /* color for current verse */ - *link_color, /* color for strongs, morph tags */ - *bible_verse_num_color, /* verse number color */ - *found_color, /* color for search word in results display */ - *font_color, /* */ - *highlight_fg, /* special fg color for highlight */ - *highlight_bg, /* special bg color for highlight */ - *verse_num_font_size_str, - *base_font_size_str, - - *special_locale; /* prefs dialog: pick abnormal locale */ - /* --requires restart-- */ +struct _settings +{ + char *gs_version, /* Xiphos version */ + *path_to_mods, /* one-time retrieval */ + *MainWindowModule, /* module to open at program startup */ + *CommWindowModule, /* module to open at program startup */ + *DictWindowModule, /* module to open at program startup */ + **parallel_list, /* strsplit result from xml parallels */ + *personalcommentsmod, /* module to open at program startup */ + sb_search_mod[80], /* module for sidebar search */ + *devotionalmod, /* module for devotional */ + *DefaultDict, /* module for default dict */ + *lex_greek, /* module for greek lexicon - strongs or thayers */ + *lex_hebrew, /* module for hebrew lexicon - strongs or BDB */ + *currentverse, /* where we are right now */ + *cvparallel, /* current verse for detached parallel */ + *dictkey, /* dictionary key to use at program startup */ + *studypadfilename, /* name of file in studypad when we closed */ + *studypaddir, /* directory for studypad files */ + searchText[256], /* search string used by sidebar search */ + findText[256], /* string used by find dialog */ + *spell_language, + /* fonts names/colors/sizes */ + *bible_text_color, /* color for text */ + *bible_bg_color, /* color for background */ + *currentverse_color, /* color for current verse */ + *link_color, /* color for strongs, morph tags */ + *bible_verse_num_color, /* verse number color */ + *found_color, /* color for search word in results display */ + *font_color, /* */ + *highlight_fg, /* special fg color for highlight */ + *highlight_bg, /* special bg color for highlight */ + *verse_num_font_size_str, *base_font_size_str, *special_locale; /* prefs dialog: pick abnormal locale */ + /* --requires restart-- */ int - verse_num_font_size, - verse_num_bold, /* verse number customizations */ - verse_num_bracket, - verse_num_superscript, - base_font_size, - sidebar_width, - verselist_toppane_height, /* height of the top pane in the search results window */ - biblepane_width, - biblepane_height, - commpane_height, - sidebar_notebook_height, - gs_width, - gs_height, - parallel_height, - parallel_width, - modmgr_height, - modmgr_width, - advsearch_height, - advsearch_width, - prefs_height, - prefs_width, - searchType, - whichwindow, /* which of the main form html windows is active */ - intCurVerse, /* detached parallel current verse */ - parallel_page, /* parallel workbook page number */ - tab_page, /* studypad workbook page number */ - percomm_page; /* percomm editor workbook page number */ + verse_num_font_size, + verse_num_bold, /* verse number customizations */ + verse_num_bracket, verse_num_superscript, base_font_size, sidebar_width, verselist_toppane_height, /* height of the top pane in the search results window */ + biblepane_width, biblepane_height, commpane_height, sidebar_notebook_height, gs_width, gs_height, parallel_height, parallel_width, modmgr_height, modmgr_width, advsearch_height, advsearch_width, prefs_height, prefs_width, searchType, whichwindow, /* which of the main form html windows is active */ + intCurVerse, /* detached parallel current verse */ + parallel_page, /* parallel workbook page number */ + tab_page, /* studypad workbook page number */ + percomm_page; /* percomm editor workbook page number */ int - strongs, /* toogle button and check menu state */ - parallel_strongs, /* check menu state parallel mods */ - parallel_headings, /* check menu state parallel mods */ - parallel_crossref, /* check menu state parallel mods */ - parallel_lemmas, /* check menu state parallel mods */ - parallel_morphs, /* check menu state parallel mods */ - parallel_segmentation, /* check menu state parallel mods */ - parallel_red_words, /* check menu state parallel mods */ - parallel_transliteration, /* check menu state parallel mods */ - parallel_variants_primary, /* check menu state parallel mods */ - parallel_variants_secondary, /* check menu state parallel mods */ - parallel_variants_all, /* check menu state parallel mods */ - parallel_hebrewpoints, /* check menu state parallel mods */ - parallel_cantillationmarks, /* check menu state parallel mods */ - parallel_footnotes, /* check menu state parallel mods */ - parallel_greekaccents, /* check menu state parallel mods */ - parallel_xlit, /* check menu state parallel mods */ - parallel_enumerated, /* check menu state parallel mods */ - versestyle, /* verse if true, paragraph if not */ - linkedtabs, /* tabs linked together, move in concert */ - showversenum, /* display verse numbers in text (default on) */ - readaloud, /* pass text through "festival -server" */ - versehighlight, /* do special fg/bg for current verse */ - annotate_highlight, /* do special bg/fg for user annotations */ - - /* saved startup displays */ - display_parallel, /* detached parallel */ - display_modmgr, /* mod.mgr */ - display_advsearch, /* advanced search */ - display_prefs, /* preferences */ - - formatpercom, /* use html to format personal notes */ - showshortcutbar, /* display shortcut bar if true */ - - showsplash, /* show splash on program start if true */ - showdevotional, /* show devotional on program start if true */ - showtexts, /* show bible texts if true */ - showpreview, /* show preview pane if true */ - showcomms, /* show commentaries if true */ - showdicts, /* show dictionaries/lexicons if true */ - showparatab, /* show parallel view in a tab if true */ - show_previewer_in_sidebar, /* show previewer in sidebar if true */ - xrefs_in_verse_list, /* as opposed to old use of previewer */ - displaySearchResults, /* are we displaying search results in chap display */ - useDefaultDict, - browsing, /* true for tabbed browsing */ - - /** if items are docked **/ - docked, /* true when sidebar is docked */ - dockedInt, /* true when parallel page is docked */ - - /** do we have these modules **/ - havebible, - havecomm, - havedict, - havebook, - havepercomm, - haveprayerlist, - /* do we need to add item to history */ - addhistoryitem; + strongs, /* toogle button and check menu state */ + parallel_strongs, /* check menu state parallel mods */ + parallel_headings, /* check menu state parallel mods */ + parallel_crossref, /* check menu state parallel mods */ + parallel_lemmas, /* check menu state parallel mods */ + parallel_morphs, /* check menu state parallel mods */ + parallel_segmentation, /* check menu state parallel mods */ + parallel_red_words, /* check menu state parallel mods */ + parallel_transliteration, /* check menu state parallel mods */ + parallel_variants_primary, /* check menu state parallel mods */ + parallel_variants_secondary, /* check menu state parallel mods */ + parallel_variants_all, /* check menu state parallel mods */ + parallel_hebrewpoints, /* check menu state parallel mods */ + parallel_cantillationmarks, /* check menu state parallel mods */ + parallel_footnotes, /* check menu state parallel mods */ + parallel_greekaccents, /* check menu state parallel mods */ + parallel_xlit, /* check menu state parallel mods */ + parallel_enumerated, /* check menu state parallel mods */ + parallel_glosses, /* check menu state parallel mods */ + parallel_morphseg, /* check menu state parallel mods */ + versestyle, /* verse if true, paragraph if not */ + linkedtabs, /* tabs linked together, move in concert */ + showversenum, /* display verse numbers in text (default on) */ + readaloud, /* pass text through "festival -server" */ + versehighlight, /* do special fg/bg for current verse */ + annotate_highlight, /* do special bg/fg for user annotations */ + /* saved startup displays */ + display_parallel, /* detached parallel */ + display_modmgr, /* mod.mgr */ + display_advsearch, /* advanced search */ + display_prefs, /* preferences */ + formatpercom, /* use html to format personal notes */ + showshortcutbar, /* display shortcut bar if true */ + showsplash, /* show splash on program start if true */ + showdevotional, /* show devotional on program start if true */ + showtexts, /* show bible texts if true */ + showpreview, /* show preview pane if true */ + showcomms, /* show commentaries if true */ + showdicts, /* show dictionaries/lexicons if true */ + showparatab, /* show parallel view in a tab if true */ + show_previewer_in_sidebar, /* show previewer in sidebar if true */ + xrefs_in_verse_list, /* as opposed to old use of previewer */ + displaySearchResults, /* are we displaying search results in chap display */ + useDefaultDict, + browsing, /* true for tabbed browsing */ + /** if items are docked **/ + docked, /* true when sidebar is docked */ + dockedInt, /* true when parallel page is docked */ + /** do we have these modules **/ + havebible, + havecomm, + havedict, havebook, havepercomm, haveprayerlist, + /* do we need to add item to history */ + addhistoryitem; int - bs_mode, // [0..3] for radio button select - // 0=disable; 1=personal; 2=speaker; 3=audience. - bs_privacy, // in personal mode, whether private (ttl 0) - - bs_navdirect, // or via verse list (false). - bs_debug, // show pkt traces. - bs_presence, // show presence announcements. - bs_mismatch, // show mismatch packets. - bs_receiving, // lock: don't re-xmit what we recv. - bs_listen_set, // 0 = some, 1 = all, 2 = none. - bs_group_tab; // use protocol's group# as tab#. - char - *bs_passphrase; // session exclusion/isolation. + bs_mode, // [0..3] for radio button select + // 0=disable; 1=personal; 2=speaker; 3=audience. + bs_privacy, // in personal mode, whether private (ttl 0) + bs_navdirect, // or via verse list (false). + bs_debug, // show pkt traces. + bs_presence, // show presence announcements. + bs_mismatch, // show mismatch packets. + bs_receiving, // lock: don't re-xmit what we recv. + bs_listen_set, // 0 = some, 1 = all, 2 = none. + bs_group_tab; // use protocol's group# as tab#. + char *bs_passphrase; // session exclusion/isolation. /* gbs */ - char *book_mod; /* module to open at program startup */ - char *book_key; /* */ + char *book_mod; /* module to open at program startup */ + char *book_key; /* */ unsigned long book_offset; - int comm_showing; /* whether comm or book is visible */ + int comm_showing; /* whether comm or book is visible */ /* store program title */ char program_title[256]; @@ -205,6 +174,7 @@ /* window location at close */ int app_x, app_y; + int maximized; /* gboolean */ int parallel_x, parallel_y; int modmgr_x, modmgr_y; int advsearch_x, advsearch_y; @@ -230,11 +200,14 @@ int mod_mgr_remote_source_index; /* mod mgr destination */ int mod_mgr_destination; /* if = 0 destination is .sword - else sword directory */ + else sword directory */ /* if true use prayerlist */ int prayerlist; + /* statusbar setting */ + int statusbar; + /* if true parallel tab is showing */ int paratab_showing; @@ -244,11 +217,11 @@ extern SETTINGS settings; -int settings_init(int argc, char **argv, int new_configs, int new_bookmarks); +int settings_init(int argc, char **argv, int new_configs, + int new_bookmarks); void load_settings_structure(void); #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/sidebar.cc xiphos-4.0.4+dfsg1/src/main/sidebar.cc --- xiphos-4.0.0+dfsg1/src/main/sidebar.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sidebar.cc 2015-02-21 02:22:53.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * utilities.c - support functions + * sidebar.cc - sidebar interface to sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include #include @@ -55,7 +55,6 @@ #include "gui/debug_glib_null.h" - enum { COL_OPEN_PIXBUF, COL_CLOSED_PIXBUF, @@ -67,7 +66,6 @@ TreePixbufs *pixbufs; - /****************************************************************************** * Name * main_open_bookmark_in_new_tab @@ -84,7 +82,7 @@ * void */ -void main_open_bookmark_in_new_tab(gchar * mod_name, gchar * key) +void main_open_bookmark_in_new_tab(gchar *mod_name, gchar *key) { gint module_type = backend->module_type(mod_name); @@ -114,7 +112,6 @@ gui_open_module_in_new_tab(mod_name); } - /****************************************************************************** * Name * main_display_verse_list_in_sidebar @@ -132,9 +129,9 @@ * void */ -void main_display_verse_list_in_sidebar(gchar * key, - gchar * module_name, - gchar * verse_list) +void main_display_verse_list_in_sidebar(gchar *key, + gchar *module_name, + gchar *verse_list) { GList *tmp = NULL; GtkTreeModel *model; @@ -153,12 +150,12 @@ is_search_result = FALSE; - XI_warning(("verse_list = %s",verse_list)); + XI_warning(("verse_list = %s", verse_list)); list_of_verses = g_list_first(list_of_verses); if (list_of_verses) { GList *chaser = list_of_verses; while (chaser) { - list_item = (RESULTS *) chaser->data; + list_item = (RESULTS *)chaser->data; g_free(list_item->module); g_free(list_item->key); g_free(list_item); @@ -171,8 +168,7 @@ strcpy(settings.sb_search_mod, module_name); model = - gtk_tree_view_get_model(GTK_TREE_VIEW - (sidebar.results_list)); + gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list)); list_store = GTK_LIST_STORE(model); gtk_list_store_clear(list_store); @@ -180,20 +176,20 @@ if (!strncmp(verse_list, "See ", 4)) verse_list += 4; - + if ((*verse_list != '/') && ((tmp = backend->parse_verse_list(module_name, verse_list, key)) != NULL)) { // normal verse list. while (tmp != NULL) { gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, 0, - (const char *) tmp->data, -1); + (const char *)tmp->data, -1); list_item = g_new(RESULTS, 1); list_item->module = g_strdup(module_name); - list_item->key = g_strdup((const char *) tmp->data); + list_item->key = g_strdup((const char *)tmp->data); list_of_verses = g_list_append(list_of_verses, - (RESULTS *) list_item); + (RESULTS *)list_item); tmp = g_list_next(tmp); } @@ -204,28 +200,25 @@ list_item = g_new(RESULTS, 1); list_item->module = g_strdup(module_name); - list_item->key = g_strdup((const char *) verse_list); + list_item->key = g_strdup((const char *)verse_list); list_of_verses = g_list_append(list_of_verses, - (RESULTS *) list_item); + (RESULTS *)list_item); } - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW(sidebar.results_list)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sidebar.results_list)); if (!gtk_tree_model_get_iter_first(model, &iter)) return; - gtk_widget_set_sensitive(sidebar.menu_item_save_search,TRUE); + gtk_widget_set_sensitive(sidebar.menu_item_save_search, TRUE); path = gtk_tree_model_get_path(model, &iter); gtk_tree_selection_select_path(selection, path); gtk_tree_path_free(path); gui_verselist_button_release_event(NULL, NULL, NULL); - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets.notebook_sidebar), 3); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar), 3); gtk_widget_grab_focus(GTK_WIDGET(sidebar.results_list)); } - /****************************************************************************** * Name * main_add_children_to_tree @@ -243,27 +236,26 @@ * void */ -static void add_children_to_tree(GtkTreeModel * model, GtkTreeIter iter, - gchar * mod_name, unsigned long offset) +static void add_children_to_tree(GtkTreeModel *model, GtkTreeIter iter, + gchar *mod_name, unsigned long offset) { gchar buf[256]; gchar *tmpbuf = NULL; GtkTreeIter child_iter; - gtk_tree_store_set(GTK_TREE_STORE(model), &iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_opened, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, -1); - XI_message(("offset: %ld",backend->get_treekey_offset())); - XI_message(("%s",backend->display_mod->getName())); + XI_message(("offset: %ld", backend->get_treekey_offset())); + XI_message(("%s", backend->display_mod->getName())); if (backend->treekey_first_child(offset)) { - XI_message(("treekey_first_child1 %s",mod_name)); + XI_message(("treekey_first_child1 %s", mod_name)); offset = backend->get_treekey_offset(); - XI_message(("offset: %ld",offset)); + XI_message(("offset: %ld", offset)); sprintf(buf, "%lu", offset); tmpbuf = backend->treekey_get_local_name(offset); @@ -273,17 +265,17 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); } else { gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); } free(tmpbuf); @@ -299,24 +291,23 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); } else { gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); } free(tmpbuf); } } - /****************************************************************************** * Name * main_create_pixbufs @@ -335,41 +326,40 @@ void main_create_pixbufs(void) { - GtkTextDirection dir = gtk_widget_get_direction (GTK_WIDGET(widgets.app)); + GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET(widgets.app)); pixbufs = g_new0(TreePixbufs, 1); if (dir == GTK_TEXT_DIR_LTR) { pixbufs->pixbuf_closed = - pixbuf_finder("book_closed.png", 16, NULL); + pixbuf_finder("book_closed.png", 16, NULL); pixbufs->pixbuf_opened = - pixbuf_finder("book_open.png", 16, NULL); - } - else { + pixbuf_finder("book_open.png", 16, NULL); + } else { pixbufs->pixbuf_closed = - pixbuf_finder("book_closed_rtol.png", 16, NULL); + pixbuf_finder("book_closed_rtol.png", 16, NULL); pixbufs->pixbuf_opened = - pixbuf_finder("book_open_rtol.png", 16, NULL); + pixbuf_finder("book_open_rtol.png", 16, NULL); } #ifdef USE_GTK_3 - -#ifdef HAVE_GTK_310 - GtkIconTheme *icon_theme = gtk_icon_theme_get_default (); - pixbufs->pixbuf_helpdoc = - gtk_icon_theme_load_icon (icon_theme, - "gtk-dnd", - GTK_ICON_SIZE_MENU, - GTK_ICON_LOOKUP_FORCE_SIZE, - NULL); -#else - pixbufs->pixbuf_helpdoc = - gtk_widget_render_icon_pixbuf(widgets.app, - GTK_STOCK_DND, - GTK_ICON_SIZE_MENU ); -#endif + +#ifdef HAVE_GTK_310 + GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); + pixbufs->pixbuf_helpdoc = + gtk_icon_theme_load_icon(icon_theme, + "gtk-dnd", + GTK_ICON_SIZE_MENU, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); +#else + pixbufs->pixbuf_helpdoc = + gtk_widget_render_icon_pixbuf(widgets.app, + GTK_STOCK_DND, + GTK_ICON_SIZE_MENU); +#endif #else gtk_widget_render_icon(widgets.app, GTK_STOCK_DND, @@ -377,7 +367,6 @@ #endif } - #ifdef ALLOW_BIBLE_NAVIGATION_FROM_SIDEBAR_TREE /****************************************************************************** @@ -396,8 +385,8 @@ * Return value * void */ -static void add_verses_to_chapter(GtkTreeModel * model, - GtkTreeIter iter, const gchar * key) +static void add_verses_to_chapter(GtkTreeModel *model, + GtkTreeIter iter, const gchar *key) { gchar **work_buf = NULL; gchar *book = NULL; @@ -413,9 +402,9 @@ } gtk_tree_store_set(GTK_TREE_STORE(model), &iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_opened, -1); - book = backend->key_get_book(settings.MainWindowModule, work_buf[3]); + book = backend->key_get_book(settings.MainWindowModule, work_buf[3]); chapter = backend->key_get_chapter(settings.MainWindowModule, work_buf[3]); - verses = backend->key_verse_count(settings.MainWindowModule, work_buf[3]); + verses = backend->key_verse_count(settings.MainWindowModule, work_buf[3]); for (i = 1; i < (verses + 1); i++) { gchar *num = main_format_number(i); @@ -431,9 +420,9 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, (gchar *) buf, - COL_MODULE, (gchar *) work_buf[2], - COL_OFFSET, (gchar *) key, + COL_CAPTION, (gchar *)buf, + COL_MODULE, (gchar *)work_buf[2], + COL_OFFSET, (gchar *)key, -1); g_free(key); g_free(buf); @@ -441,7 +430,6 @@ g_strfreev(work_buf); } - /****************************************************************************** * Name * main_add_chapters_to_book @@ -459,8 +447,8 @@ * void */ -static void add_chapters_to_book(GtkTreeModel * model, GtkTreeIter iter, - const gchar * key) +static void add_chapters_to_book(GtkTreeModel *model, GtkTreeIter iter, + const gchar *key) { gchar **work_buf = NULL; gchar *book = NULL; @@ -491,9 +479,9 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) buf, - COL_MODULE, (gchar *) work_buf[2], - COL_OFFSET, (gchar *) key, + COL_CAPTION, (gchar *)buf, + COL_MODULE, (gchar *)work_buf[2], + COL_OFFSET, (gchar *)key, -1); g_free(key); g_free(buf); @@ -501,7 +489,6 @@ g_strfreev(work_buf); } - /****************************************************************************** * Name * main_add_books_to_bible @@ -519,11 +506,12 @@ * void */ -static void add_books_to_bible(GtkTreeModel * model, GtkTreeIter iter, - const gchar * mod_name) +static void add_books_to_bible(GtkTreeModel *model, GtkTreeIter iter, + const gchar *mod_name) { SWModule *mod = backend->get_SWModule(mod_name); - if (!mod) return; + if (!mod) + return; VerseKey *vkey = (VerseKey *)mod->createKey(); gint j = 0; @@ -535,8 +523,8 @@ if (backend->module_has_testament(mod_name, 1)) { while (j < vkey->BMAX[0]) { vkey->setTestament(1); - vkey->setBook(j+1); - buf = strdup((gchar *) vkey->getBookName()); + vkey->setBook(j + 1); + buf = strdup((gchar *)vkey->getBookName()); gchar *key = g_strdup_printf("book://%s/%s 1:1", mod_name, buf); gtk_tree_store_append(GTK_TREE_STORE(model), @@ -544,9 +532,9 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) buf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) key, + COL_CAPTION, (gchar *)buf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)key, -1); g_free(key); g_free(buf); @@ -557,8 +545,8 @@ if (backend->module_has_testament(mod_name, 2)) { while (j < vkey->BMAX[1]) { vkey->setTestament(2); - vkey->setBook(j+1); - buf = strdup((gchar *) vkey->getBookName()); + vkey->setBook(j + 1); + buf = strdup((gchar *)vkey->getBookName()); gchar *key = g_strdup_printf("book://%s/%s 1:1", mod_name, buf); gtk_tree_store_append(GTK_TREE_STORE(model), @@ -566,9 +554,9 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) buf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) key, + COL_CAPTION, (gchar *)buf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)key, -1); g_free(key); g_free(buf); @@ -580,7 +568,7 @@ #endif /* ALLOW_BIBLE_NAVIGATION_FROM_SIDEBAR_TREE */ #ifdef USE_TREEVIEW_PATH -gboolean main_expand_treeview_to_path (GtkTreeModel *model, GtkTreeIter iter) +gboolean main_expand_treeview_to_path(GtkTreeModel *model, GtkTreeIter iter) { //gchar *cap = NULL; gchar *mod = NULL; @@ -595,17 +583,13 @@ //backend->set_module(mod); //backend->set_treekey(key ? atoi(key) : 0); //path = gtk_tree_model_get_path(model, &iter); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &iter) - && !key) { + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &iter) && !key) { add_children_to_tree(model, iter, mod, 0); } - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &iter) - && backend->treekey_has_children(key ? atoi(key) : 0)) { + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &iter) && backend->treekey_has_children(key ? atoi(key) : 0)) { add_children_to_tree(model, iter, mod, atol(key)); } @@ -614,7 +598,7 @@ (sidebar.module_list), path, FALSE);*/ //gtk_tree_path_free(path); - main_display_book(mod, (key ? key : (gchar *) "0")); + main_display_book(mod, (key ? key : (gchar *)"0")); main_setup_navbar_book(mod, (key ? atoi(key) : 0)); return 1; } @@ -636,7 +620,7 @@ * void */ -void main_mod_treeview_button_one(GtkTreeModel * model, +void main_mod_treeview_button_one(GtkTreeModel *model, GtkTreeIter selected) { gint sbtype; @@ -654,30 +638,27 @@ if (!g_utf8_collate(cap, _("Parallel View"))) { if (settings.dockedInt) { - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_bible_parallel), - 1); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + 1); } if (settings.showparatab) { old_page = gtk_notebook_get_current_page( - GTK_NOTEBOOK(widgets.notebook_main)); + GTK_NOTEBOOK(widgets.notebook_main)); - gtk_notebook_set_current_page ( + gtk_notebook_set_current_page( + GTK_NOTEBOOK(widgets.notebook_main), + gtk_notebook_page_num( GTK_NOTEBOOK(widgets.notebook_main), - gtk_notebook_page_num ( - GTK_NOTEBOOK (widgets.notebook_main), widgets.parallel_tab)); } } if (!g_utf8_collate(cap, _("Standard View"))) { - gtk_notebook_set_current_page ( - GTK_NOTEBOOK(widgets.notebook_main), - old_page); - gtk_notebook_set_current_page (GTK_NOTEBOOK - (widgets.notebook_bible_parallel), - 0); + gtk_notebook_set_current_page( + GTK_NOTEBOOK(widgets.notebook_main), + old_page); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), + 0); } /* let's not do anything else if the parallel tab is showing */ if (settings.paratab_showing) @@ -686,9 +667,7 @@ if (!g_utf8_collate(cap, _("Commentaries"))) { if (!settings.comm_showing) { settings.comm_showing = TRUE; - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_comm_book), + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 0); } } @@ -696,9 +675,7 @@ if (!g_utf8_collate(cap, _("General Books"))) { if (settings.comm_showing) { settings.comm_showing = FALSE; - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_comm_book), + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 1); } } @@ -709,31 +686,22 @@ sbtype = backend->module_type(mod); switch (sbtype) { case TEXT_TYPE: - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_bible_parallel), + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), 0); - // MainWindowModule is set in main_bible_display(), not here. +// MainWindowModule is set in main_bible_display(), not here. #ifdef ALLOW_BIBLE_NAVIGATION_FROM_SIDEBAR_TREE - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) - && !key) + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && !key) add_books_to_bible(model, selected, mod); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) - && strstr(key, "book:")) + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && strstr(key, "book:")) add_chapters_to_book(model, selected, key); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) - && strstr(key, "chapter:")) + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && strstr(key, "chapter:")) add_verses_to_chapter(model, selected, key); -#endif +#endif - if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widgets.viewtexts_item))) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), 1); - on_show_bible_text_activate - (GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), NULL); + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item))) { + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), 1); + on_show_bible_text_activate(GTK_CHECK_MENU_ITEM(widgets.viewtexts_item), NULL); } if (key) @@ -744,25 +712,21 @@ case COMMENTARY_TYPE: case PERCOM_TYPE: - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_comm_book), 0); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 0); settings.comm_showing = TRUE; - if ((!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item))) || + if ((!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item))) || (!settings.comm_showing)) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), 1); - on_show_commentary_activate - (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), 1); + on_show_commentary_activate(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); } main_display_commentary(mod, settings.currentverse); break; case DICTIONARY_TYPE: - if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widgets.viewdicts_item))) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), 1); - on_show_dictionary_lexicon_activate - (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item))) { + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewdicts_item), 1); + on_show_dictionary_lexicon_activate(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); } main_display_dictionary(mod, settings.dictkey); break; @@ -771,43 +735,35 @@ case PRAYERLIST_TYPE: XI_message(("key %s", (key ? key : "-null-"))); settings.comm_showing = FALSE; - gtk_notebook_set_current_page(GTK_NOTEBOOK - (widgets. - notebook_comm_book), 1); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 1); backend->set_module(mod); backend->set_treekey(key ? atoi(key) : 0); path = gtk_tree_model_get_path(model, &selected); - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) - && !key) { + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && !key) { add_children_to_tree(model, selected, mod, 0); } - if (!gtk_tree_model_iter_has_child - (GTK_TREE_MODEL(model), &selected) - && backend->treekey_has_children(key ? atoi(key) : 0)) { + if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && backend->treekey_has_children(key ? atoi(key) : 0)) { add_children_to_tree(model, selected, mod, atol(key)); } #ifdef USE_TREEVIEW_PATH - gchar *path_str = gtk_tree_path_to_string (path); - XI_message (("path: %s", path_str)); - gui_save_treeview_path_string (path_str, mod); - g_free (path_str); + gchar *path_str = gtk_tree_path_to_string(path); + XI_message(("path: %s", path_str)); + gui_save_treeview_path_string(path_str, mod); + g_free(path_str); #endif /* USE_TREEVIEW_PATH */ - gtk_tree_view_expand_row(GTK_TREE_VIEW - (sidebar.module_list), path, + gtk_tree_view_expand_row(GTK_TREE_VIEW(sidebar.module_list), path, FALSE); gtk_tree_path_free(path); - if ((!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item))) || + if ((!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item))) || (!settings.comm_showing)) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), 1); - on_show_commentary_activate - (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), 1); + on_show_commentary_activate(GTK_CHECK_MENU_ITEM(widgets.viewcomms_item), NULL); } - main_display_book(mod, (key ? key : (gchar *) "0")); + main_display_book(mod, (key ? key : (gchar *)"0")); main_setup_navbar_book(mod, (key ? atoi(key) : 0)); break; } @@ -816,7 +772,6 @@ g_free(key); } - /****************************************************************************** * Name * language_add_folders @@ -834,23 +789,23 @@ * void */ static void -language_add_folders(GtkTreeModel * model, +language_add_folders(GtkTreeModel *model, GtkTreeIter iter, - gchar ** languages) + gchar **languages) { GtkTreeIter iter_iter; GtkTreeIter child_iter; int j; - (void) gtk_tree_model_iter_children(model, &iter_iter, &iter); + (void)gtk_tree_model_iter_children(model, &iter_iter, &iter); for (j = 0; languages[j]; ++j) { gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter); gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_opened, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, COL_CAPTION, ((g_utf8_validate(languages[j], -1, NULL)) - ? languages[j] - : _("Unknown")), + ? languages[j] + : _("Unknown")), COL_MODULE, NULL, COL_OFFSET, NULL, -1); @@ -873,9 +828,9 @@ * Return value * void */ -static void add_module_to_prayerlist_folder(GtkTreeModel * model, - GtkTreeIter iter, - gchar * module_name) +static void add_module_to_prayerlist_folder(GtkTreeModel *model, + GtkTreeIter iter, + gchar *module_name) { GtkTreeIter child_iter; @@ -885,13 +840,12 @@ gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) module_name, - COL_MODULE, (gchar *) module_name, + COL_CAPTION, (gchar *)module_name, + COL_MODULE, (gchar *)module_name, COL_OFFSET, NULL, -1); } - /****************************************************************************** * Name * add_module_to_language_folder @@ -909,11 +863,11 @@ * void */ -static void add_module_to_language_folder(GtkTreeModel * model, +static void add_module_to_language_folder(GtkTreeModel *model, GtkTreeIter iter, - const gchar * language, - gchar * module_name, - const gchar * description) + const gchar *language, + gchar *module_name, + const gchar *description) { GtkTreeIter iter_iter; GtkTreeIter child_iter; @@ -921,7 +875,7 @@ /* Check language */ const gchar *buf = language; - if (!g_utf8_validate(buf,-1,NULL)) + if (!g_utf8_validate(buf, -1, NULL)) language = _("Unknown"); if (!g_unichar_isalnum(g_utf8_get_char(buf)) || (language == NULL)) language = _("Unknown"); @@ -930,6 +884,7 @@ while (valid) { /* Walk through the list, reading each row */ gchar *str_data; + const gchar *abbreviation = main_get_abbreviation(module_name); gtk_tree_model_get(model, &iter_iter, COL_CAPTION, &str_data, -1); if (!strcmp(language, str_data)) { @@ -937,12 +892,16 @@ gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, &iter_iter); - content = g_strdup_printf("%s: %s", module_name, description); + content = g_strdup_printf("%s: %s", + (abbreviation + ? abbreviation + : module_name), + description); gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) content, - COL_MODULE, (gchar *) module_name, + COL_CAPTION, (gchar *)content, + COL_MODULE, (gchar *)module_name, COL_OFFSET, NULL, -1); g_free(content); g_free(str_data); @@ -953,7 +912,6 @@ } } - /****************************************************************************** * Name * main_load_module_tree @@ -970,7 +928,7 @@ * void */ -void main_load_module_tree(GtkWidget * tree) +void main_load_module_tree(GtkWidget *tree) { GtkTreeStore *store; GtkTreeIter text; @@ -986,7 +944,6 @@ GtkTreeIter child_iter; GList *tmp = NULL; GList *tmp2 = NULL; - MOD_MGR *info; store = gtk_tree_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, @@ -1122,57 +1079,48 @@ tmp2 = tmp; while (tmp2 != NULL) { - info = (MOD_MGR *) tmp2->data; + MOD_MGR *info = (MOD_MGR *)tmp2->data; if (info->is_cult) { add_module_to_language_folder(GTK_TREE_MODEL(store), cult, info->language, info->name, info->description); - } - else if (info->type[0] == 'B') { + } else if (info->type[0] == 'B') { add_module_to_language_folder(GTK_TREE_MODEL(store), text, info->language, info->name, info->description); - } - else if (info->type[0] == 'C') { + } else if (info->type[0] == 'C') { add_module_to_language_folder(GTK_TREE_MODEL(store), commentary, info->language, info->name, info->description); - } - else if (info->is_maps) { + } else if (info->is_maps) { add_module_to_language_folder(GTK_TREE_MODEL(store), map, info->language, info->name, info->description); - } - else if (info->is_images) { + } else if (info->is_images) { add_module_to_language_folder(GTK_TREE_MODEL(store), image, info->language, info->name, info->description); - } - else if (info->is_devotional) { + } else if (info->is_devotional) { add_module_to_language_folder(GTK_TREE_MODEL(store), devotional, info->language, info->name, info->description); - } - else if (info->is_glossary) { + } else if (info->is_glossary) { add_module_to_language_folder(GTK_TREE_MODEL(store), glossary, info->language, info->name, info->description); - } - else if (info->type[0] == 'L') { + } else if (info->type[0] == 'L') { add_module_to_language_folder(GTK_TREE_MODEL(store), dictionary, info->language, info->name, info->description); - } - else if (info->type[0] == 'G') { + } else if (info->type[0] == 'G') { gchar *gstype = main_get_mod_config_entry(info->name, "GSType"); if ((gstype == NULL) || strcmp(gstype, "PrayerList")) { add_module_to_language_folder(GTK_TREE_MODEL(store), book, info->language, info->name, info->description); } - } - else { + } else { XI_warning(("mod `%s' unknown type `%s'", info->name, info->type)); } @@ -1193,7 +1141,7 @@ while (tmp != NULL) { add_module_to_prayerlist_folder(GTK_TREE_MODEL(store), prayerlist, - (gchar *) tmp->data); + (gchar *)tmp->data); tmp = g_list_next(tmp); } } @@ -1201,7 +1149,6 @@ GTK_TREE_MODEL(store)); } - /****************************************************************************** * Name * main_add_mod_tree_columns @@ -1218,7 +1165,7 @@ * void */ -void main_add_mod_tree_columns(GtkTreeView * tree) +void main_add_mod_tree_columns(GtkTreeView *tree) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -1227,12 +1174,10 @@ renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new()); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_set_attributes - (column, renderer, "pixbuf", - COL_OPEN_PIXBUF, "pixbuf-expander-open", - COL_OPEN_PIXBUF, "pixbuf-expander-closed", - COL_CLOSED_PIXBUF, NULL); - + gtk_tree_view_column_set_attributes(column, renderer, "pixbuf", + COL_OPEN_PIXBUF, "pixbuf-expander-open", + COL_OPEN_PIXBUF, "pixbuf-expander-closed", + COL_CLOSED_PIXBUF, NULL); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -1240,7 +1185,6 @@ COL_CAPTION, NULL); gtk_tree_view_append_column(tree, column); - column = gtk_tree_view_column_new(); renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); gtk_tree_view_column_pack_start(column, renderer, TRUE); diff -Nru xiphos-4.0.0+dfsg1/src/main/sidebar.h xiphos-4.0.4+dfsg1/src/main/sidebar.h --- xiphos-4.0.0+dfsg1/src/main/sidebar.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sidebar.h 2015-02-11 23:48:33.000000000 +0000 @@ -1,8 +1,8 @@ /* * Xiphos Bible Study Tool - * utilities.h - support functions + * sidebar.h - sidebar interface to sword * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -29,7 +29,8 @@ #include -typedef struct { +typedef struct +{ GdkPixbuf *pixbuf_opened; GdkPixbuf *pixbuf_closed; GdkPixbuf *pixbuf_helpdoc; @@ -37,16 +38,19 @@ extern TreePixbufs *pixbufs; #ifdef USE_TREEVIEW_PATH -gboolean main_expand_treeview_to_path (GtkTreeModel *model, GtkTreeIter iter); +gboolean main_expand_treeview_to_path(GtkTreeModel *model, + GtkTreeIter iter); #endif -void main_open_bookmark_in_new_tab(gchar * mod_name, gchar * key); -void main_display_verse_list_in_sidebar(gchar * key, gchar * module_name, - gchar * verse_list); +void main_open_bookmark_in_new_tab(gchar *mod_name, gchar *key); +void main_display_verse_list_in_sidebar(gchar *key, + gchar *module_name, + gchar *verse_list); void main_create_pixbufs(void); -void main_load_module_tree(GtkWidget * tree); -void main_add_mod_tree_columns(GtkTreeView * tree); -void main_mod_treeview_button_one(GtkTreeModel *model, GtkTreeIter selected); +void main_load_module_tree(GtkWidget *tree); +void main_add_mod_tree_columns(GtkTreeView *tree); +void main_mod_treeview_button_one(GtkTreeModel *model, + GtkTreeIter selected); #ifdef __cplusplus } diff -Nru xiphos-4.0.0+dfsg1/src/main/sword.cc xiphos-4.0.4+dfsg1/src/main/sword.cc --- xiphos-4.0.0+dfsg1/src/main/sword.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sword.cc 2015-08-21 12:08:46.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword.cc - glue * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ #include #endif - #include #include #include @@ -91,6 +90,89 @@ extern gboolean valid_scripture_key; +// these track together. when one changes, so does the other. +static std::map abbrev_name2abbrev, abbrev_abbrev2name; +typedef std::map::iterator abbrev_iter; + +/****************************************************************************** + * Name + * main_add_abbreviation + * + * Synopsis + * #include "main/sword.h" + * + * void main_add_abbreviation(char *name, char *abbreviation) + * + * Description + * adds an element to each of the abbreviation maps. + * + * Return value + * void + */ + +void main_add_abbreviation(const char *name, const char *abbreviation) +{ + // let's not be stupid about abbreviations chosen, ok? + if (!strchr(abbreviation, '(')) { + abbrev_name2abbrev[name] = abbreviation; + abbrev_abbrev2name[abbreviation] = name; + } +} + +/****************************************************************************** + * Name + * main_get_abbreviation + * + * Synopsis + * #include "main/sword.h" + * + * const char * main_get_abbreviation(const char *name) + * + * Description + * gets abbreviation from real module, if available. + * + * Return value + * const char * + */ + +const char *main_get_abbreviation(const char *name) +{ + if (name == NULL) + return NULL; + abbrev_iter it = abbrev_name2abbrev.find(name); + if (it != abbrev_name2abbrev.end()) { + return it->second.c_str(); + } + return NULL; +} + +/****************************************************************************** + * Name + * main_get_name + * + * Synopsis + * #include "main/sword.h" + * + * const char * main_get_name(const char *abbreviation) + * + * Description + * gets real module name from abbreviation, if available. + * + * Return value + * const char * + */ + +const char *main_get_name(const char *abbreviation) +{ + if (abbreviation == NULL) + return NULL; + abbrev_iter it = abbrev_abbrev2name.find(abbreviation); + if (it != abbrev_abbrev2name.end()) { + return it->second.c_str(); + } + return NULL; +} + /****************************************************************************** * Name * main_book_heading @@ -107,7 +189,7 @@ * void */ -void main_book_heading(char * mod_name) +void main_book_heading(char *mod_name) { VerseKey *vkey; SWMgr *mgr = backend->get_mgr(); @@ -121,7 +203,6 @@ backend->display_mod->display(); } - /****************************************************************************** * Name * main_chapter_heading @@ -138,7 +219,7 @@ * void */ -void main_chapter_heading(char * mod_name) +void main_chapter_heading(char *mod_name) { VerseKey *vkey; SWMgr *mgr = backend->get_mgr(); @@ -152,7 +233,6 @@ backend->display_mod->display(); } - /****************************************************************************** * Name * main_save_note @@ -171,19 +251,19 @@ * void */ -void main_save_note(const gchar * module_name, - const gchar * key_str, - const gchar * note_str) +void main_save_note(const gchar *module_name, + const gchar *key_str, + const gchar *note_str) { // Massage encoded spaces ("%20") back to real spaces. // This is a sick. unreliable hack that should be removed // after the underlying problem is fixed in Sword. gchar *rework; - for (rework = (char*)strstr(note_str, "%20"); + for (rework = (char *)strstr(note_str, "%20"); rework; - rework = strstr(rework+1, "%20")) { + rework = strstr(rework + 1, "%20")) { *rework = ' '; - (void) strcpy(rework+1, rework+3); + (void)strcpy(rework + 1, rework + 3); } XI_message(("note module %s\nnote key %s\nnote text%s", @@ -211,8 +291,8 @@ * void */ -void main_delete_note(const gchar * module_name, - const gchar * key_str) +void main_delete_note(const gchar *module_name, + const gchar *key_str) { backend->set_module_key(module_name, key_str); XI_message(("note module %s\nnote key %s\n", @@ -220,12 +300,11 @@ key_str)); backend->delete_entry(); - if ((!strcmp(settings.CommWindowModule,module_name)) && + if ((!strcmp(settings.CommWindowModule, module_name)) && (!strcmp(settings.currentverse, key_str))) main_display_commentary(module_name, key_str); } - /****************************************************************************** * Name * set_module_unlocked @@ -242,13 +321,12 @@ * void */ -void main_set_module_unlocked(const char * mod_name, char * key) +void main_set_module_unlocked(const char *mod_name, char *key) { SWMgr *mgr = backend->get_mgr(); mgr->setCipherKey(mod_name, key); } - /****************************************************************************** * Name * main_save_module_key @@ -265,12 +343,11 @@ * void */ -void main_save_module_key(const char * mod_name, char * key) +void main_save_module_key(const char *mod_name, char *key) { - backend->save_module_key((char *) mod_name, key); + backend->save_module_key((char *)mod_name, key); } - /****************************************************************************** * Name * main_getText @@ -292,7 +369,6 @@ return strdup((char *)vkey.getText()); } - /****************************************************************************** * Name * main_getShortText @@ -314,7 +390,6 @@ return strdup((char *)vkey.getShortText()); } - /****************************************************************************** * Name * main_update_nav_controls @@ -347,21 +422,20 @@ settings.apply_change = FALSE; - navbar_versekey.module_name = g_string_assign(navbar_versekey.module_name,settings.MainWindowModule); - navbar_versekey.key = g_string_assign(navbar_versekey.key,val_key); + navbar_versekey.module_name = g_string_assign(navbar_versekey.module_name, settings.MainWindowModule); + navbar_versekey.key = g_string_assign(navbar_versekey.key, val_key); main_navbar_versekey_set(navbar_versekey, val_key); settings.apply_change = TRUE; #ifdef HAVE_DBUS - IpcObject* ipc = ipc_get_main_ipc(); + IpcObject *ipc = ipc_get_main_ipc(); if (ipc) - ipc_object_navigation_signal (ipc, (const gchar*)val_key, NULL); + ipc_object_navigation_signal(ipc, (const gchar *)val_key, NULL); #endif return val_key; } - /****************************************************************************** * Name * get_module_key @@ -384,16 +458,16 @@ switch (settings.whichwindow) { case MAIN_TEXT_WINDOW: case COMMENTARY_WINDOW: - return (char *) settings.currentverse; + return (char *)settings.currentverse; break; case DICTIONARY_WINDOW: - return (char *) settings.dictkey; + return (char *)settings.dictkey; break; case parallel_WINDOW: - return (char *) settings.cvparallel; + return (char *)settings.cvparallel; break; case BOOK_WINDOW: - return (char *) settings.book_key; + return (char *)settings.book_key; break; } } @@ -421,18 +495,18 @@ if (settings.havebible) { switch (settings.whichwindow) { case MAIN_TEXT_WINDOW: - return (char *) xml_get_value("modules", - "bible"); + return (char *)xml_get_value("modules", + "bible"); break; case COMMENTARY_WINDOW: - return (char *) xml_get_value("modules", - "comm"); + return (char *)xml_get_value("modules", + "comm"); break; case DICTIONARY_WINDOW: - return (char *) settings.DictWindowModule; + return (char *)settings.DictWindowModule; break; case BOOK_WINDOW: - return (char *) settings.book_mod; + return (char *)settings.book_mod; break; } } @@ -481,8 +555,8 @@ return backend->get_sword_version(); } - - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * @@ -503,7 +577,7 @@ { return backend->treekey_get_local_name(offset); } - +#endif /****************************************************************************** * Name @@ -521,13 +595,11 @@ * char * */ -char *main_get_search_results_text(char * mod_name, char * key) +char *main_get_search_results_text(char *mod_name, char *key) { - return backend->get_render_text((char *)mod_name,(char *)key); + return backend->get_render_text((char *)mod_name, (char *)key); } - - /****************************************************************************** * Name * main_get_path_to_mods @@ -567,10 +639,11 @@ * void */ -typedef std::map < SWBuf, SWBuf > ModLanguageMap; +typedef std::map ModLanguageMap; ModLanguageMap languageMap; -void main_init_language_map() { +void main_init_language_map() +{ gchar *language_file; FILE *language; gchar *s, *end, *abbrev, *name, *newline; @@ -578,39 +651,36 @@ size_t length; if ((language_file = gui_general_user_file("languages", FALSE)) == NULL) { - gui_generic_warning - (_("Xiphos's file for language\nabbreviations is missing.")); + gui_generic_warning(_("Xiphos's file for language\nabbreviations is missing.")); return; } - XI_message(("%s",language_file)); + XI_message(("%s", language_file)); - if ((language = fopen(language_file, "r")) == NULL) { - gui_generic_warning - (_("Xiphos's language abbreviation\nfile cannot be opened.")); + if ((language = g_fopen(language_file, "r")) == NULL) { + gui_generic_warning(_("Xiphos's language abbreviation\nfile cannot be opened.")); g_free(language_file); return; } g_free(language_file); - (void) fseek(language, 0L, SEEK_END); + (void)fseek(language, 0L, SEEK_END); length = ftell(language); rewind(language); if ((length == 0) || - (mapspace = (gchar*)g_malloc(length+2)) == NULL) { + (mapspace = (gchar *)g_malloc(length + 2)) == NULL) { fclose(language); - gui_generic_warning - (_("Xiphos cannot allocate space\nfor language abbreviations.")); + gui_generic_warning(_("Xiphos cannot allocate space\nfor language abbreviations.")); return; } if (fread(mapspace, 1, length, language) != length) { fclose(language); g_free(mapspace); - gui_generic_warning - (_("Xiphos cannot read the\nlanguage abbreviation file.")); + gui_generic_warning(_("Xiphos cannot read the\nlanguage abbreviation file.")); return; } - fclose(language); // safe to do even while mmap is active. - *(end = length + mapspace) = '\0'; + fclose(language); + end = length + mapspace; + *end = '\0'; for (s = mapspace; s < end; ++s) { if ((newline = strchr(s, '\n')) == NULL) { @@ -620,7 +690,7 @@ *newline = '\0'; if ((*s == '#') || (s == newline)) { - s = newline; // comment or empty line. + s = newline; // comment or empty line. continue; } @@ -629,7 +699,7 @@ XI_message(("tab-less line in languages")); break; } - *(name++) = '\0'; // NUL-terminate abbrev, mark name. + *(name++) = '\0'; // NUL-terminate abbrev, mark name. languageMap[SWBuf(abbrev)] = SWBuf(name); s = newline; } @@ -637,7 +707,8 @@ g_free(mapspace); } -const char *main_get_language_map(const char *language) { +const char *main_get_language_map(const char *language) +{ if (language == NULL) return "Unknown"; return languageMap[language].c_str(); @@ -648,7 +719,6 @@ return backend->get_module_language_list(); } - /****************************************************************************** * Name * set_sword_locale @@ -666,25 +736,22 @@ */ char *set_sword_locale(const char *sys_locale) { - int ncmp[3] = { 100, 5, 2 }; // fixed data - if (sys_locale) { SWBuf locale; StringList localelist = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); StringList::iterator it; + int ncmp[3] = {100, 5, 2}; // fixed data // length-limited match for (int i = 0; i < 3; ++i) { for (it = localelist.begin(); it != localelist.end(); ++it) { locale = *it; if (!strncmp(sys_locale, locale.c_str(), ncmp[i])) { - LocaleMgr::getSystemLocaleMgr()-> - setDefaultLocaleName(locale.c_str()); + LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale.c_str()); return g_strdup(locale.c_str()); } } } - } // either we were given a null sys_locale, or it didn't match anything. @@ -696,7 +763,6 @@ return NULL; } - /****************************************************************************** * Name * backend_init @@ -715,10 +781,11 @@ void main_init_backend(void) { - StringMgr::setSystemStringMgr( new GS_StringMgr() ); + StringMgr::setSystemStringMgr(new GS_StringMgr()); const char *lang = getenv("LANG"); - if (!lang) lang = "C"; + if (!lang) + lang = "C"; sword_locale = set_sword_locale(lang); lang = LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName(); @@ -726,14 +793,14 @@ backend->init_SWORD(0); settings.path_to_mods = main_get_path_to_mods(); -//#ifndef DEBUG + //#ifndef DEBUG g_chdir(settings.path_to_mods); -//#else -// XI_warning(("no chdir(SWORD_PATH) => modmgr 'archive' may not work")); -//#endif + //#else + // XI_warning(("no chdir(SWORD_PATH) => modmgr 'archive' may not work")); + //#endif XI_print(("%s sword-%s\n", "Starting", backend->get_sword_version())); XI_print(("%s\n", "Initiating SWORD")); - XI_print(("%s: %s\n","path to sword", settings.path_to_mods)); + XI_print(("%s: %s\n", "path to sword", settings.path_to_mods)); XI_print(("%s %s\n", "SWORD locale is", lang)); XI_print(("%s\n", "Checking for SWORD Modules")); settings.spell_language = strdup(lang); @@ -742,17 +809,16 @@ // // BibleSync backend startup. identify the user by name. // - biblesync = new BibleSync("Xiphos", PACKAGE_VERSION, + biblesync = new BibleSync("Xiphos", VERSION, #ifdef WIN32 - // in win32 glib, get_real_name and get_user_name are the same. - (string)g_get_real_name() + // in win32 glib, get_real_name and get_user_name are the same. + (string)g_get_real_name() #else - (string)g_get_real_name() + " (" + g_get_user_name() + ")" + (string)g_get_real_name() + " (" + g_get_user_name() + ")" #endif - ); + ); } - /****************************************************************************** * Name * shutdown_sword @@ -772,10 +838,10 @@ void main_shutdown_backend(void) { if (sword_locale) - free((char*)sword_locale); + free((char *)sword_locale); sword_locale = NULL; if (backend) - delete backend; + delete backend; backend = NULL; XI_print(("%s\n", "SWORD is shutdown")); @@ -797,7 +863,7 @@ * void */ -void main_dictionary_entry_changed(char * mod_name) +void main_dictionary_entry_changed(char *mod_name) { gchar *key = NULL; @@ -808,7 +874,7 @@ settings.DictWindowModule = xml_get_value("modules", "dict"); } - key = g_strdup((gchar*)gtk_entry_get_text(GTK_ENTRY(widgets.entry_dict))); + key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(widgets.entry_dict))); backend->set_module_key(mod_name, key); g_free(key); @@ -826,11 +892,9 @@ g_free(key); } - - -static void dict_key_list_select(GtkMenuItem * menuitem, gpointer user_data) +static void dict_key_list_select(GtkMenuItem *menuitem, gpointer user_data) { - gtk_entry_set_text(GTK_ENTRY(widgets.entry_dict), (gchar*) user_data); + gtk_entry_set_text(GTK_ENTRY(widgets.entry_dict), (gchar *)user_data); gtk_widget_activate(widgets.entry_dict); } @@ -850,27 +914,26 @@ * void */ -GtkWidget *main_dictionary_drop_down_new(char * mod_name, char * old_key) +GtkWidget *main_dictionary_drop_down_new(char *mod_name, char *old_key) { gint count = 9, i; gchar *new_key; gchar *key = NULL; GtkWidget *menu; - GtkWidget * item; menu = gtk_menu_new(); if (!settings.havedict || !mod_name) return NULL; - if (strcmp(settings.DictWindowModule,mod_name)) { + if (strcmp(settings.DictWindowModule, mod_name)) { xml_set_value("Xiphos", "modules", "dict", - mod_name); + mod_name); settings.DictWindowModule = xml_get_value( - "modules", "dict"); + "modules", "dict"); } - key = g_strdup((gchar*)gtk_entry_get_text(GTK_ENTRY(widgets.entry_dict))); + key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(widgets.entry_dict))); - XI_message(("\nold_key: %s\nkey: %s",old_key,key)); + XI_message(("\nold_key: %s\nkey: %s", old_key, key)); backend->set_module_key(mod_name, key); g_free(key); key = backend->get_module_key(); @@ -883,23 +946,23 @@ backend->set_module_key(mod_name, key); backend->display_mod->display(); - new_key = g_strdup((char*)backend->display_mod->getKeyText()); + new_key = g_strdup((char *)backend->display_mod->getKeyText()); - for (i = 0; i < (count / 2)+1; i++) { + for (i = 0; i < (count / 2) + 1; i++) { (*backend->display_mod)--; } for (i = 0; i < count; i++) { free(new_key); (*backend->display_mod)++; - new_key = g_strdup((char*)backend->display_mod->getKeyText()); + new_key = g_strdup((char *)backend->display_mod->getKeyText()); /* add menu item */ - item = - gtk_menu_item_new_with_label((gchar *) new_key); + GtkWidget *item = + gtk_menu_item_new_with_label((gchar *)new_key); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(dict_key_list_select), - g_strdup(new_key)); + G_CALLBACK(dict_key_list_select), + g_strdup(new_key)); gtk_container_add(GTK_CONTAINER(menu), item); } @@ -928,7 +991,6 @@ * void */ - void main_dictionary_button_clicked(gint direction) { gchar *key = NULL; @@ -942,14 +1004,14 @@ (*backend->display_mod)--; else (*backend->display_mod)++; - key = g_strdup((char*)backend->display_mod->getKeyText()); + key = g_strdup((char *)backend->display_mod->getKeyText()); gtk_entry_set_text(GTK_ENTRY(widgets.entry_dict), key); gtk_widget_activate(widgets.entry_dict); g_free(key); } -void main_display_book(const char * mod_name, - const char * key) +void main_display_book(const char *mod_name, + const char *key) { if (!settings.havebook || !mod_name) return; @@ -962,7 +1024,7 @@ if (!backend->is_module(mod_name)) return; if (!settings.book_mod) - settings.book_mod = g_strdup((char*)mod_name); + settings.book_mod = g_strdup((char *)mod_name); if (strcmp(settings.book_mod, mod_name)) { xml_set_value("Xiphos", "modules", "book", mod_name); @@ -975,7 +1037,7 @@ backend->set_module(mod_name); backend->set_treekey(0); - settings.book_offset = backend->treekey_set_key((char*)key); + settings.book_offset = backend->treekey_set_key((char *)key); } else { settings.book_offset = atol(key); if (settings.book_offset < 4) @@ -993,39 +1055,39 @@ backend->display_mod->display(); main_setup_navbar_book(settings.book_mod, settings.book_offset); //if (settings.browsing) - gui_update_tab_struct(NULL, - NULL, - NULL, - mod_name, - NULL, - key, - FALSE, - settings.showtexts, - settings.showpreview, - settings.showcomms, - settings.showdicts); + gui_update_tab_struct(NULL, + NULL, + NULL, + mod_name, + NULL, + key, + FALSE, + settings.showtexts, + settings.showpreview, + settings.showcomms, + settings.showdicts); } -void main_display_commentary(const char * mod_name, - const char * key) +void main_display_commentary(const char *mod_name, + const char *key) { if (!settings.havecomm || !settings.comm_showing) return; if (!mod_name) mod_name = ((settings.browsing && (cur_passage_tab != NULL)) - ? g_strdup(cur_passage_tab->commentary_mod) - : xml_get_value("modules", "comm")); + ? g_strdup(cur_passage_tab->commentary_mod) + : xml_get_value("modules", "comm")); if (!mod_name || !backend->is_module(mod_name)) return; int modtype = backend->module_type(mod_name); if ((modtype != COMMENTARY_TYPE) && (modtype != PERCOM_TYPE)) - return; // what are we doing here? - + return; // what are we doing here? + if (!settings.CommWindowModule) - settings.CommWindowModule = g_strdup((gchar*)mod_name); + settings.CommWindowModule = g_strdup((gchar *)mod_name); settings.comm_showing = TRUE; settings.whichwindow = COMMENTARY_WINDOW; @@ -1053,9 +1115,9 @@ "Would you like to open these as well?%s"), mod_name, companion, ((name_length > 1) - ? _("\n\nThe first will open in the main window\n" - "and others in separate windows.") - : "")); + ? _("\n\nThe first will open in the main window\n" + "and others in separate windows.") + : "")); if (gui_yes_no_dialog(companion_question, NULL)) { main_display_bible(name_set[0], key); @@ -1066,8 +1128,10 @@ g_free(companion_question); companion_activity = FALSE; } - if (name_set) g_strfreev(name_set); - if (companion) g_free(companion); + if (name_set) + g_strfreev(name_set); + if (companion) + g_free(companion); } main_check_unlock(mod_name, TRUE); @@ -1077,24 +1141,24 @@ backend->set_module_key(mod_name, key); backend->display_mod->display(); - valid_scripture_key = TRUE; // leave nice for future use. + valid_scripture_key = TRUE; // leave nice for future use. //if (settings.browsing) - gui_update_tab_struct(NULL, - mod_name, - NULL, - NULL, - NULL, - NULL, - TRUE, - settings.showtexts, - settings.showpreview, - settings.showcomms, - settings.showdicts); + gui_update_tab_struct(NULL, + mod_name, + NULL, + NULL, + NULL, + NULL, + TRUE, + settings.showtexts, + settings.showpreview, + settings.showcomms, + settings.showdicts); } -void main_display_dictionary(const char * mod_name, - const char * key) +void main_display_dictionary(const char *mod_name, + const char *key) { const gchar *old_key; @@ -1109,26 +1173,25 @@ if (!backend->is_module(mod_name)) return; if (!settings.DictWindowModule) - settings.DictWindowModule = g_strdup((gchar*)mod_name); + settings.DictWindowModule = g_strdup((gchar *)mod_name); if (key == NULL) - key = (char*)"Grace"; + key = (char *)"Grace"; if (strcmp(settings.DictWindowModule, mod_name)) { // new dict -- is it actually a devotional? time_t curtime; - struct tm *loctime; char *feature; - if ((feature = (char *)backend->get_mgr()-> - getModule(mod_name)-> - getConfigEntry("Feature")) && + if ((feature = (char *)backend->get_mgr()->getModule(mod_name)->getConfigEntry("Feature")) && !strcmp(feature, "DailyDevotion")) { - if ((strlen(key) != 5) || // blunt tests. + if ((strlen(key) != 5) || // blunt tests. (key[0] < '0') || (key[0] > '9') || (key[1] < '0') || (key[1] > '9') || - (key[2] != '.') || + (key[2] != '.') || (key[3] < '0') || (key[3] > '9') || - (key[4] < '0') || (key[4] > '9')) { // not MM.DD + (key[4] < '0') || (key[4] > '9')) { // not MM.DD + struct tm *loctime; + curtime = time(NULL); loctime = localtime(&curtime); strftime(buf, 10, "%m.%d", loctime); @@ -1139,8 +1202,8 @@ gui_reassign_strdup(&settings.DictWindowModule, (gchar *)mod_name); } - // old_key is uppercase - key = g_utf8_strup(key, -1); + // old_key is uppercase + key = g_utf8_strup(key, -1); old_key = gtk_entry_get_text(GTK_ENTRY(widgets.entry_dict)); if (!strcmp(old_key, key)) main_dictionary_entry_changed(settings.DictWindowModule); @@ -1150,37 +1213,34 @@ } //if (settings.browsing) - gui_update_tab_struct(NULL, - NULL, - mod_name, - NULL, - key, - NULL, - settings.comm_showing, - settings.showtexts, - settings.showpreview, - settings.showcomms, - settings.showdicts); + gui_update_tab_struct(NULL, + NULL, + mod_name, + NULL, + key, + NULL, + settings.comm_showing, + settings.showtexts, + settings.showpreview, + settings.showcomms, + settings.showdicts); } - -void main_display_bible(const char * mod_name, - const char * key) +void main_display_bible(const char *mod_name, + const char *key) { - gchar *val_key = NULL; - /* keeps us out of a crash causing loop */ extern guint scroll_adj_signal; - extern GtkAdjustment* adjustment; + extern GtkAdjustment *adjustment; if (adjustment) g_signal_handler_block(adjustment, scroll_adj_signal); - if (!gtk_widget_get_realized (GTK_WIDGET(widgets.html_text))) return; + if (!gtk_widget_get_realized(GTK_WIDGET(widgets.html_text))) + return; if (!mod_name) mod_name = ((settings.browsing && (cur_passage_tab != NULL)) - ? g_strdup(cur_passage_tab->text_mod) - : xml_get_value("modules", "bible")); - + ? g_strdup(cur_passage_tab->text_mod) + : xml_get_value("modules", "bible")); if (!settings.havebible || !mod_name) return; @@ -1189,16 +1249,16 @@ int modtype = backend->module_type(mod_name); if (modtype != TEXT_TYPE) - return; // what are we doing here? - + return; // what are we doing here? + if (!settings.MainWindowModule) - settings.MainWindowModule = g_strdup((gchar*)mod_name); + settings.MainWindowModule = g_strdup((gchar *)mod_name); if (strcmp(settings.currentverse, key)) { xml_set_value("Xiphos", "keys", "verse", - key); + key); settings.currentverse = xml_get_value( - "keys", "verse"); + "keys", "verse"); } if (strcmp(settings.MainWindowModule, mod_name)) { @@ -1224,9 +1284,9 @@ "Would you like to open these as well?%s"), mod_name, companion, ((name_length > 1) - ? _("\n\nThe first will open in the main window\n" - "and others in separate windows.") - : "")); + ? _("\n\nThe first will open in the main window\n" + "and others in separate windows.") + : "")); if (gui_yes_no_dialog(companion_question, NULL)) { main_display_commentary(name_set[0], key); @@ -1237,8 +1297,10 @@ g_free(companion_question); companion_activity = FALSE; } - if (name_set) g_strfreev(name_set); - if (companion) g_free(companion); + if (name_set) + g_strfreev(name_set); + if (companion) + g_free(companion); navbar_versekey.module_name = g_string_assign(navbar_versekey.module_name, settings.MainWindowModule); @@ -1256,10 +1318,12 @@ valid_scripture_key = main_is_Bible_key(mod_name, key); if (backend->module_has_testament(mod_name, - backend->get_key_testament(mod_name, key))) { + backend->get_key_testament(mod_name, key))) { backend->set_module_key(mod_name, key); backend->display_mod->display(); } else { + gchar *val_key = NULL; + if (backend->get_key_testament(mod_name, key) == 1) val_key = main_update_nav_controls(mod_name, "Matthew 1:1"); else @@ -1270,22 +1334,22 @@ g_free(val_key); } - valid_scripture_key = TRUE; // leave nice for future use. + valid_scripture_key = TRUE; // leave nice for future use. - XI_message(("mod_name = %s",mod_name)); + XI_message(("mod_name = %s", mod_name)); //if (settings.browsing) { - gui_update_tab_struct(mod_name, - NULL, - NULL, - NULL, - NULL, - NULL, - settings.comm_showing, - settings.showtexts, - settings.showpreview, - settings.showcomms, - settings.showdicts); - gui_set_tab_label(settings.currentverse, FALSE); + gui_update_tab_struct(mod_name, + NULL, + NULL, + NULL, + NULL, + NULL, + settings.comm_showing, + settings.showtexts, + settings.showpreview, + settings.showcomms, + settings.showdicts); + gui_set_tab_label(settings.currentverse, FALSE); //} gui_change_window_title(settings.MainWindowModule); @@ -1309,7 +1373,6 @@ g_signal_handler_unblock(adjustment, scroll_adj_signal); } - /****************************************************************************** * Name * main_display_devotional @@ -1342,7 +1405,7 @@ if (g_list_length(glist) != 0) { xml_set_value("Xiphos", "modules", "devotional", - (char*)glist->data); + (char *)glist->data); gui_reassign_strdup(&settings.devotionalmod, (gchar *)glist->data); } else { gui_generic_warning(_("Daily devotional was requested, but there are none installed.")); @@ -1362,14 +1425,16 @@ text = backend->get_render_text(settings.devotionalmod, buf); if (text) { main_entry_display(settings.show_previewer_in_sidebar - ? sidebar.html_viewer_widget - : widgets.html_previewer_text, - settings.devotionalmod, text, prettybuf, TRUE); + ? sidebar.html_viewer_widget + : widgets.html_previewer_text, + settings.devotionalmod, text, prettybuf, TRUE); g_free(text); } g_free(prettybuf); } +#if 0 +// unneeded at this time. disabled to silence cppcheck. void main_refresh_all(void) { main_display_bible(settings.MainWindowModule, settings.currentverse); @@ -1377,13 +1442,14 @@ main_display_book(settings.book_mod, settings.book_key); main_display_dictionary(settings.DictWindowModule, settings.dictkey); } +#endif void main_setup_displays(void) { - backend->textDisplay = new GTKChapDisp(widgets.html_text,backend); - backend->commDisplay = new GTKEntryDisp(widgets.html_comm,backend); - backend->bookDisplay = new GTKEntryDisp(widgets.html_book,backend); - backend->dictDisplay = new GTKEntryDisp(widgets.html_dict,backend); + backend->textDisplay = new GTKChapDisp(widgets.html_text, backend); + backend->commDisplay = new GTKEntryDisp(widgets.html_comm, backend); + backend->bookDisplay = new GTKEntryDisp(widgets.html_book, backend); + backend->dictDisplay = new GTKEntryDisp(widgets.html_dict, backend); } const char *main_get_module_language(const char *module_name) @@ -1391,8 +1457,6 @@ return backend->module_get_language(module_name); } - - /****************************************************************************** * Name * main_check_for_option @@ -1409,7 +1473,7 @@ * gint */ -gint main_check_for_option(const gchar * mod_name, const gchar * key, const gchar * option) +gint main_check_for_option(const gchar *mod_name, const gchar *key, const gchar *option) { return backend->has_option(mod_name, key, option); } @@ -1430,7 +1494,7 @@ * gint */ -gint main_check_for_global_option(const gchar * mod_name, const gchar * option) +gint main_check_for_global_option(const gchar *mod_name, const gchar *option) { return backend->has_global_option(mod_name, option); } @@ -1451,7 +1515,7 @@ * int */ -int main_is_module(char * mod_name) +int main_is_module(char *mod_name) { return backend->is_module(mod_name); } @@ -1502,6 +1566,8 @@ return mod->isSearchOptimallySupported("God", -4, 0, 0); } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * get_mod_about_info @@ -1518,45 +1584,46 @@ * gchar * */ -char *main_get_mod_about_info(char * mod_name) +char *main_get_mod_about_info(char *mod_name) { - return backend->get_config_entry(mod_name, (char*)"About"); + return backend->get_config_entry(mod_name, (char *)"About"); } +#endif -char *main_get_mod_config_entry(const char * module_name, - const char * entry) +char *main_get_mod_config_entry(const char *module_name, + const char *entry) { - return backend->get_config_entry((char*)module_name, (char*)entry); + return backend->get_config_entry((char *)module_name, (char *)entry); } -char *main_get_mod_config_file(const char * module_name, - const char * moddir) +char *main_get_mod_config_file(const char *module_name, + const char *moddir) { -#ifdef SWORD_SHOULD_HAVE_A_WAY_TO_GET_A_CONF_FILENAME_FROM_A_MODNAME - return backend->get_config_file((char*)module_name, (char*)moddir); +#ifdef SWORD_SHOULD_HAVE_A_WAY_TO_GET_A_CONF_FILENAME_FROM_A_MODNAME + return backend->get_config_file((char *)module_name, (char *)moddir); #else GDir *dir; - const gchar *ent; SWBuf name; - name = moddir; + name = moddir; name += "/mods.d"; if ((dir = g_dir_open(name, 0, NULL))) { - g_dir_rewind(dir); + const gchar *ent; + + g_dir_rewind(dir); while ((ent = g_dir_read_name(dir))) { - name = moddir; + name = moddir; name += "/mods.d/"; name += ent; SWConfig *config = new SWConfig(name.c_str()); if (config->Sections.find(module_name) != - config->Sections.end()) { - gchar *ret_name = g_strdup(ent); + config->Sections.end()) { + gchar *ret_name = g_strdup(ent); g_dir_close(dir); delete config; return ret_name; - } - else - delete config; + } else + delete config; } g_dir_close(dir); } @@ -1564,9 +1631,9 @@ #endif } -int main_is_mod_rtol(const char * module_name) +int main_is_mod_rtol(const char *module_name) { - char *direction = backend->get_config_entry((char*)module_name, (char*)"Direction"); + char *direction = backend->get_config_entry((char *)module_name, (char *)"Direction"); return (direction && !strcmp(direction, "RtoL")); } @@ -1594,9 +1661,8 @@ return retval; } - -#define CIPHER_INTRO \ -_("Locked Module.\n\nYou are opening a module which requires a key.\n\nThe module is locked, meaning that the content is encrypted by its publisher, and you must enter its key in order for the content to become useful. This key should have been received by you on the web page which confirmed your purchase, or perhaps sent via email after purchase.\n\nPlease enter the key in the dialog.") +#define CIPHER_INTRO \ + _("Locked Module.\n\nYou are opening a module which requires a key.\n\nThe module is locked, meaning that the content is encrypted by its publisher, and you must enter its key in order for the content to become useful. This key should have been received by you on the web page which confirmed your purchase, or perhaps sent via email after purchase.\n\nPlease enter the key in the dialog.") /****************************************************************************** * Name @@ -1616,29 +1682,26 @@ void main_check_unlock(const char *mod_name, gboolean conditional) { - gchar *cipher_old, *cipher_key; - - cipher_old = main_get_mod_config_entry(mod_name, "CipherKey"); + gchar *cipher_old = main_get_mod_config_entry(mod_name, "CipherKey"); /* if forced by the unlock menu item, or it's present but empty... */ - if (!conditional || + if (!conditional || ((cipher_old != NULL) && (*cipher_old == '\0'))) { if (conditional) { GtkWidget *dialog; - dialog = gtk_message_dialog_new_with_markup - (NULL, /* no need for a parent window */ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - CIPHER_INTRO); + dialog = gtk_message_dialog_new_with_markup(NULL, /* no need for a parent window */ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + CIPHER_INTRO); g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show(dialog); } - cipher_key = gui_add_cipher_key(mod_name, cipher_old); + gchar *cipher_key = gui_add_cipher_key(mod_name, cipher_old); if (cipher_key) { ModuleCacheErase(mod_name); redisplay_to_realign(); @@ -1648,7 +1711,6 @@ g_free(cipher_old); } - /****************************************************************************** * Name * main_get_striptext @@ -1670,7 +1732,8 @@ return backend->get_strip_text(module_name, key); } - +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * main_get_striptext @@ -1691,6 +1754,7 @@ { return backend->get_strip_text_from_string(module_name, string); } +#endif /****************************************************************************** * Name @@ -1713,7 +1777,6 @@ return backend->get_render_text(module_name, key); } - /****************************************************************************** * Name * main_get_raw_text @@ -1735,6 +1798,8 @@ return backend->get_raw_text(module_name, key); } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * main_get_raw_text @@ -1755,6 +1820,7 @@ { return backend->get_key_from_offset(offset); } +#endif /****************************************************************************** * Name @@ -1772,13 +1838,12 @@ * int */ -int main_get_mod_type(char * mod_name) +int main_get_mod_type(char *mod_name) { return backend->module_type(mod_name); } - /****************************************************************************** * Name * main_get_module_description @@ -1795,7 +1860,7 @@ * gchar * */ -const char *main_get_module_description(const char * module_name) +const char *main_get_module_description(const char *module_name) { return backend->module_description(module_name); } @@ -1829,8 +1894,8 @@ // // "\333\260" is farsi "zero". // - char *d, *f, *farsi = g_new(char, 2*(strlen(digits)+1)); - // 2 "chars" per farsi-displayed digit + slop. + char *d, *f, *farsi = g_new(char, 2 * (strlen(digits) + 1)); + // 2 "chars" per farsi-displayed digit + slop. for (d = digits, f = farsi; *d; ++d) { *(f++) = '\333'; @@ -1843,6 +1908,8 @@ return digits; } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * main_deformat_number @@ -1872,13 +1939,14 @@ int result = 0; d = digitstring; while (*d) { - result = 10*result + (*(++d) - '\260'); - ++d; + result = 10 * result + (*(++d) - '\260'); + ++d; } return result; } return atoi(digitstring); } +#endif /****************************************************************************** * Name @@ -1928,7 +1996,7 @@ */ gboolean main_is_Bible_key(const gchar *name, const gchar *key) { - return (gboolean)(backend->is_Bible_key(name, key, settings.currentverse) != 0); + return (gboolean)(backend->is_Bible_key(name, key, settings.currentverse) != 0); } /****************************************************************************** diff -Nru xiphos-4.0.0+dfsg1/src/main/sword.h xiphos-4.0.4+dfsg1/src/main/sword.h --- xiphos-4.0.0+dfsg1/src/main/sword.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sword.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword.h - glue * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -48,7 +48,7 @@ #define DIALOG_DICTIONARY_TYPE 9 #define DIALOG_BOOK_TYPE 10 #define DIALOG_SEARCH_PREVIEW_TYPE 11 -#define PRAYERLIST_TYPE 12 +#define PRAYERLIST_TYPE 12 /* these strings are not seen by users */ /* they are returned by Sword in module->Type() */ @@ -56,7 +56,7 @@ #define COMM_MODS "Commentaries" #define DICT_MODS "Lexicons / Dictionaries" #define BOOK_MODS "Generic Books" - + #define UTF_8 "UTF-8" extern char *OLD_CODESET; extern char *sword_locale; @@ -66,55 +66,68 @@ /*** function prototypes ***/ -void main_book_heading(char * mod_name); -void main_chapter_heading(char * mod_name); -void main_delete_note( const gchar * module_name, - const gchar * key_str); -void main_save_note(const gchar * module_name, const gchar * key_str, - const gchar * note_str ); -GtkWidget *main_dictionary_drop_down_new(char * mod_name, char * old_key); +void main_add_abbreviation(const char *name, + const char *abbreviation); +const char *main_get_abbreviation(const char *name); +const char *main_get_name(const char *abbreviation); + +void main_book_heading(char *mod_name); +void main_chapter_heading(char *mod_name); +void main_delete_note(const gchar *module_name, + const gchar *key_str); +void main_save_note(const gchar *module_name, + const gchar *key_str, const gchar *note_str); +GtkWidget *main_dictionary_drop_down_new(char *mod_name, + char *old_key); char *main_get_path_to_mods(void); const char *main_get_sword_version(void); void main_shutdown_backend(void); -void main_set_module_unlocked(const char * mod_name, char * key); -void main_save_module_key(const char * mod_name, char * key); +void main_set_module_unlocked(const char *mod_name, char *key); +void main_save_module_key(const char *mod_name, char *key); char *main_getText(char *key); char *main_getShortText(char *key); -gchar *main_update_nav_controls(const char *module_name, const gchar *key); +gchar *main_update_nav_controls(const char *module_name, + const gchar *key); char *main_get_active_pane_key(void); char *main_get_active_pane_module(void); char *set_sword_locale(const char *sys_locale); void main_init_backend(void); -int main_is_mod_rtol(const char * module_name); +int main_is_mod_rtol(const char *module_name); char *main_module_name_from_description(char *description); -char *main_get_search_results_text(char * mod_name, char * key); -void main_display_book(const char * mod_name, const char * key); //, unsigned long offset); -void main_display_commentary(const char * mod_name, const char * key); -void main_display_dictionary(const char * mod_name, const char * key); -void main_display_bible(const char * mod_name, const char * key); +char *main_get_search_results_text(char *mod_name, char *key); +void main_display_book(const char *mod_name, const char *key); //, unsigned long offset); +void main_display_commentary(const char *mod_name, + const char *key); +void main_display_dictionary(const char *mod_name, + const char *key); +void main_display_bible(const char *mod_name, const char *key); void main_display_devotional(void); void main_setup_displays(void); -void main_dictionary_entry_changed(char * mod_name); +void main_dictionary_entry_changed(char *mod_name); void main_dictionary_button_clicked(gint direction); const char *main_get_module_language(const char *module_name); -int main_check_for_option(const char * mod_name, const char * key, const char * option); -int main_check_for_global_option(const char * mod_name, const char * option); +int main_check_for_option(const char *mod_name, const char *key, + const char *option); +int main_check_for_global_option(const char *mod_name, + const char *option); int main_has_cipher_tag(char *mod_name); void main_check_unlock(const char *mod_name, gboolean conditional); -int main_is_module(char * mod_name); +int main_is_module(char *mod_name); int main_has_search_framework(char *mod_name); int main_optimal_search(char *mod_name); -char *main_get_mod_config_entry(const char * module_name, - const char * entry); -char *main_get_mod_config_file(const char * module_name, - const char * moddir); -char *main_get_mod_about_info(char * mod_name); +char *main_get_mod_config_entry(const char *module_name, + const char *entry); +char *main_get_mod_config_file(const char *module_name, + const char *moddir); +char *main_get_mod_about_info(char *mod_name); char *main_get_striptext(char *module_name, char *key); -char *main_get_striptext_from_string(char *module_name, char *string); -char *main_get_rendered_text(const char *module_name, const char *key); +char *main_get_striptext_from_string(char *module_name, + char *string); +char *main_get_rendered_text(const char *module_name, + const char *key); char *main_get_raw_text(char *module_name, char *key); -int main_get_mod_type(char * mod_name); -const char *main_get_module_description(const char * module_name); +int main_get_mod_type(char *mod_name); +const char *main_get_module_description(const char *module_name); char *main_get_treekey_local_name(unsigned long offset); char *main_get_book_key_from_offset(unsigned long offset); void main_refresh_all(void); @@ -122,7 +135,8 @@ int main_deformat_number(char *digitstring); void main_flush_widgets_content(void); gboolean main_is_Bible_key(const gchar *name, const gchar *key); -const char* main_get_osisref_from_key(const char *module, const char *key); +const char *main_get_osisref_from_key(const char *module, + const char *key); const char *main_get_language_map(const char *language); char **main_get_module_language_list(void); void main_init_language_map(void); @@ -130,33 +144,29 @@ #ifdef __cplusplus } #endif - /* * waf configure -chatty to generate tracing. */ #ifdef CHATTY -# define XI_message(x) g_message x -# define XI_warning(x) g_warning x -# define XI_print(x) g_print x -# define XI_error(x) g_error x +#define XI_message(x) g_message x +#define XI_warning(x) g_warning x +#define XI_print(x) g_print x +#define XI_error(x) g_error x #else -# define XI_message(x) -# define XI_warning(x) -# define XI_print(x) -# define XI_error(x) +#define XI_message(x) +#define XI_warning(x) +#define XI_print(x) +#define XI_error(x) #endif - #ifdef WIN32 -#define Mkdir(d,m) g_mkdir(d,m) -#define DOTSWORD "Sword" -#define access(d,m) g_access(d,m) +#define Mkdir(d, m) g_mkdir(d, m) +#define DOTSWORD "Sword" +#define access(d, m) g_access(d, m) #else -#define Mkdir(d,m) mkdir(d,m) -#define DOTSWORD ".sword" +#define Mkdir(d, m) mkdir(d, m) +#define DOTSWORD ".sword" #endif /* WIN32 */ - /* we can now use "HOME" everywhere again, since we aggressively set it for WIN32. */ -#define HOMEVAR "HOME" - +#define HOMEVAR "HOME" #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/sword_treekey.cc xiphos-4.0.4+dfsg1/src/main/sword_treekey.cc --- xiphos-4.0.0+dfsg1/src/main/sword_treekey.cc 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sword_treekey.cc 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_treekey.cc - treekey stuff for book editor * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include #endif @@ -35,7 +34,6 @@ #include #include - #include "main/mod_mgr.h" #include "main/sword_treekey.h" #include "main/settings.h" @@ -55,9 +53,7 @@ using sword::SWModule; #endif - -enum -{ +enum { COL_OPEN_PIXBUF, COL_CLOSED_PIXBUF, COL_CAPTION, @@ -70,227 +66,230 @@ static gchar buf[256]; static gchar *tmpbuf; - - - - - -static void add_leaf_node_to_treeview (GtkTreeStore * model, - GtkTreeIter * iter) -{ /* has no children */ - gtk_tree_store_set (GTK_TREE_STORE (model), - iter, - COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, - COL_CLOSED_PIXBUF, NULL, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, -1); -} - -static void add_parent_to_treeview (GtkTreeStore * model, GtkTreeIter * iter) -{ - gtk_tree_store_set (GTK_TREE_STORE (model), - iter, - COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, - COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, - COL_CAPTION, (gchar *) tmpbuf, - COL_MODULE, (gchar *) mod_name, - COL_OFFSET, (gchar *) buf, -1); +static void add_leaf_node_to_treeview(GtkTreeStore *model, + GtkTreeIter *iter) +{ /* has no children */ + gtk_tree_store_set(GTK_TREE_STORE(model), + iter, + COL_OPEN_PIXBUF, pixbufs->pixbuf_helpdoc, + COL_CLOSED_PIXBUF, NULL, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); +} + +static void add_parent_to_treeview(GtkTreeStore *model, GtkTreeIter *iter) +{ + gtk_tree_store_set(GTK_TREE_STORE(model), + iter, + COL_OPEN_PIXBUF, pixbufs->pixbuf_closed, + COL_CLOSED_PIXBUF, pixbufs->pixbuf_closed, + COL_CAPTION, (gchar *)tmpbuf, + COL_MODULE, (gchar *)mod_name, + COL_OFFSET, (gchar *)buf, -1); } -static void load_treeview (GtkTreeStore * model, GtkTreeIter * parent, - TreeKeyIdx treeKey, int level = 1) +static void load_treeview(GtkTreeStore *model, GtkTreeIter *parent, + TreeKeyIdx treeKey, int level = 1) { GtkTreeIter iter; /*if (!target) target = &treeKey;*/ - sprintf (buf, "%lu", treeKey.getOffset ()); - tmpbuf = (char *) treeKey.getLocalName (); + sprintf(buf, "%lu", treeKey.getOffset()); + tmpbuf = (char *)treeKey.getLocalName(); if (atol(buf) == 0) tmpbuf = mod_name; //XI_message(("\nlocal_name: %d\noffset: %s",strlen(tmpbuf),buf)); - if (treeKey.hasChildren ()) { - add_parent_to_treeview (model, parent); + if (treeKey.hasChildren()) { + add_parent_to_treeview(model, parent); } else { - add_leaf_node_to_treeview (model, parent); + add_leaf_node_to_treeview(model, parent); } - if (treeKey.firstChild ()) { - gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent); - load_treeview (model, &iter, treeKey, level + 1); - treeKey.parent (); + if (treeKey.firstChild()) { + gtk_tree_store_append(GTK_TREE_STORE(model), &iter, parent); + load_treeview(model, &iter, treeKey, level + 1); + treeKey.parent(); } - if (treeKey.nextSibling ()) { - gtk_tree_store_insert_after (model, &iter, NULL, parent); - load_treeview (model, &iter, treeKey, level); + if (treeKey.nextSibling()) { + gtk_tree_store_insert_after(model, &iter, NULL, parent); + load_treeview(model, &iter, treeKey, level); } - } /********************************* *************************************/ -void setEntryText (RawGenBook * book, const gchar * text) +void setEntryText(RawGenBook *book, const gchar *text) { - TreeKeyIdx *treeKey = (TreeKeyIdx *) (SWKey *) (*book); - if (treeKey->getOffset ()) { + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); + if (treeKey->getOffset()) { (*book) << text; } } -void appendSibbling (TreeKeyIdx * treeKey, const gchar * name) -{ - if (treeKey->getOffset ()) { - treeKey->append (); - treeKey->setLocalName (name); - treeKey->save (); +#if 0 +// unneeded at this time. disabled to silence cppcheck. +void appendSibbling(TreeKeyIdx *treeKey, const gchar *name) +{ + if (treeKey->getOffset()) { + treeKey->append(); + treeKey->setLocalName(name); + treeKey->save(); } } +#endif -void appendChild (TreeKeyIdx * treeKey, const gchar * name) +void appendChild(TreeKeyIdx *treeKey, const gchar *name) { - treeKey->appendChild (); - treeKey->setLocalName (name); - treeKey->save (); - XI_message (("name: %s\nlocalName: %s", name, - treeKey->getLocalName ())); + treeKey->appendChild(); + treeKey->setLocalName(name); + treeKey->save(); + XI_message(("name: %s\nlocalName: %s", name, + treeKey->getLocalName())); } - -void setLocalName (TreeKeyIdx * treeKey, char *new_name) +void setLocalName(TreeKeyIdx *treeKey, char *new_name) { - treeKey->setLocalName (buf); - treeKey->save (); + treeKey->setLocalName(buf); + treeKey->save(); } -unsigned long main_treekey_remove (char *book, char *name, char * offset) +unsigned long main_treekey_remove(char *book, char *name, char *offset) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */ + if (!g_ascii_isdigit(offset[0])) + return 0; /* make sure offset is a number */ if (!mod) return 0; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); - treekey->setOffset (atol(offset)); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); + treekey->setOffset(atol(offset)); mod->setKey(treekey); - mod->getKeyText(); //snap to entry + mod->getKeyText(); //snap to entry mod->deleteEntry(); treekey->remove(); return treekey->getOffset(); } -unsigned long main_treekey_append_sibling (char *book, char *name, char * offset) +unsigned long main_treekey_append_sibling(char *book, char *name, char *offset) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */ + if (!g_ascii_isdigit(offset[0])) + return 0; /* make sure offset is a number */ if (!mod) return 0; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); - treekey->setOffset (atol(offset)); - XI_message (("offset1: %ld", treekey->getOffset())); - treekey->append (); - treekey->setLocalName (name); - treekey->save (); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); + treekey->setOffset(atol(offset)); + XI_message(("offset1: %ld", treekey->getOffset())); + treekey->append(); + treekey->setLocalName(name); + treekey->save(); mod->setKey(treekey); - mod->getKeyText(); //snap to entry + mod->getKeyText(); //snap to entry (*mod) << name; - XI_message (("offset2: %ld", treekey->getOffset())); + XI_message(("offset2: %ld", treekey->getOffset())); return treekey->getOffset(); } - -unsigned long main_treekey_append_child (char *book, char *name, char * offset) +unsigned long main_treekey_append_child(char *book, char *name, char *offset) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */ + if (!g_ascii_isdigit(offset[0])) + return 0; /* make sure offset is a number */ if (!mod) return 0; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); - treekey->setOffset (atol(offset)); - treekey->appendChild (); - treekey->setLocalName (name); - treekey->save (); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); + treekey->setOffset(atol(offset)); + treekey->appendChild(); + treekey->setLocalName(name); + treekey->save(); mod->setKey(treekey); - mod->getKeyText(); //snap to entry + mod->getKeyText(); //snap to entry (*mod) << name; - XI_message (("book: %s\nlocalName: %s\noffset :%s", book, name, - offset)); + XI_message(("book: %s\nlocalName: %s\noffset :%s", book, name, + offset)); return treekey->getOffset(); } -void main_treekey_set_local_name (char *book, char *name, char * offset) +void main_treekey_set_local_name(char *book, char *name, char *offset) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!g_ascii_isdigit(offset[0])) return; /* make sure offset is a number */ + if (!g_ascii_isdigit(offset[0])) + return; /* make sure offset is a number */ if (!mod) return; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); - treekey->setOffset (atol(offset)); - treekey->setLocalName (name); - treekey->save (); - - XI_message (("book: %s\nlocalName: %s\noffset :%s", book, name, - offset)); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); + treekey->setOffset(atol(offset)); + treekey->setLocalName(name); + treekey->save(); + XI_message(("book: %s\nlocalName: %s\noffset :%s", book, name, + offset)); } -char *main_get_book_raw_text (char *book, char * offset) +char *main_get_book_raw_text(char *book, char *offset) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!g_ascii_isdigit(offset[0])) return NULL; /* make sure offset is a number */ + if (!g_ascii_isdigit(offset[0])) + return NULL; /* make sure offset is a number */ if (!mod) return NULL; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); TreeKeyIdx treenode = *treekey; - treenode.setOffset(atol(offset)); + treenode.setOffset(atol(offset)); mod->setKey(treenode); - mod->getKeyText(); //snap to entry + mod->getKeyText(); //snap to entry return strdup(mod->getRawEntry()); } -void main_treekey_save_book_text (char *book, char * offset, char * text) +void main_treekey_save_book_text(char *book, char *offset, char *text) { - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - if (!offset || !g_ascii_isdigit(offset[0])) return; /* make sure offset is a number */ + if (!offset || !g_ascii_isdigit(offset[0])) + return; /* make sure offset is a number */ if (!mod || (atol(offset) == 0)) return; - TreeKeyIdx *treekey = (TreeKeyIdx *) mod->createKey (); + TreeKeyIdx *treekey = (TreeKeyIdx *)mod->createKey(); TreeKeyIdx treenode = *treekey; - treenode.setOffset(atol(offset)); + treenode.setOffset(atol(offset)); mod->setKey(treenode); - mod->getKeyText(); //snap to entry + mod->getKeyText(); //snap to entry (*mod) << text; - if (settings.book_mod && book - && !strcmp(settings.book_mod,book)){ + + // on recommendation of cppcheck, test of "book" for non-NULL + // was removed here. this should be ok because above we use + // book as Modules subscript. so both or neither blows up. + if (settings.book_mod && !strcmp(settings.book_mod, book)) { XI_message(("main_treekey_save_book_text")); main_display_book(book, offset); } @@ -298,31 +297,30 @@ /********************************* *************************************/ - -void main_load_book_tree_in_editor (GtkTreeView * treeview, char *book) +void main_load_book_tree_in_editor(GtkTreeView *treeview, char *book) { GtkTreeIter parent; GtkTreeStore *store; - SWMgr *mgr = backend->get_mgr (); + SWMgr *mgr = backend->get_mgr(); SWModule *mod = mgr->Modules[book]; - XI_message(("main_load_book_tree_in_editor book: %s", book )); + XI_message(("main_load_book_tree_in_editor book: %s", book)); if (!mod) return; tmpbuf = book; mod_name = book; - TreeKeyIdx root = *((TreeKeyIdx *) mod->createKey ()); - root.root (); + TreeKeyIdx root = *((TreeKeyIdx *)mod->createKey()); + root.root(); - store = gtk_tree_store_new (N_COLUMNS, - GDK_TYPE_PIXBUF, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), - GTK_TREE_MODEL (store)); - gtk_tree_store_clear (store); - gtk_tree_store_append (GTK_TREE_STORE (store), &parent, NULL); - load_treeview (store, &parent, root); + store = gtk_tree_store_new(N_COLUMNS, + GDK_TYPE_PIXBUF, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), + GTK_TREE_MODEL(store)); + gtk_tree_store_clear(store); + gtk_tree_store_append(GTK_TREE_STORE(store), &parent, NULL); + load_treeview(store, &parent, root); } diff -Nru xiphos-4.0.0+dfsg1/src/main/sword_treekey.h xiphos-4.0.4+dfsg1/src/main/sword_treekey.h --- xiphos-4.0.0+dfsg1/src/main/sword_treekey.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/sword_treekey.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_treekey.h - treekey stuff for book editor * - * Copyright (C) 2008-2014 Xiphos Developer Team + * Copyright (C) 2008-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,20 +23,24 @@ #define _SWORD_TREEKEY_HH #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -unsigned long main_treekey_remove (char *book, char *name, char * offset); -unsigned long main_treekey_append_sibling (char *book, char *name, char * offset); -unsigned long main_treekey_append_child (char *book, char *name, char * offset); -void main_treekey_set_local_name(char * book, char * name, char * offset); -void main_load_book_tree_in_editor (GtkTreeView * treeview, char * book); -char *main_get_book_raw_text (char *book, char * offset); -void main_treekey_save_book_text (char *book, char * offset, char * text); +unsigned long main_treekey_remove(char *book, char *name, + char *offset); +unsigned long main_treekey_append_sibling(char *book, char *name, + char *offset); +unsigned long main_treekey_append_child(char *book, char *name, + char *offset); +void main_treekey_set_local_name(char *book, char *name, + char *offset); +void main_load_book_tree_in_editor(GtkTreeView *treeview, + char *book); +char *main_get_book_raw_text(char *book, char *offset); +void main_treekey_save_book_text(char *book, char *offset, + char *text); #ifdef __cplusplus } #endif - #endif /* _SWORD_TREEKEY_HH */ diff -Nru xiphos-4.0.0+dfsg1/src/main/tab_history.c xiphos-4.0.4+dfsg1/src/main/tab_history.c --- xiphos-4.0.0+dfsg1/src/main/tab_history.c 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/tab_history.c 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tab_history.c - add, remove and navigate history * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,6 @@ #include - #include "gui/main_menu.h" #include "gui/main_window.h" #include "gui/tabbed_browser.h" @@ -43,8 +42,8 @@ #include "main/navbar_versekey.h" /* de-uglify all references to button sensitivitiy */ -# define BUTTON_BACK navbar_versekey.button_history_back -# define BUTTON_FORW navbar_versekey.button_history_next +#define BUTTON_BACK navbar_versekey.button_history_back +#define BUTTON_FORW navbar_versekey.button_history_next /****************************************************************************** * Name @@ -64,8 +63,7 @@ */ void -on_menu_historyitem_activate(GtkMenuItem * menuitem, - gpointer user_data) +on_menu_historyitem_activate(GtkMenuItem *menuitem, gpointer user_data) { main_change_verse_tab_history(GPOINTER_TO_INT(user_data)); } @@ -91,7 +89,7 @@ PASSAGE_TAB_INFO *tab = cur_passage_tab; //gui_remove_menu_items(_("H_istory/"), - // tab->history_items + 1); + // tab->history_items + 1); //gui_add_separator2menu(widgets.app, _("H_istory/C_lear")); /* set sensitivity of history buttons */ @@ -103,7 +101,6 @@ tab->first_back_click = TRUE; } - /****************************************************************************** * Name * main_update_tab_history_menu @@ -122,17 +119,17 @@ void main_update_tab_history_menu(gpointer data) { - PASSAGE_TAB_INFO *tab = (PASSAGE_TAB_INFO*) data; + PASSAGE_TAB_INFO *tab = (PASSAGE_TAB_INFO *)data; /* set sensitivity of history buttons */ gtk_widget_set_sensitive(BUTTON_BACK, (tab->current_history_item > 0)); gtk_widget_set_sensitive(BUTTON_FORW, - (tab->current_history_item < (tab->history_items - 1))); + (tab->current_history_item < + (tab->history_items - 1))); } - /****************************************************************************** * Name * main_add_tab_history_item @@ -151,12 +148,13 @@ void main_add_tab_history_item(gpointer data) { gint i; - PASSAGE_TAB_INFO *tab = (PASSAGE_TAB_INFO*) data; + PASSAGE_TAB_INFO *tab = (PASSAGE_TAB_INFO *)data; /* check to see if item is already in list if so do nothing except set button sensitivity */ for (i = 0; i < tab->history_items; ++i) { - if (!strcmp(tab->history_list[i].verseref, tab->text_commentary_key)) { + if (!strcmp(tab->history_list[i].verseref, + tab->text_commentary_key)) { tab->current_history_item = i; main_update_tab_history_menu(data); return; @@ -172,11 +170,14 @@ } /* add item to history menu */ - strcpy(tab->history_list[tab->history_items].verseref, tab->text_commentary_key); + strcpy(tab->history_list[tab->history_items].verseref, + tab->text_commentary_key); if (tab->text_mod) - strcpy(tab->history_list[tab->history_items].textmod, tab->text_mod); + strcpy(tab->history_list[tab->history_items].textmod, + tab->text_mod); if (tab->commentary_mod) - strcpy(tab->history_list[tab->history_items].commod, tab->commentary_mod); + strcpy(tab->history_list[tab->history_items].commod, + tab->commentary_mod); tab->current_history_item = tab->history_items; ++tab->history_items; @@ -202,27 +203,29 @@ */ void main_fake_tab_history_item(char *reference) { - PASSAGE_TAB_INFO *tab = cur_passage_tab; - int i; + PASSAGE_TAB_INFO *tab = cur_passage_tab; - /* if we have hit max length, dispose of oldest */ - if (tab->history_items == TABHISTORYLENGTH) { - for (i = 0; i < (TABHISTORYLENGTH - 1); ++i) { - tab->history_list[i] = tab->history_list[i + 1]; + /* if we have hit max length, dispose of oldest */ + if (tab->history_items == TABHISTORYLENGTH) { + int i; + for (i = 0; i < (TABHISTORYLENGTH - 1); ++i) { + tab->history_list[i] = tab->history_list[i + 1]; + } + --tab->history_items; } - --tab->history_items; - } - /* add item to history menu */ - strcpy(tab->history_list[tab->history_items].verseref, reference); - if (tab->text_mod) - strcpy(tab->history_list[tab->history_items].textmod, tab->text_mod); - if (tab->commentary_mod) - strcpy(tab->history_list[tab->history_items].commod, tab->commentary_mod); - - ++tab->history_items; - /* do not update what's current in history list. */ - main_update_tab_history_menu(tab); + /* add item to history menu */ + strcpy(tab->history_list[tab->history_items].verseref, reference); + if (tab->text_mod) + strcpy(tab->history_list[tab->history_items].textmod, + tab->text_mod); + if (tab->commentary_mod) + strcpy(tab->history_list[tab->history_items].commod, + tab->commentary_mod); + + ++tab->history_items; + /* do not update what's current in history list. */ + main_update_tab_history_menu(tab); } /****************************************************************************** @@ -243,7 +246,7 @@ * void */ -void on_clear_activate(GtkMenuItem * menuitem, gpointer user_data) +void on_clear_activate(GtkMenuItem *menuitem, gpointer user_data) { main_clear_tab_history(); } @@ -265,24 +268,25 @@ * void */ -void on_history_to_verse_list_activate(GtkMenuItem * menuitem, gpointer user_data) +void on_history_to_verse_list_activate(GtkMenuItem *menuitem, + gpointer user_data) { - int i; - gboolean first = TRUE; - GString *list = g_string_new(""); - - for (i = 0; i < cur_passage_tab->history_items; ++i) { - if (!first) - g_string_append_c(list, ';'); - g_string_append(list, cur_passage_tab->history_list[i].verseref); - first = FALSE; - } + int i; + gboolean first = TRUE; + GString *list = g_string_new(""); + + for (i = 0; i < cur_passage_tab->history_items; ++i) { + if (!first) + g_string_append_c(list, ';'); + g_string_append(list, + cur_passage_tab->history_list[i].verseref); + first = FALSE; + } - main_display_verse_list_in_sidebar - (settings.currentverse, settings.MainWindowModule, list->str); + main_display_verse_list_in_sidebar(settings.currentverse, settings.MainWindowModule, list->str); - g_string_free(list, TRUE); - return; + g_string_free(list, TRUE); + return; } GtkWidget *main_versekey_drop_down_new(gpointer data) @@ -292,7 +296,7 @@ GtkWidget *item; PASSAGE_TAB_INFO *tab = NULL; - tab = (PASSAGE_TAB_INFO*) data; + tab = (PASSAGE_TAB_INFO *)data; menu = gtk_menu_new(); item = gtk_menu_item_new_with_label(_("Clear History")); @@ -304,24 +308,25 @@ item = gtk_menu_item_new_with_label(_("History ➛ Verse List")); gtk_widget_show(item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(on_history_to_verse_list_activate), NULL); + G_CALLBACK(on_history_to_verse_list_activate), + NULL); gtk_container_add(GTK_CONTAINER(menu), item); for (i = 0; i < tab->history_items; ++i) { - item = gtk_menu_item_new_with_label(tab->history_list[i].verseref); + item = + gtk_menu_item_new_with_label(tab->history_list[i].verseref); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK - (on_menu_historyitem_activate), - GINT_TO_POINTER(i)); - if (!strcmp(tab->history_list[i].verseref, tab->text_commentary_key)) - gtk_widget_set_sensitive(item,FALSE); + G_CALLBACK(on_menu_historyitem_activate), + GINT_TO_POINTER(i)); + if (!strcmp(tab->history_list[i].verseref, + tab->text_commentary_key)) + gtk_widget_set_sensitive(item, FALSE); } return menu; } - /****************************************************************************** * Name * main_change_verse_tab_history @@ -346,18 +351,20 @@ tab->current_history_item = historynum; settings.addhistoryitem = tab->first_back_click; - XI_print(("commod = %s\n",tab->history_list[historynum].commod)); - XI_print(("textmod = %s\n",tab->history_list[historynum].textmod)); - - key = main_update_nav_controls(tab->history_list[historynum].textmod, - tab->history_list[historynum].verseref); + XI_print(("commod = %s\n", tab->history_list[historynum].commod)); + XI_print(("textmod = %s\n", + tab->history_list[historynum].textmod)); + + key = + main_update_nav_controls(tab->history_list[historynum].textmod, + tab->history_list[historynum].verseref); main_display_commentary(tab->history_list[historynum].commod, key); main_display_bible(tab->history_list[historynum].textmod, key); main_keep_bibletext_dialog_in_sync(key); - if (key) g_free(key); + if (key) + g_free(key); } - /****************************************************************************** * Name * main_navigate_tab_history @@ -398,6 +405,6 @@ } } - main_update_tab_history_menu((gpointer) tab); + main_update_tab_history_menu((gpointer)tab); settings.addhistoryitem = TRUE; } diff -Nru xiphos-4.0.0+dfsg1/src/main/tab_history.h xiphos-4.0.4+dfsg1/src/main/tab_history.h --- xiphos-4.0.0+dfsg1/src/main/tab_history.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/tab_history.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tab_history.h - add, remove and navigate history * - * Copyright (C) 2005-2014 Xiphos Developer Team + * Copyright (C) 2005-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,20 +26,22 @@ extern "C" { #endif -#define TABHISTORYLENGTH 50 +#define TABHISTORYLENGTH 50 -struct _tab_history { - gchar verseref[TABHISTORYLENGTH]; - gchar textmod[TABHISTORYLENGTH]; - gchar commod[TABHISTORYLENGTH]; +struct _tab_history +{ + gchar verseref[TABHISTORYLENGTH]; + gchar textmod[TABHISTORYLENGTH]; + gchar commod[TABHISTORYLENGTH]; }; typedef struct _tab_history TAB_HISTORY; void on_menu_historyitem_activate(GtkMenuItem *menuitem, - gpointer user_data); + gpointer user_data); void main_update_tab_history_menu(gpointer data); -void on_clear_activate(GtkMenuItem * menuitem, gpointer user_data); -void on_history_to_verse_list_activate(GtkMenuItem * menuitem, gpointer user_data); +void on_clear_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_history_to_verse_list_activate(GtkMenuItem *menuitem, + gpointer user_data); GtkWidget *main_versekey_drop_down_new(gpointer data); void main_clear_tab_history(void); void main_add_tab_history_item(gpointer data); @@ -50,5 +52,4 @@ #ifdef __cplusplus } #endif - #endif diff -Nru xiphos-4.0.0+dfsg1/src/main/url.cc xiphos-4.0.4+dfsg1/src/main/url.cc --- xiphos-4.0.0+dfsg1/src/main/url.cc 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/url.cc 2015-08-23 23:50:38.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * url.cc - support functions * - * Copyright (C) 2004-2014 Xiphos Developer Team + * Copyright (C) 2004-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -44,7 +44,6 @@ #include "editor/slib-editor.h" #endif - #include "gui/about_modules.h" #include "gui/xiphos.h" #include "gui/widgets.h" @@ -74,7 +73,6 @@ using namespace sword; - /****************************************************************************** * Name * @@ -91,22 +89,22 @@ * */ -static void alert_url_not_found(const gchar * url) +static void alert_url_not_found(const gchar *url) { GS_DIALOG *dialog; GString *dialog_text = g_string_new(NULL); dialog = gui_new_dialog(); dialog->stock_icon = -#ifdef HAVE_GTK_310 - (gchar*)"dialog-information"; +#ifdef HAVE_GTK_310 + (gchar *)"dialog-information"; #else - (gchar*) GTK_STOCK_DIALOG_INFO; -#endif + (gchar *)GTK_STOCK_DIALOG_INFO; +#endif g_string_printf(dialog_text, - "%s\n\n%s", - _("URL not found:"), - url); + "%s\n\n%s", + _("URL not found:"), + url); dialog->label_top = dialog_text->str; dialog->ok = TRUE; @@ -132,13 +130,12 @@ * gint */ - static gint show_studypad(const gchar * filename, gboolean clicked) +static gint show_studypad(const gchar *filename, gboolean clicked) { editor_create_new(filename, NULL, STUDYPAD_EDITOR); return 1; } - /****************************************************************************** * Name * @@ -156,21 +153,20 @@ */ const char *display_progs[] = { - "/usr/bin/gvfs-open", - "/usr/bin/gnome-open", - "/usr/bin/display", - NULL -}; + "/usr/bin/gvfs-open", + "/usr/bin/gnome-open", + "/usr/bin/display", + NULL}; -static gint show_separate_image(const gchar * filename, gboolean clicked) +static gint show_separate_image(const gchar *filename, gboolean clicked) { if (clicked) { #ifdef WIN32 gboolean result; gchar *win_path = g_strdup(filename); //ShellExecute can handle all / or all \\ but not a combination - win_path = g_strdelimit(win_path, "/", '\\'); - result = xiphos_open_default ((const gchar*)win_path); + win_path = g_strdelimit(win_path, "/", '\\'); + result = xiphos_open_default((const gchar *)win_path); g_free(win_path); if (result == FALSE) { gui_generic_warning((char *)"Could not display that image"); @@ -212,12 +208,11 @@ g_string_free(cmd, TRUE); #endif } else { - gui_set_statusbar (filename); + gui_set_statusbar(filename); } return 1; } - /****************************************************************************** * Name * show_mod_info @@ -235,24 +230,23 @@ * gint */ - static gint show_mod_info(const gchar * module, const gchar * description, - gboolean clicked) +static gint show_mod_info(const gchar *module, const gchar *description, + gboolean clicked) { if (clicked) { - XI_print(("module = %s\n",module)); - gui_display_about_module_dialog((gchar*)module); + XI_print(("module = %s\n", module)); + gui_display_about_module_dialog((gchar *)module); } else { /* some mod descriptions contain fun(ny) characters */ GString *desc_clean = hex_decode(description); XI_print(("description = %s\n", desc_clean->str)); - gui_set_statusbar (desc_clean->str); + gui_set_statusbar(desc_clean->str); g_string_free(desc_clean, TRUE); } return 1; } - - /****************************************************************************** +/****************************************************************************** * Name * show_parallel * @@ -268,29 +262,28 @@ * gint */ - static gint show_parallel(const gchar * svalue, const gchar * stype, - gboolean clicked) +static gint show_parallel(const gchar *svalue, const gchar *stype, + gboolean clicked) { - if (!strcmp(stype,"swap")) { + if (!strcmp(stype, "swap")) { if (clicked) { - main_swap_parallel_with_main((gchar *) svalue); + main_swap_parallel_with_main((gchar *)svalue); } else { gchar *buf = g_strdup_printf( - _("Show %s in main window"), svalue); - gui_set_statusbar (buf); + _("Show %s in main window"), svalue); + gui_set_statusbar(buf); g_free(buf); } } - if (!strcmp(stype,"verse")) { + if (!strcmp(stype, "verse")) { if (clicked) { - gtk_entry_set_text(GTK_ENTRY(navbar_parallel.lookup_entry),svalue); + gtk_entry_set_text(GTK_ENTRY(navbar_parallel.lookup_entry), svalue); gtk_widget_activate(navbar_parallel.lookup_entry); } } return 1; } - /****************************************************************************** * Name * show_morph @@ -311,17 +304,16 @@ */ static gint show_morph(const char *module_name, - const gchar *stype, + const gchar *stype, const gchar *svalue, gboolean clicked) { const gchar *modbuf = NULL; - gchar *mybuf = NULL; - if (!strcmp(stype,"Greek") || - strstr(stype,"x-Robinson") || - strstr(stype,"robinson") || - strstr(stype,"Robinson")) { + if (!strcmp(stype, "Greek") || + strstr(stype, "x-Robinson") || + strstr(stype, "robinson") || + strstr(stype, "Robinson")) { if (backend->get_key_testament(module_name, settings.currentverse) == 2) { if (backend->is_module("Robinson")) @@ -333,25 +325,24 @@ } //XI_message(("modbuf = %s", modbuf)); if (clicked) { - main_display_dictionary(modbuf, (gchar*)svalue); + main_display_dictionary(modbuf, (gchar *)svalue); } else { - mybuf = main_get_rendered_text(modbuf, (gchar*)svalue); + gchar *mybuf = main_get_rendered_text(modbuf, (gchar *)svalue); //XI_message(("mybuf = %s", mybuf)); if (mybuf) { main_information_viewer(modbuf, - mybuf, - (gchar*)svalue, - "showMorph", - (gchar*)stype, - NULL, - NULL); + mybuf, + (gchar *)svalue, + "showMorph", + (gchar *)stype, + NULL, + NULL); g_free(mybuf); } } return 1; } - /****************************************************************************** * Name * show_strongs @@ -368,27 +359,19 @@ * gint */ -static gint show_strongs(const gchar * stype, const gchar * svalue, - gboolean clicked) +static gint show_strongs(const gchar *stype, const gchar *svalue, + gboolean clicked) { const gchar *modbuf = NULL; - gchar *mybuf = NULL; - gchar *val = NULL; - - val = g_strdup(svalue); - /*if ((val1 = strchar(val,'|')) != NULL) { - val1 = (val1) ? (val1 + 1) : val; - - }*/ if (!strncmp(settings.MainWindowModule, "NASB", 4)) { - if (!strcmp(stype,"Greek")) + if (!strcmp(stype, "Greek")) modbuf = "NASGreek"; else modbuf = "NASHebrew"; } else { if (stype && (*stype != '\0')) { - if (!strcmp(stype,"Greek")) + if (!strcmp(stype, "Greek")) modbuf = settings.lex_greek; else modbuf = settings.lex_hebrew; @@ -397,44 +380,43 @@ } if (clicked) { - main_display_dictionary(modbuf, (gchar*)svalue); + main_display_dictionary(modbuf, (gchar *)svalue); } else { - mybuf = main_get_rendered_text(modbuf, (gchar*)svalue); + gchar *mybuf = main_get_rendered_text(modbuf, (gchar *)svalue); if (mybuf) { main_information_viewer( - modbuf, - mybuf, - (gchar*)svalue, - "showStrongs", - (gchar*)stype, - NULL, - NULL); + modbuf, + mybuf, + (gchar *)svalue, + "showStrongs", + (gchar *)stype, + NULL, + NULL); g_free(mybuf); } } - g_free(val); + return 1; } - /****************************************************************************** * Name - * note_uri + * show_note * * Synopsis * #include "main/url.hh" * - * gint note_uri(const gchar * url) + * gint show_note(module, passage, stype, svalue, gblooean clicked) * * Description - * + * show a footnote in the previewer. * * Return value * gint */ -static gint show_note(const gchar * module, const gchar * passage, - const gchar * stype, const gchar * svalue, gboolean clicked) +static gint show_note(const gchar *module, const gchar *passage, + const gchar *stype, const gchar *svalue, gboolean clicked) { gchar *tmpbuf = NULL; gchar *buf = NULL; @@ -445,10 +427,10 @@ if (!in_url || !svalue || !*svalue) return 1; - if (!backend->is_module((gchar*)module)) + if (!backend->is_module((gchar *)module)) module = settings.MainWindowModule; - if (passage && (strlen(passage) < 5)) + if (strlen(passage) < 5) passage = settings.currentverse; // @@ -468,56 +450,55 @@ vkey->setChapter(vkey->getChapter() + 1); vkey->setVerse(0); } else - backend->set_module_key((gchar*)module, (gchar*)passage); + backend->set_module_key((gchar *)module, (gchar *)passage); - if (strchr(stype,'x') && clicked) { + if (strchr(stype, 'x') && clicked) { tmpbuf = backend->get_entry_attribute("Footnote", - (gchar*)svalue, + (gchar *)svalue, "refList"); if (tmpbuf) { - main_display_verse_list_in_sidebar(settings. - currentverse, - (gchar*)module, + main_display_verse_list_in_sidebar(settings.currentverse, + (gchar *)module, tmpbuf); g_free(tmpbuf); } - } else if (strchr(stype,'n') && !clicked) { + } else if (strchr(stype, 'n') && !clicked) { tmpbuf = backend->get_entry_attribute("Footnote", - (gchar*)svalue, + (gchar *)svalue, "body"); - buf = backend->render_this_text((gchar*)module,(gchar*)tmpbuf); - if (tmpbuf) g_free(tmpbuf); + buf = backend->render_this_text((gchar *)module, (gchar *)tmpbuf); + if (tmpbuf) + g_free(tmpbuf); if (buf) { - main_information_viewer((gchar*)module, + main_information_viewer((gchar *)module, buf, - (gchar*)svalue, + (gchar *)svalue, "showNote", - (gchar*)stype, + (gchar *)stype, NULL, NULL); - if (buf) g_free(buf); + if (buf) + g_free(buf); } - } else if (strchr(stype,'x') && !clicked) { + } else if (strchr(stype, 'x') && !clicked) { tmpbuf = backend->get_entry_attribute("Footnote", - (gchar*)svalue, + (gchar *)svalue, "refList"); if (settings.xrefs_in_verse_list) { - main_display_verse_list_in_sidebar(settings. - currentverse, - (gchar*)module, + main_display_verse_list_in_sidebar(settings.currentverse, + (gchar *)module, tmpbuf); g_free(tmpbuf); } else { - vlist = chaser = backend->parse_verse_list - (module, tmpbuf, settings.currentverse); + vlist = chaser = backend->parse_verse_list(module, tmpbuf, settings.currentverse); while (chaser != NULL) { buf = g_strdup_printf( "" "%s,
        ", - (gchar*)module, - (const char *) chaser->data, + (gchar *)module, + (const char *)chaser->data, settings.bible_text_color, - (const char *) chaser->data); + (const char *)chaser->data); str = g_string_append(str, buf); g_free(buf); g_free((char *)chaser->data); @@ -528,7 +509,7 @@ buf = g_strdup_printf("" "%s%s
        ", - (gchar*)module, + (gchar *)module, settings.currentverse, settings.bible_text_color, _("Back to "), @@ -536,11 +517,11 @@ str = g_string_append(str, buf); g_free(buf); - main_information_viewer((gchar*)module, + main_information_viewer((gchar *)module, str->str, - (gchar*)svalue, + (gchar *)svalue, "showNote", - (gchar*)stype, + (gchar *)stype, NULL, NULL); } @@ -552,7 +533,6 @@ return 1; } - /****************************************************************************** * Name * reference_uri @@ -569,7 +549,7 @@ * gint */ -static gint show_ref(const gchar * module, const gchar * list, gboolean clicked) +static gint show_ref(const gchar *module, const gchar *list, gboolean clicked) { if (!clicked) return 1; @@ -577,13 +557,11 @@ if (!backend->is_module(module)) module = settings.MainWindowModule; main_display_verse_list_in_sidebar(settings.currentverse, - (gchar*)module, - (gchar*)list); + (gchar *)module, + (gchar *)list); return 1; } - - /****************************************************************************** * Name * show_module_and_key @@ -602,13 +580,13 @@ * gint */ -static int show_module_and_key(const char * module, const char * key, - const char * stype, gboolean clicked) +static int show_module_and_key(const char *module, const char *key, + const char *stype, gboolean clicked) { gint mod_type; - if (module && (strlen((char*)module) < 3) && - backend->is_Bible_key((char*)module, key, settings.currentverse)) { + if (module && (strlen((char *)module) < 3) && + backend->is_Bible_key((char *)module, key, settings.currentverse)) { module = settings.MainWindowModule; } if (!clicked) { @@ -616,61 +594,56 @@ } if (backend->is_module(module)) { - if (!strcmp(stype,"newTab")) { - main_open_bookmark_in_new_tab((gchar*)module, - (gchar*)key); + if (!strcmp(stype, "newTab")) { + main_open_bookmark_in_new_tab((gchar *)module, + (gchar *)key); return 1; } - if (!strcmp(stype,"newDialog")) { - if (module && (main_get_mod_type((gchar*)module) == PERCOM_TYPE)) { - editor_create_new(module,key,TRUE); + if (!strcmp(stype, "newDialog")) { + if (module && (main_get_mod_type((gchar *)module) == PERCOM_TYPE)) { + editor_create_new(module, key, TRUE); return 1; } - main_dialog_goto_bookmark((gchar*)module, - (gchar*)key); + main_dialog_goto_bookmark((gchar *)module, + (gchar *)key); return 1; } - mod_type = backend->module_type((gchar*)module); + mod_type = backend->module_type((gchar *)module); switch (mod_type) { - case TEXT_TYPE: - case COMMENTARY_TYPE: - case PERCOM_TYPE: - if (strpbrk(key, "-;,")) { // >1 verse marked - main_display_verse_list_in_sidebar - (settings.currentverse, - (gchar*)module, (gchar*)key); - } else { - gchar *url = - g_strdup_printf("sword://%s/%s", - (module ? module : ""), - key); - sword_uri(url, TRUE); - g_free(url); - } - break; - case DICTIONARY_TYPE: - main_display_dictionary((gchar*)module, - (gchar*)key); - break; - case BOOK_TYPE: - case PRAYERLIST_TYPE: - main_display_book((gchar*)module, (gchar*)key); - if (gtk_notebook_get_current_page (GTK_NOTEBOOK - (widgets.notebook_comm_book)) - != 1) - gtk_notebook_set_current_page( - GTK_NOTEBOOK (widgets. - notebook_comm_book), - 1); - break; + case TEXT_TYPE: + case COMMENTARY_TYPE: + case PERCOM_TYPE: + if (strpbrk(key, "-;,")) { // >1 verse marked + main_display_verse_list_in_sidebar(settings.currentverse, + (gchar *)module, (gchar *)key); + } else { + gchar *url = + g_strdup_printf("sword://%s/%s", + (module ? module : ""), + key); + sword_uri(url, TRUE); + g_free(url); + } + break; + case DICTIONARY_TYPE: + main_display_dictionary((gchar *)module, + (gchar *)key); + break; + case BOOK_TYPE: + case PRAYERLIST_TYPE: + main_display_book((gchar *)module, (gchar *)key); + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book)) != 1) + gtk_notebook_set_current_page( + GTK_NOTEBOOK(widgets.notebook_comm_book), + 1); + break; } } settings.addhistoryitem = TRUE; return 1; } - - /****************************************************************************** +/****************************************************************************** * Name * * @@ -687,32 +660,35 @@ * gint */ -static gint show_in_previewer(const gchar * url) +static gint show_in_previewer(const gchar *url) { gchar **work_buf = NULL; gchar *mybuf = NULL; - work_buf = g_strsplit (url,"/",4); + work_buf = g_strsplit(url, "/", 4); + + // might be an abbrev. get the real. + const char *real_mod = main_get_name(work_buf[MODULE]); - mybuf = main_get_rendered_text(work_buf[MODULE], work_buf[KEY]); + mybuf = main_get_rendered_text((real_mod ? real_mod : work_buf[MODULE]), + work_buf[KEY]); if (mybuf) { main_information_viewer( - (gchar*)work_buf[MODULE], - mybuf, - (gchar*)work_buf[KEY], - NULL, - NULL, - NULL, - NULL); + (gchar *)(real_mod ? real_mod : work_buf[MODULE]), + mybuf, + (gchar *)work_buf[KEY], + NULL, + NULL, + NULL, + NULL); g_free(mybuf); } g_strfreev(work_buf); return 1; } - /****************************************************************************** * Name * sword_uri @@ -732,43 +708,50 @@ * gint */ -gint sword_uri(const gchar * url, gboolean clicked) +gint sword_uri(const gchar *url, gboolean clicked) { const gchar *key = NULL; gchar *tmpkey = NULL; gint mod_type; gint verse_count; gchar **work_buf = NULL; + gchar *mod; // don't recurse between paratab and here. static gboolean handling_uri = FALSE; - if (handling_uri) return 0; + if (handling_uri) + return 0; handling_uri = TRUE; if (!clicked) { gchar *name = g_strstr_len(url, 10, "://"); if (!name) - gui_set_statusbar (url); + gui_set_statusbar(url); else { - name += 3; // at name beginning. + name += 3; // at name beginning. gchar *slash = g_strstr_len(name, 20, "/"); if (slash) - *slash = '\0'; // limit to name end. - int mod_type = backend->module_type(name); + *slash = '\0'; // limit to name end. + + // might be an abbrev. get the real. + const char *real_mod = main_get_name(name); + + int mod_type = backend->module_type(real_mod ? real_mod : name); + if (slash) *slash = '/'; if (mod_type == DICTIONARY_TYPE) show_in_previewer(url); else - gui_set_statusbar (url); + gui_set_statusbar(name + ((*name == '/') ? 1 : 0)); } handling_uri = FALSE; return 1; } - work_buf = g_strsplit (url,"/",4); + work_buf = g_strsplit(url, "/", 4); if (!work_buf[MODULE] && !work_buf[KEY]) { alert_url_not_found(url); g_strfreev(work_buf); @@ -787,64 +770,63 @@ work_buf[MODULE], (work_buf[KEY] ? work_buf[KEY] : "-null-"))); - if (tmpkey && strpbrk(tmpkey, "-;,")) { // >1 verse marked - main_display_verse_list_in_sidebar - (settings.currentverse, - (work_buf[MODULE] && *work_buf[MODULE] - ? work_buf[MODULE] - : settings.MainWindowModule), - tmpkey); + mod = (work_buf[MODULE] && *work_buf[MODULE] + ? work_buf[MODULE] + : settings.MainWindowModule); + + const char *real_mod = main_get_name(mod); + if (real_mod) + mod = (gchar *)real_mod; + + if (strpbrk(tmpkey, "-;,") && // >1 verse marked + (main_get_mod_type(mod) == TEXT_TYPE)) { + main_display_verse_list_in_sidebar(settings.currentverse, mod, tmpkey); handling_uri = FALSE; return 1; } verse_count = 1; //backend->is_Bible_key(mykey, settings.currentverse); - if (backend->is_module(work_buf[MODULE])) { - mod_type = backend->module_type(work_buf[MODULE]); + if (backend->is_module(mod)) { + mod_type = backend->module_type(mod); switch (mod_type) { - case TEXT_TYPE: - key = main_update_nav_controls(work_buf[MODULE], tmpkey); - main_display_bible(work_buf[MODULE], key); - if (settings.comm_showing) - main_display_commentary(NULL, key); - main_keep_bibletext_dialog_in_sync((gchar*)key); - editor_sync_with_main(); + case TEXT_TYPE: + key = main_update_nav_controls(mod, tmpkey); + main_display_bible(mod, key); + if (settings.comm_showing) + main_display_commentary(NULL, key); + main_keep_bibletext_dialog_in_sync((gchar *)key); + editor_sync_with_main(); - if (key) g_free((gchar*)key); + if (key) + g_free((gchar *)key); break; - case COMMENTARY_TYPE: - if (gtk_notebook_get_current_page - (GTK_NOTEBOOK - (widgets.notebook_comm_book)) != 0) { - gchar *save = settings.special_anchor; - gtk_notebook_set_current_page( - GTK_NOTEBOOK (widgets. - notebook_comm_book), 0); - settings.special_anchor = save; - } - settings.comm_showing = TRUE; - key = main_update_nav_controls(work_buf[MODULE], tmpkey); - main_display_commentary(work_buf[MODULE],key); - main_display_bible(NULL, key); - main_keep_bibletext_dialog_in_sync((gchar*)key); - if (key) g_free((gchar*)key); + case COMMENTARY_TYPE: + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book)) != 0) { + gchar *save = settings.special_anchor; + gtk_notebook_set_current_page( + GTK_NOTEBOOK(widgets.notebook_comm_book), 0); + settings.special_anchor = save; + } + settings.comm_showing = TRUE; + key = main_update_nav_controls(mod, tmpkey); + main_display_commentary(mod, key); + main_display_bible(NULL, key); + main_keep_bibletext_dialog_in_sync((gchar *)key); + if (key) + g_free((gchar *)key); break; - case DICTIONARY_TYPE: - main_display_dictionary(work_buf[MODULE], - tmpkey); + case DICTIONARY_TYPE: + main_display_dictionary(mod, tmpkey); break; - case BOOK_TYPE: - if (gtk_notebook_get_current_page - (GTK_NOTEBOOK - (widgets.notebook_comm_book)) != 1) { - gchar *save = settings.special_anchor; - gtk_notebook_set_current_page( - GTK_NOTEBOOK (widgets. - notebook_comm_book), 1); - settings.special_anchor = save; - } - settings.comm_showing = FALSE; - main_display_book(work_buf[MODULE], tmpkey); + case BOOK_TYPE: + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book)) != 1) { + gchar *save = settings.special_anchor; + gtk_notebook_set_current_page( + GTK_NOTEBOOK(widgets.notebook_comm_book), 1); + settings.special_anchor = save; + } + settings.comm_showing = FALSE; + main_display_book(mod, tmpkey); break; } } else { /* module name not found or not given */ @@ -853,11 +835,12 @@ /* display in current Bible and Commentary */ main_display_commentary(NULL, key); main_display_bible(NULL, key); - main_keep_bibletext_dialog_in_sync((gchar*)key); + main_keep_bibletext_dialog_in_sync((gchar *)key); editor_sync_with_main(); - if (key) g_free((gchar*)key); + if (key) + g_free((gchar *)key); } else { alert_url_not_found(url); } @@ -868,7 +851,6 @@ return 1; } - /****************************************************************************** * Name * main_url_handler @@ -885,16 +867,16 @@ * gint */ -gint main_url_handler(const gchar * url, gboolean clicked) +gint main_url_handler(const gchar *url, gboolean clicked) { - gchar* action = NULL; - gchar* stype = NULL; - gchar* svalue = NULL; - gchar* module = NULL; - gchar* passage = NULL; - gchar* morph = NULL; - gchar* strongs = NULL; - int retval = 0; // assume failure. + gchar *action = NULL; + gchar *stype = NULL; + gchar *svalue = NULL; + gchar *module = NULL; + gchar *passage = NULL; + gchar *morph = NULL; + gchar *strongs = NULL; + int retval = 0; // assume failure. XI_message(("main_url_handler => %s", url)); @@ -905,39 +887,49 @@ retval = sword_uri(url_clean->str, clicked); g_string_free(url_clean, TRUE); - } - else if (strstr(url, "passagestudy.jsp") || - strstr(url, "xiphos.url")) { + } else if (strstr(url, "passagestudy.jsp") || + strstr(url, "xiphos.url")) { // another minor nightmare: re-encode / and : in hex. gchar *place; gchar tmpbuf[1023]; GString *tmpstr = g_string_new(NULL); - place = (char*)strchr(url, '?'); // url's beginning, as-is. - strncpy(tmpbuf, url, (++place)-url); - tmpbuf[place-url] = '\0'; + place = (char *)strchr(url, '?'); // url's beginning, as-is. + strncpy(tmpbuf, url, (++place) - url); + tmpbuf[place - url] = '\0'; tmpstr = g_string_append(tmpstr, tmpbuf); - for (/* */ ; *place; ++place) { + for (/* */; *place; ++place) { switch (*place) { case '/': - tmpstr = g_string_append(tmpstr, "%2F"); break; + tmpstr = g_string_append(tmpstr, "%2F"); + break; case ':': - tmpstr = g_string_append(tmpstr, "%3A"); break; + tmpstr = g_string_append(tmpstr, "%3A"); + break; case ' ': - tmpstr = g_string_append(tmpstr, "%20"); break; + tmpstr = g_string_append(tmpstr, "%20"); + break; default: tmpstr = g_string_append_c(tmpstr, *place); } } /* passagestudy.jsp?action=showStrongs&type= */ - URL m_url((const char*)tmpstr->str); - action = g_strdup(m_url.getParameterValue("action")); - morph = g_strdup((gchar*)m_url.getParameterValue("morph")); - strongs = g_strdup((gchar*)m_url.getParameterValue("lemma")); - stype = g_strdup((gchar*)m_url.getParameterValue("type")); - svalue = g_strdup((gchar*)m_url.getParameterValue("value")); + URL m_url((const char *)tmpstr->str); + action = g_strdup((gchar *)m_url.getParameterValue("action")); + morph = g_strdup((gchar *)m_url.getParameterValue("morph")); + strongs = g_strdup((gchar *)m_url.getParameterValue("lemma")); + stype = g_strdup((gchar *)m_url.getParameterValue("type")); + svalue = g_strdup((gchar *)m_url.getParameterValue("value")); + module = g_strdup((gchar *)m_url.getParameterValue("module")); + passage = g_strdup((gchar *)m_url.getParameterValue("passage")); + + // no module specified => use main module. + if (!module || !strcmp(module, "")) { + g_free(module); + module = g_strdup(settings.MainWindowModule); + } // XXX gross hack-fix // AraSVD is named "Smith & Van Dyke", using a literal '&'. @@ -947,69 +939,52 @@ // *(svalue+1) = '-'; XI_message(("action = %s", action)); + XI_message(("morph = %s", morph)); + XI_message(("strongs = %s", strongs)); XI_message(("type = %s", stype)); XI_message(("value = %s", svalue)); - XI_message(("strongs = %s", strongs)); - XI_message(("morph = %s", morph)); + XI_message(("module = %s", module)); + XI_message(("passage = %s", passage)); if (!strcmp(action, "showStrongs")) { show_strongs(stype, svalue, clicked); } else if (!strcmp(action, "showMorph")) { - show_morph(settings.MainWindowModule, - stype, svalue, clicked); + show_morph(module, stype, svalue, clicked); } else if (!strcmp(action, "showNote")) { - module = g_strdup(m_url.getParameterValue("module")); - passage = g_strdup((gchar*)m_url.getParameterValue("passage")); show_note(module, passage, stype, svalue, clicked); - if (module) g_free(module); - if (passage) g_free(passage); } else if (!strcmp(action, "showUserNote")) { - module = g_strdup(m_url.getParameterValue("module")); - passage = g_strdup((gchar*)m_url.getParameterValue("passage")); - // need localized key, not the osisref that we've got. - ModMap::iterator it = backend->get_mgr()->Modules.find - ((module && *module) - ? module - : settings.MainWindowModule); + ModMap::iterator it = backend->get_mgr()->Modules.find(module); SWModule *m = (*it).second; VerseKey *vk = (VerseKey *)m->getKey(); *vk = passage; main_information_viewer(module, - (gchar*)svalue, - (gchar*)m->getKeyText(), + (gchar *)svalue, + (gchar *)m->getKeyText(), "showUserNote", - (gchar*)"u", + (gchar *)"u", NULL, NULL); - if (module) g_free(module); - if (passage) g_free(passage); } else if (!strcmp(action, "showRef")) { - module = g_strdup(m_url.getParameterValue("module")); if (!strcmp(stype, "scripRef")) show_ref(module, svalue, clicked); - if (module) g_free(module); } else if (!strcmp(action, "showBookmark")) { - module = g_strdup(m_url.getParameterValue("module")); show_module_and_key(module, svalue, stype, clicked); - if (module) g_free(module); } else if (!strcmp(action, "showModInfo")) { - module = g_strdup(m_url.getParameterValue("module")); show_mod_info(module, svalue, clicked); - if (module) g_free(module); } else if (!strcmp(action, "showParallel")) { @@ -1022,25 +997,34 @@ else if (!strcmp(action, "showImage")) { show_separate_image((!strncmp(svalue, "file:", 5) - ? svalue+5 - : svalue), + ? svalue + 5 + : svalue), clicked); } - if (action) g_free(action); - if (stype) g_free(stype); - if (svalue) g_free(svalue); - if (strongs) g_free(strongs); - if (morph) g_free(morph); + if (action) + g_free(action); + if (stype) + g_free(stype); + if (svalue) + g_free(svalue); + if (strongs) + g_free(strongs); + if (morph) + g_free(morph); + if (module) + g_free(module); + if (passage) + g_free(passage); + g_string_free(tmpstr, TRUE); retval = 1; } else if (clicked) - xiphos_open_default (url); + xiphos_open_default(url); return retval; } - /****************************************************************************** * Name * @@ -1057,7 +1041,7 @@ * */ -const gchar *main_url_encode(const gchar * pram) +const gchar *main_url_encode(const gchar *pram) { SWBuf retval = URL::encode(pram); if (retval.length()) @@ -1086,7 +1070,7 @@ // handle `+' space substitutions and %xx encodings. GString *url_clean = g_string_new(NULL); const gchar *url_chase; - char hex_template[] = { '0', '0', '\0' }; + char hex_template[] = {'0', '0', '\0'}; unsigned long from_hex; for (url_chase = url; *url_chase; ++url_chase) { @@ -1095,13 +1079,13 @@ g_string_append_c(url_clean, ' '); break; case '%': - if (isxdigit(*(url_chase+1)) && - isxdigit(*(url_chase+2))) { - hex_template[0] = *(url_chase+1); - hex_template[1] = *(url_chase+2); + if (isxdigit(*(url_chase + 1)) && + isxdigit(*(url_chase + 2))) { + hex_template[0] = *(url_chase + 1); + hex_template[1] = *(url_chase + 2); from_hex = strtol(hex_template, NULL, 16); g_string_append_c(url_clean, - (gchar) from_hex); + (gchar)from_hex); url_chase += 2; } else { // failed %xx encoding; normal character. diff -Nru xiphos-4.0.0+dfsg1/src/main/url.hh xiphos-4.0.4+dfsg1/src/main/url.hh --- xiphos-4.0.0+dfsg1/src/main/url.hh 2014-12-23 17:35:31.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/url.hh 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * url.h - support functions * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -35,10 +35,10 @@ NOTE_NUM }; //gint main_url_handler_gecko(const gchar * url); -gint sword_uri(const gchar * url, gboolean clicked); -gint main_url_handler(const gchar * url, gboolean clicked); -gint main_main_get_mod_type_from_url(const gchar * url); -const gchar *main_url_encode(const gchar * pram); +gint sword_uri(const gchar *url, gboolean clicked); +gint main_url_handler(const gchar *url, gboolean clicked); +gint main_main_get_mod_type_from_url(const gchar *url); +const gchar *main_url_encode(const gchar *pram); GString *hex_decode(const gchar *url); #ifdef __cplusplus diff -Nru xiphos-4.0.0+dfsg1/src/main/xml.c xiphos-4.0.4+dfsg1/src/main/xml.c --- xiphos-4.0.0+dfsg1/src/main/xml.c 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/xml.c 2015-08-25 01:24:17.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xml.c - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * 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 @@ -36,7 +36,8 @@ #include "main/xml.h" #include "gui/dialog.h" -struct _bookmark_data { +struct _bookmark_data +{ gchar *caption; gchar *key; gchar *module; @@ -48,8 +49,8 @@ static xmlDocPtr xml_export_doc; static xmlNodePtr section_ptr; static xmlDocPtr bookmark_doc; -static xmlNodePtr xml_find_prop(xmlDocPtr doc, const char *type_doc, const char *section, - const char *prop); +static xmlNodePtr xml_find_prop(xmlDocPtr doc, const char *type_doc, + const char *section, const char *prop); /****************************************************************************** * Name @@ -79,7 +80,7 @@ sprintf(buf, "%s/%s/bookmarks.xml", settings.gSwordDir, "bookmarks"); xml_filename = buf; - xml_doc = xmlNewDoc((const xmlChar *) "1.0"); + xml_doc = xmlNewDoc((const xmlChar *)"1.0"); if (xml_doc == NULL) { fprintf(stderr, @@ -87,34 +88,25 @@ return; } - xml_node = xmlNewNode(NULL, (const xmlChar *) "SwordBookmarks"); - (void) xmlNewProp(xml_node, (const xmlChar *) "syntaxVersion", - (const xmlChar *) "1.0"); + xml_node = xmlNewNode(NULL, (const xmlChar *)"SwordBookmarks"); + (void)xmlNewProp(xml_node, (const xmlChar *)"syntaxVersion", + (const xmlChar *)"1.0"); xmlDocSetRootElement(xml_doc, xml_node); xml_root = xml_add_folder_to_parent(xml_node, _("Personal")); - xml_folder = xml_add_folder_to_parent(xml_root, _("What must I do to be saved?")); - xml_add_bookmark_to_parent(xml_folder, - _("Acts 16:31"), - _("Acts 16:31"), - NULL, - NULL); - xml_add_bookmark_to_parent(xml_folder, - _("Eph 2:8,9"), - _("Eph 2:8,9"), - NULL, - NULL); - xml_add_bookmark_to_parent(xml_folder, - _("Romans 1:16"), - _("Romans 1:16"), - NULL, - NULL); - xml_folder = xml_add_folder_to_parent(xml_root, _("What is the Gospel?")); - xml_add_bookmark_to_parent(xml_folder, - _("1 Cor 15:1-4"), - _("1 Cor 15:1-4"), - NULL, - NULL); + xml_folder = + xml_add_folder_to_parent(xml_root, + _("What must I do to be saved?")); + xml_add_bookmark_to_parent(xml_folder, _("Acts 16:31"), + _("Acts 16:31"), NULL, NULL); + xml_add_bookmark_to_parent(xml_folder, _("Eph 2:8,9"), + _("Eph 2:8,9"), NULL, NULL); + xml_add_bookmark_to_parent(xml_folder, _("Romans 1:16"), + _("Romans 1:16"), NULL, NULL); + xml_folder = + xml_add_folder_to_parent(xml_root, _("What is the Gospel?")); + xml_add_bookmark_to_parent(xml_folder, _("1 Cor 15:1-4"), + _("1 Cor 15:1-4"), NULL, NULL); xmlSaveFile(xml_filename, xml_doc); xmlFreeDoc(xml_doc); @@ -137,18 +129,18 @@ * xmlNodePtr */ -xmlNodePtr xml_add_folder_to_parent(xmlNodePtr parent, gchar * caption) +xmlNodePtr xml_add_folder_to_parent(xmlNodePtr parent, gchar *caption) { xmlNodePtr cur_node; cur_node = xmlNewChild(parent, - NULL, (const xmlChar *) "Folder", NULL); - (void) xmlNewProp(cur_node, - (const xmlChar *) "caption", (const xmlChar *) caption); + NULL, (const xmlChar *)"Folder", NULL); + (void)xmlNewProp(cur_node, + (const xmlChar *)"caption", + (const xmlChar *)caption); return cur_node; } - /****************************************************************************** * Name * xml_add_bookmark_to_parent @@ -167,38 +159,39 @@ */ void xml_add_bookmark_to_parent(xmlNodePtr parent, - gchar * caption, - gchar * key, - gchar * module, - const gchar * mod_desc) + gchar *caption, + gchar *key, + gchar *module, const gchar *mod_desc) { xmlNodePtr xml_node; //gchar *mod_desc = NULL; /*if (module) { - if (strlen(module) > 2) - mod_desc = get_module_description(module); - } */ + if (strlen(module) > 2) + mod_desc = get_module_description(module); + } */ if (mod_desc == NULL) mod_desc = " "; xml_node = xmlNewChild(parent, - NULL, - (const xmlChar *) "Bookmark", NULL); - (void) xmlNewProp(xml_node, - (const xmlChar *) "modulename", - (const xmlChar *) module); - (void) xmlNewProp(xml_node, (const xmlChar *) "key", (const xmlChar *) key); - (void) xmlNewProp(xml_node, (const xmlChar *) "moduledescription", - (const xmlChar *) mod_desc); - (void) xmlNewProp(xml_node, (const xmlChar *) "description", - (const xmlChar *) caption); + NULL, (const xmlChar *)"Bookmark", NULL); + (void)xmlNewProp(xml_node, + (const xmlChar *)"modulename", + (const xmlChar *)module); + (void)xmlNewProp(xml_node, (const xmlChar *)"key", + (const xmlChar *)key); + (void)xmlNewProp(xml_node, (const xmlChar *)"moduledescription", + (const xmlChar *)mod_desc); + (void)xmlNewProp(xml_node, (const xmlChar *)"description", + (const xmlChar *)caption); /*xml_attr = - xmlNewProp(xml_node, "caption", - (const xmlChar *) caption);*/ + xmlNewProp(xml_node, "caption", + (const xmlChar *) caption); */ } +#if 0 +// unneeded at this time. disabled to silence cppcheck. /****************************************************************************** * Name * xml_write_bookmark_doc @@ -215,11 +208,12 @@ * void */ -void xml_write_bookmark_doc(const xmlChar * xml_filename) +void xml_write_bookmark_doc(const xmlChar *xml_filename) { XI_print(("\nsaving = %s\n", xml_filename)); - xmlSaveFormatFile((const char *) xml_filename, bookmark_doc,1); + xmlSaveFormatFile((const char *)xml_filename, bookmark_doc, 1); } +#endif /****************************************************************************** * Name @@ -242,7 +236,6 @@ xmlFreeDoc(bookmark_doc); } - /****************************************************************************** * Name * xml_load_bookmark_file @@ -259,12 +252,12 @@ * xmlNodePtr */ -xmlNodePtr xml_load_bookmark_file(const xmlChar * bookmark_file) +xmlNodePtr xml_load_bookmark_file(const xmlChar *bookmark_file) { xmlNodePtr cur = NULL; - bookmark_doc = xmlParseFile((const char *) bookmark_file); + bookmark_doc = xmlParseFile((const char *)bookmark_file); if (bookmark_doc == NULL) { fprintf(stderr, _("Document not parsed successfully. \n")); @@ -277,7 +270,7 @@ return NULL; } - if (xmlStrcmp(cur->name, (const xmlChar *) "SwordBookmarks")) { + if (xmlStrcmp(cur->name, (const xmlChar *)"SwordBookmarks")) { fprintf(stderr, _("wrong type, root node != SwordBookmarks\n")); xmlFreeDoc(bookmark_doc); @@ -288,7 +281,6 @@ return cur; } - /****************************************************************************** * Name * xml_save_export_doc @@ -307,11 +299,10 @@ void xml_save_export_doc(char *name) { - + xmlSaveFormatFile(name, xml_export_doc, 1); } - /****************************************************************************** * Name * xml_get_copy_export_value @@ -331,11 +322,12 @@ char *xml_get_copy_export_value(const char *section, const char *item) { xmlNodePtr cur = NULL; - xmlChar *results = NULL; if ((cur = - xml_find_prop(xml_export_doc, "Copy_Export", section, item)) != NULL) { - results = xmlNodeListGetString(xml_export_doc, - cur->xmlChildrenNode, 1); + xml_find_prop(xml_export_doc, "Copy_Export", section, + item)) != NULL) { + xmlChar *results = + xmlNodeListGetString(xml_export_doc, + cur->xmlChildrenNode, 1); if (results) return (char *)results; } @@ -359,12 +351,13 @@ * void */ -void xml_export_set_value(const char *type_doc, const char *section, const char *item, - const char *value) +void xml_export_set_value(const char *type_doc, const char *section, + const char *item, const char *value) { xmlNodePtr cur = NULL; if ((cur = - xml_find_prop(xml_export_doc, type_doc, section, item)) != NULL) { + xml_find_prop(xml_export_doc, type_doc, section, + item)) != NULL) { xmlNodeSetContent(cur, (const xmlChar *)value); } } @@ -406,11 +399,11 @@ * xmlNodePtr */ -int xml_load_copy_export_file(const xmlChar * file) +int xml_load_copy_export_file(const xmlChar *file) { xmlNodePtr cur = NULL; - xml_export_doc = xmlParseFile((const char *) file); + xml_export_doc = xmlParseFile((const char *)file); if (xml_export_doc == NULL) { fprintf(stderr, _("Document not parsed successfully. \n")); @@ -423,19 +416,17 @@ return 0; } - if (xmlStrcmp(cur->name, (const xmlChar *) "Copy_Export")) { + if (xmlStrcmp(cur->name, (const xmlChar *)"Copy_Export")) { fprintf(stderr, _("wrong type, root node != Copy_Export\n")); xmlFreeDoc(xml_export_doc); return 0; } - //cur = cur->xmlChildrenNode; return 1; } - -void xml_add_new_section_to_doc(xmlDocPtr doc, char * section) +void xml_add_new_section_to_doc(xmlDocPtr doc, char *section) { xmlNodePtr root_node = NULL; @@ -444,12 +435,10 @@ fprintf(stderr, _("empty document \n")); return; } - (void) xmlNewChild(root_node, NULL, - (const xmlChar *) section, NULL); + (void)xmlNewChild(root_node, NULL, + (const xmlChar *)section, NULL); } - - /****************************************************************************** * Name * xml_create_copy_export_file @@ -472,72 +461,114 @@ xmlNodePtr section_node; xmlDocPtr xml_doc; - xml_doc = xmlNewDoc((const xmlChar *) "1.0"); + xml_doc = xmlNewDoc((const xmlChar *)"1.0"); if (xml_doc == NULL) { - fprintf(stderr, _("Document not created successfully. \n")); + fprintf(stderr, + _("Document not created successfully. \n")); return 0; } - root_node = xmlNewNode(NULL, (const xmlChar *) "Copy_Export"); - (void) xmlNewProp(root_node, (const xmlChar *) "Version", (const xmlChar *) "0"); + root_node = xmlNewNode(NULL, (const xmlChar *)"Copy_Export"); + (void)xmlNewProp(root_node, (const xmlChar *)"Version", + (const xmlChar *)"0"); xmlDocSetRootElement(xml_doc, root_node); - + section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"dialog", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"plaintext", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"HTML", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse_numbers", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"reference_last", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"version", (const xmlChar *)"1"); - + xmlNewTextChild(section_node, NULL, (const xmlChar *)"plaintext", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"HTML", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"verse_numbers", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"reference_last", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"version", + (const xmlChar *)"1"); + /* book format */ - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "book", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "header", (const xmlChar *) _("%s
        %s
        Chapter %d

        ")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "chapterheader", (const xmlChar *) _("
        Chapter %d

        ")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_header", (const xmlChar *) _("%s\n\nChapter %d\n\n")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_chapterheader", (const xmlChar *) _("\n\nChapter %d\n\n")); - - + + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"book", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"header", + (const xmlChar *) + _("%s
        %s
        Chapter %d

        ")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"chapterheader", + (const xmlChar *) + _("
        Chapter %d

        ")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_header", + (const xmlChar *)_("%s\n\nChapter %d\n\n")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_chapterheader", + (const xmlChar *)_("\n\nChapter %d\n\n")); + /* chapter format */ - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "chapter", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "header", (const xmlChar *) _("%s%s: %s Chapter %d

        ")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_header", (const xmlChar *) _("%s: %s Chapter %d\n\n")); - + + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"chapter", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"header", + (const xmlChar *) + _("%s%s: %s Chapter %d

        ")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_header", + (const xmlChar *)_("%s: %s Chapter %d\n\n")); + /* versenumber format */ - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "versenumber", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "format", (const xmlChar *) _("  [%d]")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_format", (const xmlChar *) _(" [%d]")); - + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"versenumber", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"format", + (const xmlChar *)_("  [%d]")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_format", + (const xmlChar *)_(" [%d]")); + /* single verse format */ - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "singleverse", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "last", (const xmlChar *) _("%s%s (%s %d:%d%s)")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "first", (const xmlChar *) _("%s(%s %d:%d%s)%s ")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_last", (const xmlChar *) _("%s (%s %d:%d%s)")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_first", (const xmlChar *) _("(%s %d:%d%s) %s")); - + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"singleverse", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"last", + (const xmlChar *) + _("%s%s (%s %d:%d%s)")); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"first", + (const xmlChar *) + _("%s(%s %d:%d%s)%s ")); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"plain_last", + (const xmlChar *)_("%s (%s %d:%d%s)")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_first", + (const xmlChar *)_("(%s %d:%d%s) %s")); + /* verse range format */ - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "verserange", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "verse", (const xmlChar *) _(" %s%s")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "last", (const xmlChar *) _("%s(%s %d:%d-%d%s)")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "first", (const xmlChar *) _("(%s %d:%d-%d%s)
        ")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_last", (const xmlChar *) _("%s(%s %d:%d-%d%s)")); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "plain_first", (const xmlChar *) _("(%s %d:%d-%d%s)\n")); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"verserange", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse", + (const xmlChar *)_(" %s%s")); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"last", + (const xmlChar *)_("%s(%s %d:%d-%d%s)")); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"first", + (const xmlChar *)_("(%s %d:%d-%d%s)
        ")); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"plain_last", + (const xmlChar *)_("%s(%s %d:%d-%d%s)")); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"plain_first", + (const xmlChar *)_("(%s %d:%d-%d%s)\n")); - xmlSaveFormatFile (path, xml_doc, 1); + xmlSaveFormatFile(path, xml_doc, 1); xmlFreeDoc(xml_doc); return 1; } - /****************************************************************************** * Name * xml_create_settings_file @@ -561,213 +592,376 @@ xmlNodePtr section_node; GList *tmp = NULL; - xml_settings_doc = xmlNewDoc((const xmlChar *) "1.0"); + xml_settings_doc = xmlNewDoc((const xmlChar *)"1.0"); if (xml_settings_doc == NULL) { - fprintf(stderr, _("Document not created successfully. \n")); + fprintf(stderr, + _("Document not created successfully. \n")); return 0; } - root_node = xmlNewNode(NULL, (const xmlChar *) "Xiphos"); - (void) xmlNewProp(root_node, (const xmlChar *) "Version", (const xmlChar *) VERSION); + root_node = xmlNewNode(NULL, (const xmlChar *)"Xiphos"); + (void)xmlNewProp(root_node, (const xmlChar *)"Version", + (const xmlChar *)VERSION); xmlDocSetRootElement(xml_settings_doc, root_node); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "ranges", NULL); - cur_node = xmlNewChild(section_node, NULL, (const xmlChar *) "range", NULL); - (void) xmlNewProp(cur_node, - (const xmlChar *) "label", - (const xmlChar *) _("Old Testament")); - (void) xmlNewProp(cur_node, (const xmlChar *) "list", (const xmlChar *) _("Gen - Mal")); - - cur_node = xmlNewChild(section_node, NULL, (const xmlChar *) "range", NULL); - (void) xmlNewProp(cur_node, - (const xmlChar *) "label", - (const xmlChar *) _("New Testament")); - (void) xmlNewProp(cur_node, (const xmlChar *) "list", (const xmlChar *) _("Mat - Rev")); - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "modlists", NULL); - cur_node = xmlNewChild(section_node, NULL, (const xmlChar *) "modlist", NULL); - (void) xmlNewProp(cur_node, - (const xmlChar *) "label", - (const xmlChar *) _("Sample Module List")); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"ranges", NULL); + cur_node = + xmlNewChild(section_node, NULL, (const xmlChar *)"range", + NULL); + (void)xmlNewProp(cur_node, (const xmlChar *)"label", + (const xmlChar *)_("Old Testament")); + (void)xmlNewProp(cur_node, (const xmlChar *)"list", + (const xmlChar *)_("Gen - Mal")); + + cur_node = + xmlNewChild(section_node, NULL, (const xmlChar *)"range", + NULL); + (void)xmlNewProp(cur_node, (const xmlChar *)"label", + (const xmlChar *)_("New Testament")); + (void)xmlNewProp(cur_node, (const xmlChar *)"list", + (const xmlChar *)_("Mat - Rev")); + + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"modlists", + NULL); + cur_node = + xmlNewChild(section_node, NULL, (const xmlChar *)"modlist", + NULL); + (void)xmlNewProp(cur_node, (const xmlChar *)"label", + (const xmlChar *)_("Sample Module List")); tmp = get_list(TEXT_LIST); - (void) xmlNewProp(cur_node, - (const xmlChar *) "list", - (tmp - ? (const xmlChar *)(gchar *)(tmp->data) - : (const xmlChar *)(gchar *)"-ReplaceMe-")); + (void)xmlNewProp(cur_node, + (const xmlChar *)"list", + (tmp ? (const xmlChar *)(gchar *)(tmp->data) + : (const xmlChar *)(gchar *) "-ReplaceMe-")); section_node = xmlNewChild(root_node, NULL, - (const xmlChar *) "editor", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "spell_language", (const xmlChar *) "unknown"); + (const xmlChar *)"editor", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"spell_language", + (const xmlChar *)"unknown"); + + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"locale", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"special", + (const xmlChar *)""); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "locale", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "special", (const xmlChar *) ""); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"modmgr", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"mod_mgr_source", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"mod_mgr_destination", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"mod_mgr_local_source_index", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"mod_mgr_remote_source_index", + (const xmlChar *)"0"); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "modmgr", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_source", (const xmlChar *) "1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_destination", (const xmlChar *) "0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_local_source_index", (const xmlChar *) "0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_remote_source_index", (const xmlChar *) "0"); - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "fontsize", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "versenum", (const xmlChar *) "+0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "basefontsize", (const xmlChar *) "+0"); - - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "HTMLcolors", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *) "background", (const xmlChar *) "#FFFFFF"); /* white */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "text_fg", (const xmlChar *) "#000000"); /* black */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "versenum",(const xmlChar *) "#0000CF"); /* blue */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "currentverse", (const xmlChar *) "#009000"); /* green */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "link", (const xmlChar *) "#878787"); /* grey */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "found", (const xmlChar *) "#D02898"); /* ? */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "highlight_fg", (const xmlChar *)"#FFFF00"); /* yellow */ - xmlNewTextChild(section_node, NULL, (const xmlChar *) "highlight_bg", (const xmlChar *)"#060680"); /* navy */ + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"fontsize", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"versenum", + (const xmlChar *)"+0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"basefontsize", + (const xmlChar *)"+0"); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"HTMLcolors", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"background", (const xmlChar *)"#FFFFFF"); /* white */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"text_fg", (const xmlChar *)"#000000"); /* black */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"versenum", (const xmlChar *)"#0000CF"); /* blue */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"currentverse", (const xmlChar *)"#009000"); /* green */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"link", (const xmlChar *)"#878787"); /* grey */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"found", (const xmlChar *)"#D02898"); /* ? */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"highlight_fg", (const xmlChar *)"#FFFF00"); /* yellow */ + xmlNewTextChild(section_node, NULL, (const xmlChar *)"highlight_bg", (const xmlChar *)"#060680"); /* navy */ section_node = - xmlNewChild(root_node, NULL, (const xmlChar *)"parallel", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"cantillation", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"points", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"footnotes", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "morphs", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"strongs", (const xmlChar *)"0"); + xmlNewChild(root_node, NULL, (const xmlChar *)"parallel", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"cantillation", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"points", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"footnotes", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"morphs", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"strongs", + (const xmlChar *)"0"); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"book", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"module", NULL); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"book", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"module", + NULL); xmlNewTextChild(section_node, NULL, (const xmlChar *)"key", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"offset", (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"offset", + (const xmlChar *)"0"); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"keys", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"book", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"dictionary", (const xmlChar *)"Grace"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse", (const xmlChar *)"Romans 8:28"); - - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"layout", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"height", (const xmlChar *)"600"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "width", (const xmlChar *)"800"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"app_x", (const xmlChar *)"40"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "app_y", (const xmlChar *)"40"); - - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallelopen", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel_height", (const xmlChar *)"361"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "parallel_width", (const xmlChar *)"657"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel_x", (const xmlChar *)"40"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "parallel_y", (const xmlChar *)"40"); - - xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgropen", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgr_height", (const xmlChar *)"450"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "modmgr_width", (const xmlChar *)"710"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgr_x", (const xmlChar *)"40"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "modmgr_y", (const xmlChar *)"40"); - - xmlNewTextChild(section_node, NULL, (const xmlChar *)"advsearchopen", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"advsearch_height", (const xmlChar *)"465"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "advsearch_width", (const xmlChar *)"665"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"advsearch_x", (const xmlChar *)"40"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "advsearch_y", (const xmlChar *)"40"); - - xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefsopen", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefs_height", (const xmlChar *)"300"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "prefs_width", (const xmlChar *)"590"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefs_x", (const xmlChar *)"40"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "prefs_y", (const xmlChar *)"40"); - - xmlNewTextChild(section_node, NULL, (const xmlChar *)"textpane", (const xmlChar *)"368"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"shortcutbar", (const xmlChar *)"200"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"uperpane", (const xmlChar *)"210"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"vltoppaneheight", (const xmlChar *)"210"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"sidebar_notebook_height", (const xmlChar *)"350"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"bibleheight", (const xmlChar *)"250"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"commentaryheight", (const xmlChar *)"240"); - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"lexicons", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"indictpane", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"inviewer", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"usedefaultdict", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"defaultdictionary", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"greek", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"hebrew", NULL); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"keys", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"book", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"dictionary", + (const xmlChar *)"Grace"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse", + (const xmlChar *)"Romans 8:28"); - section_node = xmlNewChild(root_node, NULL, - (const xmlChar *) "osisrefmarkedverses", NULL); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"layout", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"maximized", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"height", + (const xmlChar *)"600"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"width", + (const xmlChar *)"800"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"app_x", + (const xmlChar *)"40"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"app_y", + (const xmlChar *)"40"); + + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"parallelopen", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"parallel_height", + (const xmlChar *)"361"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"parallel_width", + (const xmlChar *)"657"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel_x", + (const xmlChar *)"40"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallel_y", + (const xmlChar *)"40"); + + xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgropen", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"modmgr_height", + (const xmlChar *)"450"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"modmgr_width", + (const xmlChar *)"710"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgr_x", + (const xmlChar *)"40"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"modmgr_y", + (const xmlChar *)"40"); + + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"advsearchopen", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"advsearch_height", + (const xmlChar *)"465"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"advsearch_width", + (const xmlChar *)"665"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"advsearch_x", + (const xmlChar *)"40"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"advsearch_y", + (const xmlChar *)"40"); + + xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefsopen", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"prefs_height", + (const xmlChar *)"300"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"prefs_width", + (const xmlChar *)"590"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefs_x", + (const xmlChar *)"40"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"prefs_y", + (const xmlChar *)"40"); + + xmlNewTextChild(section_node, NULL, (const xmlChar *)"textpane", + (const xmlChar *)"368"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"shortcutbar", + (const xmlChar *)"200"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"uperpane", + (const xmlChar *)"210"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"vltoppaneheight", + (const xmlChar *)"210"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"sidebar_notebook_height", + (const xmlChar *)"350"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"bibleheight", + (const xmlChar *)"250"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"commentaryheight", + (const xmlChar *)"240"); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"misc", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"dailydevotional", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"splash", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"usedefault", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"formatpercom", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL,(const xmlChar *) "showcomms", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"showdicts", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"showtexts", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"versestyle", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"pinnedtabs", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"showversenum", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"imageresize", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse_num_bold", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse_num_bracket", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"verse_num_superscript", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"readaloud", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"versehighlight", (const xmlChar *)"0"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"annotatehighlight", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"xrefsinverselist", (const xmlChar *)"1"); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"lexicons", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"indictpane", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"inviewer", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"usedefaultdict", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"defaultdictionary", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"greek", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"hebrew", + NULL); + + /* cppcheck dislikes assigning this to section_node */ + /* because it is then immediately re-assigned after. */ + (void) xmlNewChild(root_node, NULL, + (const xmlChar *)"osisrefmarkedverses", + NULL); - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"modules", NULL); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"misc", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"dailydevotional", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"splash", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"usedefault", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"formatpercom", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"showcomms", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"showdicts", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"showtexts", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"versestyle", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"pinnedtabs", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"showversenum", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"imageresize", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"verse_num_bold", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"verse_num_bracket", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"verse_num_superscript", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"readaloud", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"versehighlight", + (const xmlChar *)"0"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"annotatehighlight", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"xrefsinverselist", + (const xmlChar *)"1"); + + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"modules", + NULL); tmp = get_list(GBS_LIST); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"book", (const xmlChar *)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"book", + (const xmlChar *)tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"book", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"book", NULL); tmp = get_list(COMM_LIST); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"comm", (const xmlChar *)(gchar*)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"comm", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL,(const xmlChar *) "comm", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"comm", NULL); tmp = get_list(DEVOTION_LIST); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"devotional", (const xmlChar *)(gchar*)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"devotional", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"devotional", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"devotional", NULL); tmp = get_list(DICT_LIST); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"dict", (const xmlChar *)(gchar*)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"dict", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"dict", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"dict", NULL); tmp = get_list(TEXT_LIST); - if (tmp) /* default parallels list set to 1 bible. */ - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallels", (const xmlChar *)(gchar*)tmp->data); + if (tmp) /* default parallels list set to 1 bible. */ + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"parallels", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"parallels", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"parallels", NULL); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"bible", (const xmlChar *)(gchar*)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"bible", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"bible", NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"bible", NULL); tmp = get_list(PERCOMM_LIST); if (tmp) - xmlNewTextChild(section_node, NULL, (const xmlChar *)"percomm", (const xmlChar *)(gchar*)tmp->data); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"percomm", + (const xmlChar *)(gchar *) tmp->data); else - xmlNewTextChild(section_node, NULL, (const xmlChar *)"percomm", NULL); - + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"percomm", NULL); section_node = - xmlNewChild(root_node, NULL, (const xmlChar *)"shortcutbar", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"shortcutbar", (const xmlChar *)"1"); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"docked", (const xmlChar *)"1"); - - - section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"studypad", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"directory", (const xmlChar *)settings.homedir); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"lastfile", NULL); + xmlNewChild(root_node, NULL, (const xmlChar *)"shortcutbar", + NULL); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)"shortcutbar", + (const xmlChar *)"1"); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"docked", + (const xmlChar *)"1"); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"studypad", + NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"directory", + (const xmlChar *)settings.homedir); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"lastfile", + NULL); - section_node = xmlNewChild(root_node, NULL,(const xmlChar *) "tabs", NULL); - xmlNewTextChild(section_node, NULL, (const xmlChar *)"browsing",(const xmlChar *) "1"); + section_node = + xmlNewChild(root_node, NULL, (const xmlChar *)"tabs", NULL); + xmlNewTextChild(section_node, NULL, (const xmlChar *)"browsing", + (const xmlChar *)"1"); return 1; } @@ -791,36 +985,42 @@ void xml_convert_to_osisref(void) { - gchar *label, *content, *s, *t; gchar reference[100]; GList *deletable = NULL, *hold; /* pull entries from old "markedverses" set */ /* re-insert into new "osisrefmarkedverses" */ - if (xml_set_section_ptr("markedverses") && xml_get_label()) { + if (xml_set_section_ptr("markedverses") && xml_get_label()) { do { + gchar *label, *content, *s, *t; + label = xml_get_label(); content = g_strdup(xml_get_list()); /* detect "NASB Revelation of John 1:1" */ - if (((s = strrchr(label, ' ')) != NULL) && /* rightmost space */ - ((s = strchr((t = s+1), ':')) != NULL) && /* chapter:verse */ + if (((s = strrchr(label, ' ')) != NULL) && /* rightmost space */ + ((s = strchr((t = s + 1), ':')) != NULL) && /* chapter:verse */ ((t = strchr(label, ' ')) < s)) { /* leftmost space */ /* having gotten this far, we successfully */ /* detected a wrongly-formatted label. convert. */ /* mark old bogus version for removal. */ - deletable = g_list_prepend(deletable, g_strdup(label)); + deletable = + g_list_prepend(deletable, + g_strdup(label)); /* cons up a new version. */ *t = '\0'; - g_snprintf(reference, 100, "%s %s", - label /* this is just the module name now */, - main_get_osisref_from_key((const char *)label, - (const char *)t+1)); - xml_set_list_item("osisrefmarkedverses", "markedverse", - reference, content); + g_snprintf(reference, 100, "%s %s", label + /* this is just the module name now */ + , + main_get_osisref_from_key((const char *) + label, + (const char *)t + 1)); + xml_set_list_item("osisrefmarkedverses", + "markedverse", reference, + content); } g_free(content); } while (xml_next_item() && xml_get_label()); @@ -828,7 +1028,8 @@ hold = deletable; while (deletable) { - xml_remove_node("markedverses", "markedverse", deletable->data); + xml_remove_node("markedverses", "markedverse", + deletable->data); g_free(deletable->data); deletable = g_list_next(deletable); } @@ -836,7 +1037,6 @@ g_list_free(hold); } - /****************************************************************************** * Name * xml_find_section @@ -853,7 +1053,8 @@ * xmlNodePtr */ -static xmlNodePtr xml_find_section(xmlDocPtr doc, const char *type_doc, const char *section) +static xmlNodePtr xml_find_section(xmlDocPtr doc, const char *type_doc, + const char *section) { xmlNodePtr cur = NULL; @@ -863,7 +1064,7 @@ return NULL; } - if (xmlStrcmp(cur->name, (const xmlChar *) type_doc)) { + if (xmlStrcmp(cur->name, (const xmlChar *)type_doc)) { fprintf(stderr, _("wrong type, root node != %s\n"), type_doc); return NULL; @@ -872,7 +1073,7 @@ cur = cur->xmlChildrenNode; while (cur != NULL) { - if (!xmlStrcmp(cur->name, (const xmlChar *) section)) { + if (!xmlStrcmp(cur->name, (const xmlChar *)section)) { return cur; } if (cur->next) @@ -883,7 +1084,6 @@ return NULL; } - /****************************************************************************** * Name * xml_find_item @@ -910,15 +1110,15 @@ cur = parent->xmlChildrenNode; while (cur != NULL) { - if (!xmlStrcmp(cur->name, (const xmlChar *) item)) { + if (!xmlStrcmp(cur->name, (const xmlChar *)item)) { /* no label means any (i.e. first) element matches */ if (!label) return cur; /* otherwise we must find the label match. */ - prop_label = xmlGetProp(cur, (const xmlChar *)"label"); - if (!xmlStrcmp - (prop_label, (const xmlChar *) label)) { + prop_label = + xmlGetProp(cur, (const xmlChar *)"label"); + if (!xmlStrcmp(prop_label, (const xmlChar *)label)) { return cur; } } @@ -930,7 +1130,6 @@ return NULL; } - /****************************************************************************** * Name * xml_get_list_from_label @@ -947,27 +1146,30 @@ * char * */ -char *xml_get_list_from_label(const char *section, const char *item, const char *label) +char *xml_get_list_from_label(const char *section, const char *item, + const char *label) { xmlNodePtr cur = NULL; - xmlChar *prop_label = NULL; - - if ((cur = xml_find_section(xml_settings_doc, "Xiphos", section)) != NULL) { + if ((cur = + xml_find_section(xml_settings_doc, "Xiphos", + section)) != NULL) { cur = cur->xmlChildrenNode; while (cur != NULL) { //g_warning("cur->name = %s", cur->name); - if (!xmlStrcmp - (cur->name, (const xmlChar *) item)) { - prop_label = xmlGetProp(cur, (const xmlChar *) "label"); - XI_message(("\nprop_label: %s\nlabel: %s",prop_label,label)); - if (!xmlStrcmp - (prop_label, - (const xmlChar *) label)) { - return (char *)xmlGetProp(cur, (const xmlChar *) "list"); + if (!xmlStrcmp(cur->name, (const xmlChar *)item)) { + xmlChar *prop_label = + xmlGetProp(cur, + (const xmlChar *)"label"); + XI_message(("\nprop_label: %s\nlabel: %s", + prop_label, label)); + if (!xmlStrcmp(prop_label, + (const xmlChar *)label)) { + return (char *)xmlGetProp(cur, + (const xmlChar *)"list"); } } if (cur->next) @@ -979,7 +1181,6 @@ return NULL; } - /****************************************************************************** * Name * xml_set_list_item @@ -997,25 +1198,35 @@ * void */ -void xml_set_list_item(const char *section, const char *item, const char *label, - const char *value) +void xml_set_list_item(const char *section, const char *item, + const char *label, const char *value) { xmlNodePtr cur = NULL; xmlNodePtr cur_item = NULL; xmlNodePtr new = NULL; - if ((cur = xml_find_section(xml_settings_doc, "Xiphos", section)) == NULL) { - xmlNodePtr root_node = xmlDocGetRootElement(xml_settings_doc); - cur = xmlNewChild(root_node, NULL, (const xmlChar *) section, NULL); + if ((cur = + xml_find_section(xml_settings_doc, "Xiphos", + section)) == NULL) { + xmlNodePtr root_node = + xmlDocGetRootElement(xml_settings_doc); + cur = + xmlNewChild(root_node, NULL, (const xmlChar *)section, + NULL); } if (cur) { if ((cur_item = xml_find_item(cur, item, label))) { - xmlSetProp(cur_item, (const xmlChar *) "list", (const xmlChar *) value); + xmlSetProp(cur_item, (const xmlChar *)"list", + (const xmlChar *)value); } else { - new = xmlNewChild(cur, NULL, (const xmlChar *) item, NULL); - xmlNewProp(new,(const xmlChar *) "label", (const xmlChar *) label); - xmlNewProp(new, (const xmlChar *)"list", (const xmlChar *) value); + new = + xmlNewChild(cur, NULL, (const xmlChar *)item, + NULL); + xmlNewProp(new, (const xmlChar *)"label", + (const xmlChar *)label); + xmlNewProp(new, (const xmlChar *)"list", + (const xmlChar *)value); } } } @@ -1037,18 +1248,24 @@ * void */ -void xml_set_new_element(const char *section, const char *item, const char *content) +void xml_set_new_element(const char *section, const char *item, + const char *content) { xmlNodePtr cur = NULL; - if ((cur = xml_find_section(xml_settings_doc, "Xiphos", section)) == NULL) { - xmlNodePtr root_node = xmlDocGetRootElement(xml_settings_doc); - cur = xmlNewChild(root_node, NULL, (const xmlChar *) section, NULL); + if ((cur = + xml_find_section(xml_settings_doc, "Xiphos", + section)) == NULL) { + xmlNodePtr root_node = + xmlDocGetRootElement(xml_settings_doc); + cur = + xmlNewChild(root_node, NULL, (const xmlChar *)section, + NULL); } if (cur) - (void) xmlNewChild(cur, NULL, (const xmlChar *) item, - (const xmlChar *) content); + (void)xmlNewChild(cur, NULL, (const xmlChar *)item, + (const xmlChar *)content); } /****************************************************************************** @@ -1071,7 +1288,9 @@ { xmlNodePtr cur = NULL; - if ((cur = xml_find_section(xml_settings_doc, "Xiphos", section)) != NULL) { + if ((cur = + xml_find_section(xml_settings_doc, "Xiphos", + section)) != NULL) { section_ptr = cur->xmlChildrenNode; if (section_ptr) return 1; @@ -1122,10 +1341,9 @@ char *xml_get_label(void) { - return (char *) xmlGetProp(section_ptr, (const xmlChar *) "label"); + return (char *)xmlGetProp(section_ptr, (const xmlChar *)"label"); } - /****************************************************************************** * Name * xml_get_list @@ -1144,10 +1362,9 @@ char *xml_get_list(void) { - return (char *) xmlGetProp(section_ptr, (const xmlChar *) "list"); + return (char *)xmlGetProp(section_ptr, (const xmlChar *)"list"); } - /****************************************************************************** * Name * xml_find_prop @@ -1165,8 +1382,8 @@ * xmlNodePtr */ -static xmlNodePtr xml_find_prop(xmlDocPtr doc, const char *type_doc, const char *section, - const char *prop) +static xmlNodePtr xml_find_prop(xmlDocPtr doc, const char *type_doc, + const char *section, const char *prop) { xmlNodePtr cur = NULL; xmlNodePtr item_cur = NULL; @@ -1177,7 +1394,7 @@ return NULL; } - if (xmlStrcmp(cur->name, (const xmlChar *) type_doc)) { + if (xmlStrcmp(cur->name, (const xmlChar *)type_doc)) { fprintf(stderr, _("wrong type, root node != %s\n"), type_doc); return NULL; @@ -1186,12 +1403,11 @@ cur = cur->xmlChildrenNode; while (cur != NULL) { - if (!xmlStrcmp(cur->name, (const xmlChar *) section)) { + if (!xmlStrcmp(cur->name, (const xmlChar *)section)) { item_cur = cur->xmlChildrenNode; while (item_cur != NULL) { - if (!xmlStrcmp - (item_cur->name, - (const xmlChar *) prop)) { + if (!xmlStrcmp(item_cur->name, + (const xmlChar *)prop)) { return item_cur; } if (item_cur->next) @@ -1208,7 +1424,6 @@ return NULL; } - /****************************************************************************** * Name * xml_get_value @@ -1228,11 +1443,12 @@ char *xml_get_value(const char *section, const char *item) { xmlNodePtr cur = NULL; - xmlChar *results = NULL; if ((cur = - xml_find_prop(xml_settings_doc, "Xiphos", section, item)) != NULL) { - results = xmlNodeListGetString(xml_settings_doc, - cur->xmlChildrenNode, 1); + xml_find_prop(xml_settings_doc, "Xiphos", section, + item)) != NULL) { + xmlChar *results = + xmlNodeListGetString(xml_settings_doc, + cur->xmlChildrenNode, 1); if (results) return (char *)results; } @@ -1256,18 +1472,17 @@ * void */ -void xml_set_value(const char *type_doc, const char *section, const char *item, - const char *value) +void xml_set_value(const char *type_doc, const char *section, + const char *item, const char *value) { xmlNodePtr cur = NULL; if ((cur = - xml_find_prop(xml_settings_doc, type_doc, section, item)) != NULL) { + xml_find_prop(xml_settings_doc, type_doc, section, + item)) != NULL) { xmlNodeSetContent(cur, (const xmlChar *)value); } } - - /****************************************************************************** * Name * xml_parse_settings_file @@ -1291,11 +1506,10 @@ fprintf(stderr, _("Document not parsed successfully. \n")); return FALSE; } - + return TRUE; } - /****************************************************************************** * Name * xml_save_settings_doc @@ -1333,9 +1547,10 @@ /* did it save properly? */ if (((retval = stat(name, &buf)) < 0) || ((retval == 0) && (buf.st_size == 0))) { - char *msg = g_strdup_printf(_("Save of settings failed! stat %d, size %d\n%s"), - retval, (int)buf.st_size, - _("Attempting to revert to previous save.")); + char *msg = + g_strdup_printf(_("Save of settings failed! stat %d, size %d\n%s"), + retval, (int)buf.st_size, + _("Attempting to revert to previous save.")); g_unlink(name); g_rename(backup_name, name); gui_generic_warning_modal(msg); @@ -1344,7 +1559,6 @@ #endif } - /****************************************************************************** * Name * xml_free_settings_doc @@ -1366,7 +1580,7 @@ xmlFreeDoc(xml_settings_doc); } -void xml_add_new_section_to_settings_doc(char * section) +void xml_add_new_section_to_settings_doc(char *section) { xmlNodePtr root_node = NULL; @@ -1375,12 +1589,10 @@ fprintf(stderr, _("empty document \n")); return; } - (void) xmlNewChild(root_node, NULL, - (const xmlChar *) section, NULL); + (void)xmlNewChild(root_node, NULL, + (const xmlChar *)section, NULL); } - - /****************************************************************************** * Name * @@ -1397,16 +1609,20 @@ * */ -void xml_add_new_item_to_export_doc_section(char * section, char * item_name, char * value) +void xml_add_new_item_to_export_doc_section(char *section, char *item_name, + char *value) { xmlNodePtr section_node = NULL; - section_node = xml_find_section(xml_export_doc, "Copy_Export", section); + section_node = + xml_find_section(xml_export_doc, "Copy_Export", section); if (section_node) - xmlNewTextChild(section_node, NULL, (const xmlChar *)item_name, - (const xmlChar *)value); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)item_name, + (const xmlChar *)value); } + /****************************************************************************** * Name * @@ -1423,15 +1639,18 @@ * */ -void xml_add_new_item_to_section(char * section, char * item_name, char * value) +void xml_add_new_item_to_section(char *section, char *item_name, + char *value) { xmlNodePtr section_node = NULL; - section_node = xml_find_section(xml_settings_doc, "Xiphos", section); + section_node = + xml_find_section(xml_settings_doc, "Xiphos", section); if (section_node) - xmlNewTextChild(section_node, NULL, (const xmlChar *)item_name, - (const xmlChar *)value); + xmlNewTextChild(section_node, NULL, + (const xmlChar *)item_name, + (const xmlChar *)value); } /****************************************************************************** @@ -1450,18 +1669,19 @@ * void */ -void xml_remove_node(const char *section, const char *item, const char *label) +void xml_remove_node(const char *section, const char *item, + const char *label) { xmlNodePtr cur = NULL; xmlNodePtr cur_item = NULL; if ((cur = - xml_find_section(xml_settings_doc, "Xiphos", section)) != NULL) { + xml_find_section(xml_settings_doc, "Xiphos", + section)) != NULL) { if ((cur_item = xml_find_item(cur, item, label)) != NULL) { xmlUnlinkNode(cur_item); xmlFreeNode(cur_item); } } - } /****************************************************************************** @@ -1484,9 +1704,10 @@ { xmlNodePtr cur = NULL; - if ((cur = xml_find_section(xml_settings_doc, "Xiphos", section)) != NULL) { + if ((cur = + xml_find_section(xml_settings_doc, "Xiphos", + section)) != NULL) { xmlUnlinkNode(cur); xmlFreeNode(cur); } - } diff -Nru xiphos-4.0.0+dfsg1/src/main/xml.h xiphos-4.0.4+dfsg1/src/main/xml.h --- xiphos-4.0.0+dfsg1/src/main/xml.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/main/xml.h 2015-02-11 23:48:33.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xml.h - * - * Copyright (C) 2000-2014 Xiphos Developer Team + * Copyright (C) 2000-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,41 +28,51 @@ extern "C" { #endif -void xml_add_new_section_to_settings_doc(char * section); +void xml_add_new_section_to_settings_doc(char *section); void xml_new_bookmark_file(void); -xmlNodePtr xml_add_folder_to_parent(xmlNodePtr parent, gchar * caption); -void xml_add_bookmark_to_parent(xmlNodePtr parent, gchar * caption, - gchar * key, gchar * module, const gchar * mod_desc); -void xml_write_bookmark_doc(const xmlChar * xml_filename); +xmlNodePtr xml_add_folder_to_parent(xmlNodePtr parent, + gchar *caption); +void xml_add_bookmark_to_parent(xmlNodePtr parent, gchar *caption, + gchar *key, gchar *module, + const gchar *mod_desc); +void xml_write_bookmark_doc(const xmlChar *xml_filename); void xml_free_bookmark_doc(void); -xmlNodePtr xml_load_bookmark_file(const xmlChar * bookmark_file); -char *xml_get_list_from_label(const char * section, const char * item, const char * label); -int xml_set_section_ptr(const char * section); -void xml_set_list_item(const char * section, const char * item, const char * label, - const char * value); -void xml_set_new_element(const char *section, const char *item, const char *content); +xmlNodePtr xml_load_bookmark_file(const xmlChar *bookmark_file); +char *xml_get_list_from_label(const char *section, + const char *item, const char *label); +int xml_set_section_ptr(const char *section); +void xml_set_list_item(const char *section, const char *item, + const char *label, const char *value); +void xml_set_new_element(const char *section, const char *item, + const char *content); int xml_next_item(void); char *xml_get_label(void); char *xml_get_list(void); void xml_free_export_doc(void); -void xml_export_set_value(const char *type_doc, const char *section, const char *item, - const char *value); +void xml_export_set_value(const char *type_doc, + const char *section, const char *item, + const char *value); void xml_save_export_doc(char *name); -void xml_add_new_section_to_doc(xmlDocPtr doc, char * section); +void xml_add_new_section_to_doc(xmlDocPtr doc, char *section); int xml_create_copy_export_file(char *path); -int xml_load_copy_export_file(const xmlChar * file); -char *xml_get_copy_export_value(const char *section, const char *item); -int xml_create_settings_file(char * file_name); +int xml_load_copy_export_file(const xmlChar *file); +char *xml_get_copy_export_value(const char *section, + const char *item); +int xml_create_settings_file(char *file_name); int xml_parse_settings_file(char *file_name); char *xml_get_value(const char *section, const char *item); -void xml_set_value(const char *type_doc, const char *section, const char *item, - const char *value); +void xml_set_value(const char *type_doc, const char *section, + const char *item, const char *value); void xml_save_settings_doc(char *file_name); void xml_free_settings_doc(void); -void xml_add_new_item_to_export_doc_section(char * section, char * item_name, char * value); -void xml_add_new_item_to_section(char * section, char * item_name, char * value); -void xml_remove_node(const char *section, const char *item, const char *label); +void xml_add_new_item_to_export_doc_section(char *section, + char *item_name, + char *value); +void xml_add_new_item_to_section(char *section, char *item_name, + char *value); +void xml_remove_node(const char *section, const char *item, + const char *label); void xml_remove_section(const char *section); void xml_convert_to_osisref(void); diff -Nru xiphos-4.0.0+dfsg1/src/webkit/wk-html.c xiphos-4.0.4+dfsg1/src/webkit/wk-html.c --- xiphos-4.0.0+dfsg1/src/webkit/wk-html.c 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/webkit/wk-html.c 2015-02-21 02:22:53.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * wk-html.c - webkit-specific html support * - * Copyright (C) 2010-2014 Xiphos Developer Team + * Copyright (C) 2010-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,16 @@ */ #include + +#ifndef USE_WEBKIT2 +#include +#include +#else #include #include #include #include +#endif #include "main/url.hh" #include "main/module_dialogs.h" @@ -34,7 +40,7 @@ #include "gui/dictlex.h" #include "main/sword.h" -#define WK_HTML_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WK_TYPE_HTML, WkHtmlPriv)) +#define WK_HTML_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE((object), WK_TYPE_HTML, WkHtmlPriv)) extern gboolean shift_key_pressed; extern gboolean in_url; @@ -50,124 +56,136 @@ LAST_SIGNAL }; -static guint signals[LAST_SIGNAL] = { 0 }; +static guint signals[LAST_SIGNAL] = {0}; + static GObjectClass *parent_class = NULL; -static gboolean button_release_handler (GtkWidget *widget, - GdkEventButton *event) +static gboolean button_release_handler(GtkWidget *widget, GdkEventButton *event) { - GtkClipboard * clipboard; - if(event->type == GDK_BUTTON_RELEASE && db_click) { - XI_message((" button 1 = %s" , "double click!\n")); - - if(webkit_web_view_has_selection(WEBKIT_WEB_VIEW (widget))) { - webkit_web_view_copy_clipboard (WEBKIT_WEB_VIEW (widget)); - - clipboard = gtk_widget_get_clipboard (widget, - GDK_SELECTION_CLIPBOARD ); - - gtk_clipboard_request_text (clipboard, - gui_get_clipboard_text_for_lookup, - NULL); + if (event->type == GDK_BUTTON_RELEASE && db_click) { + XI_message((" button 1 = %s", "double click!\n")); + +#ifdef USE_WEBKIT2 + webkit_web_view_execute_editing_command(WEBKIT_WEB_VIEW(widget), + WEBKIT_EDITING_COMMAND_COPY); +#else + if (webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget))) { + webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(widget)); } +#endif + GtkClipboard *clipboard = gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD); + gtk_clipboard_request_text(clipboard, gui_get_clipboard_text_for_lookup, NULL); } + return FALSE; } -static gboolean button_press_handler (GtkWidget *widget, - GdkEventButton *event) + +static gboolean button_press_handler(GtkWidget *widget, GdkEventButton *event) { WkHtmlPriv *priv; - priv = WK_HTML_GET_PRIVATE (WK_HTML(widget)); + priv = WK_HTML_GET_PRIVATE(WK_HTML(widget)); - if(event->type == GDK_2BUTTON_PRESS && !x_uri) { + if (event->type == GDK_2BUTTON_PRESS && !x_uri) { db_click = TRUE; return FALSE; } + db_click = FALSE; - if (event->button == 1) { + /* this is a left click */ + if (event->button == 1) { + /* go to the correct url otherwise webkit will do its own thing */ if (x_uri) { - if ( priv->is_dialog ) + if (priv->is_dialog) { main_dialogs_url_handler(priv->dialog, x_uri, TRUE); - else + } else { main_url_handler(x_uri, TRUE); + } + return TRUE; } + return FALSE; } - if (event->button == 3) { - g_signal_emit(widget, - signals[POPUPMENU_REQUESTED], - 0, - priv->dialog, - FALSE); + + /* this is a right click */ + if (event->button == 3) { + /* display our own popup menu instead of webkit's one */ + g_signal_emit(widget, signals[POPUPMENU_REQUESTED], 0, priv->dialog, FALSE); return TRUE; } - if (event->button == 2) { + + if (event->button == 2) { /* ignore middle button */ return TRUE; } + return FALSE; } -static void link_handler (GtkWidget *widget, - gchar *title, - gchar *uri, - gpointer user_data) -{ +/* this is the link handler for when a link is clicked */ +static void link_handler(GtkWidget *widget, +#ifdef USE_WEBKIT2 + WebKitHitTestResult *hit_test_result, + guint modifiers, +#else + gchar *title, + gchar *uri, +#endif + gpointer user_data) +{ +#ifdef USE_WEBKIT2 + const char *uri; + uri = webkit_hit_test_result_get_link_uri(hit_test_result); +#endif + WkHtmlPriv *priv; priv = WK_HTML_GET_PRIVATE(WK_HTML(widget)); XI_message(("html_link_message: uri = %s", (uri ? uri : "-none-"))); - if (shift_key_pressed) - return; - - if(x_uri) { + if (x_uri) { g_free(x_uri); x_uri = NULL; } + if (uri) { x_uri = g_strdup(uri); in_url = 1; } else in_url = 0; - g_signal_emit(widget, - signals[URI_SELECTED], - 0, - uri, - FALSE); - if (uri) { - if ( priv->is_dialog ) + g_signal_emit(widget, signals[URI_SELECTED], 0, uri, FALSE); + + if (uri) { + if (priv->is_dialog) main_dialogs_url_handler(priv->dialog, uri, FALSE); else main_url_handler(uri, FALSE); } } -static void -html_realize (GtkWidget *widget) +static void html_realize(GtkWidget *widget) { -// WkHtml *html = WK_HTML (widget); - GTK_WIDGET_CLASS (parent_class)->realize (widget); + GTK_WIDGET_CLASS(parent_class)->realize(widget); - g_signal_connect (G_OBJECT (widget), "button-press-event", - G_CALLBACK (button_press_handler), - NULL); - g_signal_connect (G_OBJECT (widget), "button-release-event", - G_CALLBACK (button_release_handler), - NULL); - g_signal_connect (G_OBJECT (widget), "hovering-over-link", - G_CALLBACK (link_handler), - NULL); + g_signal_connect(G_OBJECT(widget), "button-press-event", + G_CALLBACK(button_press_handler), NULL); + g_signal_connect(G_OBJECT(widget), "button-release-event", + G_CALLBACK(button_release_handler), NULL); + g_signal_connect(G_OBJECT(widget), +#ifdef USE_WEBKIT2 + "mouse-target-changed", +#else + "hovering-over-link", +#endif + G_CALLBACK(link_handler), NULL); } -static void -html_init (WkHtml *html) +static void html_init(WkHtml *html) { WkHtmlPriv *priv; - html->priv = priv = WK_HTML_GET_PRIVATE (html); + html->priv = priv = WK_HTML_GET_PRIVATE(html); priv->base_uri = NULL; priv->anchor = NULL; @@ -175,40 +193,32 @@ priv->content = NULL; priv->mime = NULL; priv->initialised = FALSE; - - /* g_signal_connect (html, "navigation-policy-decision-requested", */ - /* G_CALLBACK (html_open_uri), NULL); */ } -static void -html_dispose (GObject *object) +static void html_dispose(GObject *object) { -// WkHtml *html = WK_HTML (object); - parent_class->dispose (object); + parent_class->dispose(object); } -static void -html_finalize (GObject *object) +static void html_finalize(GObject *object) { - WkHtml *html = WK_HTML (object); + WkHtml *html = WK_HTML(object); WkHtmlPriv *priv = html->priv; if (priv->timeout) - g_source_remove (priv->timeout); - g_free (priv->base_uri); - g_free (priv->anchor); + g_source_remove(priv->timeout); + g_free(priv->base_uri); + g_free(priv->anchor); - parent_class->finalize (object); + parent_class->finalize(object); } -static void -html_class_init (WkHtmlClass *klass) +static void html_class_init(WkHtmlClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); -// WebKitWebViewClass *wc_class = WEBKIT_WEB_VIEW_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); - parent_class = (GObjectClass *) g_type_class_peek_parent (klass); + parent_class = (GObjectClass *)g_type_class_peek_parent(klass); object_class->finalize = html_finalize; object_class->dispose = html_dispose; @@ -216,165 +226,163 @@ widget_class->realize = html_realize; signals[URI_SELECTED] = - g_signal_new ("uri_selected", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (WkHtmlClass, - uri_selected), - NULL, NULL, - wk_marshal_VOID__POINTER_BOOLEAN, - G_TYPE_NONE, - 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); + g_signal_new("uri_selected", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(WkHtmlClass, uri_selected), + NULL, + NULL, + wk_marshal_VOID__POINTER_BOOLEAN, + G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); signals[FRAME_SELECTED] = - g_signal_new ("frame_selected", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (WkHtmlClass, - frame_selected), - g_signal_accumulator_true_handled, NULL, - wk_marshal_BOOLEAN__POINTER_BOOLEAN, - G_TYPE_BOOLEAN, - 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); - + g_signal_new("frame_selected", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(WkHtmlClass, frame_selected), + g_signal_accumulator_true_handled, NULL, + wk_marshal_BOOLEAN__POINTER_BOOLEAN, + G_TYPE_BOOLEAN, + 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); signals[POPUPMENU_REQUESTED] = - g_signal_new ("popupmenu_requested", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (WkHtmlClass, - popupmenu_requested), - NULL, NULL, - - wk_marshal_VOID__POINTER_BOOLEAN, - G_TYPE_NONE, - 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); - // g_cclosure_marshal_VOID__VOID, - // G_TYPE_NONE, - // 1,G_TYPE_POINTER - // ); + g_signal_new("popupmenu_requested", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(WkHtmlClass, popupmenu_requested), + NULL, + NULL, + wk_marshal_VOID__POINTER_BOOLEAN, + G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); - g_type_class_add_private (klass, sizeof (WkHtmlPriv)); + g_type_class_add_private(klass, sizeof(WkHtmlPriv)); } -GType -wk_html_get_type (void) +GType wk_html_get_type(void) { static GType type = 0; if (G_UNLIKELY(type == 0)) { static const GTypeInfo info = { - sizeof (WkHtmlClass), + sizeof(WkHtmlClass), NULL, NULL, - (GClassInitFunc) html_class_init, + (GClassInitFunc)html_class_init, NULL, NULL, - sizeof (WkHtml), + sizeof(WkHtml), 0, - (GInstanceInitFunc) html_init, + (GInstanceInitFunc)html_init, }; - type = g_type_register_static(WEBKIT_TYPE_WEB_VIEW, - "WkHtml", - &info, (GTypeFlags) 0); + type = g_type_register_static(WEBKIT_TYPE_WEB_VIEW, "WkHtml", + &info, (GTypeFlags)0); } return type; } -void -wk_html_set_base_uri (WkHtml *html, const gchar *uri) +void wk_html_set_base_uri(WkHtml *html, const gchar *uri) { WkHtmlPriv *priv; - g_return_if_fail(WK_HTML_IS_HTML (html)); + g_return_if_fail(WK_HTML_IS_HTML(html)); priv = html->priv; - if (priv->base_uri) - g_free (priv->base_uri); + if (priv->base_uri) { + g_free(priv->base_uri); + } priv->base_uri = g_strdup("file://"); } -void -wk_html_open_stream (WkHtml *html, const gchar *mime) +void wk_html_open_stream(WkHtml *html, const gchar *mime) { - wk_html_set_base_uri (html, NULL); + wk_html_set_base_uri(html, NULL); +#ifndef USE_WEBKIT2 webkit_web_view_set_transparent(WEBKIT_WEB_VIEW(html), TRUE); +#endif html->priv->frames_enabled = FALSE; - g_free (html->priv->content); + g_free(html->priv->content); html->priv->content = NULL; - g_free (html->priv->mime); + g_free(html->priv->mime); html->priv->mime = g_strdup(mime); } -void -wk_html_write (WkHtml *html, const gchar *data, gint len) +void wk_html_write(WkHtml *html, const gchar *data, gint len) { gchar *tmp = NULL; - if (len == -1) len = strlen (data); + if (len == -1) { + len = strlen(data); + } if (html->priv->content) { - tmp = g_strjoin (NULL, html->priv->content, data, NULL); - g_free (html->priv->content); + tmp = g_strjoin(NULL, html->priv->content, data, NULL); + g_free(html->priv->content); html->priv->content = tmp; } else { - html->priv->content = g_strdup (data); + html->priv->content = g_strdup(data); } } -void -wk_html_frames (WkHtml *html, gboolean enable) +void wk_html_frames(WkHtml *html, gboolean enable) { html->priv->frames_enabled = enable; - } -void -wk_html_printf (WkHtml *html, char *format, ...) +void wk_html_printf(WkHtml *html, char *format, ...) { - va_list args; - gchar *string; + va_list args; + gchar *string; - g_return_if_fail (format != NULL); + g_return_if_fail(format != NULL); - va_start (args, format); - string = g_strdup_vprintf (format, args); - va_end (args); + va_start(args, format); + string = g_strdup_vprintf(format, args); + va_end(args); - wk_html_write (html, string, -1); + wk_html_write(html, string, -1); - g_free (string); + g_free(string); } - -void -wk_html_close (WkHtml *html) +void wk_html_close(WkHtml *html) { - if (!html->priv->initialised) { html->priv->initialised = TRUE; - webkit_web_view_set_maintains_back_forward_list (WEBKIT_WEB_VIEW (html), FALSE); +#ifndef USE_WEBKIT2 + webkit_web_view_set_maintains_back_forward_list(WEBKIT_WEB_VIEW(html), FALSE); +#endif } - webkit_web_view_load_string (WEBKIT_WEB_VIEW (html), - html->priv->content, - html->priv->mime, - NULL, - html->priv->base_uri); - g_free (html->priv->content); +#ifdef USE_WEBKIT2 + GBytes *html_bytes; + html_bytes = g_bytes_new(html->priv->content, strlen(html->priv->content)); + + webkit_web_view_load_bytes(WEBKIT_WEB_VIEW(html), + html_bytes, + html->priv->mime, + NULL, + html->priv->base_uri); + + g_bytes_unref(html_bytes); +#else + webkit_web_view_load_string(WEBKIT_WEB_VIEW(html), + html->priv->content, + html->priv->mime, + NULL, html->priv->base_uri); +#endif + + g_free(html->priv->content); html->priv->content = NULL; - g_free (html->priv->mime); + g_free(html->priv->mime); html->priv->mime = NULL; - } -void -wk_html_render_data(WkHtml *html, const char *data, guint32 len) +void wk_html_render_data(WkHtml *html, const char *data, guint32 len) { printf("in render_data, data is %s", data); wk_html_open_stream(html, "text/html"); @@ -382,89 +390,91 @@ wk_html_close(html); } -gboolean -wk_html_find (WkHtml *html, - const gchar *find_string) +gboolean wk_html_find(WkHtml *html, const gchar *find_string) { if (html->priv->find_string) g_free(html->priv->find_string); - html->priv->find_string = g_strdup (find_string); - return webkit_web_view_search_text (WEBKIT_WEB_VIEW (html), - find_string, FALSE, - TRUE, TRUE); -} - -gboolean -wk_html_find_again (WkHtml *html, - gboolean forward) -{ - return webkit_web_view_search_text (WEBKIT_WEB_VIEW (html), - html->priv->find_string, - FALSE, - forward, TRUE); -} - -void -wk_html_set_find_props (WkHtml *html, - const char *str, - gboolean match_case, - gboolean wrap) -{ - /* Empty */ + html->priv->find_string = g_strdup(find_string); + +#ifdef USE_WEBKIT2 + WebKitFindController *find_controller; + + find_controller = webkit_web_view_get_find_controller(WEBKIT_WEB_VIEW(html)); + webkit_find_controller_search(find_controller, find_string, + WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE, + G_MAXUINT); +#else + return webkit_web_view_search_text(WEBKIT_WEB_VIEW(html), + find_string, FALSE, TRUE, TRUE); +#endif +} + +gboolean wk_html_find_again(WkHtml *html, gboolean forward) +{ +#ifdef USE_WEBKIT2 + WebKitFindController *find_controller; + find_controller = webkit_web_view_get_find_controller(WEBKIT_WEB_VIEW(html)); + webkit_find_controller_search(find_controller, + html->priv->find_string, + WEBKIT_FIND_OPTIONS_NONE, G_MAXUINT); +#else + return webkit_web_view_search_text(WEBKIT_WEB_VIEW(html), + html->priv->find_string, + FALSE, forward, TRUE); +#endif } -void -wk_html_jump_to_anchor (WkHtml *html, - gchar *anchor) +void wk_html_jump_to_anchor(WkHtml *html, gchar *anchor) { WkHtmlPriv *priv; - g_return_if_fail (html != NULL); + g_return_if_fail(html != NULL); priv = html->priv; - g_free (priv->anchor); - priv->anchor = g_strdup (anchor); -} - -/* -void ClipboardTextReceivedFunc (GtkClipboard *clipboard, - const gchar *text, - gpointer data) -{ - - XI_message(("clipboard text = %s",text)); + g_free(priv->anchor); + priv->anchor = g_strdup(anchor); } -*/ -void -wk_html_copy_selection (WkHtml *html) +void wk_html_copy_selection(WkHtml *html) { - if(webkit_web_view_has_selection(WEBKIT_WEB_VIEW (html))) - webkit_web_view_copy_clipboard (WEBKIT_WEB_VIEW (html)); +#ifdef USE_WEBKIT2 + webkit_web_view_execute_editing_command(WEBKIT_WEB_VIEW(html), + WEBKIT_EDITING_COMMAND_COPY); +#else + if (webkit_web_view_has_selection(WEBKIT_WEB_VIEW(html))) + webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(html)); +#endif } -void -wk_html_select_all (WkHtml *html) +void wk_html_select_all(WkHtml *html) { - webkit_web_view_select_all (WEBKIT_WEB_VIEW (html)); +#ifdef USE_WEBKIT2 + webkit_web_view_execute_editing_command(WEBKIT_WEB_VIEW(html), + WEBKIT_EDITING_COMMAND_SELECT_ALL); +#else + webkit_web_view_select_all(WEBKIT_WEB_VIEW(html)); +#endif } -void -wk_html_print (WkHtml *html) +void wk_html_print(WkHtml *html) { - webkit_web_frame_print (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (html))); - //webkit_web_view_execute_script (WEBKIT_WEB_VIEW (html), "print();"); +#ifdef USE_WEBKIT2 + WebKitPrintOperation *print_operation; + print_operation = webkit_print_operation_new(WEBKIT_WEB_VIEW(html)); + webkit_print_operation_run_dialog(print_operation, NULL); +#else + webkit_web_frame_print(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(html))); + webkit_web_view_execute_script(WEBKIT_WEB_VIEW(html), "print();"); +#endif } -gboolean -wk_html_initialize (void) +gboolean wk_html_initialize(void) { return TRUE; } -void -wk_html_shutdown (void) +void wk_html_shutdown(void) { /* Empty */ } diff -Nru xiphos-4.0.0+dfsg1/src/webkit/wk-html.h xiphos-4.0.4+dfsg1/src/webkit/wk-html.h --- xiphos-4.0.0+dfsg1/src/webkit/wk-html.h 2014-12-18 19:34:41.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/webkit/wk-html.h 2015-02-12 14:39:49.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * wk-html.h - webkit-specific html support * - * Copyright (C) 2010-2014 Xiphos Developer Team + * Copyright (C) 2010-2015 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,28 +23,33 @@ #define __WK_HTML_H__ #undef DATADIR -#include + +#ifdef USE_WEBKIT2 +#include +#else +#include +#endif #include "main/module_dialogs.h" #include "main/module_dialogs.h" G_BEGIN_DECLS +#define WK_TYPE_HTML (wk_html_get_type()) +#define WK_HTML(o) (G_TYPE_CHECK_INSTANCE_CAST((o), WK_TYPE_HTML, WkHtml)) +#define WK_HTML_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WK_TYPE_HTML, WkHtmlClass)) +#define WK_HTML_IS_HTML(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), WK_TYPE_HTML)) +#define WK_HTML_IS_HTML_CLASS(k) (G_TYPE_CHECK_INSTANCE_GET_CLASS((o), WK_TYPE_HTML, WkHtmlClass)) +typedef struct _WkHtml WkHtml; +typedef struct _WkHtmlClass WkHtmlClass; +typedef struct _WkHtmlPriv WkHtmlPriv; -#define WK_TYPE_HTML (wk_html_get_type ()) -#define WK_HTML(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WK_TYPE_HTML, WkHtml)) -#define WK_HTML_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), WK_TYPE_HTML, WkHtmlClass)) -#define WK_HTML_IS_HTML(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WK_TYPE_HTML)) -#define WK_HTML_IS_HTML_CLASS(k) (G_TYPE_CHECK_INSTANCE_GET_CLASS ((o), WK_TYPE_HTML, WkHtmlClass)) - -typedef struct _WkHtml WkHtml; -typedef struct _WkHtmlClass WkHtmlClass; -typedef struct _WkHtmlPriv WkHtmlPriv; - -struct _WkHtml { +struct _WkHtml +{ WebKitWebView parent; WkHtmlPriv *priv; }; -struct _WkHtmlPriv { +struct _WkHtmlPriv +{ gchar *content; gchar *mime; gchar *find_string; @@ -55,64 +60,41 @@ guint timeout; gint pane; gboolean is_dialog; - DIALOG_DATA * dialog; + DIALOG_DATA *dialog; }; -struct _WkHtmlClass { +struct _WkHtmlClass +{ WebKitWebViewClass parent; - /* Signals */ - void (*uri_selected) (WkHtml *view, - gchar *uri, - gboolean handled); - gboolean (*frame_selected) (WkHtml *view, - gchar *uri, - gboolean handled); - void (*title_changed) (WkHtml *view, - const gchar *new_title); - void (*popupmenu_requested) (WkHtml *view, - const gchar *link); + /* Signals */ + void (*uri_selected)(WkHtml *view, gchar *uri, gboolean handled); + gboolean (*frame_selected)(WkHtml *view, gchar *uri, gboolean handled); + void (*title_changed)(WkHtml *view, const gchar *new_title); + void (*popupmenu_requested)(WkHtml *view, const gchar *link); }; -GType wk_html_get_type (void); -WkHtml * wk_html_new (DIALOG_DATA * dialog, gboolean is_dialog, gint pane); -void wk_html_set_base_uri (WkHtml *html, - const gchar *uri); -void wk_html_open_stream (WkHtml *html, - const gchar *mime); -void wk_html_write (WkHtml *html, - const gchar *data, - gint len); -void wk_html_printf (WkHtml *html, - gchar *format, - ...) G_GNUC_PRINTF (2,3); -void wk_html_close (WkHtml *html); - -void wk_html_render_data (WkHtml *html, - const char *data, - guint32 len); - -void wk_html_frames (WkHtml *html, - gboolean enable); -gboolean wk_html_find (WkHtml *html, - const gchar *find_string); -gboolean wk_html_find_again (WkHtml *html, - gboolean forward); -void wk_html_set_find_props (WkHtml *html, - const char *str, - gboolean match_case, - gboolean wrap); -void wk_html_jump_to_anchor (WkHtml *html, - gchar *anchor); -void wk_html_copy_selection (WkHtml *html); +GType wk_html_get_type(void); +WkHtml *wk_html_new(DIALOG_DATA *dialog, gboolean is_dialog, gint pane); +void wk_html_set_base_uri(WkHtml *html, const gchar *uri); +void wk_html_open_stream(WkHtml *html, const gchar *mime); +void wk_html_write(WkHtml *html, const gchar *data, gint len); +void wk_html_printf(WkHtml *html, gchar *format, ...) G_GNUC_PRINTF(2, 3); +void wk_html_close(WkHtml *html); + +void wk_html_render_data(WkHtml *html, const char *data, guint32 len); + +void wk_html_frames(WkHtml *html, gboolean enable); +gboolean wk_html_find(WkHtml *html, const gchar *find_string); +gboolean wk_html_find_again(WkHtml *html, gboolean forward); +void wk_html_jump_to_anchor(WkHtml *html, gchar *anchor); +void wk_html_copy_selection(WkHtml *html); -void wk_html_select_all (WkHtml *html); +void wk_html_select_all(WkHtml *html); -void wk_html_print (WkHtml *html); +void wk_html_print(WkHtml *html); -gboolean wk_html_initialize (void); -void wk_html_shutdown (void); +gboolean wk_html_initialize(void); +void wk_html_shutdown(void); G_END_DECLS - #endif /* __WK_HTML_H__ */ - diff -Nru xiphos-4.0.0+dfsg1/src/xiphos_html/xiphos_html.c xiphos-4.0.4+dfsg1/src/xiphos_html/xiphos_html.c --- xiphos-4.0.0+dfsg1/src/xiphos_html/xiphos_html.c 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/xiphos_html/xiphos_html.c 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos_html.c - toolkit-generalized html support * - * Copyright (C) 2010-2014 Xiphos Developer Team + * Copyright (C) 2010-2015 Xiphos Developer Team * * 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 @@ -21,7 +21,8 @@ #include "xiphos_html.h" -XiphosHtml *xiphos_html_new(DIALOG_DATA * dialog, gboolean is_dialog, gint pane) +XiphosHtml *xiphos_html_new(DIALOG_DATA *dialog, gboolean is_dialog, + gint pane) { XiphosHtml *html; html = XIPHOS_HTML(g_object_new(XIPHOS_TYPE_HTML, NULL)); @@ -30,6 +31,6 @@ priv->pane = pane; priv->is_dialog = is_dialog; priv->dialog = dialog; - + return html; } diff -Nru xiphos-4.0.0+dfsg1/src/xiphos_html/xiphos_html.h xiphos-4.0.4+dfsg1/src/xiphos_html/xiphos_html.h --- xiphos-4.0.0+dfsg1/src/xiphos_html/xiphos_html.h 2014-12-18 19:34:43.000000000 +0000 +++ xiphos-4.0.4+dfsg1/src/xiphos_html/xiphos_html.h 2015-02-11 23:48:34.000000000 +0000 @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos_html.h - toolkit-generalized html support * - * Copyright (C) 2010-2014 Xiphos Developer Team + * Copyright (C) 2010-2015 Xiphos Developer Team * * 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 @@ -25,7 +25,7 @@ * A general compatibility layer that will buffer the application from the * direct effects of WebKit and Gecko being alternatively selected for * the rendering system. - */ + */ #include "webkit/wk-html.h" // Used in places like the ubiquitous _popmenu_requested_cb @@ -34,19 +34,20 @@ // Other layers of compatibility - pulled from display_info.c and other places #define XIPHOS_HTML WK_HTML -#define XIPHOS_HTML_NEW(a, b, c) xiphos_html_new(a, b, c) -#define XIPHOS_HTML_COPY_SELECTION(text_html) wk_html_copy_selection(WK_HTML(text_html)) -#define XIPHOS_HTML_OPEN_STREAM(a, b) wk_html_open_stream(WK_HTML(a), b) -#define XIPHOS_HTML_WRITE(a, b, c) wk_html_write(WK_HTML(a), b, c) -#define XIPHOS_HTML_CLOSE(a) wk_html_close(WK_HTML(a)) -#define XIPHOS_HTML_FIND(a, b) wk_html_find(a, b) -#define XIPHOS_HTML_FIND_AGAIN(a, b) wk_html_find_again(a, b) -#define XIPHOS_HTML_JUMP_TO_ANCHOR wk_html_jump_to_anchor -#define XIPHOS_HTML_PRINT_DOCUMENT(a) wk_html_print(a)// TODO: Implement? -#define XIPHOS_HTML_SHUTDOWN wk_html_shutdown -#define XIPHOS_HTML_INITIALIZE wk_html_initialize +#define XIPHOS_HTML_NEW(a, b, c) xiphos_html_new(a, b, c) +#define XIPHOS_HTML_COPY_SELECTION(text_html) wk_html_copy_selection(WK_HTML(text_html)) +#define XIPHOS_HTML_OPEN_STREAM(a, b) wk_html_open_stream(WK_HTML(a), b) +#define XIPHOS_HTML_WRITE(a, b, c) wk_html_write(WK_HTML(a), b, c) +#define XIPHOS_HTML_CLOSE(a) wk_html_close(WK_HTML(a)) +#define XIPHOS_HTML_FIND(a, b) wk_html_find(a, b) +#define XIPHOS_HTML_FIND_AGAIN(a, b) wk_html_find_again(a, b) +#define XIPHOS_HTML_JUMP_TO_ANCHOR wk_html_jump_to_anchor +#define XIPHOS_HTML_PRINT_DOCUMENT(a) wk_html_print(a) // TODO: Implement? +#define XIPHOS_HTML_SHUTDOWN wk_html_shutdown +#define XIPHOS_HTML_INITIALIZE wk_html_initialize #define XIPHOS_TYPE_HTML WK_TYPE_HTML -#define XIPHOS_HTML_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), WK_TYPE_HTML, WkHtmlPriv)) +#define XIPHOS_HTML_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE((object), WK_TYPE_HTML, WkHtmlPriv)) -XiphosHtml *xiphos_html_new(DIALOG_DATA * dialog, gboolean is_dialog, gint pane); +XiphosHtml *xiphos_html_new(DIALOG_DATA *dialog, gboolean is_dialog, + gint pane); diff -Nru xiphos-4.0.0+dfsg1/TRANSLATION-HOWTO xiphos-4.0.4+dfsg1/TRANSLATION-HOWTO --- xiphos-4.0.0+dfsg1/TRANSLATION-HOWTO 2014-12-18 19:35:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/TRANSLATION-HOWTO 2015-06-05 11:45:01.000000000 +0000 @@ -88,7 +88,7 @@ $ xml2po -e -u YOUR-LANG.po ../C/*xml -Don't forget to send YOUR-LANG.po files to xiphos-developers@lists.sourceforge.net. +Don't forget to send YOUR-LANG.po files to gnomesword-developers@lists.sourceforge.net. "..and ye shall be witnesses unto me both in Jerusalem, and in all diff -Nru xiphos-4.0.0+dfsg1/ui/bookmarks.gtkbuilder xiphos-4.0.4+dfsg1/ui/bookmarks.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/bookmarks.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/bookmarks.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -1,102 +1,67 @@ - + + + True + False Add Bookmark - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False 300 350 - True - False xiphos-x-16.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - + dialog + - + True - False - 0 - - - + False - + True - GTK_BUTTONBOX_END + False + end True - Create new folder - True True - GTK_RELIEF_NORMAL - True - - - + True + False + Create new folder True - 0.5 - 0.5 + False 0 0 - 0 - 0 - 0 - 0 - + True - False + False 2 True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 + False + document-open-symbolic - 0 False False + 0 True + False New ... True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 1 @@ -104,91 +69,88 @@ - - New Folder + + New Folder + + True + True + 0 + + gtk-add True - True True - gtk-add + True + False True - GTK_RELIEF_NORMAL - True - - - - - Add Bookmark + + Add Bookmark + + True + True + 1 + + _Cancel True - True True - _Cancel + True + False True - GTK_RELIEF_NORMAL - True - - - - - Cancel Bookmark + + Cancel Bookmark + + True + True + 2 + - 0 False True - GTK_PACK_END + end + 0 - - 6 + True - False + False + 6 + vertical 10 - + True - False + False 21 True - Label: - False - False - GTK_JUSTIFY_LEFT - False - False + False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Label: - 0 False False + 0 @@ -196,62 +158,42 @@ 180 True True - True - True - 0 - - True * - False - - - - - Label Entry + + Label Entry - 0 True True + 1 - 0 False True + 0 - + True - False + False 18 True - Verse: - False - False - GTK_JUSTIFY_LEFT - False - False + False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Verse: - 0 False False + 0 @@ -259,62 +201,42 @@ 180 True True - True - True - 0 - - True * - False - - - - - Verse Entry + + Verse Entry - 0 True True + 1 - 0 False True + 1 - + True - False + False 10 True - Module: - False - False - GTK_JUSTIFY_LEFT - False - False + False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Module: - 0 False False + 0 @@ -322,82 +244,64 @@ 180 True True - True - True - 0 - - True * - False - - - - - Module Entry + + Module Entry - 0 True True + 1 - 0 False True + 2 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + in True True False - False - False - True - False - False - False - - - - + + + + - - Bookmark Folder Treeview + + Bookmark Folder Treeview - 0 True True + 3 - 0 True True + 1 - - Bookmark Dialog + + Bookmark Dialog diff -Nru xiphos-4.0.0+dfsg1/ui/bookmarks_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/bookmarks_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/bookmarks_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/bookmarks_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,411 @@ + + + + + True + Add Bookmark + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 300 + 350 + True + False + xiphos-x-16.png + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + + + True + GTK_BUTTONBOX_END + + + True + Create new folder + True + True + GTK_RELIEF_NORMAL + True + + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + New ... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + New Folder + + + + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + + Add Bookmark + + + + + + + True + True + True + _Cancel + True + GTK_RELIEF_NORMAL + True + + + + + + Cancel Bookmark + + + + + + + 0 + False + True + GTK_PACK_END + + + + + 6 + True + False + 10 + + + True + False + 21 + + + True + Label: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 180 + True + True + True + True + 0 + + True + * + False + + + + + + Label Entry + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 18 + + + True + Verse: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 180 + True + True + True + True + 0 + + True + * + False + + + + + + Verse Entry + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 10 + + + True + Module: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 180 + True + True + True + True + 0 + + True + * + False + + + + + + Module Entry + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + False + False + False + True + False + False + False + + + + + + + Bookmark Folder Treeview + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + Bookmark Dialog + + + + + + button1 + button3 + button2 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/editor_link_dialog.xml xiphos-4.0.4+dfsg1/ui/editor_link_dialog.xml --- xiphos-4.0.0+dfsg1/ui/editor_link_dialog.xml 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/editor_link_dialog.xml 2015-02-03 20:12:46.000000000 +0000 @@ -8,7 +8,6 @@ 402 164 normal - False True diff -Nru xiphos-4.0.0+dfsg1/ui/export-dialog.gtkbuilder xiphos-4.0.4+dfsg1/ui/export-dialog.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/export-dialog.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/export-dialog.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -1,6 +1,7 @@ + - + 100 1 @@ -37,7 +38,6 @@ True True False - False True @@ -59,7 +59,6 @@ True True False - False True @@ -82,14 +81,14 @@ - + True False True False - gtk-dialog-warning + dialog-warning-symbolic True @@ -122,13 +121,14 @@ - + True False 6 + vertical 2 - + True False @@ -178,7 +178,7 @@ - + True False 29 @@ -188,7 +188,6 @@ True True False - False 0.5 True @@ -198,7 +197,7 @@ 0 0 - + True False 2 @@ -206,7 +205,7 @@ True False - gtk-copy + edit-copy-symbolic False @@ -245,7 +244,6 @@ True True False - False 0.5 True rb_copy @@ -256,7 +254,7 @@ 0 0 - + True False 2 @@ -264,7 +262,7 @@ True False - gtk-jump-to + go-jump-symbolic False @@ -317,7 +315,6 @@ True False Export complete book - False True 0.5 True @@ -348,7 +345,6 @@ True False Export complete chapter - False True 0.5 True @@ -380,7 +376,6 @@ True False Export single verse - False True 0.5 True @@ -407,7 +402,7 @@ 0 12 - + True False 2 @@ -418,7 +413,6 @@ True True False - False True 0.5 True @@ -491,7 +485,6 @@ True True False - False True 0.5 True @@ -524,7 +517,6 @@ True True False - False True 0.5 True @@ -555,7 +547,6 @@ True False Indicates whether verse numbers should appear inline in the text. - False True 0.5 True @@ -588,7 +579,6 @@ True Indicates whether reference is placed first or last. Indicates whether reference is placed first or last. - False True 0.5 True @@ -622,7 +612,6 @@ True Indicates whether or not version name is included in reference. Indicates whether or not version name is included in reference. - False True 0.50999999046325684 True diff -Nru xiphos-4.0.0+dfsg1/ui/export-dialog_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/export-dialog_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/export-dialog_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/export-dialog_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,658 @@ + + + + + 100 + 1 + 1 + 10 + + + 100 + 1 + 1 + 10 + + + True + False + Copy/Export Passage + xiphos-x-16.png + dialog + + + + True + False + + + True + False + end + + + _Cancel + False + True + True + True + False + False + True + + + Export Passage Cancel + + + + + False + True + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + Export Passage OK + + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + gtk-dialog-warning + + + True + True + 0 + + + + + True + False + Please check copyright before exporting! + True + True + + + True + True + 1 + + + + + + + + True + True + 1 + + + + + True + False + 6 + 2 + + + True + False + + + True + False + Version + + + False + False + 0 + + + + + True + False + : + + + False + False + 1 + + + + + + + + True + False + Key + + + False + False + 3 + + + + + False + False + 0 + + + + + True + False + 29 + + + False + True + True + False + False + 0.5 + True + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-copy + + + False + False + 0 + + + + + True + False + <b>Copy</b> + True + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + False + True + True + False + False + 0.5 + True + rb_copy + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-jump-to + + + False + False + 0 + + + + + True + False + <b>Export</b> + True + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + True + False + 12 + + + Book + False + True + True + False + Export complete book + False + True + 0.5 + True + + + Book Radio Button + + + + + + + False + False + 2 + + + + + True + False + 12 + + + Chapter + False + True + True + False + Export complete chapter + False + True + 0.5 + True + radiobutton1 + + + Chapter Radio Button + + + + + + + False + False + 3 + + + + + True + False + 12 + + + Verse + False + True + True + False + Export single verse + False + True + 0.5 + True + radiobutton1 + + + Verse Radio Button + + + + + + + False + False + 4 + + + + + True + False + 0 + 0 + 12 + + + True + False + 2 + + + Verse range + False + True + True + False + False + True + 0.5 + True + radiobutton1 + + + False + False + 0 + + + + + True + True + adjustment1 + 1 + + + True + True + 1 + + + + + True + True + adjustment2 + 1 + + + True + True + 2 + + + + + + + False + False + 5 + + + + + True + False + 0 + <b>Format</b> + True + + + False + False + 6 + + + + + True + False + 12 + + + Plain Text + False + True + True + False + False + True + 0.5 + True + radiobutton4 + + + Plain Text Radio Button + + + + + + + False + False + 7 + + + + + True + False + 1 + 0 + 12 + + + HTML + False + True + True + False + False + True + 0.5 + True + + + HTML Radio Button + + + + + + + False + False + 8 + + + + + True + False + 12 + + + _Verse numbers in text + False + True + True + False + Indicates whether verse numbers should appear inline in the text. + False + True + 0.5 + True + + + Verse Number button + + + + + + + False + False + 9 + + + + + True + False + 12 + + + Reference last + False + True + True + False + True + Indicates whether reference is placed first or last. + Indicates whether reference is placed first or last. + False + True + 0.5 + True + True + + + Reference last button + + + + + + + False + False + 10 + + + + + True + False + 12 + + + Include version + False + True + True + False + True + Indicates whether or not version name is included in reference. + Indicates whether or not version name is included in reference. + False + True + 0.50999999046325684 + True + True + + + Version button + + + + + + + False + False + 11 + + + + + True + True + 2 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/gtk2_webedit.ui xiphos-4.0.4+dfsg1/ui/gtk2_webedit.ui --- xiphos-4.0.0+dfsg1/ui/gtk2_webedit.ui 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/gtk2_webedit.ui 2015-01-18 16:25:39.000000000 +0000 @@ -600,14 +600,6 @@ - - True - False - _View - True - - - True False @@ -665,7 +657,7 @@ action_new True False - toolbutton1 + New True gtk-new @@ -679,7 +671,7 @@ action_open True False - toolbutton1 + Open True gtk-open @@ -693,7 +685,7 @@ action_save True False - toolbutton1 + Save True gtk-save @@ -707,7 +699,7 @@ action_delete_item True False - toolbutton10 + Delete True @@ -730,7 +722,7 @@ action_undo True False - toolbutton3 + Undo True gtk-undo @@ -744,7 +736,7 @@ action_redo True False - toolbutton3 + Redo True gtk-redo @@ -768,7 +760,7 @@ action_cut True False - toolbutton2 + Cut True gtk-cut @@ -782,7 +774,7 @@ action_copy True False - toolbutton3 + Copy True gtk-copy @@ -796,7 +788,7 @@ action_paste True False - toolbutton4 + Paste True gtk-paste @@ -820,7 +812,7 @@ action_find True False - toolbutton10 + Find True gtk-find @@ -834,7 +826,7 @@ action_replace True False - toolbutton10 + Replace True gtk-find-and-replace @@ -858,7 +850,7 @@ action_justify_left True False - toolbutton6 + Left True gtk-justify-left @@ -872,7 +864,7 @@ action_justify_right True False - toolbutton6 + Right True gtk-justify-right @@ -886,7 +878,7 @@ action_justify_center True False - toolbutton6 + Center True gtk-justify-center @@ -900,7 +892,7 @@ action_justify_full True False - toolbutton7 + Full True gtk-justify-fill @@ -924,7 +916,7 @@ action_decrease_indent True False - toolbutton10 + Decrease True gtk-unindent @@ -938,7 +930,7 @@ action_increase_indent True False - toolbutton10 + Increase True gtk-indent @@ -1015,7 +1007,7 @@ action_bold True False - toolbutton10 + Bold True gtk-bold @@ -1029,7 +1021,7 @@ action_italic True False - toolbutton10 + Italic True gtk-italic @@ -1043,7 +1035,7 @@ action_underline True False - toolbutton11 + Underline True gtk-underline @@ -1057,7 +1049,7 @@ action_strikethrough True False - toolbutton12 + Strike True gtk-strikethrough @@ -1081,7 +1073,7 @@ action_font True False - toolbutton4 + Font True gtk-select-font @@ -1144,7 +1136,7 @@ action_insert_image True False - toolbutton6 + Image True insert-image @@ -1158,7 +1150,7 @@ action_insert_sword_link True False - toolbutton9 + Link True insert-link @@ -1172,7 +1164,7 @@ action_insert_rule True False - toolbutton9 + Rule True insert-object @@ -1186,7 +1178,7 @@ action_insert_table True False - toolbutton9 + Table True insert-object @@ -1200,7 +1192,7 @@ action_insert_emoticon True False - toolbutton9 + Emoticon True face-smile diff -Nru xiphos-4.0.0+dfsg1/ui/gtk_webedit.ui xiphos-4.0.4+dfsg1/ui/gtk_webedit.ui --- xiphos-4.0.0+dfsg1/ui/gtk_webedit.ui 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/gtk_webedit.ui 2015-01-18 16:25:39.000000000 +0000 @@ -602,14 +602,6 @@ - - True - False - _View - True - - - True False @@ -668,7 +660,7 @@ action_new True False - toolbutton1 + New True gtk-new @@ -682,7 +674,7 @@ action_open True False - toolbutton1 + Open True gtk-open @@ -696,7 +688,7 @@ action_save True False - toolbutton1 + Save True gtk-save @@ -710,7 +702,7 @@ action_delete_item True False - toolbutton10 + Delete True @@ -733,7 +725,7 @@ action_undo True False - toolbutton3 + Undo True gtk-undo @@ -747,7 +739,7 @@ action_redo True False - toolbutton3 + Redo True gtk-redo @@ -771,7 +763,7 @@ action_cut True False - toolbutton2 + Cut True gtk-cut @@ -785,7 +777,7 @@ action_copy True False - toolbutton3 + Copy True gtk-copy @@ -799,7 +791,7 @@ action_paste True False - toolbutton4 + Paste True gtk-paste @@ -823,7 +815,7 @@ action_find True False - toolbutton10 + Find True gtk-find @@ -837,7 +829,7 @@ action_replace True False - toolbutton10 + Replace True gtk-find-and-replace @@ -861,7 +853,7 @@ action_justify_left True False - toolbutton6 + Left True gtk-justify-left @@ -875,7 +867,7 @@ action_justify_right True False - toolbutton6 + Right True gtk-justify-right @@ -889,7 +881,7 @@ action_justify_center True False - toolbutton6 + Center True gtk-justify-center @@ -903,7 +895,7 @@ action_justify_full True False - toolbutton7 + Full True gtk-justify-fill @@ -927,7 +919,7 @@ action_decrease_indent True False - toolbutton10 + Decrease True gtk-unindent @@ -941,7 +933,7 @@ action_increase_indent True False - toolbutton10 + Increase True gtk-indent @@ -1018,7 +1010,7 @@ action_bold True False - toolbutton10 + Bold True format-text-bold @@ -1032,7 +1024,7 @@ action_italic True False - toolbutton10 + Italic True gtk-italic @@ -1046,7 +1038,7 @@ action_underline True False - toolbutton11 + Underline True gtk-underline @@ -1060,7 +1052,7 @@ action_strikethrough True False - toolbutton12 + Strike True gtk-strikethrough @@ -1084,7 +1076,7 @@ action_font True False - toolbutton4 + Font True gtk-select-font @@ -1147,7 +1139,7 @@ action_insert_image True False - toolbutton6 + Image True insert-image @@ -1161,7 +1153,7 @@ action_insert_sword_link True False - toolbutton9 + Link True insert-link @@ -1175,7 +1167,7 @@ action_insert_rule True False - toolbutton9 + Rule True insert-object @@ -1189,7 +1181,7 @@ action_insert_table True False - toolbutton9 + Table True insert-object @@ -1203,7 +1195,7 @@ action_insert_emoticon True False - toolbutton9 + Emoticon True face-smile diff -Nru xiphos-4.0.0+dfsg1/ui/languages xiphos-4.0.4+dfsg1/ui/languages --- xiphos-4.0.0+dfsg1/ui/languages 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/languages 2015-08-18 00:27:21.000000000 +0000 @@ -698,7 +698,8 @@ alr Alutor als Tosk Albanian alt Southern Altai -alu 'Are'are +# remove leading ' (consequent to eBible repo discoveries) +alu Are'are alw Alaba-K’abeena alx Amol aly Alyawarr @@ -881,7 +882,8 @@ aub Alugu auc Waorani aud Anuta -aue =/Kx'au//'ein +# remove leading =/ (consequent to eBible repo discoveries) +aue Kx'au//'ein aug Aguna auh Aushi aui Anuki @@ -1220,6 +1222,8 @@ bjm Bajelani bjn Banjar bjo Mid-Southern Banda +# addition from eBible repo +bjp Tangga bjq Southern Betsimisaraka Malagasy bjr Binumarien bjs Bajan @@ -2219,6 +2223,8 @@ dva Duau dwa Diri dwl Walo Kumbe Dogon +# addition from eBible repo +dwr Dawro dws Dutton World Speedwords dww Dawawa dya Dyan @@ -2238,6 +2244,8 @@ dzn Dzando dzo Dzongkha ebg Ebughu +# addition from eBible repo +ebk Eastern Bontok ebo Teke-Ebo ebr Ebrié ebu Embu @@ -2614,6 +2622,8 @@ gmn Gimnime gmo Gamo-Gofa-Dawro gmu Gumalu +# addition from eBible repo +gmv Gamo gmx Magoma gmy Mycenaean Greek gna Kaansa @@ -2624,7 +2634,8 @@ gng Ngangam gnh Lere gni Gooniyandi -gnk //Gana +# remove leading // (consequent to eBible repo discoveries) +gnk Gana gnl Gangulu gnm Ginuman gnn Gumatj @@ -2640,6 +2651,8 @@ goc Gorakor god Godié goe Gongduk +# addition from eBible repo +gof Gofa gog Gogo goh Old High German (ca. 750-1050) goi Gobasi @@ -2743,7 +2756,8 @@ gwf Gowro gwg Moo gwi Gwichʼin -gwj /Gwi +# remove leading / (consequent to eBible repo discoveries) +gwj Gwi gwn Gwandara gwr Gwere gwt Gawar-Bati @@ -2874,7 +2888,8 @@ hna Mina (Cameroon) hnd Southern Hindko hne Chhattisgarhi -hnh //Ani +# remove leading // (consequent to eBible repo discoveries) +hnh Ani hni Hani hnj Hmong Njua hnn Hanunoo @@ -2925,7 +2940,8 @@ htu Hitu htx Middle Hittite hub Huambisa -huc =/Hua +# remove leading =/ (consequent to eBible repo discoveries) +huc Hua hud Huaulu hue San Francisco Del Mar Huave huf Humene @@ -3763,7 +3779,8 @@ kua Kuanyama kub Kutep kuc Kwinsu -kud 'Auhelawa +# remove leading ' (consequent to eBible repo discoveries) +kud Auhelawa kue Kuman kuf Western Katu kug Kupa @@ -3950,6 +3967,8 @@ lbg Laopang lbi La'bi lbj Ladakhi +# addition from eBible repo +lbk Central Bontok lbm Lodhi lbn Lamet lbo Laven @@ -5169,7 +5188,8 @@ nmk Namakura nml Ndemli nmm Manangba -nmn !Xóõ +# remove leading ! (consequent to eBible repo discoveries) +nmn Xóõ nmo Moyon Naga nmp Nimanbur nmq Nambya @@ -5528,7 +5548,8 @@ oue Oune oui Old Uighur oum Ouma -oun !O!ung +# remove leading ! (consequent to eBible repo discoveries) +oun O!ung owi Owiniga owl Old Welsh oyb Oy @@ -5796,6 +5817,8 @@ prc Parachi prd Parsi-Dari pre Principense +# addition from eBible repo +prf Paranan prg Prussian prh Porohanon pri Paicî @@ -6903,6 +6926,8 @@ tnx Tanema tny Tongwe tnz Tonga (Thailand) +# addition from eBible repo +to Tongan tob Toba toc Coyutla Totonac tod Toma @@ -7568,7 +7593,8 @@ xag Aghwan xai Kaimbé xal Kalmyk -xam /Xam +# remove leading / (consequent to eBible repo discoveries) +xam Xam xan Xamtanga xao Khao xap Apalachee @@ -7608,7 +7634,8 @@ xdy Malayic Dayak xeb Eblan xed Hdi -xeg //Xegwi +# remove leading // (consequent to eBible repo discoveries) +xeg Xegwi xel Kelo xem Kembayan xep Epi-Olmec @@ -7981,6 +8008,8 @@ yre Yaouré yri Yarí yrk Nenets +# add dup for cyrillic version +yrk-Cyrl Nenets yrl Nhengatu yrn Yerong yrs Yarsun diff -Nru xiphos-4.0.0+dfsg1/ui/markverse.gtkbuilder xiphos-4.0.4+dfsg1/ui/markverse.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/markverse.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/markverse.gtkbuilder 2015-02-11 23:48:34.000000000 +0000 @@ -1,135 +1,23 @@ - + + - - + True + False Mark/Unmark Verse 300 350 xiphos-x-16.png dialog - + True - - - - - - True - 6 - 10 - - - True - 18 - - - True - 0 - Verse: - - - False - False - 0 - - - - - 180 - True - True - - - - - - Verse Entry - - - - - 1 - - - - - False - 0 - - - - - True - 10 - - - True - 0 - Module: - - - False - False - 0 - - - - - 180 - True - True - - - - - - Module Entry - - - - - 1 - - - - - False - 1 - - - - - True - True - automatic - automatic - in - - - True - True - - - - - True - True - 2 - - - - - True - True - 2 - - + False - + True + False end @@ -137,24 +25,23 @@ True True False - Create new folder - - - + Create new folder True + False 0 0 - + True + False 2 True - gtk-new - 4 + False + document-new-symbolic False @@ -165,6 +52,7 @@ True + False Mark True @@ -179,7 +67,7 @@ - + New Folder @@ -198,11 +86,8 @@ True False True - - - - + Unmark @@ -221,11 +106,8 @@ True False True - - - - + Cancel Bookmark @@ -239,12 +121,129 @@ False + False end 0 + + + True + False + 6 + vertical + 10 + + + True + False + 18 + + + True + False + 0 + Verse: + + + False + False + 0 + + + + + 180 + True + True + + + Verse Entry + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + 10 + + + True + False + 0 + Module: + + + False + False + 0 + + + + + 180 + True + True + + + Module Entry + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + True + in + + + True + True + + + + + True + True + 2 + + + + + True + True + 2 + + - + Bookmark Dialog diff -Nru xiphos-4.0.0+dfsg1/ui/markverse_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/markverse_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/markverse_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/markverse_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,259 @@ + + + + + + True + Mark/Unmark Verse + 300 + 350 + xiphos-x-16.png + dialog + + + True + + + + + + True + 6 + 10 + + + True + 18 + + + True + 0 + Verse: + + + False + False + 0 + + + + + 180 + True + True + + + + + + Verse Entry + + + + + 1 + + + + + False + 0 + + + + + True + 10 + + + True + 0 + Module: + + + False + False + 0 + + + + + 180 + True + True + + + + + + Module Entry + + + + + 1 + + + + + False + 1 + + + + + True + True + automatic + automatic + in + + + True + True + + + + + True + True + 2 + + + + + True + True + 2 + + + + + True + end + + + True + True + True + False + Create new folder + + + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-new + 4 + + + False + False + 0 + + + + + True + Mark + True + + + False + False + 1 + + + + + + + + + New Folder + + + + + False + False + 0 + + + + + Unmark + True + True + True + False + True + + + + + + Unmark + + + + + False + False + 1 + + + + + _Cancel + True + True + True + False + True + + + + + + Cancel Bookmark + + + + + False + False + 2 + + + + + False + end + 0 + + + + + Bookmark Dialog + + + + + + button1 + button3 + button2 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/module-manager.glade xiphos-4.0.4+dfsg1/ui/module-manager.glade --- xiphos-4.0.0+dfsg1/ui/module-manager.glade 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/module-manager.glade 2014-12-30 00:36:59.000000000 +0000 @@ -202,6 +202,20 @@ + + False + True + True + Scan _Obsolete + Scan for obsolete modules and offer to delete them. + True + GTK_RELIEF_NORMAL + True + 309 + + + + True True diff -Nru xiphos-4.0.0+dfsg1/ui/module-manager.gtkbuilder xiphos-4.0.4+dfsg1/ui/module-manager.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/module-manager.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/module-manager.gtkbuilder 2015-03-23 01:15:22.000000000 +0000 @@ -1,6 +1,7 @@ + - + True False @@ -22,12 +23,12 @@ _View Intro + False True True True False Open a brief introductory explanation of how the Module Manager works. - False True @@ -39,11 +40,11 @@ _Load Standard + False True True False Load and synchronize the standard set of known repositories, as maintained at crosswire.org, with your current remote sources. - False True @@ -55,11 +56,11 @@ gtk-refresh + False True True False Refresh Xiphos' knowledge of what modules are available at the selected remote repository - False True @@ -70,10 +71,10 @@ + False True True False - False True @@ -81,7 +82,7 @@ 0 0 - + True False 2 @@ -89,7 +90,7 @@ True False - gtk-add + list-add-symbolic False @@ -125,11 +126,11 @@ gtk-remove + False True True False Remove the selected modules from your system - False True @@ -141,11 +142,11 @@ _Archive + False True True False Create a zip archive of the selected modules. - False True @@ -157,11 +158,11 @@ _Index + False True True False Build an index of the selected modules, for optimized ("lucene") searching. - False True @@ -173,11 +174,11 @@ _Delete Index + False True True False Delete the fast-search index of the selected modules. - False True @@ -187,41 +188,57 @@ + + Scan _Obsolete + False + True + True + False + Scan for obsolete modules and offer to delete them. + True + + + False + True + 8 + + + gtk-close + False True True True False - False True False True - 8 + 9 - _Cancel + _Cancel + False True True False - False True False True - 9 + 10 + False False False - False True @@ -229,7 +246,7 @@ 0 0 - + True False 2 @@ -237,7 +254,7 @@ True False - gtk-go-forward + go-next-symbolic False @@ -266,7 +283,7 @@ False True - 10 + 11 @@ -278,7 +295,7 @@ - + True True 8 @@ -306,10 +323,11 @@ - + True False 6 + vertical 6 @@ -318,10 +336,11 @@ False False - + True False 6 + vertical 6 @@ -390,9 +409,10 @@ - + True False + vertical 2 @@ -423,7 +443,7 @@ - + True False 6 @@ -457,18 +477,19 @@ - + True False + vertical 6 gtk-add + False True True False Add a local folder as an install source, typically on a cdrom or flash drive. Such a folder contains subfolders "mods.d" and "modules". - False True @@ -480,11 +501,11 @@ gtk-remove + False True True False Remove one of your local folders as an install source. - False True @@ -522,7 +543,7 @@ - + True False 7 @@ -556,18 +577,19 @@ - + True False + vertical 6 gtk-add + False True True False Add a custom remote install source. You must know its hostname and the folder where its repository lives. - False True @@ -579,11 +601,11 @@ gtk-remove + False True True False Remove a remote install source. - False True @@ -623,9 +645,10 @@ - + True False + vertical 3 @@ -643,7 +666,7 @@ - + True False 1 @@ -656,11 +679,12 @@ Local + False True True False - False True + 0.5 True @@ -696,7 +720,7 @@ - + True False 1 @@ -709,11 +733,12 @@ Remote + False True True False - False True + 0.5 True radiobutton1 @@ -765,18 +790,20 @@ - + True False + vertical True False 8 - + True False + vertical True @@ -794,10 +821,11 @@ + False True True False - False + 0.5 True @@ -830,10 +858,11 @@ + False True True False - False + 0.5 True radiobutton3 @@ -867,7 +896,7 @@ - + True False @@ -875,8 +904,8 @@ True False 0 - gtk-dialog-warning - 6 + dialog-warning-symbolic + 6 False @@ -922,9 +951,10 @@ - + True False + vertical 6 @@ -964,9 +994,10 @@ - + True False + vertical 6 @@ -1047,6 +1078,7 @@ button_archive button_index button_delete_index + button_scan_obsolete button_close button_cancel button4 @@ -1059,8 +1091,8 @@ xiphos-x-16.png dialog select-folder - + True @@ -1073,12 +1105,12 @@ end - _Cancel + _Cancel + False True True True False - False True @@ -1090,12 +1122,12 @@ gtk-open + False True True True True False - False True diff -Nru xiphos-4.0.0+dfsg1/ui/module-manager_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/module-manager_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/module-manager_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/module-manager_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,1143 @@ + + + + + True + False + Module Manager + 710 + 450 + xiphos-x-16.png + normal + + + + True + False + + + True + False + end + + + _View Intro + True + True + True + False + Open a brief introductory explanation of how the Module Manager works. + False + True + + + False + True + 0 + + + + + _Load Standard + True + True + False + Load and synchronize the standard set of known repositories, as maintained at crosswire.org, with your current remote sources. + False + True + + + False + True + 1 + + + + + gtk-refresh + True + True + False + Refresh Xiphos' knowledge of what modules are available at the selected remote repository + False + True + + + False + True + 2 + + + + + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-add + + + False + False + 0 + + + + + True + False + Install or update the selected modules + _Install + True + + + False + False + 1 + + + + + + + + + False + True + 3 + + + + + gtk-remove + True + True + False + Remove the selected modules from your system + False + True + + + False + True + 4 + + + + + _Archive + True + True + False + Create a zip archive of the selected modules. + False + True + + + False + True + 5 + + + + + _Index + True + True + False + Build an index of the selected modules, for optimized ("lucene") searching. + False + True + + + False + True + 6 + + + + + _Delete Index + True + True + False + Delete the fast-search index of the selected modules. + False + True + + + False + True + 7 + + + + + Scan _Obsolete + False + True + True + False + Scan for obsolete modules and offer to delete them. + False + True + + + False + True + 8 + + + + + gtk-close + True + True + True + False + False + True + + + False + True + 9 + + + + + _Cancel + True + True + False + False + True + + + False + True + 10 + + + + + False + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-go-forward + + + False + False + 0 + + + + + True + False + Continue + True + + + False + False + 1 + + + + + + + + + False + True + 11 + + + + + False + True + end + 0 + + + + + True + True + 8 + 169 + + + True + True + 6 + in + + + True + True + False + + + + + + + + False + True + + + + + True + False + 6 + 6 + + + True + False + False + False + + + True + False + 6 + 6 + + + True + False + 5 + <b>Sword</b> + True + center + + + False + False + 0 + + + + + True + False + sword3.png + + + True + True + 1 + + + + + True + False + 5 + <b>Module Manager</b> + True + + + False + False + 2 + + + + + True + False + <b>WARNING:</b> If you live in a persecuted country use with care. + True + + + False + False + 3 + + + + + + + True + False + label2 + + + False + + + + + True + False + 2 + + + True + False + 0.0099999997764825821 + <b>Add and Remove Sources</b> + True + + + False + False + 0 + + + + + True + False + 0.05000000074505806 + 6 + Current local sources + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 12 + + + True + True + in + + + True + True + False + + + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + gtk-add + True + True + False + Add a local folder as an install source, typically on a cdrom or flash drive. Such a folder contains subfolders "mods.d" and "modules". + False + True + + + False + False + 0 + + + + + gtk-remove + True + True + False + Remove one of your local folders as an install source. + False + True + + + False + False + 1 + + + + + False + False + 1 + + + + + True + True + 2 + + + + + True + False + 0.05000000074505806 + 6 + Current Remote Sources + + + False + False + 3 + + + + + True + False + 7 + + + True + False + 12 + + + True + True + in + + + True + True + False + + + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + gtk-add + True + True + False + Add a custom remote install source. You must know its hostname and the folder where its repository lives. + False + True + + + False + False + 0 + + + + + gtk-remove + True + True + False + Remove a remote install source. + False + True + + + False + False + 1 + + + + + False + False + 1 + + + + + True + True + 4 + + + + + 1 + + + + + True + False + label3 + + + 1 + False + + + + + True + False + 3 + + + True + False + 0.0099999997764825821 + 2 + <b>Install Source</b> + True + + + False + False + 0 + + + + + True + False + 1 + 19 + + + True + False + 8 + + + Local + True + True + False + False + True + True + + + + + False + False + 0 + + + + + True + False + True + + + False + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + False + 1 + 4 + + + True + False + 8 + + + Remote + True + True + False + False + True + True + radiobutton1 + + + + + False + False + 0 + + + + + True + False + True + + + False + + + + + True + True + 1 + + + + + False + True + 2 + + + + + True + False + 0.0099999997764825821 + 4 + <b>Install Destination</b> + True + + + False + False + 3 + + + + + True + False + + + True + False + 8 + + + True + False + + + True + False + 0.0099999997764825821 + 4 + <i>Personal area, for your use only:</i> + True + + + False + False + 0 + + + + + True + True + False + False + True + + + True + False + Home dir + + + + + False + False + 1 + + + + + True + False + 0.0099999997764825821 + 4 + <i>System area, for all users:</i> + True + + + False + False + 2 + + + + + True + True + False + False + True + radiobutton3 + + + True + False + Sword sys dir + + + + + False + False + 3 + + + + + + + False + True + 0 + + + + + True + True + 4 + + + + + True + False + + + True + False + 0 + gtk-dialog-warning + 6 + + + False + True + 0 + + + + + True + False + <b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use the remote installation feature! + True + True + + + False + False + 1 + + + + + True + True + 5 + + + + + 2 + + + + + True + False + label4 + + + 2 + False + + + + + True + False + 6 + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + 3 + + + + + True + False + label5 + + + 3 + False + + + + + True + False + 6 + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + 4 + + + + + True + False + label6 + + + 4 + False + + + + + True + True + 0 + + + + + False + 0.10000000149 + + + False + False + 1 + + + + + True + True + + + + + True + True + 1 + + + + + + button_view_intro + button_load_sources + button_refresh + button_install + button_remove + button_archive + button_index + button_delete_index + button_scan_obsolete + button_close + button_cancel + button4 + + + + False + 5 + Local Install Folder + xiphos-x-16.png + dialog + select-folder + + + + + True + False + 24 + + + True + False + end + + + _Cancel + True + True + True + False + False + True + + + False + True + 0 + + + + + gtk-open + True + True + True + True + False + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + + + + + button10 + button11 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/navbar_versekey.gtkbuilder xiphos-4.0.4+dfsg1/ui/navbar_versekey.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/navbar_versekey.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/navbar_versekey.gtkbuilder 2015-02-12 14:39:49.000000000 +0000 @@ -1,23 +1,24 @@ + - - - + + True False - 3 - 1 + center + 3 + 3 + False True False - False none True False - gtk-refresh + view-refresh-symbolic @@ -29,16 +30,16 @@ + False True True False - False none True False - gtk-go-back + go-previous-symbolic @@ -49,24 +50,25 @@ - + True False + vertical True + False 26 True True False Drop down history list - False none True False - arrow_down.png + open-menu-symbolic @@ -79,22 +81,22 @@ False - False + True 2 + False True True False - False none True False - gtk-go-forward + go-next-symbolic @@ -105,18 +107,7 @@ - - True - False - - - False - True - 4 - - - - + True False @@ -125,21 +116,15 @@ False + False 160 True True True - False - - - Book Selector Button - - - + True False - 2 150 @@ -157,6 +142,11 @@ + + + Book Selector Button + + @@ -167,24 +157,23 @@ - + True False - 3 + vertical True False True - + True False - - True + False - arrow_up.png + pan-up-symbolic True @@ -193,9 +182,10 @@ - + + True False - arrow_up_box.png + pan-up-symbolic True @@ -218,14 +208,13 @@ False True - + True False - - True + False - arrow_down.png + pan-down-symbolic True @@ -234,9 +223,10 @@ - + + True False - arrow_down_box.png + pan-down-symbolic True @@ -256,7 +246,8 @@ False - False + True + 1 1 @@ -264,22 +255,11 @@ False True - 5 - - - - - True - False - - - False - True - 6 + 4 - + True False @@ -288,18 +268,13 @@ False + False True True True - False 1 - - - Toggle Chapter Button - - - + True False @@ -319,6 +294,11 @@ + + + Toggle Chapter Button + + @@ -329,24 +309,23 @@ - + True False - 3 + vertical True False True - + True False - - True + False - arrow_up.png + pan-up-symbolic True @@ -355,9 +334,10 @@ - + + True False - arrow_up_box.png + pan-up-symbolic True @@ -380,14 +360,13 @@ False True - + True False - - True + False - arrow_down.png + pan-down-symbolic True @@ -396,9 +375,10 @@ - + + True False - arrow_down_box.png + pan-down-symbolic True @@ -419,6 +399,7 @@ False True + 1 1 @@ -426,22 +407,11 @@ False True - 7 - - - - - True - False - - - False - True - 8 + 5 - + True False @@ -450,19 +420,15 @@ False + False True True True - False - - - Toggle Verse Button - - - + True False + vertical True @@ -480,6 +446,11 @@ + + + Toggle Verse Button + + @@ -490,23 +461,22 @@ - + True False - 3 + vertical True False - + True False - - True + False - arrow_up.png + pan-up-symbolic True @@ -515,9 +485,10 @@ - + + True False - arrow_up_box.png + pan-up-symbolic True @@ -539,18 +510,14 @@ True False True - - - - + True False - - True + False - arrow_down.png + pan-down-symbolic True @@ -559,9 +526,10 @@ - + + True False - arrow_down_box.png + pan-down-symbolic True @@ -582,6 +550,7 @@ False True + 1 1 @@ -589,19 +558,7 @@ False True - 9 - - - - - 8 - True - False - - - False - True - 10 + 6 @@ -612,8 +569,6 @@ ● False False - True - True Reference Entry @@ -623,7 +578,8 @@ True True - 11 + 2 + 7 diff -Nru xiphos-4.0.0+dfsg1/ui/navbar_versekey_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/navbar_versekey_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/navbar_versekey_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/navbar_versekey_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,630 @@ + + + + + + True + False + 3 + 1 + + + True + False + False + none + + + True + False + gtk-refresh + + + + + False + False + 0 + + + + + True + True + False + False + none + + + True + False + gtk-go-back + + + + + False + False + 1 + + + + + True + False + True + + + 26 + True + True + False + Drop down history list + False + none + + + True + False + arrow_down.png + + + + + False + False + 0 + + + + + False + False + 2 + + + + + True + True + False + False + none + + + True + False + gtk-go-forward + + + + + False + False + 3 + + + + + True + False + + + False + True + 4 + + + + + True + False + + + True + False + + + 160 + True + True + True + False + + + Book Selector Button + + + + + True + False + 2 + + + 150 + True + False + 0.029999999329447746 + <b>Revelation of John</b> + True + + + False + False + 0 + + + + + + + + + False + False + 0 + + + + + True + False + 3 + + + True + False + True + + + True + False + + + True + False + arrow_up.png + + + True + True + 0 + + + + + False + arrow_up_box.png + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + False + True + + + True + False + + + True + False + arrow_down.png + + + True + True + 0 + + + + + False + arrow_down_box.png + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + False + True + 5 + + + + + True + False + + + False + True + 6 + + + + + True + False + + + True + False + + + True + True + True + False + 1 + + + Toggle Chapter Button + + + + + True + False + + + True + False + 3 + 1 + True + right + + + True + True + 0 + + + + + + + + + False + False + 0 + + + + + True + False + 3 + + + True + False + True + + + True + False + + + True + False + arrow_up.png + + + True + True + 0 + + + + + False + arrow_up_box.png + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + False + True + + + True + False + + + True + False + arrow_down.png + + + True + True + 0 + + + + + False + arrow_down_box.png + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + True + 1 + + + + + False + True + 7 + + + + + True + False + + + False + True + 8 + + + + + True + False + + + True + False + + + True + True + True + False + + + Toggle Verse Button + + + + + True + False + + + True + False + 3 + 1 + True + right + + + True + True + 0 + + + + + + + + + False + False + 0 + + + + + True + False + 3 + + + True + False + + + True + False + + + True + False + arrow_up.png + + + True + True + 0 + + + + + False + arrow_up_box.png + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + False + True + + + + + + True + False + + + True + False + arrow_down.png + + + True + True + 0 + + + + + False + arrow_down_box.png + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + True + 1 + + + + + False + True + 9 + + + + + 8 + True + False + + + False + True + 10 + + + + + True + True + Enter a Verse reference in Book 1:1 format and press Return + ● + False + False + True + True + + + Reference Entry + + + + + True + True + 11 + + + + diff -Nru xiphos-4.0.0+dfsg1/ui/prefs.glade xiphos-4.0.4+dfsg1/ui/prefs.glade --- xiphos-4.0.0+dfsg1/ui/prefs.glade 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/prefs.glade 2015-02-17 02:57:34.000000000 +0000 @@ -1491,6 +1491,26 @@ + + Enable Statusbar + True + True + False + Enable/Disable Statusbar. + True + True + True + + Enable Prayer Lists Checkbox + + + + False + False + 10 + + + True True @@ -1581,7 +1601,7 @@ - 10 + 11 diff -Nru xiphos-4.0.0+dfsg1/ui/prefs.gtkbuilder xiphos-4.0.4+dfsg1/ui/prefs.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/prefs.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/prefs.gtkbuilder 2015-02-17 02:57:34.000000000 +0000 @@ -1,7 +1,10 @@ - + + + + @@ -33,6 +36,7 @@ + @@ -62,10 +66,9 @@ - - True + False Preferences center 590 @@ -73,11 +76,41 @@ xiphos-x-16.png dialog - + True + False + + + True + False + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + False + end + 0 + + - + True + False 6 6 @@ -85,36 +118,42 @@ 165 True True - automatic - automatic in True True False + + + + True + True 0 True + False False False True True + False logo.png True + False Cover @@ -122,12 +161,15 @@ - + True + False 6 + vertical True + False 0 <b>Font Colors</b> True @@ -139,21 +181,27 @@ - + True + False 3 + vertical 6 - + True + False True True - 0.1 + False + 0.10000000149011612 Background + True + True 0 @@ -172,6 +220,7 @@ True + False 0 True @@ -184,17 +233,21 @@ + True + True 0 - + True + False True True - 0.1 + False + 0.10000000149011612 Foreground @@ -210,12 +263,15 @@ False + True + True 1 True + False 0 True @@ -228,17 +284,21 @@ + True + True 1 - + True + False True True - 0.1 + False + 0.10000000149011612 Current Verse @@ -254,12 +314,15 @@ False + True + True 1 True + False 0 True @@ -272,17 +335,21 @@ + True + True 2 - + True + False True True - 0.1 + False + 0.10000000149011612 Verse Number @@ -298,12 +365,15 @@ False + True + True 1 True + False 0 True @@ -316,17 +386,21 @@ + True + True 3 - + True + False True True - 0.1 + False + 0.10000000149011612 Links @@ -342,12 +416,15 @@ False + True + True 1 True + False 0 True @@ -360,17 +437,21 @@ + True + True 4 - + True + False True True - 0.1 + False + 0.10000000149011612 Highlight Foreground @@ -386,12 +467,15 @@ False + True + True 1 True + False 0 True @@ -404,17 +488,21 @@ + True + True 5 - + True + False True True - 0.1 + False + 0.10000000149011612 Highlight Background @@ -430,12 +518,15 @@ False + True + True 1 True + False 0 True @@ -448,17 +539,21 @@ + True + True 6 - + True + False True True - 0.1 + False + 0.10000000149011612 Invert color pairs @@ -468,8 +563,9 @@ - + True + False True @@ -480,6 +576,8 @@ False + True + True 0 @@ -492,17 +590,22 @@ False + True + True 1 + True + True 1 True + False 0 True @@ -515,20 +618,27 @@ + True + True 7 False + True 1 + + 1 + True + False Font Colors @@ -537,12 +647,15 @@ - + True + False 6 + vertical True + False 0 <b>Font Sizes</b> True @@ -554,25 +667,29 @@ - + True + False 8 True True - All displayed font sizes are relative to this choice + False + All displayed font sizes are relative to this choice 0.090000003576278687 Base font size False + True 0 True + False model1 @@ -590,29 +707,34 @@ False + True 1 - + True + False 8 True True - Commonly -1, to make verse numbers less obtrusive + False + Commonly -1, to make verse numbers less obtrusive 0.090000003576278687 Verse number size False + True 0 True + False model2 @@ -630,53 +752,62 @@ False + True 2 - + True + False True True - Name and size choice for any module in a given language; still overridden by a specific choice on a particular module - 0.2 + False + Name and size choice for any module in a given language; still overridden by a specific choice on a particular module + 0.20000000298023224 Font preferences, per language True False + True 0 True - - - + False - + Language Font Combo + True + True 1 + True False 3 + + 2 + True + False Font Misc @@ -685,16 +816,20 @@ - + True + False 6 + vertical - + True + False True True + False 0 0 <b>BibleSync</b> @@ -709,6 +844,7 @@ True + False 0 True @@ -722,6 +858,7 @@ True + False 0 True @@ -735,6 +872,7 @@ True + False 0 True @@ -748,9 +886,10 @@ True - biblesync-v1-50.png - 0 + False Xiphos is the first Bible study program to provide an implementation of BibleSync, a synchronization protocol for Bible programs. If you work with multiple Bible programs, or if you work in a team, or if you have classroom activities using shared study, BibleSync can be a useful tool for you. BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible applications of your own, or in a working team; Speaker, to drive a lecture audience's Bible programs to follow along; Audience, to receive the speaker's navigation. + 0 + biblesync-v1-50.png True @@ -760,20 +899,24 @@ + True + True 0 - + True + False True True + False + Select the mode in which BibleSync should operate. + 0 <i>Mode:</i> True - 0 - Select the mode in which BibleSync should operate. True @@ -788,15 +931,13 @@ True True True - Disable BibleSync. + Disable BibleSync. True + 0.5 True True - - - - + BSP off radio button @@ -814,16 +955,14 @@ True False True - Enable BibleSync as the speaker. + Enable BibleSync as the speaker. True + 0.5 True True radiobutton_BSP_off - - - - + BSP speaker radio button @@ -841,16 +980,14 @@ True False True - Enable BibleSync as a member of the audience. + Enable BibleSync as a member of the audience. True + 0.5 True True radiobutton_BSP_off - - - - + BSP audience radio button @@ -868,16 +1005,14 @@ True False True - Enable BibleSync for personal or team use. + Enable BibleSync for personal or team use. True + 0.5 True True radiobutton_BSP_off - - - - + BSP personal radio button @@ -890,16 +1025,20 @@ + True + True 1 - + True + False True True + False 0 True @@ -913,6 +1052,7 @@ True + False 0 True @@ -926,6 +1066,7 @@ True + False 0 True @@ -939,6 +1080,7 @@ True + False 0 True @@ -956,15 +1098,13 @@ True False True - When in Personal mode, only programs running on this machine will hear your navigation. + When in Personal mode, only programs running on this machine will hear your navigation. True + 0.5 True True - - - - + BSP privacy button @@ -977,20 +1117,24 @@ + True + True 2 - + True + False True True + False + Choose how to accept incoming navigation synchronization. + 0 <i>Navigate:</i> True - 0 - Choose how to accept incoming navigation synchronization. True @@ -1005,15 +1149,13 @@ True True True - BibleSync navigation will send Xiphos directly to the verse indicated. + BibleSync navigation will send Xiphos directly to the verse indicated. True + 0.5 True True - - - - + BSP nav direct radio button @@ -1031,16 +1173,14 @@ True False True - BibleSync navigation will use Xiphos' sidebar verse list. + BibleSync navigation will use Xiphos' sidebar verse list. True + 0.5 True True radiobutton_BSP_nav_direct - - - - + BSP nav verse list radio button @@ -1054,6 +1194,7 @@ True + False 0 True @@ -1067,6 +1208,7 @@ True + False 0 True @@ -1079,20 +1221,24 @@ + True + True 3 - + True + False True True + False + Xiphos will listen to Speakers according to choice here. + 0 <i>Listen:</i> True - 0 - Xiphos will listen to Speakers according to choice here. True @@ -1107,15 +1253,13 @@ True True True - Choose the Speakers to be followed. + Choose the Speakers to be followed. True + 0.5 True True - - - - + BSP listen some radio button @@ -1133,16 +1277,14 @@ True True True - All Speakers will be followed. + All Speakers will be followed. True + 0.5 True True radiobutton_BSP_listen_some - - - - + BSP listen all radio button @@ -1160,16 +1302,14 @@ True True True - No Speakers will be followed. + No Speakers will be followed. True + 0.5 True True radiobutton_BSP_listen_some - - - - + BSP listen none radio button @@ -1183,6 +1323,7 @@ True + False 0 True @@ -1195,12 +1336,15 @@ + True + True 4 - + True + False True @@ -1208,32 +1352,35 @@ 150 True True - automatic - automatic in + True + True 0 + True + True 5 - + True + False True True + False + True + Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number. 0 <i>Special:</i> True - True - Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number. - True True @@ -1248,15 +1395,13 @@ True False True - Presence announcements will be shown in dialogs. + Presence announcements will be shown in dialogs. True + 0.5 True True - - - - + BSP presence button @@ -1274,15 +1419,13 @@ True False True - Mismatches from your session will be shown in dialogs. + Mismatches from your session will be shown in dialogs. True + 0.5 True True - - - - + BSP mismatch button @@ -1300,15 +1443,13 @@ True False True - Packet tracing. + Packet tracing. True + 0.5 True True - - - - + BSP event debug button @@ -1326,15 +1467,13 @@ True False True - Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number. + Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number. True + 0.5 True True - - - - + BSP event group-as-tab button @@ -1347,14 +1486,20 @@ + True + True 6 + + 3 + True + False BibleSync @@ -1363,12 +1508,15 @@ - + True + False 6 + vertical True + False 0 <b>General</b> True @@ -1380,45 +1528,52 @@ - + True + False 8 + vertical 2 - + True + False True True - Select a particular language for interface display, other than your usual setting + False + Select a particular language for interface display, other than your usual setting 0 Special Locale (requires restart) True False + True 0 True - - - + False - + Special Locale Combo + True + True 1 + True + True 0 @@ -1429,6 +1584,7 @@ True False True + 0.5 True True @@ -1444,8 +1600,9 @@ True True False - If you have set a preferred daily devotion module, its entry for today will be shown at startup. + If you have set a preferred daily devotion module, its entry for today will be shown at startup. True + 0.5 True True @@ -1461,15 +1618,13 @@ True True False - Make double-click of a word always use default dictionary instead of dictionary currently displayed + Make double-click of a word always use default dictionary instead of dictionary currently displayed True + 0.5 True True - - - - + Use default Dictionary Checkbox @@ -1486,15 +1641,13 @@ True True False - Use Bible Text scroll bar to scroll to previous or next chapter + Use Bible Text scroll bar to scroll to previous or next chapter True + 0.5 True True - - - - + Scroll to Previous/Next Chapter Checkbox @@ -1511,15 +1664,13 @@ True True False - Automatically resize image content to fit the pane + Automatically resize image content to fit the pane True + 0.5 True True - - - - + Resize images checkbox @@ -1536,15 +1687,13 @@ True True False - Apply high-contrast highlight to current verse - see color pickers + Apply high-contrast highlight to current verse - see color pickers True + 0.5 True True - - - - + Highlight current verse check box @@ -1561,15 +1710,13 @@ True True False - Use inverted highlight on user-annotated verses + Use inverted highlight on user-annotated verses True + 0.5 True True - - - - + Highlight user annotations check box @@ -1586,15 +1733,13 @@ True True False - Use the verse list for Bible cross-references instead of the previewer + Use the verse list for Bible cross-references instead of the previewer True + 0.5 True True - - - - + Xrefs in verse list check box @@ -1611,15 +1756,13 @@ True True False - Make journals/prayer lists available + Make journals/prayer lists available True + 0.5 True True - - - - + Enable Prayer Lists Checkbox @@ -1631,23 +1774,51 @@ - + + Enable Statusbar + True + True + False + Enable/disable the Statusbar + True + 0 + True + True + + + Enable Prayer Lists Checkbox + + + + + False + False + 10 + + + + True + False True True + False + Offset the verse number in several ways 0 Verse number - Offset the verse number in several ways + True + True 0 - + True + False True @@ -1656,15 +1827,13 @@ True False True - Show verse number in bold text + Show verse number in bold text True + 0.5 True True - - - - + Verse number bold checkbox @@ -1682,15 +1851,13 @@ True False True - Show verse number with [surrounding brackets] + Show verse number with [surrounding brackets] True + 0.5 True True - - - - + Verse number bracket checkbox @@ -1708,15 +1875,13 @@ True False True - Show verse number as a superscript + Show verse number as a superscript True + 0.5 True True - - - - + Verse number superscript checkbox @@ -1736,16 +1901,20 @@ - 10 + True + True + 11 - + True + False True True + False 0 StudyPad default directory True @@ -1757,34 +1926,38 @@ - + True + False True + False select-folder Select A Directory - - - - + StudyPad default directory combo + True + True 0 False + True 1 + True + True 13 @@ -1796,10 +1969,14 @@ + + 4 + True + False General Misc @@ -1808,11 +1985,14 @@ - + + False 6 + vertical True + False 0 <b>Main Window Modules</b> True @@ -1824,169 +2004,201 @@ - + True + False 8 + vertical 6 - + True + False True True + False 0 Biblical Text False + True 0 True - - - + False - + Change Biblical Text Combo + True + True 1 + True + True 0 - + True + False True True + False 0 Commentary False + True 0 True - - - + False - + Change Commentary Combo + True + True 1 + True + True 1 - + True + False True True + False 0 Dictionary False + True 0 True - - - + False - + Change Dictionary Combo + True + True 1 + True + True 2 - + True + False True True + False 0 Book False + True 0 True - - - + False - + Change Book Combo + True + True 1 + True + True 3 False + True 1 + + 5 + + + + - + True + False 6 + vertical True + False 0 <b>Modules</b> True @@ -2000,17 +2212,17 @@ True + False icons + 2 True - Clear all modules from the list - gtk-clear - - - + False + Clear all modules from the list + edit-clear-symbolic - + Clear Modules from List Button @@ -2023,14 +2235,12 @@ True - Remove the selected module from the list + False + Remove the selected module from the list True - gtk-cut - - - + edit-cut-symbolic - + Delete Selected Module From List Button @@ -2043,23 +2253,23 @@ True + False False + False True - Open a dialog to select modules + False + Open a dialog to select modules Add Modules True - gtk-add - - - + list-add-symbolic - + Open Selection Dialog Button @@ -2080,26 +2290,33 @@ True True - automatic - automatic in True True False + + + + True + True 2 + + 6 + True + False Modules Parallel @@ -2108,12 +2325,15 @@ - + True + False 6 + vertical True + False 0 <b>Special Purpose Modules</b> True @@ -2125,201 +2345,233 @@ - + True + False 8 + vertical 6 - + True + False True True + False 0 Daily Devotional False + True 0 True - - - + False - + Daily Devotional Combo + True + True 1 + True + True 0 - + True + False True True + False 0 Hebrew Lexicon False + True 0 True - - - + False - + Hebrew Lexicon Combo + True + True 1 + True + True 1 - + True + False True True + False 0 Greek Lexicon False + True 0 True - - - + False - + Greek Lexicon Combo + True + True 1 + True + True 2 - + True + False True True + False 0 Default Dictionary False + True 0 True - - - + False - + Change Default Dictionary Combo + True + True 1 + True + True 3 - + True + False True True + False 0 Personal Notes False + True 0 True - - - + False - + Change Personal Notes Combo + True + True 1 + True + True 4 False + True 1 + + 7 + True + False Modules Misc @@ -2329,38 +2581,16 @@ + True + True 1 - 2 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - False - end - 0 + True + 2 diff -Nru xiphos-4.0.0+dfsg1/ui/prefs_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/prefs_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/prefs_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/prefs_old.gtkbuilder 2015-02-17 02:57:34.000000000 +0000 @@ -0,0 +1,2395 @@ + + + + + + + + +         -2 + + + -1 + + + +0 + + + +1 + + + +2 + + + +3 + + + +4 + + + +5 + + + + + + + + + + -2 + + + -1 + + + +0 + + + +1 + + + +2 + + + +3 + + + +4 + + + +5 + + + + + + + True + Preferences + center + 590 + 300 + xiphos-x-16.png + dialog + + + True + + + True + 6 + 6 + + + 165 + True + True + automatic + automatic + in + + + True + True + False + + + + + 0 + + + + + True + False + False + True + + + True + logo.png + + + + + True + Cover + + + False + + + + + True + 6 + + + True + 0 + <b>Font Colors</b> + True + + + False + False + 0 + + + + + True + 3 + 6 + + + True + True + + + True + 0.1 + Background + + + 0 + + + + + True + True + False + + + True + True + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 0 + + + + + True + True + + + True + 0.1 + Foreground + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 1 + + + + + True + True + + + True + 0.1 + Current Verse + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 2 + + + + + True + True + + + True + 0.1 + Verse Number + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 3 + + + + + True + True + + + True + 0.1 + Links + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 4 + + + + + True + True + + + True + 0.1 + Highlight Foreground + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 5 + + + + + True + True + + + True + 0.1 + Highlight Background + + + True + True + 0 + + + + + True + True + False + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 6 + + + + + True + True + + + True + 0.1 + Invert color pairs + + + True + True + 0 + + + + + True + True + + + Normal Text + True + True + True + False + + + 0 + + + + + Highlight + True + True + True + False + + + 1 + + + + + 1 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 7 + + + + + False + 1 + + + + + + + True + Font Colors + + + 1 + False + + + + + True + 6 + + + True + 0 + <b>Font Sizes</b> + True + + + False + False + 0 + + + + + True + 8 + True + + + True + All displayed font sizes are relative to this choice + 0.090000003576278687 + Base font size + + + False + 0 + + + + + True + model1 + + + + 0 + + + + + True + False + 1 + + + + + False + 1 + + + + + True + 8 + True + + + True + Commonly -1, to make verse numbers less obtrusive + 0.090000003576278687 + Verse number size + + + False + 0 + + + + + True + model2 + + + + 0 + + + + + True + False + 1 + + + + + False + 2 + + + + + True + True + + + True + Name and size choice for any module in a given language; still overridden by a specific choice on a particular module + 0.2 + Font preferences, per language + True + + + False + 0 + + + + + True + + + + + + Language Font Combo + + + + + 1 + + + + + False + 3 + + + + + + + True + Font Misc + + + 2 + False + + + + + True + 6 + + + True + True + + + True + 0 + 0 + <b>BibleSync</b> + True + + + True + True + 0 + + + + + True + 0 + + True + + + True + True + 1 + + + + + True + 0 + + True + + + True + True + 2 + + + + + True + 0 + + True + + + True + True + 3 + + + + + True + biblesync-v1-50.png + 0 + Xiphos is the first Bible study program to provide an implementation of BibleSync, a synchronization protocol for Bible programs. If you work with multiple Bible programs, or if you work in a team, or if you have classroom activities using shared study, BibleSync can be a useful tool for you. BibleSync operates in 1 of 3 modes: Personal, to synchronize multiple Bible applications of your own, or in a working team; Speaker, to drive a lecture audience's Bible programs to follow along; Audience, to receive the speaker's navigation. + + + True + True + 4 + + + + + 0 + + + + + True + True + + + True + <i>Mode:</i> + True + 0 + Select the mode in which BibleSync should operate. + + + True + True + 0 + + + + + _Off + True + True + True + True + Disable BibleSync. + True + True + True + + + + + + BSP off radio button + + + + + True + True + 1 + + + + + _Speaker + True + True + False + True + Enable BibleSync as the speaker. + True + True + True + radiobutton_BSP_off + + + + + + BSP speaker radio button + + + + + True + True + 2 + + + + + _Audience + True + True + False + True + Enable BibleSync as a member of the audience. + True + True + True + radiobutton_BSP_off + + + + + + BSP audience radio button + + + + + True + True + 3 + + + + + _Personal + True + True + False + True + Enable BibleSync for personal or team use. + True + True + True + radiobutton_BSP_off + + + + + + BSP personal radio button + + + + + True + True + 4 + + + + + 1 + + + + + True + True + + + True + 0 + + True + + + True + True + 0 + + + + + True + 0 + + True + + + True + True + 1 + + + + + True + 0 + + True + + + True + True + 2 + + + + + True + 0 + + True + + + True + True + 3 + + + + + Private + True + True + False + True + When in Personal mode, only programs running on this machine will hear your navigation. + True + True + True + + + + + + BSP privacy button + + + + + True + True + 4 + + + + + 2 + + + + + True + True + + + True + <i>Navigate:</i> + True + 0 + Choose how to accept incoming navigation synchronization. + + + True + True + 0 + + + + + _Direct + True + True + True + True + BibleSync navigation will send Xiphos directly to the verse indicated. + True + True + True + + + + + + BSP nav direct radio button + + + + + True + True + 1 + + + + + _Verse list + True + True + False + True + BibleSync navigation will use Xiphos' sidebar verse list. + True + True + True + radiobutton_BSP_nav_direct + + + + + + BSP nav verse list radio button + + + + + True + True + 2 + + + + + True + 0 + + True + + + True + True + 3 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 3 + + + + + True + True + + + True + <i>Listen:</i> + True + 0 + Xiphos will listen to Speakers according to choice here. + + + True + True + 0 + + + + + Selective + True + True + True + True + Choose the Speakers to be followed. + True + True + True + + + + + + BSP listen some radio button + + + + + True + True + 1 + + + + + All + True + True + True + True + All Speakers will be followed. + True + True + True + radiobutton_BSP_listen_some + + + + + + BSP listen all radio button + + + + + True + True + 2 + + + + + None + True + True + True + True + No Speakers will be followed. + True + True + True + radiobutton_BSP_listen_some + + + + + + BSP listen none radio button + + + + + True + True + 3 + + + + + True + 0 + + True + + + True + True + 4 + + + + + 4 + + + + + True + True + + + 300 + 150 + True + True + automatic + automatic + in + + + 0 + + + + + 5 + + + + + True + True + + + True + 0 + <i>Special:</i> + True + True + Additional traces can be presented during BibleSync operation by enabling presence, mismatch, and debug. Beware enabling these, they can be very chatty. Also, decide whether to allow group parameter as Xiphos' tab number. + True + + + True + True + 0 + + + + + Presence + True + True + False + True + Presence announcements will be shown in dialogs. + True + True + True + + + + + + BSP presence button + + + + + True + True + 1 + + + + + Mismatch + True + True + False + True + Mismatches from your session will be shown in dialogs. + True + True + True + + + + + + BSP mismatch button + + + + + True + True + 2 + + + + + Debug + True + True + False + True + Packet tracing. + True + True + True + + + + + + BSP event debug button + + + + + True + True + 3 + + + + + _Group as tab + True + True + False + True + Interpret the protocol's group number parameter as Xiphos' tab number. Disabling this may be necessary if some Speakers' use of group number is not appropriate as a tab number. + True + True + True + + + + + + BSP event group-as-tab button + + + + + True + True + 4 + + + + + 6 + + + + + + + True + BibleSync + + + 3 + False + + + + + True + 6 + + + True + 0 + <b>General</b> + True + + + False + False + 0 + + + + + True + 8 + 2 + + + True + True + + + True + Select a particular language for interface display, other than your usual setting + 0 + Special Locale (requires restart) + True + + + False + 0 + + + + + True + + + + + + Special Locale Combo + + + + + 1 + + + + + 0 + + + + + Show splash screen at start up + True + True + False + True + True + True + + + False + False + 1 + + + + + Show Daily Devotion at start up + True + True + False + If you have set a preferred daily devotion module, its entry for today will be shown at startup. + True + True + True + + + False + False + 2 + + + + + Use default Dictionary + True + True + False + Make double-click of a word always use default dictionary instead of dictionary currently displayed + True + True + True + + + + + + Use default Dictionary Checkbox + + + + + False + False + 3 + + + + + Scroll to Previous/Next Chapter + True + True + False + Use Bible Text scroll bar to scroll to previous or next chapter + True + True + True + + + + + + Scroll to Previous/Next Chapter Checkbox + + + + + False + False + 4 + + + + + Resize images + True + True + False + Automatically resize image content to fit the pane + True + True + True + + + + + + Resize images checkbox + + + + + False + False + 5 + + + + + Highlight current verse + True + True + False + Apply high-contrast highlight to current verse - see color pickers + True + True + True + + + + + + Highlight current verse check box + + + + + False + False + 6 + + + + + Highlight user annotations + True + True + False + Use inverted highlight on user-annotated verses + True + True + True + + + + + + Highlight user annotations check box + + + + + False + False + 7 + + + + + Cross-references in verse list + True + True + False + Use the verse list for Bible cross-references instead of the previewer + True + True + True + + + + + + Xrefs in verse list check box + + + + + False + False + 8 + + + + + Enable Prayer Lists + True + True + False + Make journals/prayer lists available + True + True + True + + + + + + Enable Prayer Lists Checkbox + + + + + False + False + 9 + + + + + Enable Statusbar + True + True + False + Make journals/prayer lists available + True + 0 + True + True + + + Enable Prayer Lists Checkbox + + + + + False + False + 10 + + + + + True + True + + + True + 0 + Verse number + Offset the verse number in several ways + + + 0 + + + + + True + True + + + Bold + True + True + False + True + Show verse number in bold text + True + True + True + + + + + + Verse number bold checkbox + + + + + True + True + 0 + + + + + Brackets + True + True + False + True + Show verse number with [surrounding brackets] + True + True + True + + + + + + Verse number bracket checkbox + + + + + True + True + 1 + + + + + Superscript + True + True + False + True + Show verse number as a superscript + True + True + True + + + + + + Verse number superscript checkbox + + + + + True + True + 2 + + + + + True + True + 1 + + + + + 11 + + + + + True + True + + + True + 0 + StudyPad default directory + True + + + True + True + 0 + + + + + True + + + True + select-folder + Select A Directory + + + + + + StudyPad default directory combo + + + + + 0 + + + + + False + 1 + + + + + 13 + + + + + False + False + 1 + + + + + + + True + General Misc + + + 4 + False + + + + + 6 + + + True + 0 + <b>Main Window Modules</b> + True + + + False + False + 0 + + + + + True + 8 + 6 + + + True + True + + + True + 0 + Biblical Text + + + False + 0 + + + + + True + + + + + + Change Biblical Text Combo + + + + + 1 + + + + + 0 + + + + + True + True + + + True + 0 + Commentary + + + False + 0 + + + + + True + + + + + + Change Commentary Combo + + + + + 1 + + + + + 1 + + + + + True + True + + + True + 0 + Dictionary + + + False + 0 + + + + + True + + + + + + Change Dictionary Combo + + + + + 1 + + + + + 2 + + + + + True + True + + + True + 0 + Book + + + False + 0 + + + + + True + + + + + + Change Book Combo + + + + + 1 + + + + + 3 + + + + + False + 1 + + + + + + + True + 6 + + + True + 0 + <b>Modules</b> + True + + + False + False + 0 + + + + + True + icons + + + True + Clear all modules from the list + gtk-clear + + + + + + Clear Modules from List Button + + + + + False + True + + + + + True + Remove the selected module from the list + True + gtk-cut + + + + + + Delete Selected Module From List Button + + + + + False + True + + + + + True + + + False + + + + + True + Open a dialog to select modules + Add Modules + True + gtk-add + + + + + + Open Selection Dialog Button + + + + + False + True + + + + + False + False + 1 + + + + + True + True + automatic + automatic + in + + + True + True + False + + + + + 2 + + + + + + + True + Modules Parallel + + + 6 + False + + + + + True + 6 + + + True + 0 + <b>Special Purpose Modules</b> + True + + + False + False + 0 + + + + + True + 8 + 6 + + + True + True + + + True + 0 + Daily Devotional + + + False + 0 + + + + + True + + + + + + Daily Devotional Combo + + + + + 1 + + + + + 0 + + + + + True + True + + + True + 0 + Hebrew Lexicon + + + False + 0 + + + + + True + + + + + + Hebrew Lexicon Combo + + + + + 1 + + + + + 1 + + + + + True + True + + + True + 0 + Greek Lexicon + + + False + 0 + + + + + True + + + + + + Greek Lexicon Combo + + + + + 1 + + + + + 2 + + + + + True + True + + + True + 0 + Default Dictionary + + + False + 0 + + + + + True + + + + + + Change Default Dictionary Combo + + + + + 1 + + + + + 3 + + + + + True + True + + + True + 0 + Personal Notes + + + False + 0 + + + + + True + + + + + + Change Personal Notes Combo + + + + + 1 + + + + + 4 + + + + + False + 1 + + + + + + + True + Modules Misc + + + 7 + False + + + + + 1 + + + + + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + closebutton1 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/search-dialog.gtkbuilder xiphos-4.0.4+dfsg1/ui/search-dialog.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/search-dialog.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/search-dialog.gtkbuilder 2015-02-11 23:48:34.000000000 +0000 @@ -1,6 +1,7 @@ + - + True False @@ -21,11 +22,11 @@ _Lucene Search Syntax + False True True False Open a brief explanation of the syntax used for optimized "lucene" searches. - False True @@ -37,11 +38,11 @@ _Attribute Search + False True True False Open a brief explanation of attribute-based searches. - False True @@ -53,11 +54,11 @@ gtk-close + False True True True False - False True @@ -75,15 +76,17 @@ - + True False 6 + vertical 6 - + True False + vertical 4 @@ -101,7 +104,7 @@ - + True False 6 @@ -138,11 +141,11 @@ gtk-find + False True True False Start/stop searching - False True @@ -176,7 +179,7 @@ True False - + True True 166 @@ -190,14 +193,14 @@ True True False + + + Search Criteria Treeview - - - @@ -207,15 +210,18 @@ - + True False + vertical 16 + bottom - + True False 4 + vertical 4 @@ -237,7 +243,7 @@ False 8 - + True False 6 @@ -245,12 +251,13 @@ Entire module + False True True False Search entire module - False True + 0.5 True @@ -267,12 +274,13 @@ Current results + False True True False Use the results of the last search as the scope of the search - False True + 0.5 True radiobutton1 @@ -290,12 +298,13 @@ Custom verse range + False True True False Use a custom range for the scope of the search - False True + 0.5 True radiobutton1 @@ -330,16 +339,16 @@ False False True - - - Custom Range Selector Combo - - False + + + Custom Range Selector Combo + + @@ -357,10 +366,11 @@ - + True False 4 + vertical 4 @@ -382,7 +392,7 @@ False 8 - + True False 6 @@ -390,12 +400,13 @@ Single module + False True True False Use a single module for the search - False True + 0.5 True @@ -412,12 +423,13 @@ Module list + False True True False Use the current module list for the search - False True + 0.5 True radiobutton4 @@ -435,12 +447,13 @@ Custom module list + False True True False Use a custom module list for the search - False True + 0.5 True radiobutton4 @@ -487,16 +500,16 @@ False False True - - - Custom Range Selector Combo - - False + + + Custom Range Selector Combo + + @@ -514,15 +527,16 @@ - + True False 4 35 - + True False + vertical True @@ -543,20 +557,22 @@ False 8 - + True False + vertical Optimized ("Lucene") + False True True False Fast, featureful, index-based search Indexes must have been built beforehand: See Module Manager's maintenance functions - False True + 0.5 True @@ -573,11 +589,12 @@ Multi word + False True True False - False True + 0.5 True radiobutton16 @@ -595,11 +612,12 @@ Regular expression + False True True False - False True + 0.5 True radiobutton16 @@ -617,11 +635,12 @@ Exact phrase + False True True False - False True + 0.5 True radiobutton16 @@ -639,12 +658,13 @@ Attributes + False True True False Make selections on the Attribute Search tab - False True + 0.5 True radiobutton16 @@ -676,9 +696,10 @@ - + True False + vertical True @@ -699,17 +720,19 @@ False 8 - + True False + vertical Match case + False True True False - False True + 0.5 True @@ -783,22 +806,24 @@ - + True False 4 + vertical 6 True False icons + 2 + False False Show in main window - False - gtk-jump-to + go-jump-symbolic False @@ -807,11 +832,11 @@ + False True False Save search results as bookmarks - False - gtk-save + document-save-symbolic @@ -821,13 +846,13 @@ + False True False Export current search results - False Export True - gtk-goto-bottom + go-bottom-symbolic @@ -837,11 +862,11 @@ + False True False Clear lists for new search - False - gtk-clear + edit-clear-symbolic False @@ -856,14 +881,15 @@ - + True True 148 - + True False + vertical True @@ -883,24 +909,24 @@ True True in - - - Result Summary Window - - True True False + + + Result Summary Table - - - + + + + + Result Summary Window @@ -917,14 +943,16 @@ - + True True + vertical 148 - + True False + vertical True @@ -949,9 +977,9 @@ True True False + - @@ -971,9 +999,10 @@ - + True False + vertical True @@ -1039,23 +1068,25 @@ - + True False 6 + vertical 6 True False icons + 2 + False True False Create new custom range - False - gtk-new + document-new-symbolic New Range Button @@ -1069,11 +1100,11 @@ + False True False Save custom range - False - gtk-save + document-save-symbolic Save Range Button @@ -1087,11 +1118,11 @@ + False True False Delete selected range - False - gtk-cut + edit-cut-symbolic Delete Range Button @@ -1111,15 +1142,16 @@ - + True False 7 True - + True False + vertical True @@ -1164,9 +1196,10 @@ - + True False + vertical 6 @@ -1250,14 +1283,14 @@ True True False + + + Custom Range Preview - - - @@ -1298,23 +1331,25 @@ - + True False 6 + vertical 6 True False icons + 2 + False True False Create a new module list - False - gtk-new + document-new-symbolic New Custom Module List Button @@ -1328,11 +1363,11 @@ + False True False Save the module list - False - gtk-save + document-save-symbolic Save Custom Module List Button @@ -1346,11 +1381,11 @@ + False True False Delete the selected list - False - gtk-cut + edit-cut-symbolic Clear Custom Module List Button @@ -1370,15 +1405,16 @@ - + True False 7 True - + True False + vertical True @@ -1423,9 +1459,10 @@ - + True False + vertical 6 @@ -1476,13 +1513,14 @@ True False icons + 2 + False True False Clear all modules from the list - False - gtk-clear + edit-clear-symbolic Clear Modules from List Button @@ -1496,12 +1534,12 @@ + False True False Remove the selected module from the list - False True - gtk-cut + edit-cut-symbolic Delete Selected Module From List Button @@ -1520,17 +1558,18 @@ False + False + False True False Open a dialog to select modules to add to the list - False Add Modules True - gtk-add + list-add-symbolic Open Selection Dialog Button @@ -1559,8 +1598,8 @@ True True False - + @@ -1605,13 +1644,14 @@ - + True False - + True False + vertical True @@ -1627,19 +1667,21 @@ - + True False 6 + vertical Strongs Numbers + False True True False Search for Strongs Numbers like G4442 or H1121 - False True + 0.5 True True @@ -1657,12 +1699,13 @@ Morphological Tags + False True True False Search for Morphological tags - False True + 0.5 True radiobutton13 @@ -1680,12 +1723,13 @@ Footnotes + False True True False Search in footnotes - False True + 0.5 True radiobutton13 @@ -1721,9 +1765,10 @@ - + True False + vertical True @@ -1739,19 +1784,21 @@ - + True False 6 + vertical Show Strong's Numbers + False True True False In modules that have Strong's Numbers - False True + 0.5 True True @@ -1769,12 +1816,13 @@ Show Morphological Tags + False True True False In modules that have Morphological Tags - False True + 0.5 True @@ -1791,12 +1839,13 @@ Show Footnotes + False True True False In modules that have Footnotes - False True + 0.5 True @@ -1892,11 +1941,11 @@ gtk-close + False True True True False - False True @@ -1909,11 +1958,11 @@ gtk-add + False True True True False - False True @@ -1940,8 +1989,8 @@ True True False - + diff -Nru xiphos-4.0.0+dfsg1/ui/search-dialog_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/search-dialog_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/search-dialog_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/search-dialog_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,1964 @@ + + + + + True + False + Advanced Search + 665 + 465 + xiphos-x-16.png + normal + + + True + False + + + True + False + end + + + _Lucene Search Syntax + True + True + False + Open a brief explanation of the syntax used for optimized "lucene" searches. + False + True + + + False + True + 0 + + + + + _Attribute Search + True + True + False + Open a brief explanation of attribute-based searches. + False + True + + + False + True + 1 + + + + + gtk-close + True + True + True + False + False + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + True + False + 4 + + + True + False + 0 + <b>search module</b> + True + end + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + 6 + for + + + False + False + 0 + + + + + True + True + + + Main Search Entry + + + + + True + True + 1 + + + + + gtk-find + True + True + False + Start/stop searching + False + True + + + Find Button + + + + + False + False + 2 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + True + False + + + True + True + 166 + + + True + True + in + + + True + True + False + + + Search Criteria Treeview + + + + + + + + + + False + True + + + + + True + False + 16 + + + True + False + 4 + 4 + + + True + False + 0 + <b>Scope</b> + True + + + False + False + 0 + + + + + True + False + 8 + + + True + False + 6 + True + + + Entire module + True + True + False + Search entire module + False + True + True + + + Entire module radiobutton + + + + + False + False + 0 + + + + + Current results + True + True + False + Use the results of the last search as the scope of the search + False + True + True + radiobutton1 + + + Current results radiobutton + + + + + False + False + 1 + + + + + Custom verse range + True + True + False + Use a custom range for the scope of the search + False + True + True + radiobutton1 + + + Custom verse range radiobutton + + + + + False + False + 2 + + + + + + + False + True + 1 + + + + + True + False + 8 + + + True + False + False + True + + + Custom Range Selector Combo + + + + + False + + + + + + + False + True + 2 + + + + + False + True + 0 + + + + + True + False + 4 + 4 + + + True + False + 0 + <b>Modules</b> + True + + + False + False + 0 + + + + + True + False + 8 + + + True + False + 6 + True + + + Single module + True + True + False + Use a single module for the search + False + True + True + + + Single module radiobutton + + + + + False + False + 0 + + + + + Module list + True + True + False + Use the current module list for the search + False + True + True + radiobutton4 + + + Module list radiobutton + + + + + False + False + 1 + + + + + Custom module list + True + True + False + Use a custom module list for the search + False + True + True + radiobutton4 + + + Custom module list radiobutton + + + + + False + False + 2 + + + + + + + False + True + 1 + + + + + True + False + 8 + + + False + True + 2 + + + + + True + False + 8 + + + True + False + False + True + + + Custom Range Selector Combo + + + + + False + + + + + + + False + True + 3 + + + + + False + True + 1 + + + + + True + False + 4 + 35 + + + True + False + + + True + False + 0 + <b>Search Type</b> + True + + + False + False + 0 + + + + + True + False + 8 + + + True + False + + + Optimized ("Lucene") + True + True + False + Fast, featureful, index-based search +Indexes must have been built beforehand: +See Module Manager's maintenance functions + False + True + True + + + Optimized ("Lucene") radiobutton + + + + + False + False + 0 + + + + + Multi word + True + True + False + False + True + True + radiobutton16 + + + Multi word radiobutton + + + + + False + False + 1 + + + + + Regular expression + True + True + False + False + True + True + radiobutton16 + + + Regular expression radiobutton + + + + + False + False + 2 + + + + + Exact phrase + True + True + False + False + True + True + radiobutton16 + + + Exact phrase radiobutton + + + + + False + False + 3 + + + + + Attributes + True + True + False + Make selections on the Attribute Search tab + False + True + True + radiobutton16 + + + Attributes radiobutton + + + + + False + False + 4 + + + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + True + False + 0 + <b>Options</b> + True + + + False + False + 0 + + + + + True + False + 8 + + + True + False + + + Match case + True + True + False + False + True + True + + + Match case checkbox + + + + + False + False + 0 + + + + + + + False + False + 1 + + + + + + + + True + False + 8 + + + + + + True + True + 3 + + + + + False + True + 1 + + + + + True + True + 2 + + + + + True + True + + + + + + + True + False + Search Criteria + + + False + + + + + True + False + 4 + 6 + + + True + False + icons + + + False + Show in main window + False + gtk-jump-to + + + False + True + + + + + True + False + Save search results as bookmarks + False + gtk-save + + + + False + True + + + + + True + False + Export current search results + False + Export + True + gtk-goto-bottom + + + + False + True + + + + + True + False + Clear lists for new search + False + gtk-clear + + + False + True + + + + + False + False + 0 + + + + + True + True + 148 + + + True + False + + + True + False + 0 + <b>Found</b> + True + + + False + False + 0 + + + + + True + True + in + + + Result Summary Window + + + + + True + True + False + + + Result Summary Table + + + + + + + + + + True + True + 1 + + + + + False + True + + + + + True + True + 148 + + + True + False + + + True + False + 0 + <b>Search Results</b> + True + + + False + False + 0 + + + + + True + True + in + + + True + True + False + + + + + + + + + + + True + True + 1 + + + + + False + True + + + + + True + False + + + True + False + 0 + <b>Preview</b> + True + + + False + False + 0 + + + + + + + + True + True + + + + + True + True + + + + + True + True + 1 + + + + + True + False + 0.10000000149 + + + False + False + 2 + + + + + 1 + + + + + True + False + Results + + + 1 + False + + + + + True + False + 6 + 6 + + + True + False + icons + + + True + False + Create new custom range + False + gtk-new + + + New Range Button + + + + + False + True + + + + + True + False + Save custom range + False + gtk-save + + + Save Range Button + + + + + False + True + + + + + True + False + Delete selected range + False + gtk-cut + + + Delete Range Button + + + + + False + True + + + + + False + False + 0 + + + + + True + False + 7 + True + + + True + False + + + True + False + 0 + <b>Ranges</b> + True + + + False + False + 0 + + + + + True + True + in + + + True + True + False + + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Range Name</b> + True + + + False + False + 0 + + + + + True + True + + + Range Name Entry + + + + + False + False + 1 + + + + + True + False + 0 + <b>Range Definition</b> + True + + + False + False + 2 + + + + + True + True + + + Range Definition Entry + + + + + False + False + 3 + + + + + True + False + e.g. Matt-John;Rev4 + + + False + False + 4 + + + + + True + True + in + + + True + True + False + + + Custom Range Preview + + + + + + + + + + True + True + 5 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + 2 + + + + + True + False + Custom Verse Ranges + + + 2 + False + + + + + True + False + 6 + 6 + + + True + False + icons + + + True + False + Create a new module list + False + gtk-new + + + New Custom Module List Button + + + + + False + True + + + + + True + False + Save the module list + False + gtk-save + + + Save Custom Module List Button + + + + + False + True + + + + + True + False + Delete the selected list + False + gtk-cut + + + Clear Custom Module List Button + + + + + False + True + + + + + False + False + 0 + + + + + True + False + 7 + True + + + True + False + + + True + False + 0 + <b>Module Lists</b> + True + + + False + False + 0 + + + + + True + True + in + + + True + True + False + + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>List Name</b> + True + + + False + False + 0 + + + + + True + True + + + Custom Module List Name Entry + + + + + False + False + 1 + + + + + True + False + 0 + <b>Modules</b> + True + + + False + False + 2 + + + + + True + False + icons + + + True + False + Clear all modules from the list + False + gtk-clear + + + Clear Modules from List Button + + + + + False + True + + + + + True + False + Remove the selected module from the list + False + True + gtk-cut + + + Delete Selected Module From List Button + + + + + False + True + + + + + True + False + + + False + + + + + True + False + Open a dialog to select modules to add to the list + False + Add Modules + True + gtk-add + + + Open Selection Dialog Button + + + + + False + True + + + + + False + False + 3 + + + + + True + True + in + + + True + True + False + + + + + + + + + + + True + True + 4 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + 3 + + + + + True + False + Custom Module Lists + + + 3 + False + + + + + True + False + + + True + False + + + True + False + 0.019999999552965164 + <b>Attribute</b> + True + + + False + False + 0 + + + + + True + False + 6 + + + Strongs Numbers + True + True + False + Search for Strongs Numbers like G4442 or H1121 + False + True + True + True + + + Strongs Numbers radiobutton + + + + + False + False + 0 + + + + + Morphological Tags + True + True + False + Search for Morphological tags + False + True + True + radiobutton13 + + + Morphological Tags radiobutton + + + + + False + False + 1 + + + + + Footnotes + True + True + False + Search in footnotes + False + True + True + radiobutton13 + + + Footnotes radiobutton + + + + + False + False + 2 + + + + + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + + + True + False + 0 + <b>Results Display Options</b> + True + + + False + False + 0 + + + + + True + False + 6 + + + Show Strong's Numbers + True + True + False + In modules that have Strong's Numbers + False + True + True + True + + + Show Strong's Numbers checkbox + + + + + False + False + 0 + + + + + Show Morphological Tags + True + True + False + In modules that have Morphological Tags + False + True + True + + + Show Morphological Tags checkbox + + + + + False + False + 1 + + + + + Show Footnotes + True + True + False + In modules that have Footnotes + False + True + True + + + Show Footnotes checkbox + + + + + False + False + 2 + + + + + True + True + 1 + + + + + + + + + + + + + + True + True + 1 + + + + + + + + 4 + + + + + False + Attribute Search + + + 4 + False + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + button_intro_lucene + button_intro_attributes + closebutton1 + + + + False + Module Selection + 222 + 300 + xiphos-x-16.png + dialog + + + True + False + + + True + False + end + + + gtk-close + True + True + True + False + False + True + + + + False + True + 0 + + + + + gtk-add + True + True + True + False + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + True + in + + + True + True + False + + + + + + + + + + True + True + 1 + + + + + + closebutton2 + button2 + + + diff -Nru xiphos-4.0.0+dfsg1/ui/selector-prefs.gtkbuilder xiphos-4.0.4+dfsg1/ui/selector-prefs.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/selector-prefs.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/selector-prefs.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -1,6 +1,9 @@ - + + + + False Module Selection True 222 @@ -8,32 +11,13 @@ xiphos-x-16.png dialog - + True - - - True - True - automatic - automatic - in - - - True - True - False - - - - - True - True - 2 - - + False - + True + False end @@ -68,10 +52,33 @@ False + False end 0 + + + True + True + in + + + True + True + False + + + + + + + + True + True + 2 + + diff -Nru xiphos-4.0.0+dfsg1/ui/selector-prefs_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/selector-prefs_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/selector-prefs_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/selector-prefs_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,82 @@ + + + + Module Selection + True + 222 + 300 + xiphos-x-16.png + dialog + + + True + + + True + True + automatic + automatic + in + + + True + True + False + + + + + True + True + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + gtk-add + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + mod_sel_button_close + mod_sel_button_add + + + diff -Nru xiphos-4.0.0+dfsg1/ui/xi-menus.glade xiphos-4.0.4+dfsg1/ui/xi-menus.glade --- xiphos-4.0.0+dfsg1/ui/xi-menus.glade 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/xi-menus.glade 2015-01-06 15:27:04.000000000 +0000 @@ -1105,6 +1105,26 @@ + + False + Glosses + True + False + + + + + + + False + Morpheme Segmentation + True + False + + + + + False Image Content diff -Nru xiphos-4.0.0+dfsg1/ui/xi-menus.gtkbuilder xiphos-4.0.4+dfsg1/ui/xi-menus.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/xi-menus.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/xi-menus.gtkbuilder 2015-03-23 01:15:22.000000000 +0000 @@ -1,74 +1,85 @@ + - - + True + False True + False _File True + False Open Study_pad True + False True True - + True + False _Open Session True + False True True - + _Save Session True + False True True - + True + False _New Prayerlist/Journal True + False True True - + True + False gtk-quit True + False True True - + @@ -78,49 +89,56 @@ True + False _Edit True + False _Search True + False True True - + _Advanced Search True + False True True - + True + False _Preferences True + False True True - + _Module Manager True + False True True - + @@ -130,116 +148,133 @@ True + False _View True + False True + False Preview _Daily Devotion True - + True + False True + False _Bible True - + True + False _Preview True - + True + False _Commentary/Book True - + True + False Dictionar_y True - + True + False True + False L_ink Tabs True - + True + False _Read Aloud True - + True + False Show Verse _Numbers True - + True + False _Highlight Current Verse True - + True + False True + False _Attach/Detach Sidebar True - + True + False _Show/Hide Attached Sidebar True - + True + False Show Parallel View in a _Tab True @@ -247,9 +282,10 @@ True + False Show Previe_wer in the Sidebar True - + @@ -259,81 +295,92 @@ True + False _Help True + False _Contents True + False True True - + _Mailing List True + False True True - + _Live Chat True + False True True - + _Report Bug True + False True True - + True + False About _Translation True + False True True - + True + False _About The SWORD Project True + False True True - + About _Xiphos True + False True True - + diff -Nru xiphos-4.0.0+dfsg1/ui/xi-menus_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/xi-menus_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/xi-menus_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/xi-menus_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,344 @@ + + + + + + True + + + True + _File + True + + + + + Open Study_pad + True + True + True + + + + + + True + + + + + _Open Session + True + True + True + + + + + + _Save Session + True + True + True + + + + + + True + + + + + _New Prayerlist/Journal + True + True + True + + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + + True + _Edit + True + + + + + _Search + True + True + True + + + + + + _Advanced Search + True + True + True + + + + + + True + + + + + _Preferences + True + True + True + + + + + + _Module Manager + True + True + True + + + + + + + + + + True + _View + True + + + + + True + Preview _Daily Devotion + True + + + + + + True + + + + + True + _Bible + True + + + + + + True + _Preview + True + + + + + + True + _Commentary/Book + True + + + + + + True + Dictionar_y + True + + + + + + True + + + + + True + L_ink Tabs + True + + + + + + True + _Read Aloud + True + + + + + + True + Show Verse _Numbers + True + + + + + + True + _Highlight Current Verse + True + + + + + + True + + + + + True + _Attach/Detach Sidebar + True + + + + + + True + _Show/Hide Attached Sidebar + True + + + + + + True + Show Parallel View in a _Tab + True + + + + + True + Show Previe_wer in the Sidebar + True + + + + + + + + + + True + _Help + True + + + + + _Contents + True + True + True + + + + + + _Mailing List + True + True + True + + + + + + _Live Chat + True + True + True + + + + + + _Report Bug + True + True + True + + + + + + True + + + + + About _Translation + True + True + True + + + + + + True + + + + + _About The SWORD Project + True + True + True + + + + + + About _Xiphos + True + True + True + + + + + + + + + diff -Nru xiphos-4.0.0+dfsg1/ui/xi-menus-popup.gtkbuilder xiphos-4.0.4+dfsg1/ui/xi-menus-popup.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/xi-menus-popup.gtkbuilder 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/xi-menus-popup.gtkbuilder 2015-03-23 01:15:22.000000000 +0000 @@ -1,15 +1,16 @@ + - + False Open in new tab + False True False Open this bookmark in a new tab - False True True @@ -18,10 +19,10 @@ Open in a dialog + False True False Open this bookmark in a dialog - False True True @@ -30,10 +31,10 @@ New Folder + False True False Add new folder to selected folder - False True True @@ -42,10 +43,10 @@ Insert Bookmark + False True False Insert new bookmark here - False True True @@ -54,10 +55,10 @@ _Edit Item + False True False Edit bookmark item - False True True @@ -66,10 +67,10 @@ Delete Item + False True False Delete item - False True True @@ -84,10 +85,10 @@ Expand All + False True False Expand all Bookmarks groups - False True True @@ -96,10 +97,10 @@ Collapse All + False True False Collapse all Bookmarks groups - False True True @@ -113,10 +114,10 @@ + False True False Allow items to be moved from one folder to another - False Allow Reordering True @@ -131,10 +132,10 @@ Import Bookmarks + False True False Load other bookmarks file (default: from BibleTime) - False True True @@ -143,10 +144,10 @@ Export Folder + False True False Remove folder and save it - False True True @@ -157,11 +158,11 @@ False - Add Sub-Item + Add Sub-Item + False True False Add a sub-item - False True True @@ -170,10 +171,10 @@ Add Item + False True False Add an item - False True True @@ -182,10 +183,10 @@ Remove + False True False Remove this item - False True True @@ -194,10 +195,10 @@ Edit + False True False Edit this item - False True True @@ -209,10 +210,10 @@ Open in new tab + False True False Open selected module in a new tab - False True True @@ -221,11 +222,11 @@ Open in a separate window + False True False Open selected module in a separate ['dialog'] window - False True True @@ -234,9 +235,9 @@ About + False True False - False True True @@ -248,9 +249,9 @@ About + False True False - False True True @@ -259,9 +260,9 @@ Bookmark + False True False - False True True @@ -270,9 +271,9 @@ Annotate Verse + False True False - False True True @@ -287,9 +288,9 @@ Copy/Export Passage + False True False - False True True @@ -304,9 +305,9 @@ File + False True False - False True True @@ -315,9 +316,9 @@ Open Module + False True False - False True True @@ -331,9 +332,9 @@ gtk-print + False True False - False True True @@ -342,9 +343,9 @@ gtk-close + False True False - False True True @@ -357,9 +358,9 @@ Edit + False True False - False True True @@ -368,9 +369,9 @@ gtk-copy + False True False - False True True @@ -379,9 +380,9 @@ gtk-find + False True False - False True True @@ -390,9 +391,9 @@ Note + False True False - False True True @@ -400,9 +401,9 @@ Open in editor + False True False - False True True @@ -414,9 +415,9 @@ Module Options + False True False - False True True @@ -425,9 +426,9 @@ gtk-select-font + False True False - False True True @@ -441,9 +442,8 @@ - False - False False + False Verse Per Line True @@ -451,9 +451,8 @@ - False - False False + False Headings True @@ -461,9 +460,8 @@ - False - False False + False Words of Christ in Red True @@ -471,9 +469,8 @@ - False - False False + False Strong's Numbers True @@ -481,9 +478,8 @@ - False - False False + False Lemmas True @@ -491,9 +487,8 @@ - False - False False + False Morphological Tags True @@ -501,9 +496,8 @@ - False - False False + False Footnotes True @@ -511,9 +505,8 @@ - False - False False + False Cross-references True @@ -521,9 +514,9 @@ + False True False - False Footnote/Cross-ref Markers True @@ -531,9 +524,8 @@ - False - False False + False Greek Accents True @@ -541,9 +533,8 @@ - False - False False + False Hebrew Vowel Points True @@ -551,9 +542,8 @@ - False - False False + False Hebrew Cantillation True @@ -561,9 +551,9 @@ + False True False - False Transliteration True @@ -571,9 +561,8 @@ - False - False False + False Variants True @@ -581,9 +570,9 @@ False + False True False - False Primary Reading True @@ -591,9 +580,9 @@ + False True False - False Secondary Reading True @@ -601,9 +590,9 @@ + False True False - False All Readings True @@ -615,9 +604,8 @@ - False - False False + False Transliterated Forms True @@ -625,19 +613,35 @@ - False - False False + False Enumerations True - - False + + False False + Glosses + True + + + + + False + False + Morpheme Segmentation + True + + + + + + False + False Image Content True @@ -645,9 +649,8 @@ - False - False False + False Respect Font Faces True @@ -655,9 +658,8 @@ - False - False False + False Commentary by Chapter True @@ -665,9 +667,9 @@ + False True False - False Doublespace True @@ -680,9 +682,9 @@ Lookup Selection + False True False - False True True @@ -690,9 +692,9 @@ False + False True False - False Use Current Dictionary True @@ -700,9 +702,9 @@ + False True False - False Browse in BibleMap.org True @@ -721,9 +723,9 @@ Unlock This Module + False True False - False True True @@ -732,9 +734,9 @@ Display Book Heading + False True False - False True True @@ -742,10 +744,10 @@ - Display Chapter Heading + Display Chapter Heading + False True False - False True True @@ -754,9 +756,9 @@ Rename Pers.Comm. + False True False - False True True @@ -765,9 +767,9 @@ Dump Pers.Comm. + False True False - False True True @@ -776,9 +778,9 @@ Read Selection Aloud + False True False - False True True @@ -790,10 +792,10 @@ Simple + False True False Create a new simple prayer list - False True True @@ -802,10 +804,10 @@ Subject + False True False Create a new subject prayer list - False True True @@ -814,10 +816,10 @@ Monthly + False True False Create a new monthly journal - False True True @@ -826,10 +828,10 @@ Daily + False True False Create a new daily journal - False True True @@ -838,10 +840,10 @@ Outlined + False True False Create a new outlined topic - False True True @@ -853,10 +855,10 @@ Open in new tab + False True False Open selected module in a new tab - False True True @@ -865,10 +867,10 @@ Open in separate window + False True False Open module in editor or plain display window - False True True @@ -877,9 +879,9 @@ About + False True False - False True True @@ -891,10 +893,10 @@ Save list as a single bookmark + False True False Save these results as a single bookmark - False True True @@ -903,10 +905,10 @@ Save list as a series of bookmarks + False True False Save these results as a series of bookmarks in their own folder - False True True @@ -921,10 +923,10 @@ Populate verse list + False True False Provide a dialog in which to paste a line of verse references, to fill the verse list. - False True True @@ -933,10 +935,10 @@ Preload history from verse list + False True False Push the entire verse list contents directly into the history list. - False True True @@ -951,10 +953,10 @@ Send list via BibleSync + False True False Send this verse list via BibleSync to others, if you are in Personal or Speaker mode. - False True True @@ -963,9 +965,9 @@ Export List + False True False - False True True @@ -977,10 +979,10 @@ Send list via BibleSync + False True False Send this verse list via BibleSync to others, if you are in Personal or Speaker mode. - False True True diff -Nru xiphos-4.0.0+dfsg1/ui/xi-menus-popup_old.gtkbuilder xiphos-4.0.4+dfsg1/ui/xi-menus-popup_old.gtkbuilder --- xiphos-4.0.0+dfsg1/ui/xi-menus-popup_old.gtkbuilder 1970-01-01 00:00:00.000000000 +0000 +++ xiphos-4.0.4+dfsg1/ui/xi-menus-popup_old.gtkbuilder 2015-02-03 19:37:38.000000000 +0000 @@ -0,0 +1,1000 @@ + + + + + False + + + Open in new tab + True + False + Open this bookmark in a new tab + False + True + True + + + + + + Open in a dialog + True + False + Open this bookmark in a dialog + False + True + True + + + + + + New Folder + True + False + Add new folder to selected folder + False + True + True + + + + + + Insert Bookmark + True + False + Insert new bookmark here + False + True + True + + + + + + _Edit Item + True + False + Edit bookmark item + False + True + True + + + + + + Delete Item + True + False + Delete item + False + True + True + + + + + + True + False + + + + + Expand All + True + False + Expand all Bookmarks groups + False + True + True + + + + + + Collapse All + True + False + Collapse all Bookmarks groups + False + True + True + + + + + + True + False + + + + + True + False + Allow items to be moved from one folder to another + False + Allow Reordering + True + + + + + + True + False + + + + + Import Bookmarks + True + False + Load other bookmarks file (default: from BibleTime) + False + True + True + + + + + + Export Folder + True + False + Remove folder and save it + False + True + True + + + + + + False + + + Add Sub-Item + True + False + Add a sub-item + False + True + True + + + + + + Add Item + True + False + Add an item + False + True + True + + + + + + Remove + True + False + Remove this item + False + True + True + + + + + + Edit + True + False + Edit this item + False + True + True + + + + + + False + + + Open in new tab + True + False + Open selected module in a new tab + False + True + True + + + + + + Open in a separate window + True + False + Open selected module in a + separate ['dialog'] window + False + True + True + + + + + + About + True + False + False + True + True + + + + + + False + + + About + True + False + False + True + True + + + + + + Bookmark + True + False + False + True + True + + + + + + Annotate Verse + True + False + False + True + True + + + + + + True + False + + + + + Copy/Export Passage + True + False + False + True + True + + + + + + True + False + + + + + File + True + False + False + True + True + + + False + + + Open Module + True + False + False + True + True + + + + + True + False + + + + + gtk-print + True + False + False + True + True + + + + + + gtk-close + True + False + False + True + True + + + + + + + + + + Edit + True + False + False + True + True + + + False + + + gtk-copy + True + False + False + True + True + + + + + + gtk-find + True + False + False + True + True + + + + + + Note + True + False + False + True + True + + + + + Open in editor + True + False + False + True + True + + + + + + + + + Module Options + True + False + False + True + True + + + False + + + gtk-select-font + True + False + False + True + True + + + + + + True + False + + + + + False + False + False + Verse Per Line + True + + + + + + False + False + False + Headings + True + + + + + + False + False + False + Words of Christ in Red + True + + + + + + False + False + False + Strong's Numbers + True + + + + + + False + False + False + Lemmas + True + + + + + + False + False + False + Morphological Tags + True + + + + + + False + False + False + Footnotes + True + + + + + + False + False + False + Cross-references + True + + + + + + True + False + False + Footnote/Cross-ref Markers + True + + + + + + False + False + False + Greek Accents + True + + + + + + False + False + False + Hebrew Vowel Points + True + + + + + + False + False + False + Hebrew Cantillation + True + + + + + + True + False + False + Transliteration + True + + + + + + False + False + False + Variants + True + + + False + + + True + False + False + Primary Reading + True + + + + + + True + False + False + Secondary Reading + True + + + + + + True + False + False + All Readings + True + + + + + + + + + + False + False + False + Transliterated Forms + True + + + + + + False + False + False + Enumerations + True + + + + + + False + False + False + Glosses + True + + + + + + False + False + False + Image Content + True + + + + + + False + False + False + Respect Font Faces + True + + + + + + False + False + False + Commentary by Chapter + True + + + + + + True + False + False + Doublespace + True + + + + + + + + + + Lookup Selection + True + False + False + True + True + + + False + + + True + False + False + Use Current Dictionary + True + + + + + + True + False + False + Browse in BibleMap.org + True + + + + + + True + False + + + + + + + + + Unlock This Module + True + False + False + True + True + + + + + + Display Book Heading + True + False + False + True + True + + + + + + Display Chapter Heading + True + False + False + True + True + + + + + + Rename Pers.Comm. + True + False + False + True + True + + + + + + Dump Pers.Comm. + True + False + False + True + True + + + + + + Read Selection Aloud + True + False + False + True + True + + + + + + False + + + Simple + True + False + Create a new simple prayer list + False + True + True + + + + + + Subject + True + False + Create a new subject prayer list + False + True + True + + + + + + Monthly + True + False + Create a new monthly journal + False + True + True + + + + + + Daily + True + False + Create a new daily journal + False + True + True + + + + + + Outlined + True + False + Create a new outlined topic + False + True + True + + + + + + False + + + Open in new tab + True + False + Open selected module in a new tab + False + True + True + + + + + + Open in separate window + True + False + Open module in editor or plain display window + False + True + True + + + + + + About + True + False + False + True + True + + + + + + False + + + Save list as a single bookmark + True + False + Save these results as a single bookmark + False + True + True + + + + + + Save list as a series of bookmarks + True + False + Save these results as a series of bookmarks in their own folder + False + True + True + + + + + + True + False + + + + + Populate verse list + True + False + Provide a dialog in which to paste a line of verse references, to fill the verse list. + False + True + True + + + + + + Preload history from verse list + True + False + Push the entire verse list contents directly into the history list. + False + True + True + + + + + + True + False + + + + + Send list via BibleSync + True + False + Send this verse list via BibleSync to others, if you are in Personal or Speaker mode. + False + True + True + + + + + + Export List + True + False + False + True + True + + + + + + False + + + Send list via BibleSync + True + False + Send this verse list via BibleSync to others, if you are in Personal or Speaker mode. + False + True + True + + + + + diff -Nru xiphos-4.0.0+dfsg1/wscript xiphos-4.0.4+dfsg1/wscript --- xiphos-4.0.0+dfsg1/wscript 2014-12-24 03:04:06.000000000 +0000 +++ xiphos-4.0.4+dfsg1/wscript 2015-08-30 16:16:08.000000000 +0000 @@ -14,10 +14,7 @@ import waffles.misc import waffles.gnome as gnome -bzrrevno = '$CurRevno$' -bzrrevid = '$CurRevid$' - -VERSION='4.0.0' +VERSION='4.0.4' APPNAME='xiphos' PACKAGE='xiphos' @@ -76,7 +73,11 @@ miscgroup.add_option('--enable-webkit-editor', action='store_true', default=False, dest='webkit_editor', help='Use webkit editor [default: disabled]') - + + miscgroup.add_option('--enable-webkit2', action='store_true', default=False, + dest='webkit2', + help='Use webkit2 instead of original webkit [default: disabled]') + miscgroup.add_option('--disable-dbus', action = 'store_true', default = False, @@ -203,8 +204,8 @@ env['CXXFLAGS'] = [] env['CXXFLAGS_OPTIMIZED'] = ['-O2'] env['CXXFLAGS_RELEASE'] = ['-O2'] - env['CXXFLAGS_DEBUG'] = ['-g', '-DDEBUG', '-ftemplate-depth-25'] - env['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG', '-ftemplate-depth-25'] + env['CXXFLAGS_DEBUG'] = ['-g', '-DDEBUG'] + env['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG'] if env['IS_WIN32']: ## setup for Winsock on Windows (required for read-aloud) @@ -238,7 +239,7 @@ msg='Auto detecting gtk 2', mandatory=True) opt.gtkver = '2' - # FIXME: Find out why we still need this! + # FIXME: Find out why we still need this! dfn('WEBKIT', 1) #gtk @@ -331,31 +332,17 @@ conf.define('USE_WEBKIT_EDITOR', 1) env['ENABLE_WEBKIT_EDITOR'] = True common_libs += ' "gtk+-2.0 >= 2.24" ' - # FC15 and Oneiric have this, Natty does not elif conf.check_cfg(modversion='gtkhtml-editor-3.14', msg='Checking for GNOME3 gtkhtml-editor', okmsg='Definitely', - errmsg='Probably not' + errmsg='Probably not', + mandatory=True ): common_libs += ' "gtk+-2.0 >= 2.14" ' common_libs += ' "gtkhtml-editor-3.14" ' common_libs += ' "libgtkhtml-3.14 >= 3.23" ' - elif conf.check_cfg(modversion='gtkhtml-editor-4.0', - msg='Checking for GNOME3 gtkhtml-editor', - okmsg='Definitely', - errmsg='Probably not' - ): - common_libs += ' "gtk+-2.0 >= 2.14" ' - common_libs += ' "gtkhtml-editor-4.0" ' - common_libs += ' "libgtkhtml-4.0 >= 3.23" ' - else: - common_libs += ' "gtk+-2.0 >= 2.14" ' - common_libs += ' "gtkhtml-editor" ' - common_libs += ' "libgtkhtml-3.14 >= 3.23" ' else: - # common_libs += ' "gtk+-3.0" ' - common_libs += ' "webkitgtk-3.0" ' conf.check_cfg(package="gtk+-3.0", atleast_version = "3.2", uselib_store="GTK_32") @@ -368,21 +355,41 @@ conf.check_cfg(package="gtk+-3.0", atleast_version = "3.10", uselib_store="GTK_310") - # conf.check_cfg(package="gtk+-3.0", - # atleast_version = "3.12", - # uselib_store="GTK_312") + conf.check_cfg(package="gtk+-3.0", + atleast_version = "3.12", + uselib_store="GTK_312") + conf.check_cfg(package="gtk+-3.0", + atleast_version = "3.14", + uselib_store="GTK_314") conf.define('USE_GTK_3', 1) conf.define('USE_GTKBUILDER', 1) if opt.webkit_editor: - conf.define('USE_WEBKIT_EDITOR', 1) - env['ENABLE_WEBKIT_EDITOR'] = True - # FC15 and Oneiric have this, Natty does not + conf.define('USE_WEBKIT_EDITOR', 1) + env['ENABLE_WEBKIT_EDITOR'] = True + common_libs += ' "webkitgtk-3.0" ' else: - if conf.check_cfg(modversion='libgtkhtml-4.0', msg='Checking for libgtkhtml4', okmsg='ok', errmsg='fail'): - common_libs += ' "libgtkhtml-4.0" ' - # FC15 and Oneiric have this, Natty does not - if conf.check_cfg(modversion="gtkhtml-editor-4.0", msg="Checking for GtkHTML Editor 4.0", okmsg='ok', errmsg='fail', mandatory=True): - common_libs += ' "gtkhtml-editor-4.0" ' + if conf.check_cfg(modversion='libgtkhtml-4.0', + msg='Checking for libgtkhtml4', + okmsg='ok', + errmsg='fail'): + common_libs += ' "libgtkhtml-4.0" ' + if conf.check_cfg(modversion="gtkhtml-editor-4.0", + msg="Checking for GtkHTML Editor 4.0", + okmsg='ok', + errmsg='fail', + mandatory=True): + common_libs += ' "gtkhtml-editor-4.0" ' + if opt.gtkver == '3' and opt.webkit2 and conf.check_cfg(modversion='webkit2gtk-4.0', + msg='Checking for WebKit2', + okmsg='ok', + errmsg='fail'): + common_libs += ' "webkit2gtk-4.0" ' + conf.define('USE_WEBKIT2', 1) + elif conf.check_cfg(modversion='webkitgtk-3.0', + msg='Checking for WebKit', + okmsg='ok', + errmsg='fail'): + common_libs += ' "webkitgtk-3.0" ' conf.check_cfg(atleast_pkgconfig_version='0.9.0') conf.check_cfg(msg="Checking for GNOME related libs", @@ -407,8 +414,8 @@ conf.check_cfg(package='biblesync', args='"biblesync >= 1.1.2" --cflags --libs', uselib_store='BIBLESYNC', - errmsg='no: using local (possibly out of date) version.', - mandatory=False) + errmsg='fail', + mandatory=True) env.append_value('ALL_LIBS', 'BIBLESYNC') if not env["IS_WIN32"]: @@ -478,11 +485,6 @@ ui """) - if not env['HAVE_BIBLESYNC']: - bld.add_subdirs('src/biblesync') - # following is repulsive. why doesn't it link on its own? how was it lost? - env.prepend_value('LINKFLAGS', 'default/src/biblesync/biblesync_1.o') - bld.add_subdirs('src/webkit') if env['IS-WIN32']: diff -Nru xiphos-4.0.0+dfsg1/xiphos.1 xiphos-4.0.4+dfsg1/xiphos.1 --- xiphos-4.0.0+dfsg1/xiphos.1 2014-12-18 19:36:21.000000000 +0000 +++ xiphos-4.0.4+dfsg1/xiphos.1 2015-05-04 17:14:08.000000000 +0000 @@ -1,21 +1,18 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH "XIPHOS" "1" "November 2008" "Xiphos 2.4.1" "GNOME" +.TH XIPHOS "1" "May 2015" "xiphos 4.0.2" "User Commands" .SH NAME xiphos \- A Bible research tool .SH SYNOPSIS -.B xiphos -[\fIOPTION\fR...] -.SH "DESCRIPTION" -.B Xiphos -is a Bible study application for -.B Gnome, -a graphical desktop environment which is available for several Unix and Linux flavors. It is based on -.B Sword -by the CrossWire Bible Society, a framework providing the possibility to study the Bible and additional -information like commentaries, dictionaries and other texts using your computer. Display multiple -translations in the interlinear window. Search for passages in any translation by word, phrase, -or regular expression. Install this package if you want to browse the Bible translations and reference -works distributed by Crosswire Bible Society through the SWORD Project. +.B xiphos [OPTION...] + +.SH DESCRIPTION +.B Xiphos +is a Bible study application for GTK+ enviroments, a widget set which +is available for several Unix and Linux flavors. It is based on Sword by the +CrossWire Bible Society, a framework providing the possibility to study the +Bible and additional information like commentaries, dictionaries and other +texts using your computer. Display multiple translations in the interlinear +window. Search for passages in any translation by word, phrase, or regular +expression. .PP The program can be started from the command line as .B xiphos @@ -24,39 +21,29 @@ When started on the command line, .B xiphos may be followed by the options listed below. -.PP -Generic options: +.SH "OPTIONS" +.SS "Help Options:" .TP -\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... -Dynamic modules to load -.PP -Help options +\fB\-h\fR, \fB\-\-help\fR +Show help options .TP -\fB\-?, \-\-help\fR -Show the help message +\fB\-\-help\-all\fR +Show all help options .TP -\fB\-\-usage\fR -Display brief usage message -.PP - +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-\-display\fR=\fI\,DISPLAY\/\fR +X display to use .SH "SEE ALSO" -The full documentations for -.B xiphos -are maintained as gnome help files. If -.B Gnome -is properly installed at your site, you -should have access to the complete manual -by using the Help menu in +The full documentation for .B xiphos +can be found online at http://xiphos.org/manual/ or on your system through the +help menu in .SH "BUGS" -Bug reports and feedback in general improve quality and get to know -what the average user wants. Use the Tracker on SourceForge -(http://sourceforge.net/tracker/?group_id=5528) -or the mailing lists. +Please report bugs online at: https://sourceforge.net/p/gnomesword/bugs/ .SH "AUTHOR" -.B -xiphos -was written by The Xiphos Developer Team - +.B xiphos +was written by the Xiphos Developer Team. .PP - diff -Nru xiphos-4.0.0+dfsg1/xiphos.appdata.xml xiphos-4.0.4+dfsg1/xiphos.appdata.xml --- xiphos-4.0.0+dfsg1/xiphos.appdata.xml 2014-12-18 19:34:33.000000000 +0000 +++ xiphos-4.0.4+dfsg1/xiphos.appdata.xml 2015-02-04 01:50:49.000000000 +0000 @@ -1,5 +1,5 @@ - + xiphos.desktop CC0-1.0
        %s