[jsword-svn] r1577 - in trunk: bibledesktop/.settings bibledesktop/src/main/resources common/src/main/java/org/crosswire/common/config common/src/main/java/org/crosswire/common/util

dmsmith at www.crosswire.org dmsmith at www.crosswire.org
Sat Jul 28 11:27:15 MST 2007


Author: dmsmith
Date: 2007-07-28 11:27:15 -0700 (Sat, 28 Jul 2007)
New Revision: 1577

Added:
   trunk/bibledesktop/.settings/org.eclipse.core.resources.prefs
Modified:
   trunk/bibledesktop/src/main/resources/config.properties
   trunk/bibledesktop/src/main/resources/config_fa.properties
   trunk/bibledesktop/src/main/resources/config_fa.txt
   trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
   trunk/common/src/main/java/org/crosswire/common/util/Convert.java
Log:
More config changes.

Added: trunk/bibledesktop/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/bibledesktop/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ trunk/bibledesktop/.settings/org.eclipse.core.resources.prefs	2007-07-28 18:27:15 UTC (rev 1577)
@@ -0,0 +1,3 @@
+#Sat Jul 28 14:45:35 EDT 2007
+eclipse.preferences.version=1
+encoding//src/main/resources/config_fa.txt=UTF-8

Modified: trunk/bibledesktop/src/main/resources/config.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config.properties	2007-07-28 16:49:57 UTC (rev 1576)
+++ trunk/bibledesktop/src/main/resources/config.properties	2007-07-28 18:27:15 UTC (rev 1577)
@@ -6,8 +6,10 @@
 Bibles.RetainCurrent.help=New Bible Views use the last chosen Bible. Otherwise, use the default Bible.
 Bibles.DefaultBible.name=Default Bible
 Bibles.DefaultBible.help=Which of the available Bibles is the default.
+Bibles.DefaultDictionary.hidden=true
 Bibles.DefaultDictionary.name=Default Dictionary
 Bibles.DefaultDictionary.help=Which of the available Dictionaries is the default.
+Bibles.DefaultCommentary.hidden=true
 Bibles.DefaultCommentary.name=Default Commentary
 Bibles.DefaultCommentary.help=Which of the available Commentaries is the default.
 Bibles.DefaultDailyDevotional.name=Default Daily Devotional
@@ -18,6 +20,7 @@
 Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strong''s) is the default.
 Bibles.DefaultGreekParse.name=Default Greek Morphology/Parsing Guides
 Bibles.DefaultGreekParse.help=Which of the available Greek Morphology/Parsing Guides is the default.
+Bibles.DefaultHebrewParse.hidden=true
 Bibles.DefaultHebrewParse.name=Default Hebrew Morphology/Parsing Guides
 Bibles.DefaultHebrewParse.help=Which of the available Hebrew Morphology/Parsing Guides is the default.
 

Modified: trunk/bibledesktop/src/main/resources/config_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.properties	2007-07-28 16:49:57 UTC (rev 1576)
+++ trunk/bibledesktop/src/main/resources/config_fa.properties	2007-07-28 18:27:15 UTC (rev 1577)
@@ -5,26 +5,27 @@
 Bibles.name=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
 Bibles.RetainCurrent.name=\u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0627\u062E\u06CC\u0631 \u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u06A9\u0646\u06CC\u062F
 Bibles.RetainCurrent.help=\u0647\u0631 \u0634\u0645\u0627\u062D\u0644 \u062A\u0631\u0698\u0648\u0645\u06D5\u06CC \u0642\u0628\u0644\u06CC \u06CC\u0627 \u062A\u0631\u0698\u0648\u0645\u06D5\u06CC\u0627\u0639\u062F\u06CC \u0627\u0633\u062A\u0641\u062F\u06D5 \u0645\u06CC\u06A9\u0646\u062F
-Bibles.DefaultBible.name=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A    
-Bibles.DefaultBible.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A 
+Bibles.DefaultBible.name=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A
+Bibles.DefaultBible.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A
 Bibles.DefaultDictionary.name=\u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0627\u0635\u0644\u06CC\u06A9\u062A\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627
 Bibles.DefaultDictionary.help=\u061F\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0627\u0635\u0644 \u0627\u0633\u062A
 Bibles.DefaultCommentary.name=\u06A9\u062A\u0627\u0628 \u062A\u0641\u0633\u06CC\u0631 \u0627\u0635\u0644\u06CC
 Bibles.DefaultCommentary.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0628 \u062A\u0641\u0633\u06CC\u0631 \u0645\u0648\u062C\u0648\u062F\u060C \u06A9\u062A\u0627\u0628 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
 Bibles.DefaultDailyDevotional.name=\u06A9\u062A\u0627\u0628 \u0631\u0627\u0632\u06AF\u0627\u0647\u0627\u0646 \u0631\u0648\u0632\u0627\u0646\u0647 \u0627\u0635\u0644\u06CC
 Bibles.DefaultDailyDevotional.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0628 \u0631\u0627\u0632\u06AF\u0627\u0646\u060C \u06A9\u062A\u0627\u0628 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultGreekDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
+Bibles.DefaultGreekDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632)
 Bibles.DefaultGreekDefinitions.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0645\u0639\u0627\u0646\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC \u0645\u0648\u062C\u0648\u062F(\u0633\u062A\u0631\u0627\u0646\u06AF\u0632) \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultHebrewDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
+Bibles.DefaultHebrewDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632)
 Bibles.DefaultHebrewDefinitions.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0645\u0639\u0627\u0646\u06CC \u0645\u0648\u062C\u0648\u062F \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632) \u0645\u0639\u0646\u06CC \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
 Bibles.DefaultGreekParse.name=\u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u0627\u0635\u0644\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC
 Bibles.DefaultGreekParse.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0631\u0627\u0647\u0646\u0645\u0627\u0647\u0627\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
 Bibles.DefaultHebrewParse.name=\u0631\u0627\u0647\u0646\u0645\u0627\u06CC
 Bibles.DefaultHebrewParse.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0631\u0627\u0647\u0646\u0645\u0627\u0647\u0627\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u0639\u0628\u0631\u06CC \u0645\u0648\u062C\u0648\u062F \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
 
-# All above refer to the Bible tab in the settings. Lines with "Path" need a "Ketab moghadass" as initial bit. The "Help" lines are free floati8ng text explaining the box.
-# I have chosen the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously 
-# refers to multiplicity of  translations 
+# All above refer to the Bible tab in the settings. 
+# The "Help" lines are free floating text explaining the box.
+# I have chosen the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously
+# refers to multiplicity of translations
 
 BibleDisplay.name=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
 BibleDisplay.Reuse.name=\u067E\u06CC\u0648\u0646\u062F\u0647\u0627\u06CC \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0647\u0645\u06CC\u0646 \u062A\u0631\u062C\u0645\u0647 \u0631\u0627 \u0628\u0627\u0632 \u06A9\u0646
@@ -44,13 +45,12 @@
 BibleDisplay.AntiAliasDisplay.name=\u062A\u0645\u06CC\u0633 \u06A9\u0631\u062F\u0646 \u0641\u0648\u0646\u062A\u0647\u0627
 BibleDisplay.AntiAliasDisplay.help=\u062A\u0645\u06CC\u0633 \u06A9\u0631\u062F\u0646 \u0641\u0648\u0646\u062A \u0647\u0627 \u06A9\u0631 \u06CC\u0648\u0627\u0634 \u0647\u0633\u062A \u0648\u0644\u06CC \u0642\u0634\u0646\u06AF\u062A\u0631 \u0647\u0633\u062A \u062F\u0631 \u0628\u0639\u0633\u06CC \u0641\u06CC\u0646\u062A\u0647\u0627
 
-
 # All the above refers to the presentation of the Bibles in the central viewing pane.
 
 SwordBook.name=\u0645\u062F\u0648\u0644\u0647\u0627 \u06A9\u062A\u0627\u0628\u0647\u0627
 SwordBook.BookSearchPath.name=\u0641\u0647\u0631\u0633\u062A \u06A9\u062A\u0627\u0628\u0647\u0627
 SwordBook.BookSearchPath.help=
-SwordBook.DownloadDirectory.name=\u0641\u0647\u0631\u0633\u062A 
+SwordBook.DownloadDirectory.name=\u0641\u0647\u0631\u0633\u062A
 SwordBook.DownloadDirectory.help=
 
 Passages.name=\u0642\u0633\u0645\u062A\u0647\u0627
@@ -59,7 +59,7 @@
 Passages.FullBookName.name=\u0639\u0633\u0645 \u06A9\u062A\u0627\u0628\u0647\u0627 \u06A9\u0627\u0645\u0644
 Passages.FullBookName.help=
 Passages.BlurringRules.ignore=true
-#Passages.BlurringRules.name=\u062C\u0642\u062F\u0631 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647 
+#Passages.BlurringRules.name=\u062C\u0642\u062F\u0631 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647
 #Passages.BlurringRules.help=\u0628\u06CC\u0634\u062A\u0631 \u0627\u0633 \u06CC\u06A9 \u0628\u0627\u0628 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647\u061F
 #Passages.BlurringRules.alternative.0=\u0647\u06CC\u062C
 #Passages.BlurringRules.alternative.1=\u0628\u0627\u0628
@@ -78,29 +78,28 @@
 #Application.InitialLayout.alternative.1=\u067E\u0646\u062C\u0631\u0647\u0647\u0627
 Application.MaxHeight.name=\u0628\u0644\u0646\u062F\u06CC \u067E\u0646\u062C\u0631\u0647
 Application.MaxHeight.help=
-Application.MaxWidth.name=\u0628\u0631\u0646\u0627\u0645\u0647.\u067E\u0647\u0646\u0627 \u067E\u0646\u062C\u0631\u0647
+Application.MaxWidth.name=\u067E\u0647\u0646\u0627 \u067E\u0646\u062C\u0631\u0647
 Application.MaxWidth.help=
 Application.UIFont.name=\u0641\u0648\u0646\u062A \u0648\u0645\u0648\u0645\u06CC
 Application.UIFont.help=\u0641\u0648\u0646\u062A \u0628\u0631\u0646\u0627\u0645\u0647. \u0634\u0631\u0648\u0639 \u062A\u0627\u0632\u0647 \u0644\u0632\u0645 \u0647\u0633\u062A
 
 # The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.name=CSS Override
-BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.name=Converter
-BibleDisplay.Converter.help=The engine used to generate the book display
-BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
-BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.name=Look and Feel
-Application.LookAndFeel.help=The look and feel of the application.
-Advanced.name=Advanced
-Advanced.SourcePath.name=Source Path
-Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.name=Default Passage Type
-Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
-Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
-Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
-Advanced.DefaultPassageType.alternative.2=Size (Distinct)
-Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
-Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
-
+#BibleDisplay.CSSOverride.name=CSS Override
+#BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
+#BibleDisplay.Converter.name=Converter
+#BibleDisplay.Converter.help=The engine used to generate the book display
+#BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
+#BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
+#Application.LookAndFeel.name=Look and Feel
+#Application.LookAndFeel.help=The look and feel of the application.
+#Advanced.name=Advanced
+#Advanced.SourcePath.name=Source Path
+#Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
+#Advanced.DefaultPassageType.name=Default Passage Type
+#Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
+#Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
+#Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
+#Advanced.DefaultPassageType.alternative.2=Size (Distinct)
+#Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
+#Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
+#Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
\ No newline at end of file

Modified: trunk/bibledesktop/src/main/resources/config_fa.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.txt	2007-07-28 16:49:57 UTC (rev 1576)
+++ trunk/bibledesktop/src/main/resources/config_fa.txt	2007-07-28 18:27:15 UTC (rev 1577)
@@ -1,30 +1,30 @@
-# The naming convention for the keys in the file is to match that of the
+# The naming convention for the keys in the file is to match that of the
 # keys of the options in the config.xml file.
 # Since the keys may have spaces these need to be escaped here.
-
 Bibles.name=کتاب مقدس
 Bibles.RetainCurrent.name=از کتاب مقدس اخیر استفاده کنید
 Bibles.RetainCurrent.help=هر شماحل ترژومەی قبلی یا ترژومەیاعدی استفدە میکند
-Bibles.DefaultBible.name=کدامیک از کتاب مقدس های موجود متن اصلی است    
-Bibles.DefaultBible.help=کدامیک از کتاب مقدس های موجود متن اصلی است 
+Bibles.DefaultBible.name=کدامیک از کتاب مقدس های موجود متن اصلی است
+Bibles.DefaultBible.help=کدامیک از کتاب مقدس های موجود متن اصلی است
 Bibles.DefaultDictionary.name=لغت نامه اصلیکتب مقدس ها
 Bibles.DefaultDictionary.help=؟کدامیک از لغت نامه های موجود لغت نامه اصل است
 Bibles.DefaultCommentary.name=کتاب تفسیر اصلی
 Bibles.DefaultCommentary.help=کدامیک از کتب تفسیر موجود، کتاب اصلی است.
 Bibles.DefaultDailyDevotional.name=کتاب رازگاهان روزانه اصلی
 Bibles.DefaultDailyDevotional.help=کدامیک از کتب رازگان، کتاب اصلی است.
-Bibles.DefaultGreekDefinitions.name=معانی اصلی یونانی (سترانگز
+Bibles.DefaultGreekDefinitions.name=معانی اصلی یونانی (سترانگز)
 Bibles.DefaultGreekDefinitions.help=کدامیک از معانی یونانی موجود(سترانگز) اصلی است.
-Bibles.DefaultHebrewDefinitions.name=معانی اصلی عبری (سترانگز
+Bibles.DefaultHebrewDefinitions.name=معانی اصلی عبری (سترانگز)
 Bibles.DefaultHebrewDefinitions.help=کدامیک از معانی موجود عبری (سترانگز) معنی اصلی است.
 Bibles.DefaultGreekParse.name=راهنمای اصلی مورفولوژی یونانی
 Bibles.DefaultGreekParse.help=کدامیک از راهنماهای مورفولوژی یونانی اصلی است.
 Bibles.DefaultHebrewParse.name=راهنمای
 Bibles.DefaultHebrewParse.help=کدامیک از راهنماهای مورفولوژی عبری موجود اصلی است.
 
-# All above refer to the Bible tab in the settings. Lines with "Path" need a "Ketab moghadass" as initial bit. The "Help" lines are free floati8ng text explaining the box.
-# I have chosen the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously 
-# refers to multiplicity of  translations 
+# All above refer to the Bible tab in the settings. 
+# The "Help" lines are free floating text explaining the box.
+# I have chosen the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously
+# refers to multiplicity of translations
 
 BibleDisplay.name=نمایش کتاب مقدس
 BibleDisplay.Reuse.name=پیوندهای مربوط به همین ترجمه را باز کن
@@ -33,7 +33,7 @@
 BibleDisplay.MaxPickers.help=
 BibleDisplay.Commentaries.name=کتابه تفسیری با کتاب مقدسها
 BibleDisplay.Commentaries.help=کتابها تفسیری در لیست کتاب مقدسهابگسر
-BibleDisplay.Sidebar.name=
+BibleDisplay.Sidebar.name=Show the Passage Sidebar
 BibleDisplay.Sidebar.help=
 BibleDisplay.VersesPerTab.name=جند عیات در صفه؟
 BibleDisplay.VersesPerTab.help=
@@ -45,58 +45,61 @@
 BibleDisplay.AntiAliasDisplay.help=تمیس کردن فونت ها کر یواش هست ولی قشنگتر هست در بعسی فینتها
 
 # All the above refers to the presentation of the Bibles in the central viewing pane.
+
 SwordBook.name=مدولها کتابها
 SwordBook.BookSearchPath.name=فهرست کتابها
 SwordBook.BookSearchPath.help=
-SwordBook.DownloadDirectory.name=فهرست 
+SwordBook.DownloadDirectory.name=فهرست
 SwordBook.DownloadDirectory.help=
+
 Passages.name=قسمتها
 Passages.PersistentNaming.name=حسمها نوزی
 Passages.PersistentNaming.help=
 Passages.FullBookName.name=عسم کتابها کامل
 Passages.FullBookName.help=
 Passages.BlurringRules.ignore=true
-Passages.BlurringRules.name=جقدر در هر صفه 
-Passages.BlurringRules.help=بیشتر اس یک باب در هر صفه؟
-Passages.BlurringRules.alternative.0=هیج
-Passages.BlurringRules.alternative.1=باب
-#Passages.BlurringRules.alternative.2=کتاب
+#Passages.BlurringRules.name=جقدر در هر صفه
+#Passages.BlurringRules.help=بیشتر اس یک باب در هر صفه؟
+#Passages.BlurringRules.alternative.0=هیج
+#Passages.BlurringRules.alternative.1=باب
+##Passages.BlurringRules.alternative.2=کتاب
 
 # The BookCase option is relevant only for scripts with upper case. I have therefore taken them out. I also do not know exactly how to translate them anyway...
+
 Passages.BookCase.ignore=true
 
 Application.name=برنامه
 Application.Language.name=زبان
 Application.Language.help=شروع تازه لزم هست
 Application.InitialLayout.ignore=true
-Application.InitialLayout.name=ترتیب
-Application.InitialLayout.help=نمایش با پنجرهها یا با جدول بند
-Application.InitialLayout.alternative.0=جدول بند
-Application.InitialLayout.alternative.1=پنجرهها
+#Application.InitialLayout.name=ترتیب
+#Application.InitialLayout.help=نمایش با پنجرهها یا با جدول بند
+#Application.InitialLayout.alternative.0=جدول بند
+#Application.InitialLayout.alternative.1=پنجرهها
 Application.MaxHeight.name=بلندی پنجره
 Application.MaxHeight.help=
-Application.MaxWidth.name=برنامه.پهنا پنجره
+Application.MaxWidth.name=پهنا پنجره
 Application.MaxWidth.help=
 Application.UIFont.name=فونت ومومی
 Application.UIFont.help=فونت برنامه. شروع تازه لزم هست
 
 # The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.name=CSS Override
-BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.name=Converter
-BibleDisplay.Converter.help=The engine used to generate the book display
-BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
-BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.name=Look and Feel
-Application.LookAndFeel.help=The look and feel of the application.
-Advanced.name=Advanced
-Advanced.SourcePath.name=Source Path
-Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.name=Default Passage Type
-Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
-Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
-Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
-Advanced.DefaultPassageType.alternative.2=Size (Distinct)
-Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
-Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
+#BibleDisplay.CSSOverride.name=CSS Override
+#BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
+#BibleDisplay.Converter.name=Converter
+#BibleDisplay.Converter.help=The engine used to generate the book display
+#BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
+#BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
+#Application.LookAndFeel.name=Look and Feel
+#Application.LookAndFeel.help=The look and feel of the application.
+#Advanced.name=Advanced
+#Advanced.SourcePath.name=Source Path
+#Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
+#Advanced.DefaultPassageType.name=Default Passage Type
+#Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
+#Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
+#Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
+#Advanced.DefaultPassageType.alternative.2=Size (Distinct)
+#Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
+#Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
+#Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)

Modified: trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java	2007-07-28 16:49:57 UTC (rev 1576)
+++ trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java	2007-07-28 18:27:15 UTC (rev 1577)
@@ -52,7 +52,7 @@
         // Hidden is an optional field so it is ok for the resource to be missing.
         try
         {
-            String hiddenState = option.getAttributeValue("hidden"); //$NON-NLS-1$
+            String hiddenState = configResources.getString(key + ".hidden"); //$NON-NLS-1$
             hidden = Boolean.valueOf(hiddenState).booleanValue();
         }
         catch (MissingResourceException e)

Modified: trunk/common/src/main/java/org/crosswire/common/util/Convert.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Convert.java	2007-07-28 16:49:57 UTC (rev 1576)
+++ trunk/common/src/main/java/org/crosswire/common/util/Convert.java	2007-07-28 18:27:15 UTC (rev 1577)
@@ -25,8 +25,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.crosswire.common.icu.NumberShaper;
-
 /**
  * Conversions between various types and Strings.
  *
@@ -97,7 +95,7 @@
     {
         try
         {
-            return Integer.parseInt(new NumberShaper().unshape(data));
+            return Integer.parseInt(data);
         }
         catch (NumberFormatException ex)
         {
@@ -112,7 +110,7 @@
      */
     public static String int2String(int data)
     {
-        return new NumberShaper().shape(Integer.toString(data));
+        return Integer.toString(data);
     }
 
     /**




More information about the jsword-svn mailing list