[jsword-svn] r1472 - in trunk/bibledesktop/src/main: java/org/crosswire/bibledesktop/book java/org/crosswire/bibledesktop/book/install java/org/crosswire/bibledesktop/desktop resources

dmsmith at www.crosswire.org dmsmith at www.crosswire.org
Wed Jul 4 08:20:11 MST 2007


Author: dmsmith
Date: 2007-07-04 08:20:10 -0700 (Wed, 04 Jul 2007)
New Revision: 1472

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_de.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_fa.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
   trunk/bibledesktop/src/main/resources/config.properties
Log:
corrected Strongs to Strong's
More rtol changes (mostly EAST => LINE_END, WEST => LINE_START)

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -236,42 +236,42 @@
         this.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
         this.setLayout(new GridBagLayout());
         int gridy = 0;
-        this.add(lblHeading,  new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-        this.add(lblPhrase,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblHeading,  new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        this.add(lblPhrase,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtPhrase,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(lblIncludes, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblIncludes, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtIncludes, new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(lblExcludes, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblExcludes, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtExcludes, new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(lblSpell,    new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblSpell,    new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtSpell,    new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(lblStartsWith, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblStartsWith, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtStartsWith, new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(chkRank,     new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-        this.add(lblRank,     new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(chkRank,     new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        this.add(lblRank,     new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(sliderRank,  new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-        this.add(chkRestrict, new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-        this.add(lblPresets,  new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(chkRestrict, new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        this.add(lblPresets,  new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(cboPresets,  new GridBagConstraints(1,   gridy, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
-        this.add(lblRestrict, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblRestrict, new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(txtRestrict, new GridBagConstraints(1,   gridy, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));
         this.add(btnRestrict, new GridBagConstraints(2,   gridy, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE,       new Insets(0, 0, 0, 5), 0, 0));
-//        this.add(chkHebGrk,   new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-//        this.add(lblHebInc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(chkHebGrk,   new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+//        this.add(lblHebInc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtHebInc,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-//        this.add(lblHebExc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(lblHebExc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtHebExc,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-//        this.add(lblGrkInc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(lblGrkInc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtGrkInc,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-//        this.add(lblGrkExc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(lblGrkExc,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtGrkExc,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-//        this.add(chkTime,     new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-//        this.add(lblAfter,    new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(chkTime,     new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+//        this.add(lblAfter,    new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtAfter,    new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-//        this.add(lblBefore,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+//        this.add(lblBefore,   new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
 //        this.add(txtBefore,   new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
-        this.add(chkSummary,  new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.WEST,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-        this.add(lblSummary,  new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.EAST,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
+        this.add(chkSummary,  new GridBagConstraints(0, ++gridy, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_START,   GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        this.add(lblSummary,  new GridBagConstraints(0, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,   GridBagConstraints.NONE,       new Insets(0, 0, 0, 0), 0, 0));
         this.add(scrSummary,  new GridBagConstraints(1,   gridy, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,       new Insets(2, 5, 2, 5), 0, 0));
         this.add(btnGo,       new GridBagConstraints(2, ++gridy, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTH,  GridBagConstraints.NONE,       new Insets(10, 0, 5, 5), 0, 0));
         GuiUtil.applyDefaultOrientation(this);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -20,7 +20,7 @@
 HeadSummary.Name:Show quick search syntax
 Summary.Name:Quick search syntax:
 
-HeadOriginal.Name:Contains Strongs Hebrew and Greek
+HeadOriginal.Name:Contains Strong''s Hebrew and Greek
 HebrewInclude.Name:Includes Hebrew Nos:
 HebrewExclude.Name:Excludes Hebrew Nos:
 GreekInclude.Name:Includes Greek Nos:

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -20,7 +20,7 @@
 HeadSummary.Name:Show quick search syntax
 Summary.Name:Quick search syntax:
 
-HeadOriginal.Name:Contains Strongs Hebrew and Greek
+HeadOriginal.Name:Contains Strong''s Hebrew and Greek
 HebrewInclude.Name:Includes Hebrew Nos:
 HebrewExclude.Name:Excludes Hebrew Nos:
 GreekInclude.Name:Includes Greek Nos:

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -21,7 +21,7 @@
 HeadSummary.Name:Show quick search syntax
 Summary.Name:Quick search syntax:
 
-HeadOriginal.Name:Contains Strongs Hebrew and Greek
+HeadOriginal.Name:Contains Strong''s Hebrew and Greek
 HebrewInclude.Name:Includes Hebrew Nos:
 HebrewExclude.Name:Excludes Hebrew Nos:
 GreekInclude.Name:Includes Greek Nos:

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -195,21 +195,21 @@
         btnIndex = new JButton(actions.getAction(INDEX));
 
         this.setLayout(new GridBagLayout());
-        this.add(lblBible,    new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 5), 0, 0));
-        this.add(biblePicker, new GridBagConstraints(2, 0, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(quickPicker, new GridBagConstraints(4, 0, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblBible,    new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 5), 0, 0));
+        this.add(biblePicker, new GridBagConstraints(2, 0, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(quickPicker, new GridBagConstraints(4, 0, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
 
-        this.add(lblKey,      new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+        this.add(lblKey,      new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
         this.add(txtKey,      new GridBagConstraints(2, 1, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 0, 1, 2), 0, 0));
         this.add(btnKey,      new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 0, 2, 2), 0, 0));
         this.add(btnKeyGo,    new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
 
-        this.add(btnHelp,     new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(lblSearch,   new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
-        this.add(btnIndex,    new GridBagConstraints(2, 2, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 2), 0, 0));
+        this.add(btnHelp,     new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(lblSearch,   new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+        this.add(btnIndex,    new GridBagConstraints(2, 2, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(2, 0, 2, 2), 0, 0));
         this.add(txtSearch,   new GridBagConstraints(2, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 0, 3, 2), 0, 0));
         this.add(btnAdvanced, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 0, 2, 2), 0, 0));
-        this.add(btnSearch,   new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(btnSearch,   new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
 
         enableComponents();
         GuiUtil.applyDefaultOrientation(this);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -49,13 +49,9 @@
 HelpAction.LargeIcon=toolbarButtonGraphics/general/ContextualHelp24.gif
 
 # for the Bible combo box
-Bible.Name=Bible:\ 
+Bible.Name=Bible:
 Bible.MnemonicKey=B
 
-# for the best match toggle button
-Rank.Name=Rank
-Rank.MnemonicKey=R
-
 # for the advanced search button
 Advanced.Name=Advanced
 Advanced.ShortDescription=Advanced Search

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_de.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_de.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_de.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -45,23 +45,15 @@
 HelpAction.Name=Hilfe
 HelpAction.ShortDescription=Hilfe
 HelpAction.LongDescription=Hilfe
-HelpAction.SmallIcon=toolbarButtonGraphics/general/ContextualHelp16.gif
-HelpAction.LargeIcon=toolbarButtonGraphics/general/ContextualHelp24.gif
 
 # for the Bible combo box
-Bible.Name=Bibel:\ 
+Bible.Name=Bibel:
 Bible.MnemonicKey=B
 
-# for the best match toggle button
-Rank.Name=Rang
-Rank.MnemonicKey=R
-
 # for the advanced search button
 Advanced.Name=Fortgeschritten
 Advanced.ShortDescription=Fortgeschrittenene Suche
 Advanced.LongDescription=Fortgeschrittene Suche
-Advanced.SmallIcon=toolbarButtonGraphics/general/Find16.gif
-Advanced.LargeIcon=toolbarButtonGraphics/general/Find24.gif
 Advanced.MnemonicKey=
 
 # for the index button

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_fa.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane_fa.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -12,63 +12,55 @@
 
 # for the Passage label
 ViewLabel.Name=\u0645\u062A\u0646 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0628\u062F\u0647
-#ViewLabel.MnemonicKey=W
+ViewLabel.MnemonicKey=
 
 # for the Passage Lookup text entry field
-PassageAction.Name= \u0645\u062A\u0646
+PassageAction.Name=\u0645\u062A\u0646
 PassageAction.ShortDescription=\u0645\u062A\u0646\u06CC \u0631\u0627 \u0628\u0631\u0627\u06CC \u0646\u0645\u0627\u06CC\u0634 \u0648\u0627\u0631\u062F \u06A9\u0646. \u062F\u06AF\u0645\u0647 \u06A9\u0646\u062A\u0631\u0644+ \u0648\u0631\u0648\u062F \u0631\u0627 \u0641\u0634\u0627\u0631 \u062F\u0647\u06CC\u062F \u06CC\u0627 \u062F\u06AF\u0645\u0647 ... \u0631\u0627 \u0628\u0631\u0627\u06CC \u0627\u0646\u062A\u062E\u0627\u0628 \u067E\u0646\u062C\u0631\u0647 \u0645\u062A\u0646 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u0641\u0634\u0627\u0631 \u062F\u0647\u06CC\u062F. 
 PassageAction.LongDescription=\u0645\u062A\u0646\u06CC \u0631\u0627 \u0628\u0631\u0627\u06CC \u0646\u0645\u0627\u06CC\u0634 \u0646\u0634\u0627\u0646 \u062F\u0647\u06CC\u062F.\u062F\u06AF\u0645\u0647 \u06A9\u0646\u062A\u0631\u0644+ \u0648\u0631\u0648\u062F \u0631\u0627 \u0641\u0634\u0627\u0631 \u062F\u0647\u06CC\u062F \u06CC\u0627 \u062F\u06AF\u0645\u0647 ... \u0631\u0627 \u0628\u0631\u0627\u06CC \u0627\u0646\u062A\u062E\u0627\u0628 \u067E\u0646\u062C\u0631\u0647 \u0645\u062A\u0646 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u0641\u0634\u0627\u0631 \u062F\u0647\u06CC\u062F
 
 # for the ... button that brings up a passage picker dialog
-More.Name= \u0627\u0646\u062A\u062E\u0627\u0628
-More.ShortDescription= \u0645\u062A\u0646\u06CC \u0631\u0627 \u0628\u0631\u0627\u06CC \u0646\u0645\u0627\u06CC\u0634 \u0627\u0646\u062A\u062E\u0627\u0628 \u06A9\u0646\u06CC\u062F.
-More.LongDescription= \u067E\u0646\u062C\u0631\u0647 \u0645\u062A\u0646 \u0645\u0646\u062A\u062E\u0628 \u0631\u0627 \u0628\u0627\u0632 \u06A9\u0646\u06CC\u062F.
+More.Name=\u0627\u0646\u062A\u062E\u0627\u0628
+More.ShortDescription=\u0645\u062A\u0646\u06CC \u0631\u0627 \u0628\u0631\u0627\u06CC \u0646\u0645\u0627\u06CC\u0634 \u0627\u0646\u062A\u062E\u0627\u0628 \u06A9\u0646\u06CC\u062F.
+More.LongDescription=\u067E\u0646\u062C\u0631\u0647 \u0645\u062A\u0646 \u0645\u0646\u062A\u062E\u0628 \u0631\u0627 \u0628\u0627\u0632 \u06A9\u0646\u06CC\u062F.
 
 # for the Passage Lookup go button
-GoPassage.Name= \u0628\u0631\u0648
-GoPassage.ShortDescription= \u0646\u0645\u0627\u06CC\u0634 \u0645\u062A\u0646
-GoPassage.LongDescription= \u0646\u0645\u0627\u06CC\u0634 \u0645\u062A\u0646
-#GoPassage.MnemonicKey=G
+GoPassage.Name=\u0628\u0631\u0648
+GoPassage.ShortDescription=\u0646\u0645\u0627\u06CC\u0634 \u0645\u062A\u0646
+GoPassage.LongDescription=\u0646\u0645\u0627\u06CC\u0634 \u0645\u062A\u0646
+GoPassage.MnemonicKey=
 
 # for the Search label
-SearchLabel.Name=Search: \u062C\u0633\u062A\u062C\u0648:
-#SearchLabel.MnemonicKey=S
+SearchLabel.Name=\u062C\u0633\u062A\u062C\u0648:
+SearchLabel.MnemonicKey=
 
 # for the Search text entry field
-SearchAction.Name= \u062C\u0633\u062A\u062C\u0648
+SearchAction.Name=\u062C\u0633\u062A\u062C\u0648
 SearchAction.ShortDescription=\u062C\u0633\u062A\u062C\u0648\u06CC \u0645\u062A\u0646.
 
 # for the Search go button
-GoSearch.Name= \u0628\u0631\u0648
-GoSearch.ShortDescription= \u062C\u0633\u062A\u062C\u0648\u06CC \u0645\u062A\u0646
-#GoSearch.MnemonicKey=G
+GoSearch.Name=\u0628\u0631\u0648
+GoSearch.ShortDescription=\u062C\u0633\u062A\u062C\u0648\u06CC \u0645\u062A\u0646
+GoSearch.MnemonicKey=
 
 # for the Help button
-HelpAction.Name= \u062C\u0633\u062A\u062C\u0648\u06CC \u06A9\u0645\u06A9
-HelpAction.ShortDescription= \u062C\u0633\u062A\u062C\u0648\u06CC \u0641\u0648\u0631\u06CC \u06A9\u0645\u06A9
-HelpAction.LongDescription= \u06A9\u0645\u06A9 \u0641\u0648\u0631\u06CC \u0628\u0631\u0627\u06CC \u0686\u06AF\u0648\u0646\u06AF\u06CC \u062C\u0633\u062A\u062C\u0648 \u0646\u0634\u0627\u0646 \u0628\u062F\u0647
-HelpAction.SmallIcon=toolbarButtonGraphics/general/ContextualHelp16.gif
-HelpAction.LargeIcon=toolbarButtonGraphics/general/ContextualHelp24.gif
+HelpAction.Name=\u062C\u0633\u062A\u062C\u0648\u06CC \u06A9\u0645\u06A9
+HelpAction.ShortDescription=\u062C\u0633\u062A\u062C\u0648\u06CC \u0641\u0648\u0631\u06CC \u06A9\u0645\u06A9
+HelpAction.LongDescription=\u06A9\u0645\u06A9 \u0641\u0648\u0631\u06CC \u0628\u0631\u0627\u06CC \u0686\u06AF\u0648\u0646\u06AF\u06CC \u062C\u0633\u062A\u062C\u0648 \u0646\u0634\u0627\u0646 \u0628\u062F\u0647
 
 # for the Bible combo box
-Bible.Name=Bible:\ 
-#Bible.MnemonicKey=B
+Bible.Name=Bible:
+Bible.MnemonicKey=
 
-# for the best match toggle button
-Rank.Name=Rank
-#Rank.MnemonicKey=R
-
 # for the advanced search button
-Advanced.Name= \u067E\u06CC\u0634\u0631\u0641\u062A\u0647
-Advanced.ShortDescription= \u062C\u0633\u062A\u062C\u0648\u06CC \u067E\u06CC\u0634\u0631\u0641\u062A\u0647
-Advanced.LongDescription= \u0646\u0645\u0627\u06CC\u0634 \u062C\u0633\u062A\u062C\u0648\u06CC \u067E\u06CC\u0634\u0631\u0641\u062A\u0647
-Advanced.SmallIcon=toolbarButtonGraphics/general/Find16.gif
-Advanced.LargeIcon=toolbarButtonGraphics/general/Find24.gif
-#Advanced.MnemonicKey=V
+Advanced.Name=\u067E\u06CC\u0634\u0631\u0641\u062A\u0647
+Advanced.ShortDescription=\u062C\u0633\u062A\u062C\u0648\u06CC \u067E\u06CC\u0634\u0631\u0641\u062A\u0647
+Advanced.LongDescription=\u0646\u0645\u0627\u06CC\u0634 \u062C\u0633\u062A\u062C\u0648\u06CC \u067E\u06CC\u0634\u0631\u0641\u062A\u0647
+Advanced.MnemonicKey=
 
 # for the index button
-Index.Name= \u06A9\u0627\u0631\u0627\u0646\u062F\u0627\u0632\u06CC \u062C\u0633\u062A\u062C\u0648
-Index.ShortDescription= \u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u062C\u0633\u062A\u062C\u0648 \u0627\u06CC\u062C\u0627\u062F \u06A9\u0646
-Index.LongDescription= \u0627\u06CC\u062C\u0627\u062F \u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u062C\u0633\u062A\u062C\u0648 \u0628\u0631\u0627\u06CC \u06A9\u0627\u0631\u0627\u0646\u062F\u0627\u0632\u06CC \u062C\u0633\u062A\u062C\u0648
-#Index.MnemonicKey=E
+Index.Name=\u06A9\u0627\u0631\u0627\u0646\u062F\u0627\u0632\u06CC \u062C\u0633\u062A\u062C\u0648
+Index.ShortDescription=\u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u062C\u0633\u062A\u062C\u0648 \u0627\u06CC\u062C\u0627\u062F \u06A9\u0646
+Index.LongDescription=\u0627\u06CC\u062C\u0627\u062F \u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u062C\u0633\u062A\u062C\u0648 \u0628\u0631\u0627\u06CC \u06A9\u0627\u0631\u0627\u0646\u062F\u0627\u0632\u06CC \u062C\u0633\u062A\u062C\u0648
+Index.MnemonicKey=
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -100,13 +100,13 @@
 
         this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         this.setLayout(new GridBagLayout());
-        this.add(lblAll, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 10, 5, 5), 0, 0));
+        this.add(lblAll, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(5, 10, 5, 5), 0, 0));
         this.add(createScrolledTree(lblAll), new GridBagConstraints(0, 1, 1, 4, 0.5, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 10, 10, 2), 0, 0));
         this.add(new JPanel(), new GridBagConstraints(1, 1, 1, 1, 0.0, 0.5, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
         this.add(new JButton(actions.getAction(DELETE)), new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
         this.add(new JButton(actions.getAction(ADD)), new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
         this.add(new JPanel(), new GridBagConstraints(1, 4, 1, 1, 0.0, 0.5, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(lblSel, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 10), 0, 0));
+        this.add(lblSel, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(5, 5, 5, 10), 0, 0));
         this.add(createScrolledList(lblSel), new GridBagConstraints(2, 1, 1, 4, 0.5, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 2, 10, 10), 0, 0));
         this.add(createMessageLabel(), new GridBagConstraints(0, 5, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 10, 5, 10), 0, 0));
         this.add(createDisplayPanel(), new GridBagConstraints(0, 6, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 10, 0, 10), 0, 0));
@@ -170,7 +170,7 @@
         JPanel panel = new JPanel();
         panel.setLayout(new BorderLayout());
         panel.add(txtDisplay, BorderLayout.CENTER);
-        panel.add(lblDisplay, BorderLayout.WEST);
+        panel.add(lblDisplay, BorderLayout.LINE_START);
         return panel;
     }
 
@@ -298,7 +298,7 @@
 
         pnlAction.setLayout(new BorderLayout());
         pnlAction.setBorder(BorderFactory.createEmptyBorder(5, 5, 15, 20));
-        pnlAction.add(btnGo, BorderLayout.EAST);
+        pnlAction.add(btnGo, BorderLayout.LINE_END);
 
         ActionListener closer = new ActionListener()
         {

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -175,16 +175,16 @@
         JPanel pnlMain = new JPanel();
         pnlMain.setPreferredSize(new Dimension(300, 300));
         pnlMain.setLayout(new GridBagLayout());
-        pnlMain.add(lblMesg, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 10, 10, 10), 0, 0));
-        pnlMain.add(lblName, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        pnlMain.add(lblMesg, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(10, 10, 10, 10), 0, 0));
+        pnlMain.add(lblName, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         pnlMain.add(txtName, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
         // If there is only one type, then don't give the user a choice
         if (imanager.getInstallerFactoryNames().size() > 1)
         {
-            pnlMain.add(lblType, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+            pnlMain.add(lblType, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
             pnlMain.add(cboType, new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
         }
-        pnlMain.add(new JSeparator(), new GridBagConstraints(0, 3, 2, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 10, 10, 10), 0, 0));
+        pnlMain.add(new JSeparator(), new GridBagConstraints(0, 3, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(10, 10, 10, 10), 0, 0));
         pnlMain.add(siteEditorPane, new GridBagConstraints(0, 4, 2, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
         pnlMain.add(pnlBtn2, new GridBagConstraints(0, 5, 2, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
 
@@ -228,8 +228,8 @@
         dlgMain.getContentPane().add(new JPanel(), BorderLayout.NORTH);
         dlgMain.getContentPane().add(pnlAction, BorderLayout.SOUTH);
         dlgMain.getContentPane().add(this, BorderLayout.CENTER);
-        dlgMain.getContentPane().add(new JPanel(), BorderLayout.EAST);
-        dlgMain.getContentPane().add(new JPanel(), BorderLayout.WEST);
+        dlgMain.getContentPane().add(new JPanel(), BorderLayout.LINE_END);
+        dlgMain.getContentPane().add(new JPanel(), BorderLayout.LINE_START);
         dlgMain.getRootPane().setDefaultButton(btnClose);
         dlgMain.getRootPane().registerKeyboardAction(closer, esc, JComponent.WHEN_IN_FOCUSED_WINDOW);
         dlgMain.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -61,15 +61,15 @@
         JLabel proxyPortLabel = getLabelForText(Msg.PROXY_PORT, proxyPort);
 
         setLayout(new GridBagLayout());
-        add(hostLabel,       new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(hostLabel,       new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         add(host,            new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(catalogDirLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(catalogDirLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         add(catalogDir,      new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(packageDirLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(packageDirLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         add(packageDir,      new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(proxyHostLabel,  new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(proxyHostLabel,  new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         add(proxyHost,       new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
-        add(proxyPortLabel,  new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+        add(proxyPortLabel,  new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
         add(proxyPort,       new GridBagConstraints(1, 4, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
 
         reset();

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -242,7 +242,7 @@
 Forward.AcceleratorKey=0x27
 Forward.AcceleratorKey.Modifiers=alt
 
-Strongs.Name=Show Strongs Links
+Strongs.Name=Show Strong''s Links
 Strongs.ShortDescription=Show Strong''s links
 Strongs.LongDescription=Show Strong''s Numbers as Links
 Strongs.SmallIcon=

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -179,7 +179,7 @@
 Forward.AcceleratorKey=0x27
 Forward.AcceleratorKey.Modifiers=alt
 
-Strongs.Name=Show Strongs Links
+Strongs.Name=Show Strong''s Links
 Strongs.ShortDescription=\u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0644\u06CC\u0646\u06A9\u0647\u0627\u06CC \u0627\u0633\u062A\u0631\u0627\u0646\u06AF 
 Strongs.LongDescription=\u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0634\u0645\u0627\u0631\u0647\u0627\u06CC \u0644\u06CC\u0646\u06A9\u0647\u0627\u06CC \u0627\u0633\u062A\u0631\u0627\u0646\u06AF 
 Strongs.MnemonicKey=

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java	2007-07-04 15:20:10 UTC (rev 1472)
@@ -96,9 +96,9 @@
             finalPadX = 20;
             finalPadY = 5;
         }
-        this.add(labelMessage,  new GridBagConstraints(0, 0, 1, 1, 0.3, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(separator,     new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(panelProgress, new GridBagConstraints(2, 0, 1, 1, 0.7, 0.0, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), finalPadX, finalPadY));
+        this.add(labelMessage,  new GridBagConstraints(0, 0, 1, 1, 0.3, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(separator,     new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
+        this.add(panelProgress, new GridBagConstraints(2, 0, 1, 1, 0.7, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), finalPadX, finalPadY));
         GuiUtil.applyDefaultOrientation(this);
     }
 

Modified: trunk/bibledesktop/src/main/resources/config.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config.properties	2007-07-03 21:01:02 UTC (rev 1471)
+++ trunk/bibledesktop/src/main/resources/config.properties	2007-07-04 15:20:10 UTC (rev 1472)
@@ -12,10 +12,10 @@
 Bibles.DefaultCommentary.help=Which of the available Commentaries is the default.
 Bibles.DefaultDailyDevotional.path=Bibles.Default Daily Devotional
 Bibles.DefaultDailyDevotional.help=Which of the available Daily Devotionals is the default.
-Bibles.DefaultGreekDefinitions.path=Bibles.Default Greek Definitions (Strongs)
-Bibles.DefaultGreekDefinitions.help=Which of the available Greek Definitions (Strongs) is the default.
-Bibles.DefaultHebrewDefinitions.path=Bibles.Default Hebrew Definitions (Strongs)
-Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strongs) is the default.
+Bibles.DefaultGreekDefinitions.path=Bibles.Default Greek Definitions (Strong''s)
+Bibles.DefaultGreekDefinitions.help=Which of the available Greek Definitions (Strong''s) is the default.
+Bibles.DefaultHebrewDefinitions.path=Bibles.Default Hebrew Definitions (Strong''s)
+Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strong''s) is the default.
 Bibles.DefaultGreekParse.path=Bibles.Default Greek Morphology/Parsing Guides
 Bibles.DefaultGreekParse.help=Which of the available Greek Morphology/Parsing Guides is the default.
 Bibles.DefaultHebrewParse.path=Bibles.Default Hebrew Morphology/Parsing Guides




More information about the jsword-svn mailing list