sync with crosswire 20020925-1300

10 files changed, 520 insertions, 287 deletions

diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
index a5be646..2eccedd 100644
--- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
+++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
@@ -28,7 +28,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="VCL;_DEBUG"/>
+    <USERDEFINES value="VCL"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="InstallMgr.cpp"/>
     <INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/>
@@ -40,12 +40,12 @@
     <IDLCFLAGS value="-I..\BibleCS -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr 
       -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix 
       cpp -DVCL -boa"/>
-    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -r- 
-      -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
-    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 
+      -b- -k- -vi -c -tW -tWM"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zi"/>
-    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
@@ -58,7 +58,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=1
 MinorVer=5
-Release=3
+Release=4
 Build=0
 Debug=0
 PreRelease=0
@@ -71,13 +71,13 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=CrossWire Bible Society
 FileDescription=SWORD Installation Manager
-FileVersion=1.5.3.0
+FileVersion=1.5.4.0
 InternalName=InstallMgr
 LegalCopyright=Copyright 2002 by CrossWire Bible Society
 LegalTrademarks=
 OriginalFilename=
 ProductName=The SWORD Project
-ProductVersion=1.5.3
+ProductVersion=1.5.4
 Comments=Seek Jesus who exchanges temporary for eternal
 
 [HistoryLists\hlIncludePath]
@@ -103,8 +103,8 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=8
-Item0=VCL;_DEBUG
-Item1=VCL
+Item0=VCL
+Item1=VCL;_DEBUG
 Item2=VCL;__STDC__ true
 Item3=VCL;__STDC__
 Item4=VCL;_MSC_VER
diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res
index 67f5484..a67dc92 100644
--- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res
+++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res
diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp
index d3e5c34..a162354 100644
--- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp
+++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp
@@ -21,7 +21,12 @@ TStatusForm *StatusForm;
 
 
 void status_callback(double dltotal, double dlnow) {
-	StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (" + IntToStr((int)((float)(dlnow + 1) / (float)(dltotal) * 100)) + "%)";
+	int filePercent  = (int)((float)(dlnow + 1) / (float)(dltotal) * 100);
+	int totalPercent = (int)((float)(dlnow + StatusForm->completedBytes + 1) / (float)(StatusForm->totalBytes) * 100);
+	StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (file: " + IntToStr(filePercent) + "% / total: " + IntToStr(totalPercent) + "%)";
+	StatusForm->fileProgress->Position = filePercent;
+	StatusForm->totalProgress->Position = totalPercent;
+	
 	StatusForm->statusBar->Repaint();
 }
 
@@ -101,7 +106,7 @@ void __fastcall TStatusForm::TFTPThread::Execute()
 
 
 	string url = "ftp://" + ist->Source + ist->Directory.c_str() + "/" + src + "/"; //dont forget the final slash
-	vector<struct ftpparse> dirList = FTPURLGetDir(session, url.c_str());
+	vector<struct ftpparse> dirList = FTPURLGetDir(session, url.c_str(), passive);
 
 	if (!dirList.size()) {
 		MessageBox(0, "Can't connect.  Please check your configuration.", "Connection Error", MB_OK);
@@ -110,6 +115,10 @@ void __fastcall TStatusForm::TFTPThread::Execute()
 					
 //			StatusForm->ftpCon->List(dirText, "*", true);
 //			TIdFTPListItems *dirList = StatusForm->ftpCon->DirectoryListing;
+			StatusForm->totalBytes = 0;
+			for (int i = 0; i < dirList.size(); i++)
+				StatusForm->totalBytes += dirList[i].size;
+			StatusForm->completedBytes = 0;
 			for (int i = 0; i < dirList.size(); i++) {
 				if (dirList[i].flagtrycwd != 1) {
 					buffer = dest + "/" + (dirList[i].name);
@@ -125,15 +134,15 @@ void __fastcall TStatusForm::TFTPThread::Execute()
 						TMainForm::createParent(buffer.c_str());	// make sure parent directory exists
 						Synchronize((TThreadMethod)&PreDownload1);
 						try {
-							StatusForm->currentFileSize = dirList[i].size;
 //							StatusForm->ftpCon->Get(dirList->Items[i]->FileName.c_str(), buffer.c_str(), true, false);
 
 							string url = "ftp://" + ist->Source + ist->Directory.c_str() + "/" + src + "/" + dirList[i].name; //dont forget the final slash
 
-							if (FTPURLGetFile(session, buffer.c_str(), url.c_str(), status_callback)) {
+							if (FTPURLGetFile(session, buffer.c_str(), url.c_str(), passive, status_callback)) {
 								MessageBox(0, "Can't download file.  If you have not done so recently, you might try pressing the Refresh from Remote Source button.", "Download Error", MB_OK);
 								StatusForm->Button1Click(0);	// abort thread
 							}
+							StatusForm->completedBytes += dirList[i].size;
 						}
 						catch (...) {}
 						if (Terminated)
@@ -171,8 +180,6 @@ void __fastcall TStatusForm::TFTPThread::FTPLinkPacketRecvd(TObject *Sender)
 
 //void __fastcall TStatusForm::TFTPThread::UpdateBytes(void) {
 void __fastcall TStatusForm::UpdateBytes(void) {
-	StatusForm->statusBar->Caption = IntToStr(StatusForm->currentByteCount) + " bytes out of " + IntToStr(StatusForm->currentFileSize) + " transferred (" + IntToStr((int)((float)(StatusForm->currentByteCount + 1) / (float)(StatusForm->currentFileSize + 1) * 100)) + "%)";
-	StatusForm->statusBar->Repaint();
 }
 
 
diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm
index 08ca739..4d009c4 100644
--- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm
+++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm
diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h
index b00ed50..54bcbca 100644
--- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h
+++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h
@@ -9,6 +9,7 @@
 #include <ExtCtrls.hpp>
 //#include <NMFtp.hpp>
 #include "MainFrm.h"
+#include <ComCtrls.hpp>
 //#include "IdBaseComponent.hpp"
 //#include "IdComponent.hpp"
 //#include "IdFTP.hpp"
@@ -35,6 +36,10 @@ __published:	// IDE-managed Components
 	TPanel *statusBar;
 	TPanel *Panel3;
 	TPanel *actionBar;
+	TPanel *Panel4;
+	TPanel *Panel5;
+	TProgressBar *fileProgress;
+	TProgressBar *totalProgress;
 	void __fastcall FormShow(TObject *Sender);
 	void __fastcall Cleanup(TObject *Sender);
 	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
@@ -67,8 +72,8 @@ private:	// User declarations
 	} *ftpThread;
 public:		// User declarations
 	TFTPCon *ftpCon;
-	long currentByteCount;
-	long currentFileSize;
+	long completedBytes;
+	long totalBytes;
 	InstallSourceTab *ist;
 	string src;
 	string dest;
diff --git a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
index 635316b..b23ce01 100644
--- a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
+++ b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
@@ -113,11 +113,6 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
 [Language]
 ActiveLang=
 ProjectLang=
diff --git a/locales.d/id.conf b/locales.d/id.conf
index a48876e..1b9bfac 100644
--- a/locales.d/id.conf
+++ b/locales.d/id.conf
@@ -1,6 +1,6 @@
 [Meta]
 Name=id
-Description=Indonesia
+Description=Indonesian
 
 [Text]
 Genesis=Kejadian
@@ -71,322 +71,385 @@ Jude=Yudas
 Revelation of John=Wahyu
 
 [Book Abbrevs]
-
 1 C=46
 1 CHRONICLES=13
 1 CORINTHIANS=46
 1 JN=62
 1 JOHN=62
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=11
+1 KINGS=11
+1 KOR=46
+1 KORINTUS=46
+1 PE=60
+1 PETER=60
+1 PETRUS=60
+1 PTR=60
+1 RA=11
+1 RAJA=11
+1 SA=9
+1 SAMUEL=9
+1 TA=13
+1 TAWARIKH=13
+1 TE=52
+1 TESALONIKA=52
+1 THESSALONIANS=52
+1 TI=54
+1 TIMOTHY=54
+1 TIMOTIUS=54
+1 YO=62
+1 YOHANES=62
 1C=46
 1CHRONICLES=13
 1CORINTHIANS=46
 1JN=62
 1JOHN=62
 1KGS=11
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=11
+1KO=46
+1PE=60
+1PETER=60
+1PTR=60
+1RA=11
+1SA=9
+1SAMUEL=9
+1TA=13
+1TE=52
+1THESSALONIANS=52
+1TI=54
+1TIMOTHY=54
+1YO=62
+1YOH=62
+2 C=47
+2 CHRONICLES=14
+2 CORINTHIANS=47
 2 JN=63
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-WAHYU OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=63
+2 KGS=12
+2 KINGS=12
+2 KO=47
+2 KORINTUS=47
+2 PE=61
+2 PETER=61
+2 PETRUS=61
+2 PTR=61
+2 RA=12
+2 RAJA=12
+2 SA=10
+2 SAMUEL=10
+2 TA=14
+2 TAWARIKH=14
+2 TE=53
+2 TESALONIKA=53
+2 THESSALONIANS=53
+2 TI=55
+2 TIMOTHY=55
+2 TIMOTIUS=55
+2 YO=63
+2 YOHANES=63
+2C=47
+2CHRONICLES=14
+2CORINTHIANS=47
+2JN=63
+2JOHN=63
+2KGS=12
+2KINGS=12
+2KO=47
+2PE=61
+2PETER=61
+2PTR=61
+2RA=12
+2SA=10
+2SAMUEL=10
+2TA=14
+2TE=53
+2THESSALONIANS=53
+2TI=55
+2TIMOTHY=55
+2YO=63
+2YOH=63
+3 JN=64
+3 JOHN=64
+3 YO=64
+3 YOHANES=64
+3JN=64
+3JOHN=64
+3YO=64
+3YOH=64
+A=20
+ACTS=44
+AM=30
+AMO=30
+AMOS=30
+AMS=20
+AMSAL=20
+AYB=18
+AYU=18
+AYUB=18
+BIL=4
+BILANGAN=4
+C=51
+CANTICLE OF CANTICLES=22
+COC=22
+COLOSSIANS=51
+D=27
+DAN=27
+DANIEL=27
+DEUTERONOMY=5
+E=49
+ECCLESIASTES=21
+EF=49
+EFESUS=49
+EPHESIANS=49
+EST=17
+ESTER=17
+ESTHER=17
+EXODUS=2
+EZEKIEL=26
+EZR=15
+EZRA=15
+F=50
+FILE=57
+FILEMON=57
+FILI=50
+FILIPI=50
+FLM=57
+FLP=50
+G=48
+GAL=48
+GALATIA=48
+GALATIANS=48
+GENESIS=1
+H=7
+HA=7
+HAB=35
+HABAKKUK=35
+HABAKUK=35
+HAG=37
+HAGAI=37
+HAGGAI=37
+HAK=7
+HAKIM-HAKIM=7
+HE=58
+HEBREWS=58
+HOS=28
+HOSEA=28
 I C=46
 I CHRONICLES=13
 I CORINTHIANS=46
 I JN=62
 I JOHN=62
 I KGS=11
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=11
+I KO=46
+I PE=60
+I PETER=60
+I PETRUS=60
+I PTR=60
+I RA=11
+I SA=9
+I SAMUEL=9
+I TA=13
+I TE=52
+I THESSALONIANS=52
+I TI=54
+I TIMOTHY=54
+I YO=62
+I=3
+IBR=58
+IBRANI=58
 IC=46
 ICHRONICLES=13
 ICORINTHIANS=46
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=47
+II CHRONICLES=14
+II CORINTHIANS=47
+II JN=63
+II JOHN=63
 II KGS=12
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=12
+II KO=47
+II PE=61
+II PETER=61
+II PETRUS=61
+II PTR=61
+II RA=12
+II SA=10
+II SAMUEL=10
+II TA=14
+II TE=53
+II THESSALONIANS=53
+II TI=55
+II TIMOTHY=55
+II YO=63
+IIC=47
+IICHRONICLES=14
+IICORINTHIANS=47
+III JN=64
+III JOHN=64
+III YO=64
+IIIJN=64
+IIIJOHN=64
+IIIYO=64
+IIJN=63
+IIJOHN=63
+IIKGS=12
+IIKINGS=12
+IIKO=47
+IIPE=61
+IIPETER=61
+IIPETRUS=61
+IIPTR=61
+IIRA=12
+IISA=10
+IISAMUEL=10
+IITA=14
+IITE=53
+IITHESSALONIANS=53
+IITI=54
+IITI=55
+IITIMOTHY=55
+IIYO=63
 IJN=62
 IJOHN=62
 IKGS=11
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=43  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUD=7   
-JUDE=65   
+IKINGS=11
+IKO=46
+IM=3
+IMAMAT=3
+IPE=60
+IPETER=60
+IPETRUS=60
+IPTR=60
+IRA=11
+ISA=23
+ISAIAH=23
+ISAMUEL=9
+ITA=13
+ITE=52
+ITHESSALONIANS=52
+ITIMOTHY=54
+IYES=23
+IYO=62
+J=43
+JAMES=59
+JAS=59
+JEREMIAH=24
+JN=43
+JO=43
+JOB=18
+JOEL=29
+JOHN=43
+JONAH=32
+JOSHUA=6
+JUD=7
+JUDE=65
 JUDGES=7
+KEJ=1
+KEJADIAN=1
+KEL=2
+KELUARAN=2
+KID=22
+KIDUNG AGUNG=22
+KIS=44
+KISAH PARA RASUL=44
+KOL=51
+KOLOSE=51
 L=42
 LAMENTATIONS=25
 LEVITICUS=3
 LK=42
+LUK=42
+LUKAS=42
 LUKE=42
 MA=40
-MALACHI=39   
+MAL=39
+MALACHI=39
+MALEAKHI=39
 MARK=41
+MARKUS=41
+MAT=40
+MATIUS=40
 MATTHEW=40
+MAZ=19
+MAZMUR=19
 MICAH=33
+MIK=33
+MIKHA=33
 MK=41
 MR=41
+MRK=41
 MT=40
-N=4
+MZM=19
+N=16
+NAH=34
 NAHUM=34
+NEH=16
+NEHEMIA=16
 NEHEMIAH=16
 NUMBERS=4
+OB=31
 OBADIAH=31
-P=19
+OBAJA=31
+P=21
+PENGK=21
+PENGKHOTBAH=21
 PH=50
 PHILEMON=57
 PHILIPPIANS=50
 PHM=57
 PHP=50
+PKH=21
 PROVERBS=20
 PSALMS=19
 PSM=19
 PSS=19
+R=45
+RAT=25
+RATAPAN=25
 REVELATION OF JOHN=66
+REVELATION OF ST. JOHN=66
+REVELATION=66
+RM=45
+ROM=45
+ROMA=45
 ROMANS=45
+RUT=8
 RUTH=8
 SONG OF SOLOMON=22
 SONG OF SONGS=22
 SOS=22
+TIT=56
 TITUS=56
-ZECHARIAH=38
-ZEPHANIAH=36
-
-
-KEJADIAN=1
-KJ=1
-KELUARAN=2
-KL=2
-IMAMAT=3
-IM=3
-BILANGAN=4
-BI=4
-ULANGAN=5
 UL=5
-YOSUA=6
-YS=6
-HAKIM-HAKIM=7
-HH=7
-RUT=8
-RT=8
-1 SAMUEL=9
-1SM=9
-2 SAMUEL=10
-2SM=10
-1 RAJA-RAJA=11
-1RA=11
-2 RAJA-RAJA=12
-2RA=12
-1 TAWARIKH=13
-1TR=13
-2 TAWARIKH=14
-2TR=14
-EZRA=15
-EZ=15
-NEHEMIA=16
-NE=16
-ESTER=17
-ET=17
-AYUB=18
-AY=18
-MAZMUR=19
-MZ=19
-AMSAL=20
-AM=20
-PENGKHOTBAH=21
-PK=21
-KIDUNG AGUNG=22
-KA=22
-YESAYA=23
-YS=23
-YEREMIA=24
-YR=24
-RATAPAN=25
-RA=25
+ULANGAN=5
+WAH=66
+WAHYU=66
+WHY=66
+Y=43
+YAK=59
+YAKOBUS=59
+YE=23
+YEH=26
 YEHEZKIEL=26
-YZ=26
-DANIEL=27
-DN=27
-HOSEA=28
-HS=28
-YOEL=29
+YER=24
+YEREMIA=24
+YES=23
+YESAYA=23
 YL=29
-AMOS=30
-AM=30
-OBAJA=31
-OB=31
-YUNUS=32
-YU=32
-MIKHA=33
-MK=33
-NAHUM=34
-NA=34
-HABAKUK=35
-HK=35
-ZEFANYA=36
-ZF=36
-HAGAI=37
-HG=37
-ZAKHARIA=38
-ZK=38
-MALEAKHI=39
-ML=39
-MATIUS=40
-MT=40
-MARKUS=41
-MK=41
-LUKAS=42
-LK=42
-YOHANES=43
 YO=43
-KISAH PARA RASUL=44
-KI=44
-ROMA=45
-RM=45
-1 KORINTUS=46
-1KO=46
-2 KORINTUS=47
-2KO=47
-GALATIA=48
-GL=48
-EFESUS=49
-EF=49
-FILIPI=50
-FL=50
-KOLOSE=51
-KL=51
-1 TESALONIKA=52
-1TE=52
-2 TESALONIKA=53
-2TE=53
-1 TIMOTIUS=54
-1TM=54
-2 TIMOTIUS=55
-2TM=55
-TITUS=56
-TT=56
-FILEMON=57
-FM=57
-IBRANI=58
-IB=58
-YAKOBUS=59
-YA=59
-1 PETRUS=60
-1PE=60
-2 PETRUS=61
-2PE=61
-1 YOHANES=62
-1YO=62
-2 YOHANES=63
-2YO=63
-3 YOHANES=64
-3YO=64
+YOE=29
+YOEL=29
+YOH=43
+YOHANES=43
+YOS=6
+YOSUA=6
+YUD=65
 YUDAS=65
-YU=65
-WAHYU=66
-WA=66
-
+YUN=32
+YUNUS=32
+ZAK=38
+ZAKHARIA=38
+ZECHARIAH=38
+ZEF=36
+ZEFANYA=36
+ZEPHANIAH=36
diff --git a/sword.kdevprj b/sword.kdevprj
index becc028..d710a02 100644
--- a/sword.kdevprj
+++ b/sword.kdevprj
@@ -15,7 +15,7 @@ email=scribe@crosswire.org
 kdevprj_version=1.3
 lfv_open_groups=
 make_options=\s-j1
-makefiles=Makefile.am,sword/Makefile.am,sword/docs/Makefile.am,sword/docs/en/Makefile.am,po/Makefile.am,include/Makefile.am,src/mgr/Makefile.am,src/Makefile.am,src/keys/Makefile.am,src/frontend/Makefile.am,src/utilfuns/Makefile.am,src/utilfuns/zlib/Makefile.am,src/modules/Makefile.am,src/modules/comments/Makefile.am,src/modules/comments/hrefcom/Makefile.am,src/modules/comments/rawcom/Makefile.am,src/modules/comments/rawfiles/Makefile.am,src/modules/comments/zcom/Makefile.am,src/modules/common/Makefile.am,src/modules/lexdict/Makefile.am,src/modules/lexdict/rawld/Makefile.am,src/modules/lexdict/rawld4/Makefile.am,src/modules/texts/Makefile.am,src/modules/texts/rawgbf/Makefile.am,src/modules/texts/rawtext/Makefile.am,src/modules/texts/ztext/Makefile.am,src/modules/filters/Makefile.am,src/frontend/im/Makefile.am,src/modules/genbook/Makefile.am,src/modules/genbook/rawgenbook/Makefile.am,src/modules/lexdict/zld/Makefile.am
+makefiles=Makefile.am,sword/Makefile.am,sword/docs/Makefile.am,sword/docs/en/Makefile.am,po/Makefile.am,include/Makefile.am,src/mgr/Makefile.am,src/Makefile.am,src/keys/Makefile.am,src/frontend/Makefile.am,src/utilfuns/Makefile.am,src/utilfuns/zlib/Makefile.am,src/modules/Makefile.am,src/modules/comments/Makefile.am,src/modules/comments/hrefcom/Makefile.am,src/modules/comments/rawcom/Makefile.am,src/modules/comments/rawfiles/Makefile.am,src/modules/comments/zcom/Makefile.am,src/modules/common/Makefile.am,src/modules/lexdict/Makefile.am,src/modules/lexdict/rawld/Makefile.am,src/modules/lexdict/rawld4/Makefile.am,src/modules/texts/Makefile.am,src/modules/texts/rawgbf/Makefile.am,src/modules/texts/rawtext/Makefile.am,src/modules/texts/ztext/Makefile.am,src/modules/filters/Makefile.am,src/frontend/im/Makefile.am,src/modules/genbook/Makefile.am,src/modules/genbook/rawgenbook/Makefile.am,src/modules/lexdict/zld/Makefile.am,tests/Makefile.am
 modifyMakefiles=false
 project_name=Sword
 project_type=normal_empty
@@ -33,9 +33,9 @@ Quellen=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l
 groups=Header,Quellen,Benutzerschnittstelle,Andere
 
 [Makefile.am]
-files=sword.kdevprj
-sub_dirs=sword,include,src
-type=normal
+files=sword.kdevprj,testlib.cpp
+sub_dirs=sword,include,src,tests
+type=static_library
 
 [include/Greek2Greek.h]
 dist=true
@@ -1579,3 +1579,166 @@ type=normal
 [sword/docs/en/Makefile.am]
 sub_dirs=
 type=normal
+
+[testlib.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/Makefile.am]
+files=tests/casttest.cpp,tests/complzss.cpp,tests/compnone.cpp,tests/compzip.cpp,tests/configtest.cpp,tests/filtertest.cpp,tests/genbooktest.cpp,tests/icutest.cpp,tests/indextest.cpp,tests/introtest.cpp,tests/keycast.cpp,tests/keytest.cpp,tests/lextest.cpp,tests/listtest.cpp,tests/localetest.cpp,tests/mgrtest.cpp,tests/modtest.cpp,tests/parsekey.cpp,tests/rawldidxtest.cpp,tests/romantest.cpp,tests/swaptest.cpp,tests/testblocks.cpp,tests/tlitmgrtest.cpp,tests/translittest.cpp,tests/treeidxtest.cpp
+sharedlib_LDFLAGS=-version-info 0:0:0
+sharedlib_rootname=tests
+sub_dirs=
+type=static_library
+
+[tests/casttest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/complzss.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/compnone.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/compzip.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/configtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/filtertest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/genbooktest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/icutest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/indextest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/introtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/keycast.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/keytest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/lextest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/listtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/localetest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/mgrtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/modtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/parsekey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/rawldidxtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/romantest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/swaptest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/testblocks.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/tlitmgrtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/translittest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/treeidxtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
diff --git a/testlib.cpp b/testlib.cpp
index 2adc9e8..e74fbb6 100644
--- a/testlib.cpp
+++ b/testlib.cpp
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
 #include <versekey.h>
 #include <rawtext.h>
 //#include <zcom.h>
diff --git a/tests/lextest.cpp b/tests/lextest.cpp
index 403bbce..f918ff7 100644
--- a/tests/lextest.cpp
+++ b/tests/lextest.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <rawld.h>
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	RawLD::createModule("tmp/lextest");
 	RawLD lex("tmp/lextest");