From 0f9285ce51edf199ba98bec0996eb4d48e27d207 Mon Sep 17 00:00:00 2001 From: danglassey Date: Fri, 4 Oct 2002 13:01:49 +0000 Subject: sync with crosswire 20021004-1300 --- apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm | 2 +- .../CBuilder5/BibleCS/cdstartup/mainfrm.cpp | 2 +- .../CBuilder5/BibleCS/cdstartup/mainfrm.dfm | Bin 488359 -> 1097717 bytes apps/windoze/CBuilder5/BibleCS/mainfrm.cpp | 19 +++++++++++++++++++ apps/windoze/CBuilder5/BibleCS/sword.bpr | 11 ++++++++--- apps/windoze/CBuilder5/BibleCS/sword.cpp | 1 + apps/windoze/CBuilder5/BibleCS/sword.res | Bin 1968 -> 1972 bytes locales.d/hu.conf | 10 +++++----- tests/icutest.cpp | 2 ++ tests/mgrtest.cpp | 1 - tests/tlitmgrtest.cpp | 2 ++ tests/translittest.cpp | 2 ++ utilities/normcode.cpp | 2 ++ 13 files changed, 43 insertions(+), 11 deletions(-) diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm index 95f51fc..6863fa0 100644 --- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm +++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm @@ -102,7 +102,7 @@ object AboutBox: TAboutBox Width = 213 Height = 21 AutoSize = False - Caption = 'v1.5.4' + Caption = 'v1.5.4a' IsControl = True end object Copyright: TLabel diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp index 1f51c39..614598c 100644 --- a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp +++ b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp @@ -48,7 +48,7 @@ void __fastcall TForm1::BitBtn2Click(TObject *Sender) //--------------------------------------------------------------------------- void __fastcall TForm1::FormShow(TObject *Sender) { - ShellExecute(this->Handle, "open", "fourlaws.html", NULL, NULL, SW_SHOWMAXIMIZED); + ShellExecute(this->Handle, "open", "tract.html", NULL, NULL, SW_SHOWMAXIMIZED); } //--------------------------------------------------------------------------- void __fastcall TForm1::BitBtn3Click(TObject *Sender) diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm index f79c4ae..db60376 100644 Binary files a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm and b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm differ diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp index 79fcb8a..bc54534 100644 --- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp +++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp @@ -972,6 +972,25 @@ void __fastcall TForm1::FormShow(TObject *Sender) bool devotional = false; bool glossary = false; + const char *check; + for (check = it->first.c_str(); *check; check++) { + if ((*check >= 'a') && (*check <= 'z')) + continue; + if ((*check >= 'A') && (*check <= 'Z')) + continue; + if ((*check >= '0') && (*check <= '9')) + continue; + if ((*check == ' ') || (*check == '_')) + continue; + break; + } + if (*check) { + char buf[2047]; + sprintf(buf, "Module Name: (%s) is unsupported and the module must be upgraded or removed. You may be able to merely modify the [name] line in the modules' .conf file located in the mods.d directory where you installed SWORD. You should remove any special characters including spaces and symbols. Send email to sword-support@crosswire.org if you need further assistance.", it->first.c_str()); + MessageBox(this->Handle, buf, "Module Unsupported", MB_OK|MB_ICONWARNING); + continue; + } + // leave out enciphered texts with no key if ((sit = mainmgr->config->Sections.find((*it).second->Name())) != mainmgr->config->Sections.end()) { if ((eit = (*sit).second.find("CipherKey")) != (*sit).second.end()) { diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index b9eb01f..5627534 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -73,7 +73,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=5 Release=4 -Build=127 +Build=129 Debug=0 PreRelease=0 Special=0 @@ -85,13 +85,13 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project -FileVersion=1.5.4.127 +FileVersion=1.5.4.129 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License LegalTrademarks= OriginalFilename= ProductName=The SWORD Project -ProductVersion=1.5.4 +ProductVersion=1.5.4a Comments=Seek Him and you will find Him [HistoryLists\hlIncludePath] @@ -160,5 +160,10 @@ RemoteDebug=0 ShowInfoMsgs=0 LinkDebugVcl=0 LinkCGLIB=1 + +[Language] +ActiveLang= +ProjectLang= +RootDir= \ No newline at end of file diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp index 277b859..b6600fc 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.cpp +++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp @@ -196,3 +196,4 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in + diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res index 138d1ab..d1055c4 100644 Binary files a/apps/windoze/CBuilder5/BibleCS/sword.res and b/apps/windoze/CBuilder5/BibleCS/sword.res differ diff --git a/locales.d/hu.conf b/locales.d/hu.conf index 3b1a087..085a18d 100644 --- a/locales.d/hu.conf +++ b/locales.d/hu.conf @@ -1,5 +1,5 @@ [Meta] -Name=de +Name=hu Description=Magyar [Text] @@ -26,7 +26,7 @@ Proverbs=P Ecclesiastes=Prédikátor Song of Solomon=Énekek éneke Isaiah=Ézsaiás -Jeremiah=Jeremás +Jeremiah=Jeremiás Lamentations=Jeremiás Siralmai Ezekiel=Ezékiel Daniel=Dániel @@ -53,7 +53,7 @@ II Corinthians=2. Korintus Galatians=Galata Ephesians=Efézus Philippians=Filippi -Colossians=Kolosser +Colossians=Kolossé I Thessalonians=1. Thessalonika II Thessalonians=2. Thessalonika I Timothy=1. Timóteus @@ -271,7 +271,7 @@ RUTH=8 2. KRÓNIKA=14 EZSDRÁS=15 NEHÉMIÁS=16 -ESZER=17 +ESZTER=17 JÓB=18 ZSOLTÁROK=19 PÉLDABESZÉDEK=20 @@ -283,7 +283,7 @@ JEREMI EZÉKIEL=26 DÁNIEL=27 HÓSEÁS=28 -JOEL=29 +JÓEL=29 ÁMOS=30 ABDIÁS=31 JÓNÁS=32 diff --git a/tests/icutest.cpp b/tests/icutest.cpp index fa3cf3d..e8f3bfd 100644 --- a/tests/icutest.cpp +++ b/tests/icutest.cpp @@ -8,6 +8,8 @@ #include "unicode/translit.h" +using namespace std; + int main() { UChar * uBuf; diff --git a/tests/mgrtest.cpp b/tests/mgrtest.cpp index d02b26e..9edeea9 100644 --- a/tests/mgrtest.cpp +++ b/tests/mgrtest.cpp @@ -29,6 +29,5 @@ int main(int argc, char **argv) { for (mhc->Key("Gen 1:1"); mhc->Key() < (VerseKey) "Gen 1:10"; (*mhc)++) std::cout << (const char *) *mhc << "\n"; } - std::cin >> keypress; return 0; } diff --git a/tests/tlitmgrtest.cpp b/tests/tlitmgrtest.cpp index 9725501..fbdf519 100644 --- a/tests/tlitmgrtest.cpp +++ b/tests/tlitmgrtest.cpp @@ -261,6 +261,8 @@ static const char SW_RESDATA[] = "/usr/local/lib/sword/"; #include +using namespace std; + struct SWTransData { UnicodeString resource; UTransDirection dir; diff --git a/tests/translittest.cpp b/tests/translittest.cpp index 1b2bddf..074bf9c 100644 --- a/tests/translittest.cpp +++ b/tests/translittest.cpp @@ -12,6 +12,8 @@ #include "utf8transliterator.h" +using namespace std; + // Print the given string to stdout void uprintf(const UnicodeString &str) { char *buf = 0; diff --git a/utilities/normcode.cpp b/utilities/normcode.cpp index 4a5bbf6..fe1f735 100644 --- a/utilities/normcode.cpp +++ b/utilities/normcode.cpp @@ -14,6 +14,8 @@ #define BUFSIZE 65536 +using namespace std; + int main (char argc, char** argv) { if (argc < 5) { -- cgit