Merge translation files from master branch.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 11de5b6c28)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

Makefile.am

@@ -1,5 +1,5 @@
 KDE_OPTIONS = noautodist
-SUBDIRS = bibletime pot docs .
+SUBDIRS = bibletime translations docs .
 
 EXTRA_DIST = \
 BibleTime.tdevelop \
@@ -55,7 +55,7 @@ $(top_srcdir)/configure.files:
 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
 
 install-data-local:
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
+	chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime
 	$(mkinstalldirs) $(datadir)/applications
 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(datadir)/applications/bibletime.desktop
 

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

bibletime.desktop.in

@@ -23,4 +23,4 @@ Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
 Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;TDE;QT
-DocPath=bibletime/handbook/index.html
+X-DocPath=bibletime/handbook/index.html

bibletime.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          BibleTime
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    A Bible study tool for the Trinity Desktop Environment
-Keywords:       bible,study,TDE,QT,sword,bibletime,bibletime2,crosswire,www.bibletime.info,crosswire.org
-Author:         The BibleTime Team <Info@bibletime.info>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://www.bibletime.info/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

bibletime/CMakeL10n.txt

@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "messages"
+    SOURCES "." "../docs/tips"
+)

bibletime/backend/btstringmgr.cpp

@@ -54,7 +54,7 @@ bool BTStringMgr::supportsUnicode() const {
 
 const bool BTStringMgr::isUtf8(const char *buf) const {
 	int i, n;
-	register unsigned char c;
+	unsigned char c;
 	bool gotone = false;
 
 	#define F 0   /* character never appears in text */

bibletime/backend/cbookdisplay.h

@@ -18,7 +18,7 @@ class CSwordTreeKey;
 
 namespace Rendering {
 
-	class CTextRendering::KeyTree;
+	class CTextRendering;
 
 	/**
 	* A CEntryDisplay implementation which works on tree-based GenBook modules

bibletime/backend/cswordbackend.cpp

@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModules() {
 
 /** Returns true if the given option is enabled. */
 const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) {
-	return (getGlobalOption( optionName(type).latin1() ) == "On");
+	return (strcmp(getGlobalOption( optionName(type).latin1() ), "On") == 0);
 }
 
 /** Sets the given options enabled or disabled depending on the second parameter. */

bibletime/bibletime.cpp

@@ -331,3 +331,4 @@ void BibleTime::polish() {
 	applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
 }
 
+#include "bibletime.moc"

bibletime/frontend/btinstallmgr.cpp

@@ -341,3 +341,4 @@ namespace BookshelfManager {
 
 }
 
+#include "btinstallmgr.moc"

bibletime/frontend/cdragdropmgr.cpp

@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) {
 };
 
 bool CDragDropMgr::BTDrag::provides( const char* type ) const {
-	return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
+	return (strcmp(type, "BibleTime/DND") == 0); //return only true if the type is BibleTime/DND
 };
 
 const char* CDragDropMgr::BTDrag::format( int i ) const {

bibletime/frontend/cinfodisplay.cpp

@@ -460,3 +460,5 @@ namespace InfoDisplay {
 	}
 
 } //end of namespace InfoDisplay
+
+#include "cinfodisplay.moc"

bibletime/frontend/cinputdialog.cpp

@@ -92,3 +92,5 @@ const TQString CInputDialog::getText( const TQString& caption, const TQString& d
 	delete dlg;
 	return ret;
 }
+
+#include "cinputdialog.moc"

bibletime/frontend/cmanageindiceswidget.cpp

@@ -191,3 +191,5 @@ void CManageIndicesWidget::deleteOrphanedIndices()
 
 
 }
+
+#include "cmanageindiceswidget.moc"

bibletime/frontend/cmdiarea.cpp

@@ -329,3 +329,5 @@ void CMDIArea::triggerWindowUpdate() {
 		}
 	}
 }
+
+#include "cmdiarea.moc"

bibletime/frontend/cmoduleindexdialog.cpp

@@ -96,3 +96,5 @@ void CModuleIndexDialog::slotFinished( ) {
 	progress->progressBar()->setProgress( progress->progressBar()->totalSteps() );
 	TDEApplication::kApplication()->processEvents( 1 ); //1 ms only
 }
+
+#include "cmoduleindexdialog.moc"

bibletime/frontend/coptionsdialog.cpp

@@ -1022,3 +1022,5 @@ void COptionsDialog::slotKeyChooserTypeChanged(const TQString& title) {
 
 	m_settings.keys.keyChooserStack->raiseWidget(t->keyChooser);
 }
+
+#include "coptionsdialog.moc"

bibletime/frontend/cprinter.cpp

@@ -128,3 +128,5 @@ namespace Printing {
 	}
 
 } //end of namespace
+
+#include "cprinter.moc"

bibletime/frontend/cswordsetupdialog.cpp

@@ -921,3 +921,5 @@ the module remote installation feature!</b>")
 	}
 
 } // NAMESPACE
+
+#include "cswordsetupdialog.moc"

bibletime/frontend/cswordsetupinstallsourcesdialog.cpp

@@ -170,3 +170,5 @@ namespace BookshelfManager {
 
 
 } //namespace
+
+#include "cswordsetupinstallsourcesdialog.moc"

bibletime/frontend/cswordsetupmodulelistview.cpp

@@ -271,3 +271,4 @@ namespace BookshelfManager {
 
 } //NAMESPACE
 
+#include "cswordsetupmodulelistview.moc"

bibletime/frontend/display/cdisplay.cpp

@@ -214,3 +214,4 @@ TQPopupMenu* const CDisplay::installedPopup() {
 	return m_popup;
 }
 
+#include "cdisplay.moc"

bibletime/frontend/display/chtmlreaddisplay.cpp

@@ -505,3 +505,5 @@ void CHTMLReadDisplay::openFindTextDialog() {
 	"version of BibleTime, we will remove the option.");
 #endif
 }
+
+#include "chtmlreaddisplay.moc"

bibletime/frontend/display/chtmlwritedisplay.cpp

@@ -264,3 +264,5 @@ TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
 
 	return popup;
 };
+
+#include "chtmlwritedisplay.moc"

bibletime/frontend/displaywindow/cbiblereadwindow.cpp

@@ -456,3 +456,5 @@ void CBibleReadWindow::syncWindows() {
 		  }*/
 	}
 }
+
+#include "cbiblereadwindow.moc"

bibletime/frontend/displaywindow/cbookreadwindow.cpp

@@ -174,3 +174,5 @@ void CBookReadWindow::setupPopupMenu() {
 
 	popup()->changeTitle(-1, CToolClass::getIconForModule(modules().first()), i18n("Book window"));
 }
+
+#include "cbookreadwindow.moc"

bibletime/frontend/displaywindow/cbuttons.cpp

@@ -216,3 +216,5 @@ const bool CDisplaySettingsButton::itemStatus( const int index ) {
 void CDisplaySettingsButton::setChanged() {
 	emit sigChanged();
 }
+
+#include "cbuttons.moc"

bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp

@@ -196,3 +196,5 @@ void CCommentaryReadWindow::setupPopupMenu() {
 
 	popup()->changeTitle(-1, CToolClass::getIconForModule(modules().first()), i18n("Commentary window"));
 }
+
+#include "ccommentaryreadwindow.moc"

bibletime/frontend/displaywindow/cdisplaywindow.cpp

@@ -496,3 +496,4 @@ void CDisplayWindow::printAnchorWithText() {
 	m_displayWidget->connectionsProxy()->printAnchorWithText( m_displayOptions, m_filterOptions);
 }
 
+#include "cdisplaywindow.moc"

bibletime/frontend/displaywindow/chtmlwritewindow.cpp

@@ -130,3 +130,5 @@ void CHTMLWriteWindow::restoreText() {
 const bool CHTMLWriteWindow::syncAllowed() const {
 	return m_actions.syncWindow->isChecked();
 }
+
+#include "chtmlwritewindow.moc"

bibletime/frontend/displaywindow/clexiconreadwindow.cpp

@@ -315,3 +315,5 @@ void CLexiconReadWindow::slotUpdateHistoryButtons() {
 	m_actions.backInHistory->setEnabled( keyChooser()->getPreviousKeys().size() > 0 );
 	m_actions.forwardInHistory->setEnabled( keyChooser()->getNextKeys().size() > 0 );
 }
+
+#include "clexiconreadwindow.moc"

bibletime/frontend/displaywindow/cmodulechooserbar.cpp

@@ -150,3 +150,5 @@ void CModuleChooserBar::updateMenuItems() {
 		buttons.current()->updateMenuItems();
 	}
 }
+
+#include "cmodulechooserbar.moc"

bibletime/frontend/displaywindow/cmodulechooserbutton.cpp

@@ -274,3 +274,5 @@ void CModuleChooserButton::updateMenuItems() {
 		}
 	}
 }
+
+#include "cmodulechooserbutton.moc"

bibletime/frontend/displaywindow/cplainwritewindow.cpp

@@ -174,3 +174,5 @@ void CPlainWriteWindow::initActions() {
 
 void CPlainWriteWindow::insertKeyboardActions( TDEActionCollection* const ) {
 }
+
+#include "cplainwritewindow.moc"

bibletime/frontend/displaywindow/creadwindow.cpp

@@ -193,3 +193,5 @@ void CReadWindow::openSearchStrongsDialog() {
 	
 	Search::CSearchDialog::openDialog( modules(), searchText, 0 );
 }
+
+#include "creadwindow.moc"

bibletime/frontend/displaywindow/cwritewindow.cpp

@@ -174,3 +174,5 @@ void CWriteWindow::beforeKeyChange(const TQString& key) {
 		}
 	}
 }
+
+#include "cwritewindow.moc"

bibletime/frontend/keychooser/cbiblekeychooser.cpp

@@ -111,3 +111,5 @@ void CBibleKeyChooser::refreshContent() {
 /** No descriptions */
 void CBibleKeyChooser::updateKey(CSwordKey* /*key*/) {}
 void CBibleKeyChooser::adjustFont() {}
+
+#include "cbiblekeychooser.moc"

bibletime/frontend/keychooser/cbookkeychooser.cpp

@@ -286,3 +286,4 @@ void CBookKeyChooser::updateKey(CSwordKey* key) {
 	setKey(key, false);
 }
 
+#include "cbookkeychooser.moc"

bibletime/frontend/keychooser/cbooktreechooser.cpp

@@ -319,3 +319,5 @@ void CBookTreeChooser::setupTree() {
 	m_key->setOffset( offset );
 	setKey(m_key, false); //the module may have changed
 }
+
+#include "cbooktreechooser.moc"

bibletime/frontend/keychooser/ckeychooser.cpp

@@ -147,3 +147,5 @@ void CKeyChooser::polish() {
 	//connect the history calls just before we show, we want an empty history
 	connect(this, TQT_SIGNAL(keyChanged(CSwordKey*)), TQT_SLOT(addToHistory(CSwordKey*)));
 }
+
+#include "ckeychooser.moc"

bibletime/frontend/keychooser/ckeychooserwidget.cpp

@@ -301,3 +301,4 @@ void CKeyChooserWidget::changeCombo(int n) {
 	}
 }
 
+#include "ckeychooserwidget.moc"

bibletime/frontend/keychooser/ckeyreferencewidget.cpp

@@ -208,3 +208,5 @@ void CKeyReferenceWidget::slotVerseChange(int n) {
 	updateText();
 	if (!updatelock) emit changed(m_key);
 }
+
+#include "ckeyreferencewidget.moc"

bibletime/frontend/keychooser/clexiconkeychooser.cpp

@@ -174,3 +174,5 @@ void CLexiconKeyChooser::setModules( const ListCSwordModuleInfo& modules, const
 
 /** No descriptions */
 void CLexiconKeyChooser::updateKey(CSwordKey*) {}
+
+#include "clexiconkeychooser.moc"

bibletime/frontend/keychooser/crefselectdialog.cpp

@@ -93,8 +93,4 @@
 //  m_chooser = NULL;
 //}
 
-
-
-
-
-
+#include "crefselectdialog.moc"

bibletime/frontend/keychooser/cscrollbutton.cpp

@@ -99,3 +99,5 @@ void CScrollButton::wheelEvent( TQWheelEvent* e ) {
 		e->ignore();
 	}
 }
+
+#include "cscrollbutton.moc"

bibletime/frontend/keychooser/cscrollerwidgetset.cpp

@@ -76,3 +76,5 @@ void CScrollerWidgetSet::slotUnlock() { emit scroller_released(); }
 void CScrollerWidgetSet::slotScroller(int n) { emit change(n); }
 void CScrollerWidgetSet::slotUpClick() { slotScroller(-1); }
 void CScrollerWidgetSet::slotDownClick() { slotScroller(1); }
+
+#include "cscrollerwidgetset.moc"

bibletime/frontend/mainindex/cmainindex.cpp

@@ -228,7 +228,7 @@ void CMainIndex::slotExecuted( TQListViewItem* i ) {
 /** Reimplementation. Returns the drag object for the current selection. */
 TQDragObject* CMainIndex::dragObject() {
 	if (!m_itemsMovable) {
-		return false;
+		return 0;
 	}
 
 	CDragDropMgr::ItemList dndItems;
@@ -867,3 +867,5 @@ void CMainIndex::polish()
 	initTree();
 	readSettings();
 }
+
+#include "cmainindex.moc"

bibletime/frontend/manageindicesform.cpp

@@ -74,7 +74,6 @@ void ManageIndicesForm::languageChange()
 {
     setCaption( tr2i18n( "Manage Indicies" ) );
     m_autoDeleteOrphanedIndicesBox->setText( tr2i18n( "Automaticall&y delete orphaned indices when BibleTime starts" ) );
-    m_autoDeleteOrphanedIndicesBox->setAccel( TQKeySequence( tr2i18n( "Alt+Y" ) ) );
     m_createIndicesButton->setText( tr2i18n( "&Create selected indices" ) );
     m_deleteIndicesButton->setText( tr2i18n( "De&lete selected indices" ) );
 }

bibletime/frontend/manageindicesform.ui

@@ -51,9 +51,6 @@
             <property name="text">
                 <string>Automaticall&amp;y delete orphaned indices when BibleTime starts</string>
             </property>
-            <property name="accel">
-                <string>Alt+Y</string>
-            </property>
         </widget>
         <widget class="TDEListView">
             <property name="name">
@@ -108,7 +105,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>

bibletime/frontend/searchdialog/cmodulechooser.cpp

@@ -301,3 +301,5 @@ void CModuleChooserDialog::slotOk() {
 
 	} //end of namespace Search::Options
 } //end of namespace Search
+
+#include "cmodulechooser.moc"

bibletime/frontend/searchdialog/cmoduleresultview.cpp

@@ -267,3 +267,5 @@ void CModuleResultView::printResult() {
 
 	} //end of namespace Search.Result
 } //end of namespace Search
+
+#include "cmoduleresultview.moc"

bibletime/frontend/searchdialog/crangechooser.cpp

@@ -285,3 +285,5 @@ void CRangeChooserDialog::slotDefault() {
  
 	} //end of namespace Search::Options
 } //end of namespace Search
+
+#include "crangechooser.moc"

bibletime/frontend/searchdialog/csearchanalysis.cpp

@@ -585,3 +585,5 @@ void CSearchAnalysis::saveAsHTML() {
  
 	} //end of namespace Search::Analysis
 } //end of namespace Search
+
+#include "csearchanalysis.moc"

bibletime/frontend/searchdialog/csearchdialog.cpp

@@ -261,3 +261,5 @@ void CSearchDialog::slotClose() {
 }
 
 } //end of namespace Search
+
+#include "csearchdialog.moc"

bibletime/frontend/searchdialog/csearchdialogpages.cpp

@@ -782,3 +782,5 @@ bool CSearchOptionsPage::hasSearchScope() {
 
 	} //end of namespace Options
 } //end of namespace Search
+
+#include "csearchdialogpages.moc"

bibletime/frontend/searchdialog/csearchresultview.cpp

@@ -269,3 +269,4 @@ TQDragObject* CSearchResultView::dragObject() {
 	} //end of namespace Search::Result
 } //end of namespace
 
+#include "csearchresultview.moc"

bibletime/frontend/searchdialog/searchoptionsform.cpp

@@ -107,11 +107,8 @@ void SearchOptionsForm::languageChange()
     searchGroupBox->setTitle( tr2i18n( "Search parameters" ) );
     m_searchTextLabel->setText( tr2i18n( "Search for:" ) );
     m_syntaxButton->setText( tr2i18n( "&Help" ) );
-    m_syntaxButton->setAccel( TQKeySequence( tr2i18n( "Alt+H" ) ) );
     m_chooseModulesButton->setText( tr2i18n( "&Choose" ) );
-    m_chooseModulesButton->setAccel( TQKeySequence( tr2i18n( "Alt+C" ) ) );
     m_chooseRangeButton->setText( tr2i18n( "&Setup" ) );
-    m_chooseRangeButton->setAccel( TQKeySequence( tr2i18n( "Alt+S" ) ) );
     m_searchScopeLabel->setText( tr2i18n( "Search scope:" ) );
     m_modulesLabel->setText( tr2i18n( "Search in:" ) );
 }

bibletime/frontend/searchdialog/searchoptionsform.ui

@@ -82,9 +82,6 @@
                     <property name="text">
                         <string>&amp;Help</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+H</string>
-                    </property>
                 </widget>
                 <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
@@ -93,9 +90,6 @@
                     <property name="text">
                         <string>&amp;Choose</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+C</string>
-                    </property>
                 </widget>
                 <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
@@ -104,9 +98,6 @@
                     <property name="text">
                         <string>&amp;Setup</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+S</string>
-                    </property>
                 </widget>
                 <widget class="TQLabel" row="2" column="0">
                     <property name="name">
@@ -191,9 +182,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="3" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>

bibletime/frontend/searchdialog/searchresultsform.ui

@@ -189,8 +189,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>cmoduleresultview.h</includehint>
-    <includehint>csearchresultview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">cmoduleresultview.h</include>
+    <include location="global" impldecl="in implementation">csearchresultview.h</include>
+</includes>
 </UI>

bibletime/main.cpp

@@ -59,7 +59,7 @@ void myMessageOutput( TQtMsgType type, const char *msg ) {
 			fprintf( stderr,"(BibleTime %s) WARNING: %s\n",VERSION, msg );
 			break;
 		case TQtFatalMsg:
-			fprintf( stderr,"(BibleTime %s) _FATAL_: %s\nPlease visit http://bugs.pearsoncomputing.net and report this bug!",VERSION, msg );
+			fprintf( stderr,"(BibleTime %s) _FATAL_: %s\nPlease visit http://bugs.trinitydesktop.org and report this bug!",VERSION, msg );
 			abort(); // dump core on purpose
 	}
 }
@@ -137,7 +137,7 @@ int main(int argc, char* argv[]) {
 		I18N_NOOP("(c)1999-2010, The BibleTime Team and The Trinity Project"),
 		I18N_NOOP("BibleTime is an easy to use but powerful Bible study tool for Trinity.\nIt is a fork of the main BibleTime project in order to provide a native Trinity application.\n\nThe BibleTime project is looking for developers and translators.\nIf you'd like to join their team, please send an email to info@bibletime.info."),
 		"http://www.bibletime.info/",
-		"trinity-devel@lists.pearsoncomputing.net"
+		"devels@trinitydesktop.org"
 	);
 
 	/***********************************************
@@ -150,7 +150,7 @@ int main(int argc, char* argv[]) {
 	// artwork
 	aboutData.addAuthor("James Ots", I18N_NOOP("Crystal icons, crystal startlogo, webpage"), "me@jamesots.com", "http://www.jamesots.com");
 	// Trinity project maintainer
-	aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Trinity project maintainer"), "kb9vqf@pearsoncomputing.net", "http://trinity.pearsoncomputing.net");
+	aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Trinity project"), "kb9vqf@pearsoncomputing.net", "http://www.trinitydesktop.org");
 
 	//inactiv
 

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

configure.in.in

@@ -59,6 +59,31 @@ AC_SUBST(HOWTODIR)
 dnl Check for the used distribution
 AC_CHECK_DISTRIBUTION
 
+dnl Check for sword FTBFS on some 64bit architectures
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_MSG_CHECKING([if Sword needs __SANE_USERSPACE_TYPES__])
+AC_TRY_COMPILE([
+    #include <signal.h>
+    #include <$ac_cv_sword_incdir/sysdata.h>
+    ],[],
+    AC_MSG_RESULT(no),
+    [AC_MSG_RESULT(yes)
+     sword_needs_sane_userspace_types=yes])
+if test "x$sword_needs_sane_userspace_types" = xyes; then
+  AC_MSG_CHECKING([if Sword builds with __SANE_USERSPACE_TYPES__])
+  AC_TRY_COMPILE([
+      #define __SANE_USERSPACE_TYPES__
+      #include <signal.h>
+      #include <$ac_cv_sword_incdir/sysdata.h>
+      ],[],
+      AC_MSG_RESULT(yes),
+      [AC_MSG_RESULT(no)
+       AC_MSG_ERROR(Sword causes FTBFS on this architecture!)])
+  CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__"
+fi
+AC_LANG_RESTORE
+
 dnl Check bibletime API version
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS

docs/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

docs/handbook/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

docs/handbook/unicode/CMakeL10n.txt

@@ -0,0 +1,14 @@
+##### create translation templates ##############
+
+file( GLOB _docs
+      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/*.docbook
+)
+list( SORT _docs )
+list( REMOVE_ITEM _docs "index.docbook" )
+list( INSERT _docs 0 "index.docbook" )
+
+tde_l10n_create_template(
+    CATALOG "handbook"
+    SOURCES ${_docs}
+)

docs/handbook/unicode/index.docbook

@@ -78,12 +78,3 @@
 &hdbkchap5;
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->

docs/howto/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

docs/howto/unicode/CMakeL10n.txt

@@ -0,0 +1,14 @@
+##### create translation templates ##############
+
+file( GLOB _docs
+      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/*.docbook
+)
+list( SORT _docs )
+list( REMOVE_ITEM _docs "index.docbook" )
+list( INSERT _docs 0 "index.docbook" )
+
+tde_l10n_create_template(
+    CATALOG "howto"
+    SOURCES ${_docs}
+)

docs/howto/unicode/index.docbook

@@ -75,12 +75,3 @@ heart He will not disappoint you.</para>
 &how2-chap3;
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->

sword.m4

@@ -28,7 +28,8 @@ AC_ARG_ENABLE(static-sword,
 dnl try to find Sword library files
 AC_MSG_CHECKING([for Sword library files])
 AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+sword_multiarch="`gcc -print-multiarch 2>/dev/null`"
+ac_sword_library_dirs="$ac_sword_dir/lib/$sword_multiarch $ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib/$sword_multiarch $exec_prefix/lib $prefix/lib/$sword_multiarch $prefix/lib64 $prefix/lib /usr/lib/$sword_multiarch /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib/$sword_multiarch /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
 
 if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";