[sword-svn] r442 - in trunk: . stage stage/uilocales.d
scribe at www.crosswire.org
scribe at www.crosswire.org
Sun Sep 3 17:21:34 MST 2006
Author: scribe
Date: 2006-09-03 17:21:24 -0700 (Sun, 03 Sep 2006)
New Revision: 442
Modified:
trunk/DevOfTheDay.cpp
trunk/FontSel.cpp
trunk/FontSel.dfm
trunk/FontSel.h
trunk/PreviewForm.cpp
trunk/PrintFrm.cpp
trunk/PrintFrm.dfm
trunk/TModuleFonts.cpp
trunk/TModuleFonts.dfm
trunk/TModuleFonts.h
trunk/mainfrm.cpp
trunk/mainfrm.dfm
trunk/mainfrm.h
trunk/optionfrm.cpp
trunk/optionfrm.h
trunk/paraldisp.cpp
trunk/paraldisp.h
trunk/stage/layout.conf
trunk/stage/options.conf
trunk/stage/uilocales.d/fi.conf
Log:
Updated i18n
Modified: trunk/DevOfTheDay.cpp
===================================================================
--- trunk/DevOfTheDay.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/DevOfTheDay.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -5,8 +5,10 @@
#include <swmgr.h>
#include <listkey.h>
+#include <localemgr.h>
#include "DevOfTheDay.h"
#include "mainfrm.h"
+#include "TntSystem.hpp"
//---------------------------------------------------------------------------
#pragma package(smart_init)
#pragma resource "*.dfm"
@@ -45,7 +47,9 @@
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
RichTip->fillWithVerses(it->second, &key, 0, false, false);
}
- else DevOfTheDay2->RichTip->Text = "A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day.\n\nTo configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".\n\nVisit our website at www.crosswire.org for more information.";
+ else DevOfTheDay2->RichTip->Text = _tr("A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day\".") + "\n\n"
+ + _tr("To configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".") + "\n\n"
+ + _tr("Visit our website at www.crosswire.org for more information.");
// If no devotional text is shown then a general how-to is diplayed.
tmpval = Form1->optionsconf->Sections["General"]["TipOfTheDay"];
Modified: trunk/FontSel.cpp
===================================================================
--- trunk/FontSel.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/FontSel.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -4,6 +4,10 @@
#pragma hdrstop
#include "FontSel.h"
+#include "mainfrm.h"
+#include "TntSystem.hpp"
+#include <localemgr.h>
+
//---------------------------------------------------------------------------
#pragma package(smart_init)
#pragma link "RxCombos"
@@ -67,6 +71,7 @@
SizeComboBox->ItemIndex = SizeComboBox->Items->IndexOf(Font->Size);
UpdatePreview();
+ updateI18N();
initialized = true;
}
@@ -149,3 +154,15 @@
initialized = false;
}
//---------------------------------------------------------------------------
+
+void TFontSelFrm::updateI18N() {
+ this->Caption = _tr("Font Selection");
+ ckShowFont->Caption = _tr("Show Font Faces");
+ Label1->Caption = _tr("Font");
+ Label2->Caption = _tr("Size");
+ OKBtn->Caption = _tr("OK");
+ CancelBtn->Caption = _tr("Cancel");
+ Label3->Caption = _tr("Background");
+ Label4->Caption = _tr("Foreground");
+ GroupBox1->Caption = _tr("Sample Text");
+}
Modified: trunk/FontSel.dfm
===================================================================
--- trunk/FontSel.dfm 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/FontSel.dfm 2006-09-04 00:21:24 UTC (rev 442)
@@ -57,14 +57,14 @@
Top = 6
Width = 21
Height = 13
- Caption = '&Font'
+ Caption = 'Font'
end
object Label2: TLabel
Left = 186
Top = 6
Width = 20
Height = 13
- Caption = '&Size'
+ Caption = 'Size'
end
object Label3: TLabel
Left = 8
Modified: trunk/FontSel.h
===================================================================
--- trunk/FontSel.h 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/FontSel.h 2006-09-04 00:21:24 UTC (rev 442)
@@ -49,6 +49,7 @@
TFontComboBox *FontComboBox;
TColorComboBox *BGColorCmb;
TColorComboBox *FGColorCmb;
+ void updateI18N();
protected:
void UpdatePreview();
private:
Modified: trunk/PreviewForm.cpp
===================================================================
--- trunk/PreviewForm.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/PreviewForm.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -3,6 +3,9 @@
#pragma hdrstop
#include "PreviewForm.h"
+#include "mainfrm.h"
+#include "TntSystem.hpp"
+#include <localemgr.h>
//---------------------------------------------------------------------------
// include this...
#include <vcl\printers.hpp>
@@ -312,12 +315,12 @@
void TPreviewForm::UpdatePageNums()
{
- AnsiString strPages = "Page ";
+ AnsiString strPages = _tr("Page") + " ";
strPages += IntToStr(currPage + 1);
- strPages += " of ";
+ strPages += " "+ _tr("of") + " ";
strPages += IntToStr(FPageOffsets.size());
editPages->Text = strPages;
- Caption = (AnsiString)"Print Preview " + strPages;
+ Caption = _tr("Print Preview") + " " + strPages;
}
void __fastcall TPreviewForm::btnPrintClick(TObject *Sender)
Modified: trunk/PrintFrm.cpp
===================================================================
--- trunk/PrintFrm.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/PrintFrm.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -40,7 +40,7 @@
void __fastcall TPrintForm::FormShow(TObject *Sender) {
/* TODO -oDavid T -cPrinting : Remove this once Printing is in a finished form */
if(Form1->optionsconf->Sections["Printing"]["Notice"] != "1"){
- Application->MessageBox("This release of The Sword Printer is preliminary and is not yet fully functional, therefore some of the features here have been disabled. Please be sure to take a look at the formatting options to be able to fully take control of how your page will look. Also be sure to use the \"Print Preview\" feature to preview how your page(s) will look on paper before printing. Enjoy! From, The Sword Project Development Team!", "The Sword Printer", MB_ICONINFORMATION | MB_OK);
+ MessageBoxW(0, _tr("This release of The SWORD Printer is preliminary and is not yet fully functional, therefore some of the features here have been disabled. Please be sure to take a look at the formatting options to be able to fully take control of how your page will look. Also be sure to use the \"Print Preview\" feature to preview how your page(s) will look on paper before printing. Enjoy! -- The SWORD Project Development Team!"), _tr("The SWORD Printer"), MB_ICONINFORMATION | MB_OK);
Form1->optionsconf->Sections["Printing"]["Notice"] = "1";
Form1->optionsconf->Save();
}
@@ -58,19 +58,19 @@
if ((Form1->ActiveControl == Form1->CommentaryPageControl) || (IsChild(Form1->CommentaryPageControl->Handle, Form1->ActiveControl->Handle))){
pc = Form1->CommentaryPageControl;
radComm->Checked = true;
- staticRange->Caption = "Verse Range or List";
+ staticRange->Caption = _tr("Verse Range or List");
editStart->Text = (keys) ? keys->getRangeText() : Form1->DefaultVSKey->getText();
}
else if ((Form1->ActiveControl == Form1->LexDictPageControl) || (IsChild(Form1->LexDictPageControl->Handle, Form1->ActiveControl->Handle))){
pc = Form1->LexDictPageControl;
radLD->Checked = true;
- staticRange->Caption = "Lookup Range";
+ staticRange->Caption = _tr("Lookup Range");
editStart->Text = (keys) ? WideString(keys->getRangeText()) : Form1->DictKeyEdit->Text;
}
else {
pc = Form1->TextPageControl;
radText->Checked = true;
- staticRange->Caption = "Verse Range or List";
+ staticRange->Caption = _tr("Verse Range or List");
editStart->Text = (keys) ? keys->getRangeText() : Form1->DefaultVSKey->getText();
}
@@ -324,19 +324,19 @@
{
TStringList* strList = new TStringList;
if(radText->Checked || radComm->Checked){
- strList->Add("Examples:");
- strList->Add("John 1:1 Prints John chapter 1 verse 1");
- strList->Add("John 1 Prints the entire first chapter of John");
- strList->Add("John 1,2 Prints chapters 1 and 2 of John");
- strList->Add("John 3:16;Rom 3:23 Prints John 3:16 and Romans 3:23");
+ strList->Add(_tr("Examples:"));
+ strList->Add(_tr("John 1:1 Prints John chapter 1 verse 1"));
+ strList->Add(_tr("John 1 Prints the entire first chapter of John"));
+ strList->Add(_tr("John 1,2 Prints chapters 1 and 2 of John"));
+ strList->Add(_tr("John 3:16;Rom 3:23 Prints John 3:16 and Romans 3:23"));
}else{
- strList->Add("Examples:");
+ strList->Add(_tr("Examples:"));
/* TODO 2 -oDavid -cPrinting : Make printing ranges of dictionaries work */
// The ranges don't work yet.
- //strList->Add("Aaron - David Prints dictionary entries from Aaron to David");
- strList->Add("Jesus Prints dictionary entry for Jesus");
- //strList->Add("0051 - 0054 Prints dictionary entry for range 0051 to 0054");
- strList->Add("0051 Prints dictionary entry for 0051");
+ //strList->Add(_tr("Aaron - David Prints dictionary entries from Aaron to David"));
+ strList->Add(_tr("Jesus Prints dictionary entry for Jesus"));
+ //strList->Add(_tr("0051 - 0054 Prints dictionary entry for range 0051 to 0054"));
+ strList->Add(_tr("0051 Prints dictionary entry for 0051"));
}
editStart->Hint = strList->Text;
delete strList;
Modified: trunk/PrintFrm.dfm
===================================================================
--- trunk/PrintFrm.dfm 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/PrintFrm.dfm 2006-09-04 00:21:24 UTC (rev 442)
@@ -123,7 +123,7 @@
Top = 0
Width = 450
Height = 283
- ActivePage = shtSetup
+ ActivePage = shtSelection
Align = alClient
TabOrder = 1
object shtSelection: TTabSheet
@@ -138,7 +138,7 @@
object lblModName: TLabel
Left = 9
Top = 75
- Width = 66
+ Width = 160
Height = 13
Caption = 'Module Name'
end
@@ -176,7 +176,7 @@
Top = 91
Width = 264
Height = 21
- ItemHeight = 0
+ ItemHeight = 13
TabOrder = 3
end
end
@@ -190,7 +190,7 @@
object staticRange: TLabel
Left = 8
Top = 16
- Width = 46
+ Width = 125
Height = 13
Caption = 'Verse List'
end
Modified: trunk/TModuleFonts.cpp
===================================================================
--- trunk/TModuleFonts.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/TModuleFonts.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -4,6 +4,9 @@
#pragma hdrstop
#include "TModuleFonts.h"
+#include "TntSystem.hpp"
+#include <localemgr.h>
+
//---------------------------------------------------------------------------
#pragma package(smart_init)
#pragma link "RxCombos"
@@ -28,6 +31,7 @@
void __fastcall TModuleFonts::FormShow(TObject *Sender)
{
FillList();
+ updateI18N();
}
//---------------------------------------------------------------------------
void __fastcall TModuleFonts::viewAllClick(TObject *Sender)
@@ -60,15 +64,15 @@
for (mods = manager->Modules.begin(); mods != manager->Modules.end(); mods++) {
for (node = installTree->Items->GetFirstNode(); node; node = node->getNextSibling()) {
- if (!strcmp(node->Text.c_str(), mods->second->Type())) {
+ if (node->Text == _tr(mods->second->Type())) {
break;
}
}
// if (mods->second->isUnicode() || viewAll->Checked){
if (!node) { // Add Section
if (!strncmp(mods->second->Type(), "Bibl", 4)) // If Bibles, put first in list
- node = installTree->Items->AddChildFirst(0, mods->second->Type());
- else node = installTree->Items->AddChild(0, mods->second->Type());
+ node = installTree->Items->AddChildFirst(0, _tr(mods->second->Type()));
+ else node = installTree->Items->AddChild(0, _tr(mods->second->Type()));
}
nodeName = "[";
nodeName += mods->second->Name();
@@ -157,3 +161,17 @@
}
//---------------------------------------------------------------------------
+void TModuleFonts::updateI18N() {
+ this->Caption = _tr("Select Module Fonts");
+ Label1->Caption = _tr("Installed Modules");
+ Label2->Caption = _tr("Font Name");
+ Label3->Caption = _tr("Font Size");
+ menuView->Caption = _tr("&View");
+ viewAll->Caption = _tr("Show &All Installed");
+ viewUnicode->Caption = _tr("Show &Unicode Only");
+ btnReset->Caption = _tr("&Reset All");
+ btnOK->Caption = _tr("OK");
+
+}
+
+
Modified: trunk/TModuleFonts.dfm
===================================================================
--- trunk/TModuleFonts.dfm 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/TModuleFonts.dfm 2006-09-04 00:21:24 UTC (rev 442)
@@ -121,15 +121,15 @@
object Label2: TLabel
Left = 7
Top = 8
- Width = 52
+ Width = 70
Height = 13
Anchors = [akLeft, akBottom]
Caption = 'Font Name'
end
object Label3: TLabel
- Left = 192
+ Left = 188
Top = 8
- Width = 44
+ Width = 56
Height = 13
Anchors = [akRight, akBottom]
Caption = 'Font Size'
@@ -145,7 +145,7 @@
TabOrder = 0
end
object cmbSizeSel: TComboBox
- Left = 242
+ Left = 246
Top = 4
Width = 44
Height = 21
Modified: trunk/TModuleFonts.h
===================================================================
--- trunk/TModuleFonts.h 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/TModuleFonts.h 2006-09-04 00:21:24 UTC (rev 442)
@@ -52,6 +52,7 @@
public: // User declarations
TFontComboBox *cmbFontSel;
__fastcall TModuleFonts(TComponent* Owner);
+ void updateI18N();
};
//---------------------------------------------------------------------------
extern PACKAGE TModuleFonts *ModuleFonts;
Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/mainfrm.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -615,7 +615,7 @@
//---------------------------------------------------------------------------
-void __fastcall TForm1::DictionaryLookup1Click(TObject *Sender)
+void __fastcall TForm1::DictionaryLookup2Click(TObject *Sender)
{
SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
int wordstart;
@@ -845,13 +845,18 @@
Copy1->Caption = _tr("&Copy");
Copy2->Caption = _tr("&Copy");
Copy3->Caption = _tr("&Copy");
- Copy4->Caption = _tr("&Copy");
+ Copy3_2->Caption = _tr("&Copy");
+ Copy5->Caption = _tr("&Copy");
+ SearchForWord1->Caption = _tr("Search For Word/Phrase");
+ SearchForWord2->Caption = _tr("Search For Word/Phrase");
+ SearchForWord3->Caption = _tr("Search For Word/Phrase");
+ SearchForWord5->Caption = _tr("Search For Word/Phrase");
+ DictionaryLookup1->Caption = _tr("Dictionary Lookup");
+ DictionaryLookup2->Caption = _tr("Dictionary Lookup");
+ DictionaryLookup3->Caption = _tr("Dictionary Lookup");
+ DictionaryLookup5->Caption = _tr("Dictionary Lookup");
NewVer1->Caption = _tr("&New Verse List");
CopyasBGreekTransliteration1->Caption = _tr("Copy as &B-Greek Transliteration");
- MenuItem1->Caption = _tr("Dictionary Lookup");
- Copy4->Caption = _tr("&Copy");
- Copy4->Caption = _tr("&Copy");
- Copy4->Caption = _tr("&Copy");
Options2->Caption = _tr("Options");
Options1->Caption = _tr("&Preferences...");
Search1->Caption = _tr("&Search");
@@ -860,11 +865,12 @@
InstallManager1->Caption = _tr("Install Manager");
Help1->Caption = _tr("&Help");
Contents1->Caption = _tr("Contents");
+
DevotionaloftheDay1->Caption = _tr("Devotional of the Day");
+// DevotionaloftheDay1->
+
About1->Caption = _tr("&About");
Bookmarkbtn->Caption = _tr("Bookmark");
- DictionaryLookup1->Caption = _tr("Dictionary Lookup");
- DictionaryLookup2->Caption = _tr("Dictionary Lookup");
EditEntry1->Caption = _tr("&Edit Entry");
DeleteEntry1->Caption = _tr("&Delete Entry");
LinktoVerse1->Caption = _tr("Link to Comment for Verse...");
@@ -877,10 +883,15 @@
CommentaryPageControl->Hint = _tr("Commentaries");
LexDictPageControl->Hint = _tr("Lexicons / Dictionaries");
- LemmaBtn->Hint = _tr("Lemma");
- MorphBtn->Hint = _tr("Morphology");
- NotesBtn->Hint = _tr("Footnotes");
- XRefBtn->Hint = _tr("Cross-references");
+ parallelDisp->helpMessageL1 = _tr("This must be your first time using the new parallel display in SWORD. This tab is for viewing up to three of your installed Bibles on the screen together. You will notice that this page is currently blank. Right-click the page to get a menu for selecting Bibles to be compared.");
+ parallelDisp->helpMessageL2 = _tr("This is our first pass at this feature, so Lord willing, it will improve in future versions.");
+ parallelDisp->helpMessageL3 = _tr("Enjoy! -- The SWORD Project Development Team");
+ parallelDisp->helpTitle = _tr("New Feature - Parallel Display");
+
+ LemmaBtn->Hint = _tr("Lemma");
+ MorphBtn->Hint = _tr("Morphology");
+ NotesBtn->Hint = _tr("Footnotes");
+ XRefBtn->Hint = _tr("Cross-references");
cbBook->Font = UIFont;
freeHandLookup->Font = UIFont;
@@ -927,55 +938,7 @@
NewBMfrm->CancelBtn->Caption = _tr("Cancel");
// OptionsForm
- /* DONE 2 -cLocalize : Change Module Type to Window Type here and in the localization files and get it updated by our local guys :) */
- Optionsfrm->Caption = _tr("Preferences");
- Optionsfrm->TabSheet1->Caption = _tr("General");
- Optionsfrm->TabSheet2->Caption = _tr("Special Modules");
- Optionsfrm->TabSheet3->Caption = _tr("Display");
- Optionsfrm->gbPersonalize->Caption = _tr("Personalize");
- Optionsfrm->AutoBMPersonal->Caption = _tr("Autosave Personal Bookmarks");
- Optionsfrm->AutoBMOther->Caption = _tr("Autosave Other Bookmarks");
- Optionsfrm->HintPopups->Caption = _tr("Show Hint Pop-ups");
- Optionsfrm->Label4->Caption = _tr("Language");
- Optionsfrm->AutoLayout->Caption = _tr("Autosave Screen Layout");
- Optionsfrm->HintStrongs->Caption = _tr("Show Lexicon Lookup Over Strongs Numbers");
- Optionsfrm->HintVLists->Caption = _tr("Show Preview Over Verse Lists");
- Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words (CTRL-W)");
- Optionsfrm->OkBtn->Caption = _tr("OK");
- Optionsfrm->CancelBtn->Caption = _tr("Cancel");
- Optionsfrm->gbDefModules->Caption = _tr("Original Language Support - Default Modules");
- Optionsfrm->Label7->Caption = _tr("Definitions");
- Optionsfrm->Label8->Caption = _tr("Parsing");
- Optionsfrm->Label5->Caption = _tr("Greek");
- Optionsfrm->Label6->Caption = _tr("Hebrew");
- Optionsfrm->Label10->Caption = _tr("Strong's Numbered Text");
- Optionsfrm->gbDevos->Caption = _tr("Daily Devotionals");
- Optionsfrm->Label9->Caption = _tr("Default Devotional");
- Optionsfrm->Label17->Caption = _tr("Default General Dictionary");
- Optionsfrm->devSplashCB->Caption = _tr("Show Devotional Splash Screen on Startup");
- Optionsfrm->devsAsDictsCB->Caption = _tr("Show Devotionals as Dictionaries");
- Optionsfrm->gbGloss->Caption = _tr("Glossaries / General Dictionaries");
- Optionsfrm->glosAsDictsCB->Caption = _tr("Show Glossaries as Dictionaries");
- Optionsfrm->gbColors->Caption = _tr("Display Colors");
- Optionsfrm->Label2->Caption = _tr("Preview");
- Optionsfrm->Label3->Caption = _tr("Window Type");
- Optionsfrm->Label14->Caption = _tr("Scheme");
- Optionsfrm->Label11->Caption = _tr("Text Styles and Colors");
- Optionsfrm->btnFont->Caption = _tr("Select Font...");
- Optionsfrm->Label13->Caption = _tr("Verse Number Color");
- Optionsfrm->btnNumClr->Caption = _tr("Select Color...");
- Optionsfrm->AutoVSColor->Caption = _tr("Current Verse Color");
- Optionsfrm->VerseNewLine->Caption = _tr("Start Each Verse On New Line");
- Optionsfrm->btnCurrVerse->Caption = _tr("Select Color...");
- Optionsfrm->Label15->Caption = _tr("Combo/Edit Fields");
- Optionsfrm->btnFieldClr->Caption = _tr("Select Color...");
- Optionsfrm->Label1->Caption = _tr("Individual Modules (Font Only)");
- Optionsfrm->btnModFonts->Caption = _tr("Select Font...");
- Optionsfrm->Label12->Caption = _tr("Strong's Numbers <...>");
- Optionsfrm->Label16->Caption = _tr("Strong's Tense (...)");
- Optionsfrm->btnStrongClr->Caption = _tr("Select Color...");
- Optionsfrm->btnMorphClr->Caption = _tr("Select Color...");
- Optionsfrm->cmbTextSelect->Items->CommaText = _tr("\"All Windows\",\"Bible Window\",\"Commentary Window\",\"Lexicon/Dictionary Window\",\"Popup Windows\",\"Search Results\",\"User Interface\"");
+ Optionsfrm->updateI18N();
// RangeMaintForm
@@ -1019,6 +982,7 @@
VerseListForm->SpeedButton6->Hint = _tr("Load Verse List From File");
// Print Form
+ PrintForm->Caption = _tr("The SWORD Printer");
PrintForm->shtSelection->Caption = _tr("Print Selection");
PrintForm->radText->Caption = _tr("Bible Text");
PrintForm->radComm->Caption = _tr("Commentary Text");
@@ -1026,7 +990,7 @@
PrintForm->lblModName->Caption = _tr("Module Name");
PrintForm->GroupBox1->Caption = _tr("Print Source");
PrintForm->GroupBox2->Caption = _tr("Print Range");
- PrintForm->staticRange->Caption = _tr("Verse List");
+ PrintForm->staticRange->Caption = _tr("Verse Range or List");
PrintForm->shtSetup->Caption = _tr("Page Setup");
PrintForm->labelLeft->Caption = _tr("Left:");
PrintForm->labelRight->Caption = _tr("Right:");
@@ -1061,6 +1025,8 @@
PreviewForm->btnPrint->Caption = _tr("Print");
PreviewForm->btnClose->Caption = _tr("&Close");
+ updateModuleOptions(Options2);
+
delete UIFont;
}
@@ -1274,32 +1240,10 @@
ctrlstates.insert(ctrlstates.begin(), 0);
// Add options to Options Main Menu choice
- sit = layoutconf->Sections.find("ModuleOptions");
- StringList options = mainmgr->getGlobalOptions();
- for (StringList::iterator it = options.begin(); it != options.end(); it++) {
- TMenuItem *newitem = new TMenuItem(MainMenu1);
- newitem->Caption = it->c_str();
- newitem->Default = false;
- newitem->OnClick = OptionShowVals;
- newitem->Hint = mainmgr->getGlobalOptionTip(it->c_str());
- if (sit != layoutconf->Sections.end()) {
- if ((eit = sit->second.find(it->c_str())) != sit->second.end())
- mainmgr->setGlobalOption(it->c_str(), eit->second.c_str());
- }
- StringList values = mainmgr->getGlobalOptionValues(it->c_str());
- for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
- TMenuItem *newitem2 = new TMenuItem(MainMenu1);
- newitem2->Caption = it2->c_str();
- newitem2->Default = false;
- newitem2->OnClick = GlobalOptionChange;
- newitem->Add(newitem2);
- }
-// Mainmenu->Items->Add(newitem);
- Options2->Add(newitem);
- }
-
- syncSpeedButtons();
-
+ updateModuleOptions(Options2);
+
+ syncSpeedButtons();
+
if ((sit = layoutconf->Sections.find("History")) != layoutconf->Sections.end()) {
eitend = (*sit).second.upper_bound("SearchText");
@@ -1370,13 +1314,13 @@
SplashPg->Hide();
+ refreshAppearance();
+
tmpval = optionsconf->Sections["General"]["TipOfTheDay"];
if(!::stricmp(tmpval.c_str(), "Devotional")) {
DevOfTheDay2->Show();
}
- refreshAppearance();
-
if (startVerse.Length()) {
NavigateVerseURL(startVerse.c_str());
}
@@ -1391,7 +1335,45 @@
}
+void TForm1::updateModuleOptions(TMenuItem *parentItem, int staticMenuItemsCount) {
+ SectionMap::iterator sit;
+ ConfigEntMap::iterator eit, eitend;
+
+ static vector<SWBuf> optionStrings;
+ optionStrings.clear();
+
+ while (parentItem->Count > staticMenuItemsCount)
+ parentItem->Delete(staticMenuItemsCount);
+
+ sit = layoutconf->Sections.find("ModuleOptions");
+ StringList options = mainmgr->getGlobalOptions();
+ for (StringList::iterator it = options.begin(); it != options.end(); it++) {
+ TMenuItem *newitem = new TMenuItem(parentItem->GetParentMenu());
+ optionStrings.push_back(it->c_str());
+ newitem->Tag = (int)optionStrings[optionStrings.size()-1].c_str();
+ newitem->Caption = _tr(it->c_str());
+ newitem->Default = false;
+ newitem->OnClick = OptionShowVals;
+ newitem->Hint = _tr(mainmgr->getGlobalOptionTip(it->c_str()));
+ if (sit != layoutconf->Sections.end()) {
+ if ((eit = sit->second.find(it->c_str())) != sit->second.end())
+ mainmgr->setGlobalOption(it->c_str(), eit->second.c_str());
+ }
+ StringList values = mainmgr->getGlobalOptionValues(it->c_str());
+ for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
+ TMenuItem *newitem2 = new TMenuItem(parentItem->GetParentMenu());
+ optionStrings.push_back(it2->c_str());
+ newitem2->Tag = (int)optionStrings[optionStrings.size()-1].c_str();
+ newitem2->Caption = _tr(it2->c_str());
+ newitem2->Default = false;
+ newitem2->OnClick = GlobalOptionChange;
+ newitem->Add(newitem2);
+ }
+// Mainmenu->Items->Add(newitem);
+ parentItem->Add(newitem);
+ }
+}
bool TForm1::hasFeature(SWMgr *mgr, const char *modName, const char *feature) {
SectionMap::iterator sit;
ConfigEntMap::iterator eit, eitend;
@@ -2077,56 +2059,40 @@
ConfigEntMap::iterator eit;
TMenuItem *menuchoice = dynamic_cast<TMenuItem *>(Sender);
- if (!menuchoice) {
- if (Sender == LemmaBtn) {
- mainmgr->setGlobalOption("Strong's Numbers", (LemmaBtn->Down)? "On" : "Off");
- }
- else if (Sender == MorphBtn) {
- mainmgr->setGlobalOption("Morphological Tags", (MorphBtn->Down)? "On" : "Off");
- }
- else if (Sender == NotesBtn) {
- mainmgr->setGlobalOption("Footnotes", (NotesBtn->Down)? "On" : "Off");
- }
- else if (Sender == XRefBtn) {
- mainmgr->setGlobalOption("Cross-references", (XRefBtn->Down)? "On" : "Off");
- }
- }
- else {
- const char *source = menuchoice->Caption.c_str();
- char *value = new char [strlen(source) + 1];
- int k = 0;
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- value[k++] = source[j];
- }
- value[k] = 0;
- source = menuchoice->Parent->Caption.c_str();
- char *option = new char [strlen(source) + 1];
- k = 0;
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- option[k++] = source[j];
- }
- option[k] = 0;
- mainmgr->setGlobalOption(option, value);
+ if (!menuchoice) {
+ if (Sender == LemmaBtn) {
+ mainmgr->setGlobalOption("Strong's Numbers", (LemmaBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == MorphBtn) {
+ mainmgr->setGlobalOption("Morphological Tags", (MorphBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == NotesBtn) {
+ mainmgr->setGlobalOption("Footnotes", (NotesBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == XRefBtn) {
+ mainmgr->setGlobalOption("Cross-references", (XRefBtn->Down)? "On" : "Off");
+ }
+ }
+ else {
+ const char *value = (const char *)menuchoice->Tag;
+ const char *option = (const char *)menuchoice->Parent->Tag;
- if ((!::stricmp(option, "Strong's Numbers")) && (!::stricmp(value, "On"))) {
- SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
- if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
- SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
- for (int i = 0; i < TextPageControl->PageCount; i++) {
- if (!::stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
- TextPageControl->ActivePageIndex = i;
- break;
- }
- }
- }
- }
+ mainmgr->setGlobalOption(option, value);
- delete [] option;
- delete [] value;
- syncSpeedButtons();
- }
+ if ((!::stricmp(option, "Strong's Numbers")) && (!::stricmp(value, "On"))) {
+ SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
+ if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
+ SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
+ for (int i = 0; i < TextPageControl->PageCount; i++) {
+ if (!::stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
+ TextPageControl->ActivePageIndex = i;
+ break;
+ }
+ }
+ }
+ }
+ syncSpeedButtons();
+ }
TextKeyChanged();
}
//---------------------------------------------------------------------------
@@ -2137,31 +2103,14 @@
{
TMenuItem *menuChoice = (TMenuItem *)Sender;
- SWBuf option = menuChoice->Caption.c_str();
- int k = 0;
- const char *source = option.c_str();
- char *caption = new char [strlen(source) + 1];
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- caption[k++] = source[j];
- }
- caption[k] = 0;
-
- SWBuf value = mainmgr->getGlobalOption(caption);
- delete [] caption;
+ const char *option = (const char *)menuChoice->Tag;
+ SWBuf value = mainmgr->getGlobalOption(option);
+
for (int i = 0; i < menuChoice->Count; i++) {
- int k = 0;
- char *source = menuChoice->Items[i]->Caption.c_str();
- char *caption = new char [strlen(source) + 1];
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- caption[k++] = source[j];
- }
- caption[k] = 0;
- if (!::stricmp(caption, value.c_str()))
+ const char *choice = (const char *)menuChoice->Items[i]->Tag;
+ if (!::stricmp(choice, value.c_str()))
menuChoice->Items[i]->Checked = true;
else menuChoice->Items[i]->Checked = false;
- delete [] caption;
}
}
//---------------------------------------------------------------------------
@@ -3072,11 +3021,11 @@
for (int i = 0; i < menuCount; i++) {
menus[i] = new TMenuItem(menu);
- menus[i]->Caption = "Bible " + IntToStr(i+1);
+ menus[i]->Caption = _tr("Bible")+" " + IntToStr(i+1);
menu->Items->Add(menus[i]);
newitem = new TMenuItem(menu);
- newitem->Caption = "[NONE]";
- newitem->Hint = "Remove This View";
+ newitem->Caption = "["+_tr("NONE")+"]";
+ newitem->Hint = _tr("Remove This View");
newitem->OnClick = ParallelMenuItemClick;
menus[i]->Add(newitem);
}
Modified: trunk/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/mainfrm.h
===================================================================
--- trunk/mainfrm.h 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/mainfrm.h 2006-09-04 00:21:24 UTC (rev 442)
@@ -210,7 +210,7 @@
TMenuItem *Help1;
TMenuItem *About1;
TPopupMenu *PopupMenu2;
- TMenuItem *DictionaryLookup1;
+ TMenuItem *DictionaryLookup2;
TMenuItem *File1;
TMenuItem *SaveLayout1;
TMenuItem *Exit1;
@@ -219,7 +219,7 @@
TDdeServerItem *Lookup;
TDdeServerConv *Bible;
TPopupMenu *PopupMenu1;
- TMenuItem *MenuItem1;
+ TMenuItem *DictionaryLookup1;
TMenuItem *Copy1;
TMenuItem *CopyasBGreekTransliteration1;
TMenuItem *Copy2;
@@ -249,8 +249,8 @@
TImageList *ImageList2;
TSpeedButton *Bookmarkbtn;
TPopupMenu *PopupMenu3;
- TMenuItem *Copy4;
- TMenuItem *DictionaryLookup2;
+ TMenuItem *Copy3_2;
+ TMenuItem *DictionaryLookup3;
TMenuItem *N3;
TMenuItem *EditEntry1;
TMenuItem *DeleteEntry1;
@@ -279,9 +279,8 @@
TComboBox *cbBookOld;
TComboBox *freeHandLookupOld;
TPopupMenu *PopupMenu5;
- TMenuItem *MenuItem2;
- TMenuItem *MenuItem3;
- TMenuItem *MenuItem4;
+ TMenuItem *DictionaryLookup5;
+ TMenuItem *SearchForWord5;
TMenuItem *N4;
TImage *BookmarkBtnImage;
TToolBar *ToolBar3;
@@ -294,6 +293,7 @@
TImage *MorphBtnImage;
TImage *FootnoteBtnImage;
TImage *XRefBtnImage;
+ TMenuItem *Copy5;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
void __fastcall CommentaryPageControlChange(TObject *Sender);
@@ -306,7 +306,7 @@
void __fastcall Exit1Click(TObject *Sender);
void __fastcall About1Click(TObject *Sender);
- void __fastcall DictionaryLookup1Click(TObject *Sender);
+ void __fastcall DictionaryLookup2Click(TObject *Sender);
void __fastcall SaveLayout1Click(TObject *Sender);
@@ -431,6 +431,7 @@
ParallelDisp *parallelDisp;
SWBuf getNoteText(const char *noteText, SWModule *module = 0);
SWModule *getActiveModule(TRxRichEdit *rtf = 0);
+ void updateModuleOptions(TMenuItem *parentItem, int staticMenuItemsCount = 1);
};
class TRTFHintWindow : public THintWindow {
Modified: trunk/optionfrm.cpp
===================================================================
--- trunk/optionfrm.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/optionfrm.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -11,8 +11,10 @@
#include "TModuleFonts.h"
#include "optionfrm.h"
#include "mainfrm.h"
+#include "TntSystem.hpp"
+
//---------------------------------------------------------------------------
#pragma link "TntButtons"
#pragma link "TntComCtrls"
@@ -81,6 +83,7 @@
{
TFontSelFrm* tempFrm = new TFontSelFrm(this);
+
switch (cmbTextSelect->ItemIndex)
{
case 0: // All Windows
@@ -253,7 +256,7 @@
GetCurrentScheme();
}
-TOptionsfrm::CopyFontDlg(TFontSelFrm* lhs, const TFontSelFrm* rhs)
+void TOptionsfrm::CopyFontDlg(TFontSelFrm* lhs, const TFontSelFrm* rhs)
{
lhs->BackColor = rhs->BackColor;
lhs->Font->Color = rhs->Font->Color;
@@ -325,7 +328,7 @@
schemeconf.Sections["Appearance"] = emap;
schemeconf.Save();
}else{
- Application->MessageBox("Scheme name missing or invalid.","Oops", MB_OK);
+ MessageBoxW(0, _tr("Scheme name missing or invalid."),_tr("Oops"), MB_OK);
}
SetCurrentDir(ExtractFilePath(Application->ExeName));
FindSchemeNames();
@@ -374,10 +377,10 @@
exName = subdir + name + COLOR_EXT;
newFileName = SaveSchDlg->FileName.c_str();
if(!CopyFileA(exName.c_str(), newFileName.c_str(),1))
- Application->MessageBox("Export Failed." , "Oops", MB_OK);
+ MessageBoxW(0, _tr("Export Failed.") , _tr("Oops"), MB_OK);
}
}else{
- Application->MessageBox("No Scheme Selected to Export. Please Select a Scheme and Retry" , "Oops", MB_OK);
+ MessageBoxW(0, _tr("No Scheme Selected to Export. Please Select a Scheme and Retry") , _tr("Oops"), MB_OK);
}
SetCurrentDir(ExtractFilePath(Application->ExeName));
}
@@ -393,7 +396,7 @@
newFileName = ExtractFileName(exName);
newPath = subdir + newFileName;
if(!CopyFileA(exName.c_str(), newPath.c_str(),1))
- MessageBox(this, "Import Failed." , "Oops", MB_OK);
+ MessageBoxW(0, _tr("Import Failed.") , _tr("Oops"), MB_OK);
}
SetCurrentDir(ExtractFilePath(Application->ExeName));
FindSchemeNames();
@@ -407,7 +410,7 @@
if(name != ""){
DeleteFile(fullName);
}else{
- Application->MessageBox("No Scheme Selected to Delete. Please Select a Scheme and Retry" , "Oops", MB_OK);
+ MessageBoxW(0, _tr("No Scheme Selected to Delete. Please Select a Scheme and Retry") , _tr("Oops"), MB_OK);
}
SetCurrentDir(ExtractFilePath(Application->ExeName));
FindSchemeNames();
@@ -474,7 +477,7 @@
void __fastcall TOptionsfrm::HintPopupsClick(TObject *Sender)
{
- // If we turn off HintPopups we have to turn off HintStrongs
+ // If we turn off HintPopups we have to turn off HintStrongs
// because HintStrongs will not work if hints are off
HintStrongs->Enabled = HintPopups->Checked;
HintWords->Enabled = HintPopups->Checked;
@@ -876,4 +879,66 @@
+void TOptionsfrm::updateI18N() {
+ /* DONE 2 -cLocalize : Change Module Type to Window Type here and in the localization files and get it updated by our local guys :) */
+ this->Caption = _tr("Preferences");
+ TabSheet1->Caption = _tr("General");
+ TabSheet2->Caption = _tr("Special Modules");
+ TabSheet3->Caption = _tr("Display");
+ gbPersonalize->Caption = _tr("Personalize");
+ AutoBMPersonal->Caption = _tr("Autosave Personal Bookmarks");
+ AutoBMOther->Caption = _tr("Autosave Other Bookmarks");
+ HintPopups->Caption = _tr("Show Hint Pop-ups");
+ Label4->Caption = _tr("Language");
+ AutoLayout->Caption = _tr("Autosave Screen Layout");
+ HintStrongs->Caption = _tr("Show Lexicon Lookup Over Strongs Numbers");
+ HintVLists->Caption = _tr("Show Preview Over Verse Lists");
+ HintWords->Caption = _tr("Show Glossary Lookup Over Words (CTRL-W)");
+ OkBtn->Caption = _tr("OK");
+ CancelBtn->Caption = _tr("Cancel");
+ gbDefModules->Caption = _tr("Original Language Support - Default Modules");
+ Label7->Caption = _tr("Definitions");
+ Label8->Caption = _tr("Parsing");
+ Label5->Caption = _tr("Greek");
+ Label6->Caption = _tr("Hebrew");
+ Label10->Caption = _tr("Strong's Numbered Text");
+ gbDevos->Caption = _tr("Daily Devotionals");
+ Label9->Caption = _tr("Default Devotional");
+ Label17->Caption = _tr("Default General Dictionary");
+ devSplashCB->Caption = _tr("Show Devotional Splash Screen on Startup");
+ devsAsDictsCB->Caption = _tr("Show Devotionals as Dictionaries");
+ gbGloss->Caption = _tr("Glossaries / General Dictionaries");
+ glosAsDictsCB->Caption = _tr("Show Glossaries as Dictionaries");
+ gbColors->Caption = _tr("Display Colors");
+ Label2->Caption = _tr("Preview");
+ Label3->Caption = _tr("Window Type");
+ Label14->Caption = _tr("Scheme");
+ Label11->Caption = _tr("Text Styles and Colors");
+ btnFont->Caption = _tr("Select Font...");
+ Label13->Caption = _tr("Verse Number Color");
+ btnNumClr->Caption = _tr("Select Color...");
+ AutoVSColor->Caption = _tr("Current Verse Color");
+ VerseNewLine->Caption = _tr("Start Each Verse On New Line");
+ btnCurrVerse->Caption = _tr("Select Color...");
+ Label15->Caption = _tr("Combo/Edit Fields");
+ btnFieldClr->Caption = _tr("Select Color...");
+ Label1->Caption = _tr("Individual Modules (Font Only)");
+ btnModFonts->Caption = _tr("Select Font...");
+ Label12->Caption = _tr("Strong's Numbers <...>");
+ Label16->Caption = _tr("Strong's Tense (...)");
+ btnStrongClr->Caption = _tr("Select Color...");
+ btnMorphClr->Caption = _tr("Select Color...");
+ cmbTextSelect->Items->CommaText = _tr("\"All Windows\",\"Bible Window\",\"Commentary Window\",\"Lexicon/Dictionary Window\",\"Popup Windows\",\"Search Results\",\"User Interface\"");
+ SaveScheme->Caption = _tr("&Save Scheme");
+ DeleteScheme1->Caption = _tr("&Delete Scheme");
+ Import->Caption = _tr("Import Scheme...");
+ Export->Caption = _tr("E&xport Scheme...");
+
+ FontDialogText->updateI18N();
+ FontDialogComment->updateI18N();
+ FontDialogLD->updateI18N();
+ FontDialogPopup->updateI18N();
+ FontDialogSearch->updateI18N();
+ FontDialogUI->updateI18N();
+}
Modified: trunk/optionfrm.h
===================================================================
--- trunk/optionfrm.h 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/optionfrm.h 2006-09-04 00:21:24 UTC (rev 442)
@@ -93,17 +93,17 @@
TLabel *Label12;
TLabel *Label16;
TShape *shpStrongClr;
- TButton *btnStrongClr;
+ TButton *btnStrongClr;
TShape *shpMorphClr;
- TButton *btnMorphClr;
+ TButton *btnMorphClr;
TShape *shpFieldClr;
TColorDialog *ColorDialogStrongs;
TColorDialog *ColorDialogMorph;
TShape *shpNumClr;
- TCheckBox *HintWords;
- TComboBox *genDictCB;
- TLabel *Label17;
- TCheckBox *HintVLists;
+ TCheckBox *HintWords;
+ TComboBox *genDictCB;
+ TLabel *Label17;
+ TCheckBox *HintVLists;
TCheckBox *VerseNewLine;
void __fastcall btnCurrVerseClick(TObject *Sender);
void __fastcall FormCreate(TObject *Sender);
@@ -130,25 +130,26 @@
void __fastcall shpMorphClrMouseDown(TObject *Sender, TMouseButton Button,
TShiftState Shift, int X, int Y);
void __fastcall shpNumClrMouseDown(TObject *Sender, TMouseButton Button,
- TShiftState Shift, int X, int Y);
+ TShiftState Shift, int X, int Y);
private: // User declarations
static const char *defaultLocaleName;
static const char *defaultLocaleDescription;
- CopyFontDlg(TFontSelFrm* lhs, const TFontSelFrm* rhs);
+ void CopyFontDlg(TFontSelFrm* lhs, const TFontSelFrm* rhs);
void FindSchemeNames();
void GetCurrentScheme();
public:
- TFontSelFrm* FontDialogText;
- TFontSelFrm* FontDialogComment;
- TFontSelFrm* FontDialogLD;
- TFontSelFrm* FontDialogPopup;
- TFontSelFrm* FontDialogSearch;
- TFontSelFrm* FontDialogUI;
+ TFontSelFrm* FontDialogText;
+ TFontSelFrm* FontDialogComment;
+ TFontSelFrm* FontDialogLD;
+ TFontSelFrm* FontDialogPopup;
+ TFontSelFrm* FontDialogSearch;
+ TFontSelFrm* FontDialogUI;
void LoadDispSettings(SWConfig* config);
void LoadMiscSettings(SWConfig* config);
void extractSettings(SWConfig* config);
void UpdatePreview();
+ void updateI18N();
public: // User declarations
__fastcall TOptionsfrm(TComponent* Owner);
};
Modified: trunk/paraldisp.cpp
===================================================================
--- trunk/paraldisp.cpp 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/paraldisp.cpp 2006-09-04 00:21:24 UTC (rev 442)
@@ -23,6 +23,10 @@
modCount = 3;
mods = 0;
warnNoMod = false;
+ helpMessageL1 = "";
+ helpMessageL2 = "";
+ helpMessageL3 = "";
+ helpTitle = "New Feature - Parallel Display";
}
__fastcall ParallelDisp::~ParallelDisp() {
@@ -78,7 +82,7 @@
RTFStream->Position = 0;
Lines->LoadFromStream(RTFStream);
if (!warnNoMod) {
- Application->MessageBox("This must be your first time using the new parallel display in SWORD. This tab is for viewing up to three of your installed Bibles on the screen together. You will notice that this page is currently blank. Right-click the page to get a menu for selecting Bibles to be compared.\n\nThis is our first pass at this feature, so Lord willing, it will improve in future versions.\n\nEnjoy!\n\nThe SWORD Project Development Team", "New Feature - Parallel Display", MB_OK);
+ MessageBoxW(0, helpMessageL1 + "\n\n" + helpMessageL2 + "\n\n" + helpMessageL3, helpTitle, MB_OK);
warnNoMod = true;
}
return 0;
Modified: trunk/paraldisp.h
===================================================================
--- trunk/paraldisp.h 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/paraldisp.h 2006-09-04 00:21:24 UTC (rev 442)
@@ -48,6 +48,10 @@
virtual char Display(SWModule & imodule);
virtual char Display();
SWModule **getModules();
+ WideString helpMessageL1;
+ WideString helpMessageL2;
+ WideString helpMessageL3;
+ WideString helpTitle;
private:
bool warnNoMod;
};
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/stage/layout.conf 2006-09-04 00:21:24 UTC (rev 442)
@@ -37,20 +37,20 @@
Wesley=
[History]
-LastComModule=Personal
+LastComModule=JFB
LastLDKey=04210
-LastLDModule=2BabDict
-LastParaMod01=
-LastParaMod02=
-LastParaMod03=
-LastTextModule=ESV
-LastVerse=James 1:3
+LastLDModule=CBC
+LastParaMod01=[EI MIKÄÄN]
+LastParaMod02=[EI MIKÄÄN]
+LastParaMod03=[EI MIKÄÄN]
+LastTextModule=ASV
+LastVerse=1. Johanneksen kirje 2:10
LookupSaveCount=5
-LookupText=James 1:3
-LookupText=jas 1.19
-LookupText=Psalms 3:2
-LookupText=Psalms 3:1
-LookupText=ps 3
+LookupText=1. Johanneksen kirje 2:10
+LookupText=I John 2:10
+LookupText=1. Johanneksen kirje 2:4
+LookupText=1. János 2:4
+LookupText=Jaakobin kirje 1:3
SearchSaveCount=5
SearchText=God love +world
SearchText=God love world
@@ -202,9 +202,9 @@
[Screen]
MainHeight=776
-MainLeft=69
-MainTop=247
-MainWidth=1029
+MainLeft=30
+MainTop=94
+MainWidth=1257
Maximized=false
SearchHeight=566
SearchLeft=599
@@ -213,7 +213,7 @@
SearchTop=51
SearchWidth=759
TextComHeight=421
-TextWidth=563
+TextWidth=889
[TextView]
AB=
Modified: trunk/stage/options.conf
===================================================================
--- trunk/stage/options.conf 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/stage/options.conf 2006-09-04 00:21:24 UTC (rev 442)
@@ -89,7 +89,7 @@
UIFontSize=14
VSNumberColor=16711680
VerseNewLine=0
-locale=en_us
+locale=fi
[Bookmarks]
AutoSaveOther=0
@@ -115,30 +115,37 @@
Hints=true
Strongs=true
VLists=true
-Words=false
+Words=true
[Layout]
AutoSaveLayout=1
[ModDefaults]
DailyDevotion=SME
-GenDict=CBC
+GenDict=ZhHanzi
GreekDef=StrongsGreek
GreekParse=Robinson
HebrewDef=StrongsHebrew
StrongsNumbers=ChiUn
[PrintedPage]
+AutoVSColor=
BottomMargin=0.75
-Footer=Page &p of &t
+CurrentVSColor=
+FieldColor=
+Footer=Sivu &p/&t
Header=&d
-LeftMargin=0.50
+LeftMargin=0.5
+MorphColor=
PrnFooter=0
PrnHeader=0
-RightMargin=0.50
+RightMargin=0.5
+StrongsColor=
+TextBackColor=
TextBkName=1
TextChHead=1
TextChHeadSize=16
+TextFontColor=
TextFontName=Arial
TextFontSize=12
TextParagraph=1
@@ -147,7 +154,9 @@
TextSuperVS=1
TextVSNum=1
TextVSNumSize=10
-TopMargin=0.50
+TopMargin=0.5
+VSNumberColor=
+VerseNewLine=
[Printing]
Notice=1
Modified: trunk/stage/uilocales.d/fi.conf
===================================================================
--- trunk/stage/uilocales.d/fi.conf 2006-08-28 08:33:25 UTC (rev 441)
+++ trunk/stage/uilocales.d/fi.conf 2006-09-04 00:21:24 UTC (rev 442)
@@ -79,7 +79,6 @@
&Personal Bookmarks=&Omat kirjanmerkit
Footer Text:=Alatunnisteen teksti:
Range Name:=Alueen nimi:
-Cross-references=Ristiviittaukset
Show Lexicon Lookup Over Strongs Numbers=Näytä sanakirjahaku Strongin numeroiden yllä
Window Type=Ikkunan tyyppi
@@ -203,13 +202,7 @@
"All Windows","Bible Window","Commentary Window","Lexicon/Dictionary Window","Popup Windows","Search Results","User Interface"="Kaikki ikkunat","Raamattuikkuna","Kommentaari-ikkuna","Sanakirjaikkuna","Ponnahdusikkuna","Hakutulokset","Käyttöliittymä"
-## These string are not translatable but are included in the hope
-## that biblecs will be fixed.
-## These include "Select Module Fonts" and "Select Font" and some
-## strange pieces of other items.
-## Color selection form seems to be translated by Windows or something.
-
-
+Font Selection=Valitse fontti
Show Font Faces=Näytä fonttien ulkoasu
Font=Fontti
Size=Koko
@@ -217,23 +210,22 @@
Foreground=Edusta
Sample Text=Malliteksti
-Save Scheme=Tallenna skeema
-Import Scheme=Tuo skeema
-Export Scheme=Vie skeema
-Delete Scheme=Poista skeema
+&Save Scheme=Tallenna skeema
+Import Scheme...=Tuo skeema...
+E&xport Scheme...=Vie skeema...
+&Delete Scheme=Poista skeema
-##Options
-&Transliteration=&Translitteraatio
-&Footnotes=&Alaviitteet
-O&n=P&äällä
-&Off=&Pois
-O&ff=&Pois
+Oops=Hupsis
+No Scheme Selected to Export. Please Select a Scheme and Retry=Mitään skeemaa ei ole valittu. Valitse ja yritä uudelleen.
+No Scheme Selected to Delete. Please Select a Scheme and Retry=Mitään skeemaa ei ole valittu. Valitse ja yritä uudelleen.
-Biblical Texts=Raamattutekstit
-Commentaries=Kommentaarit
-Lexicons / Dictionaries=Sanakirjat
+##These are in Parallel Display
+NONE=EI MIKÄÄN
+Search For Word/Phrase=Hae sanaa/lausetta
+Bible=Raamattu
##Select font for modules
+Select Module Fonts=Select Module Fonts
&View=&Näkymä
Show &All Installed=Näytä kaikki asennetut
Show &Unicode Only=Näytä vain unicodea käyttävät
@@ -242,26 +234,87 @@
Font Size=Fontin koko
&Reset All=Palauta kaikki
-##This original string includes \n and is not here completely.
-This must be your first time using the new parallel display in SWORD. This tab is for viewing up to three of your installed Bibles on the screen together. You will notice that this page is currently blank. Right-click the page to get a menu for selecting Bibles to be compared. This is our first pass at this feature, so Lord willing, it will improve in future versions.=Ilmeisesti tämä on ensimmäinen kerta kun käytät uutta rinnakkaisnäyttöä. Tällä välilehdellä voi katsoa enintään kolmea raamatunkäännöstä yhtä aikaa. Se on aluksi tyhjä; käytä hiiren oikeanpuoleista nappia nähdäksesi valikon josta käännökset valitaan. Tämä on uusi ominaisuus ja toivon mukaan kehittyy tulevissa versioissa.
+Biblical Texts=Raamattutekstit
+Commentaries=Kommentaarit
+Lexicons / Dictionaries=Sanakirjat
-##This original string includes "".
-This release of The Sword Printer is preliminary and is not yet fully functional, therefore some of the features here have been disabled. Please be sure to take a look at the formatting options to be able to fully take control of how your page will look. Also be sure to use the "Print Preview" feature to preview how your page(s) will look on paper before printing. Enjoy! From, The Sword Project Development Team!=Tämä tulostusominaisuus ei ole vielä täysin valmis ja kaikki toimintoja eivät ole saatavilla. Käytä muotoiluvalintoja sivun ulkoasun muokkaamiseksi. Sivua voi esikatsella ennen tulostusta.
+This release of The SWORD Printer is preliminary and is not yet fully functional, therefore some of the features here have been disabled. Please be sure to take a look at the formatting options to be able to fully take control of how your page will look. Also be sure to use the "Print Preview" feature to preview how your page(s) will look on paper before printing. Enjoy! -- The SWORD Project Development Team!=Tämä tulostusominaisuus ei ole vielä täysin valmis ja kaikki toimintoja eivät ole saatavilla. Käytä muotoiluvalintoja sivun ulkoasun muokkaamiseksi. Sivua voi esikatsella ennen tulostusta.
-## This long string includes both \n and ".
-#A Daily Devotional is not installed or is not configured[...]
+Print=Tulosta
+
Examples:=Esimerkkejä:
-Oops=Hupsis
-No Scheme Selected to Export. Please Select a Scheme and Retry=Mitään skeemaa ei ole valittu. Valitse ja yritä uudelleen.
-No Scheme Selected to Delete. Please Select a Scheme and Retry=Mitään skeemaa ei ole valittu. Valitse ja yritä uudelleen.
+
+##Options
+On=Päällä
+Off=Pois
+Cross-references=Ristiviittaukset
+Toggles Scripture Cross-references On and Off if they exist=Toggles Scripture Cross-references On and Off if they exist
+Footnotes=Alaviitteet
+Toggles Footnotes On and Off if they exist=Toggles Footnotes On and Off if they exist
+Greek Accents=Greek Accents
+Toggles Greek Accents=Toggles Greek Accents
+Headings=Headings
+Toggles Headings On and Off if they exist=Toggles Headings On and Off if they exist
+Hebrew Cantillation=Hebrew Cantillation
+Toggles Hebrew Cantillation Marks=Toggles Hebrew Cantillation Marks
+Hebrew Vowel Points=Hebrew Vowel Points
+Toggles Hebrew Vowel Points=Toggles Hebrew Vowel Points
+Lemmas=Lemmas
+Toggles Lemmas On and Off if they exist=Toggles Lemmas On and Off if they exist
+Morpheme Segmentation=Morpheme Segmentation
+Toggles morpheme segmentation, when present=Toggles morpheme segmentation, when present
+Morphological Tags=Morphological Tags
+Toggles Morphological Tags On and Off if they exist=Toggles Morphological Tags On and Off if they exist
+Strong's Numbers=Strongin numerot
+Toggles Strong's Numbers On and Off if they exist=Toggles Strong's Numbers On and Off if they exist
+Transliteration=Translitteraatio
+Transliterates between scripts=Transliterates between scripts
+Words of Christ in Red=Words of Christ in Red
+Toggles Red Coloring for Words of Christ On and Off if they are marked=Toggles Red Coloring for Words of Christ On and Off if they are marked
+
+
+## Still need translating
+
+Remove This View=Remove This View
+Scheme name missing or invalid.=Scheme name missing or invalid.
+Export Failed.=Export Failed.
+Import Failed.=Import Failed.
+General Books=General Books
+
New Feature - Parallel Display=Uusi ominaisuus - rinnakkaisnäyttö
-Print=Tulosta
+This must be your first time using the new parallel display in SWORD. This tab is for viewing up to three of your installed Bibles on the screen together. You will notice that this page is currently blank. Right-click the page to get a menu for selecting Bibles to be compared.=Ilmeisesti tämä on ensimmäinen kerta kun käytät uutta rinnakkaisnäyttöä. Tällä välilehdellä voi katsoa enintään kolmea raamatunkäännöstä yhtä aikaa. Se on aluksi tyhjä; käytä hiiren oikeanpuoleista nappia nähdäksesi valikon josta käännökset valitaan.
+This is our first pass at this feature, so Lord willing, it will improve in future versions.=Tämä on uusi ominaisuus ja toivon mukaan kehittyy tulevissa versioissa.
+Enjoy! -- The SWORD Project Development Team=Enjoy! -- The SWORD Project Development Team
-##These are in Parallel Display
-NONE=EI MIKÄÄN
-Search For Word/Phrase=Hae sanaa/lausetta
-Bible=Raamattu
+A Daily Devotional is not installed or is not configured for use with the "Devotional of the Day".=A Daily Devotional is not installed or is not configured for use with the "Devotional of the Day".
+To configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the "Options" menu and selecting "Preferences..."; then click the "Special Modules" tab. Find the "Default Devotional" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are "Spurgeon's Morning and Evening" or "Jonathan Bagster's Daily Light".=To configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the "Options" menu and selecting "Preferences..."; then click the "Special Modules" tab. Find the "Default Devotional" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are "Spurgeon's Morning and Evening" or "Jonathan Bagster's Daily Light".
+Visit our website at www.crosswire.org for more information.=Visit our website at www.crosswire.org for more information.
-##Verse Range or List - translated already but used in PrintFrm.cpp
-## also without _tr
\ No newline at end of file
+The SWORD Printer=The SWORD Printer
+
+Lookup Range=Lookup Range
+
+Print Preview=Tulosta Esikatselu
+## e.g. page 1 of 5
+Page=Page
+of=of
+
+# range examples
+John 1:1 Prints John chapter 1 verse 1=John 1:1 Prints John chapter 1 verse 1
+John 1 Prints the entire first chapter of John=John 1 Prints the entire first chapter of John
+John 1,2 Prints chapters 1 and 2 of John=John 1,2 Prints chapters 1 and 2 of John
+John 3:16;Rom 3:23 Prints John 3:16 and Romans 3:23=John 3:16;Rom 3:23 Prints John 3:16 and Romans 3:23
+
+Jesus Prints dictionary entry for Jesus=Jesus Prints dictionary entry for Jesus
+0051 Prints dictionary entry for 0051=0051 Prints dictionary entry for 0051
+
+## These string are not translatable but are included in the hope
+## that biblecs will be fixed.
+## These include "Select Module Fonts" and "Select Font" and some
+## strange pieces of other items.
+## Color selection form seems to be translated by Windows or something.
+
+
+
+
More information about the sword-cvs
mailing list