[jsword-svn] r2308 - in trunk/bibledesktop: . etc/eclipse src/main/java/org/crosswire/common/config/swing src/main/java/org/crosswire/common/swing src/main/java/org/crosswire/common/swing/desktop src/main/resources

dmsmith at crosswire.org dmsmith at crosswire.org
Tue Jan 28 09:07:16 MST 2014


Author: dmsmith
Date: 2014-01-28 09:07:15 -0700 (Tue, 28 Jan 2014)
New Revision: 2308

Modified:
   trunk/bibledesktop/build.xml
   trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
   trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
   trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
   trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch
   trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
   trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
   trunk/bibledesktop/src/main/resources/BDMsg.properties
   trunk/bibledesktop/src/main/resources/BDMsg_fa.properties
   trunk/bibledesktop/src/main/resources/BDMsg_in.properties
   trunk/bibledesktop/src/main/resources/BDMsg_tr.properties
   trunk/bibledesktop/src/main/resources/BDMsg_vi.properties
   trunk/bibledesktop/src/main/resources/BDMsg_zh.properties
   trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties
   trunk/bibledesktop/src/main/resources/config.properties
   trunk/bibledesktop/src/main/resources/config.xml
   trunk/bibledesktop/src/main/resources/config_de.properties
   trunk/bibledesktop/src/main/resources/config_fa.properties
   trunk/bibledesktop/src/main/resources/config_fa.txt
   trunk/bibledesktop/src/main/resources/config_in.properties
   trunk/bibledesktop/src/main/resources/config_vi.properties
   trunk/bibledesktop/src/main/resources/config_zh.properties
   trunk/bibledesktop/src/main/resources/config_zh_CN.properties
Log:
Consolidate messages into one place to make translation easier.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/build.xml	2014-01-28 16:07:15 UTC (rev 2308)
@@ -41,7 +41,7 @@
 	    		includes="**/*.java"
 	    		destdir="${dest.test.classes.dir}"
 				includeantruntime="false"
-				source="1.5">
+				target="1.5">
 			<src path="${gener.root}/config"/>
 			<classpath refid="classpath.test"/>
 		</javac>

Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch	2014-01-28 16:07:15 UTC (rev 2308)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/bibledesktop/build.xml"/>
 </listAttribute>
@@ -15,7 +15,7 @@
 <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/jdk6"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>

Modified: trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch	2014-01-28 16:07:15 UTC (rev 2308)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/bibledesktop/build.xml"/>
 </listAttribute>
@@ -15,7 +15,7 @@
 <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/jdk6"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>

Modified: trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-install.launch	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-install.launch	2014-01-28 16:07:15 UTC (rev 2308)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/bibledesktop/build.xml"/>
 </listAttribute>
@@ -12,7 +12,7 @@
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/jdk6"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>

Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch	2014-01-28 16:07:15 UTC (rev 2308)
@@ -16,7 +16,6 @@
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/bibledesktop/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/common-swing/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jsword/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;bibledesktop&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
 </listAttribute>

Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch	2014-01-28 16:07:15 UTC (rev 2308)
@@ -16,7 +16,6 @@
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/bibledesktop/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/common-swing/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jsword/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;bibledesktop&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
 </listAttribute>

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -37,9 +37,9 @@
 import javax.swing.UIManager;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.swing.CWScrollPane;
-import org.crosswire.common.swing.CWMsg;
 
 /**
  * A further refinement of a Tree Configuration Editor
@@ -148,7 +148,7 @@
 
         // TRANSLATOR: This is the label for the banner when one opens a type of Options/Preferences.
         // {0} is the type of preference, e.g. Bible Display
-        title.setText(CWMsg.gettext("{0} Preferences", obj));
+        title.setText(BDMsg.gettext("{0} Preferences", obj));
 
         // Get the name of the current deck
         Object[] list = tree.getSelectionPath().getPath();

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -28,9 +28,9 @@
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.swing.ActionFactory;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.util.Convert;
 
 /**
@@ -48,9 +48,9 @@
         ActionFactory actions = new ActionFactory(this);
 
         // TRANSLATOR: This is the text on a "Yes" button
-        on = new JRadioButton(actions.addAction("Yes", CWMsg.gettext("Yes")));
+        on = new JRadioButton(actions.addAction("Yes", BDMsg.gettext("Yes")));
         // TRANSLATOR: This is the text on a "No" button
-        off = new JRadioButton(actions.addAction("No", CWMsg.gettext("No")));
+        off = new JRadioButton(actions.addAction("No", BDMsg.gettext("No")));
 
         ButtonGroup group = new ButtonGroup();
         group.add(on);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -30,9 +30,9 @@
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.EdgeBorder;
-import org.crosswire.common.swing.CWMsg;
 
 /**
  * A pane that contains ok, cancel and apply buttons.
@@ -66,11 +66,11 @@
         buttons.setLayout(new GridLayout(1, 2, 10, 10));
         buttons.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
         // TRANSLATOR: This is the text on an "OK" button
-        buttons.add(new JButton(actions.addAction("OK", CWMsg.gettext("OK"))));
+        buttons.add(new JButton(actions.addAction("OK", BDMsg.gettext("OK"))));
         // TRANSLATOR: This is the text on a "Cancel" button
-        buttons.add(new JButton(actions.addAction("Cancel", CWMsg.gettext("Cancel"))));
+        buttons.add(new JButton(actions.addAction("Cancel", BDMsg.gettext("Cancel"))));
         // TRANSLATOR: This is the text on an "Apply" button
-        buttons.add(new JButton(actions.addAction("Apply", CWMsg.gettext("Apply"))));
+        buttons.add(new JButton(actions.addAction("Apply", BDMsg.gettext("Apply"))));
 
         this.setBorder(new EdgeBorder(SwingConstants.NORTH));
         this.setLayout(new BorderLayout(10, 10));

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -27,8 +27,8 @@
 import java.io.IOException;
 import java.net.URI;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Config;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.util.LucidRuntimeException;
 import org.crosswire.common.util.PluginUtil;
 import org.crosswire.common.util.Reporter;
@@ -117,7 +117,7 @@
                 config.localToPermanent(uri);
             } catch (IOException ex) {
                 // TRANSLATOR: Common error condition: Preferences could not be saved. {0} is a placeholder for the preference file.
-                throw new LucidRuntimeException(CWMsg.gettext("Could not save preferences: {0}", uri), ex);
+                throw new LucidRuntimeException(BDMsg.gettext("Could not save preferences: {0}", uri), ex);
             }
         }
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -29,10 +29,10 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.CWAction;
-import org.crosswire.common.swing.CWMsg;
 
 /**
  * A Filename selection.
@@ -53,9 +53,9 @@
         setLayout(new BorderLayout(10, 0));
         add(text, BorderLayout.CENTER);
         // TRANSLATOR: This is the text on a "Browse" button, that brings up a file selection dialog.
-        CWAction action = actions.addAction("Browse", CWMsg.gettext("Browse"));
+        CWAction action = actions.addAction("Browse", BDMsg.gettext("Browse"));
         // TRANSLATOR: This is the tooltip for a "Browse" button, that brings up a file selection dialog.
-        action.setTooltip(CWMsg.gettext("Browse for a directory to select."));
+        action.setTooltip(BDMsg.gettext("Browse for a directory to select."));
         add(new JButton(action), BorderLayout.LINE_END);
     }
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -38,10 +38,10 @@
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.CWScrollPane;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.util.Convert;
 
 /**
@@ -72,13 +72,13 @@
         JScrollPane scroll = new CWScrollPane(list);
 
         // TRANSLATOR: This is the text on an "Add" button.
-        buttons.add(new JButton(actions.addAction("Add", CWMsg.gettext("Add"))));
+        buttons.add(new JButton(actions.addAction("Add", BDMsg.gettext("Add"))));
         // TRANSLATOR: This is the text on a "Remove" button.
-        buttons.add(new JButton(actions.addAction("Remove", CWMsg.gettext("Remove"))));
+        buttons.add(new JButton(actions.addAction("Remove", BDMsg.gettext("Remove"))));
         // TRANSLATOR: This is the text on an "Update" button for a path
         // Note: The " (path)" is not to be translated.
         // It is here because some languages translate "Update" differently depending on context.
-        buttons.add(new JButton(actions.addAction("Update", CWMsg.gettext("Update (path)"))));
+        buttons.add(new JButton(actions.addAction("Update", BDMsg.gettext("Update (path)"))));
 
         setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEtchedBorder(), BorderFactory.createEmptyBorder(5, 5, 5, 5)));
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -43,13 +43,13 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.border.Border;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.swing.ActionFactory;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.swing.CWOptionPane;
+import org.crosswire.common.swing.CWOtherMsg;
 import org.crosswire.common.swing.CWScrollPane;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWOtherMsg;
 import org.crosswire.common.util.Convert;
 
 /**
@@ -79,11 +79,11 @@
         JScrollPane scroll = new CWScrollPane(list);
 
         // TRANSLATOR: This is the text on an "Add" button.
-        buttons.add(new JButton(actions.addAction("Add", CWMsg.gettext("Add"))));
+        buttons.add(new JButton(actions.addAction("Add", BDMsg.gettext("Add"))));
         // TRANSLATOR: This is the text on a "Remove" button.
-        buttons.add(new JButton(actions.addAction("Remove", CWMsg.gettext("Remove"))));
+        buttons.add(new JButton(actions.addAction("Remove", BDMsg.gettext("Remove"))));
         // TRANSLATOR: This is the text on an "Update" button.
-        buttons.add(new JButton(actions.addAction("Update", CWMsg.gettext("Update"))));
+        buttons.add(new JButton(actions.addAction("Update", BDMsg.gettext("Update"))));
 
         Border title = BorderFactory.createTitledBorder(CWOtherMsg.lookupText("Component Editor"));
         Border pad = BorderFactory.createEmptyBorder(5, 5, 5, 5);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -46,13 +46,13 @@
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.config.Config;
 import org.crosswire.common.swing.CWScrollPane;
 import org.crosswire.common.swing.FixedSplitPane;
 import org.crosswire.common.swing.FormPane;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWMsg;
 
 /**
  * A Configuration Editor that provides a tree for navigating to options.
@@ -83,7 +83,7 @@
         layout = new CardLayout();
 
         // TRANSLATOR: Label indicating that the user should select a preference category.
-        blank.add(new JLabel(CWMsg.gettext("Select a preference category")));
+        blank.add(new JLabel(BDMsg.gettext("Select a preference category")));
 
         deck.setLayout(layout);
         deck.add(blank, BLANK);
@@ -110,7 +110,7 @@
         title.setForeground(Color.white);
         title.setOpaque(true);
         // TRANSLATOR: This is the label for the banner when one opens Options/Preferences.
-        title.setText(CWMsg.gettext("Preferences"));
+        title.setText(BDMsg.gettext("Preferences"));
         title.setAlignmentX(SwingConstants.LEADING);
 
         panel.setLayout(new BorderLayout());
@@ -195,7 +195,7 @@
 
         // TRANSLATOR: This is the label for the banner when one opens a type of Options/Preferences.
         // {0} is the type of preference, e.g. Bible Display
-        title.setText(CWMsg.gettext("{0} Preferences", obj));
+        title.setText(BDMsg.gettext("{0} Preferences", obj));
 
         // Get the name of the current deck
         Object[] list = tree.getSelectionPath().getPath();

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -42,6 +42,8 @@
 import javax.swing.JRootPane;
 import javax.swing.UIManager;
 
+import org.crosswire.bibledesktop.BDMsg;
+
 /**
  * CWOptionPane is just like JOptionPane, but internationalize the button text
  * for some languages that Java does not handle, for which JSword has
@@ -781,13 +783,13 @@
     private static ActionFactory actions = new ActionFactory(null);
     static {
         // TRANSLATOR: This is the text on a "Yes" button.
-        actions.addAction("Yes", CWMsg.gettext("Yes"));
+        actions.addAction("Yes", BDMsg.gettext("Yes"));
         // TRANSLATOR: This is the text on a "No" button.
-        actions.addAction("No", CWMsg.gettext("No"));
+        actions.addAction("No", BDMsg.gettext("No"));
         // TRANSLATOR: This is the text on an "OK" button.
-        actions.addAction("OK", CWMsg.gettext("OK"));
+        actions.addAction("OK", BDMsg.gettext("OK"));
         // TRANSLATOR: This is the text on a "Cancel" button.
-        actions.addAction("Cancel", CWMsg.gettext("Cancel"));
+        actions.addAction("Cancel", BDMsg.gettext("Cancel"));
     }
 
     /**

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -57,6 +57,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.util.FileUtil;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.common.util.ReporterEvent;
@@ -87,7 +88,7 @@
     private void initialise() {
         String exmsg = MessageFormat.format("<html><font size=\"-1\">{0}</font> {1}",
                 // TRANSLATOR: When an error dialog is presented to the user, this labels the error.
-                CWMsg.gettext("An error has occurred:"), ExceptionPane.getHTMLDescription(ex)
+                BDMsg.gettext("An error has occurred:"), ExceptionPane.getHTMLDescription(ex)
         );
 
         // The upper pane
@@ -114,7 +115,7 @@
         detail = new JCheckBox();
         detail.addItemListener(new SelectedItemListener(this));
         // TRANSLATOR: When an error dialog is presented to the user, this labels the details of the error.
-        detail.setText(CWMsg.gettext("Details"));
+        detail.setText(BDMsg.gettext("Details"));
         if (detailShown) {
             buttons.add(detail, BorderLayout.LINE_START);
         }
@@ -151,7 +152,7 @@
             label.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
             label.setFont(courier);
             // TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source is unavailable.
-            label.setText(CWMsg.gettext("No File"));
+            label.setText(BDMsg.gettext("No File"));
             text = new JTextArea();
             text.setEditable(false);
             text.setFont(courier);
@@ -214,7 +215,7 @@
         Frame root = GuiUtil.getFrame(parent);
 
         // TRANSLATOR: When an error dialog is presented to the user, this is the title of the dialog.
-        String error = CWMsg.gettext("Error");
+        String error = BDMsg.gettext("Error");
 
         // If this dialog is not modal then if we display an exception dialog
         // where there is a modal dialog displayed then although this dialog
@@ -228,7 +229,7 @@
         final ActionFactory actions = new ActionFactory(pane);
 
         // TRANSLATOR: This is the text on an "OK" button.
-        JButton ok = actions.createJButton(actions.addAction("OK", CWMsg.gettext("OK")), new ActionListener() {
+        JButton ok = actions.createJButton(actions.addAction("OK", BDMsg.gettext("OK")), new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 dialog.dispose();
             }
@@ -310,7 +311,7 @@
         if (msg == null || "".equals(msg)) {
             // TRANSLATOR: When an error dialog is presented to the user, this is shown when
             // there is no other message available
-            msg = CWMsg.gettext("No description available.");
+            msg = BDMsg.gettext("No description available.");
         }
         String orig = XMLUtil.escape(msg);
         msg = orig.replaceAll("\n", "<br>");
@@ -323,7 +324,7 @@
         if (nex != null) {
             retcode.append("<p><br><font size=\"-1\">");
             // TRANSLATOR: When an error dialog is presented to the user, this labels the cause of the error.
-            retcode.append(CWMsg.gettext("This was caused by:"));
+            retcode.append(BDMsg.gettext("This was caused by:"));
             retcode.append("</font>");
             retcode.append(getHTMLDescription(nex));
         }
@@ -423,7 +424,7 @@
             String orig = name;
             Integer errorLine = Integer.valueOf(line_num);
             // TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source is unavailable.
-            mylabel.setText(CWMsg.gettext("No File"));
+            mylabel.setText(BDMsg.gettext("No File"));
 
             // Find a file
             name = File.separator + orig.replace('.', File.separatorChar) + FileUtil.EXTENSION_JAVA;
@@ -443,7 +444,7 @@
                         // TRANSLATOR: When an error dialog is presented to the user, this indicates that the location of the error in the Java source.
                         // {0} is a placeholder for the line number on which the error occurred.
                         // {1} is a placeholder for the Java file.
-                        String found = CWMsg.gettext("Error on line {0} in file {1}", errorLine, file.getCanonicalPath());
+                        String found = BDMsg.gettext("Error on line {0} in file {1}", errorLine, file.getCanonicalPath());
                         mylabel.setText(found);
                         in = new LineNumberReader(new FileReader(file));
                         while (true) {
@@ -486,12 +487,12 @@
             // TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source could not be found.
             // {1} is a placeholder for the line number on which the error occurred.
             // {0} is a placeholder for the Java file.
-            StringBuilder error = new StringBuilder(CWMsg.gettext("Cannot open source for: {0}, line: {1}\n", st.getClassName(level), errorLine));
+            StringBuilder error = new StringBuilder(BDMsg.gettext("Cannot open source for: {0}, line: {1}\n", st.getClassName(level), errorLine));
             for (int i = 0; i < srcs.length; i++) {
                 // TRANSLATOR: When an error dialog is presented to the user, and the Java source could not be found
                 // this indicates what locations were tried.
                 // {0} is a placeholder for the location.
-                error.append(CWMsg.gettext("Tried: {0}\n", srcs[i].getAbsolutePath() + name));
+                error.append(BDMsg.gettext("Tried: {0}\n", srcs[i].getAbsolutePath() + name));
             }
 
             mytext.setText(error.toString());

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -46,6 +46,8 @@
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
+import org.crosswire.bibledesktop.BDMsg;
+
 /**
  * FontChooserBean allows the user to select a font in a similar way to a
  * FileSelectionDialog.
@@ -82,12 +84,12 @@
         size.addItemListener(changer);
 
         // TRANSLATOR: This is an option for a bold font.
-        bold = new JCheckBox(CWMsg.gettext("Bold"));
+        bold = new JCheckBox(BDMsg.gettext("Bold"));
         bold.setSelected(font.isBold());
         bold.addItemListener(changer);
 
         // TRANSLATOR: This is an option for an italic font.
-        italic = new JCheckBox(CWMsg.gettext("Italic"));
+        italic = new JCheckBox(BDMsg.gettext("Italic"));
         italic.setSelected(font.isItalic());
         italic.addItemListener(changer);
 
@@ -119,14 +121,14 @@
         final ActionFactory actions = new ActionFactory(fontc);
 
         // TRANSLATOR: This is the text on an "OK" button.
-        JButton ok = actions.createJButton(actions.addAction("OK", CWMsg.gettext("OK")), new ActionListener() {
+        JButton ok = actions.createJButton(actions.addAction("OK", BDMsg.gettext("OK")), new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 fontc.dialog.dispose();
             }
         });
 
         // TRANSLATOR: This is the text on a "Cancel" button.
-        JButton cancel = actions.createJButton(actions.addAction("Cancel", CWMsg.gettext("Cancel")), new ActionListener() {
+        JButton cancel = actions.createJButton(actions.addAction("Cancel", BDMsg.gettext("Cancel")), new ActionListener() {
             public void actionPerformed(ActionEvent ex) {
                 fontc.dialog.setVisible(false);
                 fontc.font = null;
@@ -139,7 +141,7 @@
         buttons.add(cancel);
 
         // TRANSLATOR: Label indicating that the user should select a font.
-        fontc.setBorder(BorderFactory.createTitledBorder(CWMsg.gettext("Select Font")));
+        fontc.setBorder(BorderFactory.createTitledBorder(BDMsg.gettext("Select Font")));
 
         fontc.dialog.getRootPane().setDefaultButton(ok);
         fontc.dialog.getContentPane().setLayout(new BorderLayout());

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -38,6 +38,8 @@
 import javax.swing.JScrollPane;
 import javax.swing.text.html.HTMLEditorKit;
 
+import org.crosswire.bibledesktop.BDMsg;
+
 /**
  * .
  * 
@@ -84,7 +86,7 @@
         scrHelp.setBorder(null);
 
         // TRANSLATOR: This is the text on an "OK" button.
-        JButton btnOK = new JButton(actions.addAction("OK", CWMsg.gettext("OK")));
+        JButton btnOK = new JButton(actions.addAction("OK", BDMsg.gettext("OK")));
         JPanel pnlOK = new JPanel();
         pnlOK.setLayout(new FlowLayout(FlowLayout.TRAILING));
         pnlOK.add(btnOK, null);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -31,8 +31,8 @@
 import javax.swing.JPanel;
 import javax.swing.event.EventListenerList;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.swing.desktop.event.ViewEvent;
 import org.crosswire.common.swing.desktop.event.ViewEventListener;
 
@@ -229,7 +229,7 @@
     private String generateTitle() {
         // TRANSLATOR: This is the label on a Bible View tab when it is cleared.
         // {0} is a number to make the label unique.
-        return CWMsg.gettext("Untitled {0}", Integer.valueOf(base++));
+        return BDMsg.gettext("Untitled {0}", Integer.valueOf(base++));
     }
 
     /**

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -21,7 +21,7 @@
  */
 package org.crosswire.common.swing.desktop;
 
-import org.crosswire.common.swing.CWMsg;
+import org.crosswire.bibledesktop.BDMsg;
 
 
 /**
@@ -50,7 +50,7 @@
         public String toString() {
             // TRANSLATOR: This is the name of one of two different ways to present Bible Views.
             // These show up in Options/Preferences.
-            return CWMsg.gettext("Tabbed Document Interface");
+            return BDMsg.gettext("Tabbed Document Interface");
         }
     },
 
@@ -67,7 +67,7 @@
         public String toString() {
             // TRANSLATOR: This is the name of one of two different ways to present Bible Views.
             // These show up in Options/Preferences.
-            return CWMsg.gettext("Multiple Document Interface");
+            return BDMsg.gettext("Multiple Document Interface");
         }
     };
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -37,10 +37,10 @@
 import javax.swing.JToolBar;
 import javax.swing.SwingConstants;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.CWAction;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.util.OSType;
 
 /**
@@ -171,9 +171,9 @@
      */
     public JMenuItem getShowToggle() {
         // TRANSLATOR: This is the label of a view option allowing a user to show/hide the tool bar
-        CWAction action = actions.addAction("ToolBarToggle", CWMsg.gettext("Show Tool Bar"));
+        CWAction action = actions.addAction("ToolBarToggle", BDMsg.gettext("Show Tool Bar"));
         // TRANSLATOR: This is the tooltip for a view option allowing a user to show/hide the tool bar
-        action.setTooltip(CWMsg.gettext("Toggle the display of the tool bar"));
+        action.setTooltip(BDMsg.gettext("Toggle the display of the tool bar"));
         action.setAccelerator("B,ctrl");
         JCheckBoxMenuItem toggle = new JCheckBoxMenuItem(action);
         toggle.setSelected(true);
@@ -187,9 +187,9 @@
      */
     public JMenuItem getTextToggle() {
         // TRANSLATOR: This is the label of a view option allowing a user to show/hide the text for icons on the tool bar
-        CWAction action = actions.addAction("ToolBarText", CWMsg.gettext("Show Tool Bar Text"));
+        CWAction action = actions.addAction("ToolBarText", BDMsg.gettext("Show Tool Bar Text"));
         // TRANSLATOR: This is the tooltip for a view option allowing a user to show/hide the text for icons on the tool bar
-        action.setTooltip(CWMsg.gettext("Toggle the display of the tool bar text"));
+        action.setTooltip(BDMsg.gettext("Toggle the display of the tool bar text"));
         return new JCheckBoxMenuItem(action);
     }
 
@@ -201,9 +201,9 @@
      */
     public JMenuItem getIconSizeToggle() {
         // TRANSLATOR: This is the label of a view option allowing a user to toggle between large and small icons on the tool bar
-        CWAction action = actions.addAction("ToolBarSize", CWMsg.gettext("Large Tool Bar"));
+        CWAction action = actions.addAction("ToolBarSize", BDMsg.gettext("Large Tool Bar"));
         // TRANSLATOR: This is the tooltip for a view option allowing a user to toggle between large and small icons on the tool bar
-        action.setTooltip(CWMsg.gettext("Toggle size of the tool bar icons"));
+        action.setTooltip(BDMsg.gettext("Toggle size of the tool bar icons"));
         JCheckBoxMenuItem toggle = new JCheckBoxMenuItem(action);
         toggle.setSelected(true);
         return toggle;

Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java	2014-01-28 16:07:15 UTC (rev 2308)
@@ -33,9 +33,9 @@
 import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
 
+import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWMsg;
 import org.crosswire.common.swing.desktop.event.TitleChangedEvent;
 import org.crosswire.common.swing.desktop.event.TitleChangedListener;
 import org.crosswire.common.swing.desktop.event.ViewEvent;
@@ -104,10 +104,10 @@
 
         // TRANSLATOR: This is the name of one of two different ways to present Bible Views.
         // These show up in Options/Preferences.
-        tdiView = new JRadioButtonMenuItem(contextActions.addAction(TAB_MODE, CWMsg.gettext("Tabbed Document Interface")));
+        tdiView = new JRadioButtonMenuItem(contextActions.addAction(TAB_MODE, BDMsg.gettext("Tabbed Document Interface")));
         // TRANSLATOR: This is the name of one of two different ways to present Bible Views.
         // These show up in Options/Preferences.
-        mdiView = new JRadioButtonMenuItem(contextActions.addAction(WINDOW_MODE, CWMsg.gettext("Multiple Document Interface")));
+        mdiView = new JRadioButtonMenuItem(contextActions.addAction(WINDOW_MODE, BDMsg.gettext("Multiple Document Interface")));
 
         ButtonGroup grpViews = new ButtonGroup();
         grpViews.add(mdiView);

Modified: trunk/bibledesktop/src/main/resources/BDMsg.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -291,3 +291,38 @@
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB.\ Continue?={0} is {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB. Continue?
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB.\ Continue?={0} is {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB. Continue?
 {0}\ v{1}={0} v{1}
+
+An\ error\ has\ occurred\:=An error has occurred\:
+Apply=_Apply
+Bold=Bold
+Browse=_Browse
+Cannot\ open\ source\ for\:\ {0},\ line\:\ {1}=Cannot open source for\: {0}, line\: {1}\n
+Details=Details
+Error\ on\ line\ {0}\ in\ file\ {1}=Error on line {0} in file {1}
+Finish=_Finish
+Italic=Italic
+Next=_Next
+No\ File=No File
+No\ description\ available.=No description available.
+Remove=_Remove
+Select\ Font=Select Font
+This\ was\ caused\ by\:=This was caused by\:
+Tried\:\ {0}=Tried\: {0}\n
+Update=_Update
+
+Browse\ for\ a\ directory\ to\ select.=Browse for a directory to select.
+Could\ not\ save\ preferences\:\ {0}=Could not save preferences\: {0}
+Preferences=Preferences
+Select\ a\ preference\ category=Select a preference category
+Update\ (path)=Alias.Update
+{0}\ Preferences={0} Preferences
+
+Large\ Tool\ Bar=Large Tool Bar
+Multiple\ Document\ Interface=Multiple Document Interface
+Show\ Tool\ Bar=Show Tool Bar
+Show\ Tool\ Bar\ Text=Show Tool Bar Text
+Tabbed\ Document\ Interface=Tabbed Document Interface
+Toggle\ size\ of\ the\ tool\ bar\ icons=Toggle size of the tool bar icons
+Toggle\ the\ display\ of\ the\ tool\ bar=Toggle the display of the tool bar
+Toggle\ the\ display\ of\ the\ tool\ bar\ text=Toggle the display of the tool bar text
+

Modified: trunk/bibledesktop/src/main/resources/BDMsg_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_fa.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_fa.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -259,3 +259,37 @@
 {0}\ books\ installed.={0} \u06A9\u062A\u0627\u0628\u0647\u0627 \u0646\u0636\u0628 \u0647\u0633\u062A\u0646\u062A \u062F\u0631 \u0627\u06CC\u0646 \u06A9\u0645\u067E\u0648\u062A\u0631
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB.\ Continue?=\u0627\u0646\u062F\u0627\u0632\u0647{0}  {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB \u0647\u0633\u062A.  \u062F\u0627\u0646\u0644\u0648\u062F \u0631\u0627 \u0642\u0628\u0648\u0644 \u06A9\u0646\u06CC\u062F\u061F
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB.\ Continue?={0} \u0627\u0646\u062F\u0627\u0632\u0647 {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB \u0647\u0633\u062A. \u062F\u0627\u0646\u0644\u0648\u062F \u0631\u0627 \u0642\u0628\u0648\u0644 \u06A9\u0646\u06CC\u062F\u061F
+
+An\ error\ has\ occurred\:=\u0628\u0631\u0646\u0627\u0645\u0647 \u0645\u0634\u06A9\u0644 \u062F\u0631\u062F
+Apply=\u0627\u0646\u062C\u0627\u0645
+Bold=\u062F\u0631\u0634\u062A
+Browse=\u0627\u0646\u062A\u062E\u0627\u0628
+Cannot\ open\ source\ for\:\ {0},\ line\:\ {1}=\u0628\u0627\u0632 \u0646\u0634\u062F {0},\u062F\u0631 \u0633\u0637\u0631 {1}\N
+Copy.AcceleratorKey=C,ctrl
+Cut.AcceleratorKey=X,ctrl
+Details=\u062C\u0632\u062B\u06CC\u0627\u062A
+Error\ on\ line\ {0}\ in\ file\ {1}=\u0645\u0634\u06A9\u0644 \u062F\u0627\u0631 \u0633\u0637\u0631 {0} \u062F\u0631 \u067E\u0631\u0648\u0646\u062F\u0647{1}
+Finish=\u062A\u0645\u0627\u0645
+Italic=\u06A9\u062C
+Next=\u062C\u0644\u0648
+No\ File=\u067E\u0631\u0648\u0646\u062F\u0647 \u0648\u062C\u0648\u062F \u0646\u062F\u0627\u0631\u062F
+No\ description\ available.=\u062F\u0644\u06CC\u0644 \u0627\u06CC\u0646 \u0645\u0634\u06A9\u0644 \u0648\u0686\u0648\u062F \u0646\u062F\u0631\u062F
+Remove=\u062D\u0632\u0641 \u06A9\u0631\u062F\u0646
+Select\ Font=\u0627\u0646\u062A\u062E\u0627\u0628 \u0641\u0648\u0646\u062A
+This\ was\ caused\ by\:=\u062F\u0644\u06CC\u0644 \u0627\u06CC\u0646 \u0645\u0634\u06A9\u0644\:
+Tried\:\ {0}=\u0627\u0645\u062A\u062D\u0627\u0646 \u06A9\u0631\u062F\u0645\: {0}\N
+Update=\u0628\u0647 \u0631\u0648\u0632 \u06A9\u0631\u062F\u0646
+
+Browse\ for\ a\ directory\ to\ select.=\u0627\u0646\u062A\u062E\u0627\u0628
+Preferences=\u0627\u0646\u062A\u062E\u0627\u0628\u0647\u0627
+Select\ a\ preference\ category=\u0634\u0627\u062C\u0647 \u0627\u0632 \u062F\u0631\u062C\u062A \u0627\u0646\u062A\u062E\u0627\u0628 \u06A9\u0646\u06CC\u062F\!
+{0}\ Preferences={0} \u0627\u0646\u062A\u062E\u0627\u0628\u0647\u0627
+
+Large\ Tool\ Bar=\u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631 \u0628\u0632\u0631\u06AF
+Multiple\ Document\ Interface=\u067E\u0646\u062C\u0631\u0647 \u0647\u0627
+Show\ Tool\ Bar=\u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631
+Show\ Tool\ Bar\ Text=\u0645\u062A\u0646 \u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631
+Tabbed\ Document\ Interface=\u0636\u0641\u062D\u0647 \u0647\u0627
+Toggle\ size\ of\ the\ tool\ bar\ icons=\u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631 \u0628\u0632\u0631\u06AF
+Toggle\ the\ display\ of\ the\ tool\ bar=\u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631
+Toggle\ the\ display\ of\ the\ tool\ bar\ text=\u0645\u062A\u0646 \u0633\u062A\u0648\u0646 \u0627\u0628\u0632\u0627\u0631

Modified: trunk/bibledesktop/src/main/resources/BDMsg_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_in.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_in.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -255,3 +255,40 @@
 {0}\ books\ installed.={0} buku terinstall.
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB.\ Continue?={0} adalah {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB. Melanjutkan?
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB.\ Continue?={0} adalah {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB. Melanjutkan?
+
+An\ error\ has\ occurred\:=Kesalahan terjadi\:
+Apply=_Apply
+Back.AcceleratorKey=0x27,alt
+Bold=Tebal
+Browse=_Browse
+Copy.AcceleratorKey=C,ctrl
+Cut.AcceleratorKey=X,ctrl
+Error\ on\ line\ {0}\ in\ file\ {1}=Kesalahn pada line {0} in file {1}
+Finish=_Selesai
+Forward.AcceleratorKey=0x25,alt
+Help.AcceleratorKey=0x70
+Italic=Miring
+Next=Berikut_nya
+No\ File=Tidak ada Berkas
+No\ description\ available.=Tidak penjelasan
+Remove=Hapus
+Reset=_Reset
+Save.AcceleratorKey=S,ctrl
+Select\ Font=Pilih Font
+This\ was\ caused\ by\:=Ini disebabkan karena\:
+Tried\:\ {0}=Percobaan\: {0}\n
+Update=_Update
+
+Could\ not\ save\ preferences\:\ {0} = Gagal menyimpan preferensi: {0}
+Preferences = Preferensi
+{0}\ Preferences = {0} Preferensi
+Select\ a\ preference\ category = Pilih kategori preferensi
+
+Large\ Tool\ Bar=Besar Tool Bar
+Multiple\ Document\ Interface=Antar muka Multiple Document
+Show\ Tool\ Bar=Tampilkan Tool Bar
+Show\ Tool\ Bar\ Text=Tampilkan Tool Bar Teks
+Tabbed\ Document\ Interface=Antar muka Tabbed
+Toggle\ size\ of\ the\ tool\ bar\ icons=Tuas untuk tool bar ikon
+Toggle\ the\ display\ of\ the\ tool\ bar=Tuas untuk tampilan tool bar
+Toggle\ the\ display\ of\ the\ tool\ bar\ text=Tuas untuk tool bar teks

Modified: trunk/bibledesktop/src/main/resources/BDMsg_tr.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_tr.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_tr.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -25,3 +25,31 @@
 Navigate=Git
 Tools=Aletler
 View=Tema\u015Fa
+Add=Add
+Apply=Apply
+Back=Back
+Back.AcceleratorKey=0x27,alt
+Browse=Browse
+Cancel=Cancel
+Close=Close
+Copy=Copy
+Copy.AcceleratorKey=C,ctrl
+Cut=Cut
+Cut.AcceleratorKey=X,ctrl
+Delete=Delete
+Edit=Araştırmak
+Finish=Finish
+Forward=Forward
+Forward.AcceleratorKey=0x25,alt
+Go=Git
+Help=Yardım
+Help.AcceleratorKey=0x70
+Next=Next
+No=No
+OK=OK
+Remove=Remove
+Reset=Reset
+Save=Save
+Save.AcceleratorKey=S,ctrl
+Update=Update
+Yes=Yes

Modified: trunk/bibledesktop/src/main/resources/BDMsg_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_vi.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_vi.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -192,3 +192,37 @@
 Yes=C\u00F3
 You\ can\ use\ ||\ to\ join\ phrases,\ for\ example\ <code>balaam\ ||\ balak</code>\ finds\ passages\ containing\ Balak\ OR\ Balaam=B\u1EA1n c\u00F3 th\u1EC3 s\u1EED d\u1EE5ng || \u0111\u1EC3 k\u1EBFt h\u1EE3p c\u1EE5m t\u1EEB. V\u00ED d\u1EE5, <code>\u0111a-v\u00EDt || sa-l\u00F4-m\u00F4n</code> t\u00ECm \u0111\u01B0\u1EE3c ph\u00E2n \u0111o\u1EA1n ch\u1EE9a \u0111\u1EF1ng \u0110a-v\u00EDt ho\u1EB7c Sa-l\u00F4-m\u00F4n.
 You\ have\ no\ Bibles\ installed.\ Do\ you\ wish\ to\ install\ some\ now?=B\u1EA1n ch\u01B0a c\u00E0i \u0111\u1EB7t Kinh Th\u00E1nh. B\u1EA1n c\u00F3 mu\u1ED1n c\u00E0i \u0111\u1EB7t Kinh Th\u00E1nh ngay b\u00E2y gi\u1EDD kh\u00F4ng?
+
+An\ error\ has\ occurred\:=M\u1ED9t l\u1ED7i l\u1EA7m \u0111\u00E3 x\u1EA9y ra\:
+Apply=\u00C1p D\u1EE5ng
+Back.AcceleratorKey=0x27,alt
+Bold=Ch\u1EEF \u0110\u1EADm
+Browse=\u0110\u1ECDc l\u01B0\u1EDBt
+Cannot\ open\ source\ for\:\ {0},\ line\:\ {1}=Kh\u00F4ng m\u1EDF d\u01B0\u1EE3c ngu\u1ED3n g\u1ED1c cho\: {0}, d\u00F2ng\: {1}\n
+Close=Close
+Copy.AcceleratorKey=C,ctrl
+Cut.AcceleratorKey=X,ctrl
+Delete=Delete
+Details=Chi Ti\u1EBFt
+Error=L\u1ED7i
+Error\ on\ line\ {0}\ in\ file\ {1}=L\u1ED7i t\u1EA1i d\u00F2ng {0} trong t\u1EADp tin {1}
+Finish=K\u1EBFt Th\u00FAc
+Forward.AcceleratorKey=0x25,alt
+Help.AcceleratorKey=0x70
+Italic=Ch\u1EEF Nghi\u00EAng
+Next=\u0110i T\u1EDBi
+No\ File=Kh\u00F4ng C\u00F3 T\u1EADp Tin
+No\ description\ available.=Kh\u00F4ng c\u00F3 m\u00F4 t\u1EA3
+Remove=B\u1ECF \u0110i
+Reset=Reset
+Save.AcceleratorKey=S,ctrl
+Select\ Font=Ch\u1ECDn Ph\u00F4ng Ch\u1EEF
+This\ was\ caused\ by\:=L\u1ED7i n\u00E0y do\:
+Tried\:\ {0}=Th\u1EED\: {0}\n
+Update=C\u1EADp Nh\u1EADt
+
+Browse\ for\ a\ directory\ to\ select.=\u0110\u1ECDc l\u01B0\u1EDBt t\u00ECm t\u1EADp tin \u0111\u1EC3 ch\u1ECDn
+Could\ not\ save\ preferences\:\ {0}=Kh\u00F4ng l\u01B0u \u0111\u01B0\u1EE3c t\u1EADp tin c\u1EA5u h\u00ECnh\: {0}
+Preferences=T\u00EDnh Ch\u1EA5t
+Select\ a\ preference\ category=Ch\u1ECDn sub-node c\u1EE7a tree cho th\u00EAm tu\u1EF3 ch\u1ECDn n\u1EEFa.
+{0}\ Preferences={0} T\u00EDnh Ch\u1EA5t

Modified: trunk/bibledesktop/src/main/resources/BDMsg_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_zh.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_zh.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -225,3 +225,28 @@
 {0}\ books\ installed.={0} \u66F8\u5DF2\u5B89\u88DD.
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB.\ Continue?={0} \u5171 {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB. \u7E7C\u7E8C?
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB.\ Continue?={0} \u5171 {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB. \u7E7C\u7E8C?
+
+Apply=\u5957\u7528
+Back.AcceleratorKey=0x27,alt
+Browse=\u700F\u89BD
+Copy.AcceleratorKey=C,ctrl
+Cut.AcceleratorKey=X,ctrl
+Delete=Delete
+Finish=Finish
+Forward.AcceleratorKey=0x25,alt
+Help.AcceleratorKey=0x70
+Next=Next
+Remove=Remove
+Reset=Reset
+Save.AcceleratorKey=S,ctrl
+
+Browse\ for\ a\ directory\ to\ select.=\u9078\u64C7\u3127\u500B\u6A94\u6848
+
+Large\ Tool\ Bar=\u5927\u5DE5\u5177\u5716\u793A
+Multiple\ Document\ Interface=\u591A\u6587\u4EF6\u4ECB\u9762
+Show\ Tool\ Bar=\u5DE5\u5177\u5217
+Show\ Tool\ Bar\ Text=\u5DE5\u5177\u5716\u793A\u6587\u5B57
+Tabbed\ Document\ Interface=\u55AE\u6587\u4EF6\u4ECB\u9762
+Toggle\ size\ of\ the\ tool\ bar\ icons=\u5207\u63DB\u5DE5\u5177\u5716\u793A
+Toggle\ the\ display\ of\ the\ tool\ bar=\u986F\u793A\u5DE5\u5177\u5217
+Toggle\ the\ display\ of\ the\ tool\ bar\ text=\u5207\u63DB\u5716\u793A\u6587\u5B57

Modified: trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -224,3 +224,28 @@
 {0}\ books\ installed.={0} \u4E66\u5DF2\u5B89\u88C5.
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB.\ Continue?={0} \u5171 {1,number,\#\#\#,\#\#\#,\#\#\#.\#}KB. \u7EE7\u7EED?
 {0}\ is\ {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB.\ Continue?={0} \u5171 {1,number,\#\#\#,\#\#\#,\#\#\#.\#}MB. \u7EE7\u7EED?
+
+Apply=\u5957\u7528
+Back.AcceleratorKey=0x27,alt
+Browse=\u6D4F\u89C8
+Copy.AcceleratorKey=C,ctrl
+Cut.AcceleratorKey=X,ctrl
+Delete=Delete
+Finish=Finish
+Forward.AcceleratorKey=0x25,alt
+Help.AcceleratorKey=0x70
+Next=Next
+Remove=Remove
+Reset=Reset
+Save.AcceleratorKey=S,ctrl
+
+Browse\ for\ a\ directory\ to\ select.=\u9009\u62E9\u3127\u4E2A\u6863\u6848
+
+Large\ Tool\ Bar=\u5927\u5DE5\u5177\u56FE\u793A
+Multiple\ Document\ Interface=\u591A\u6587\u4EF6\u4ECB\u9762
+Show\ Tool\ Bar=\u5DE5\u5177\u5217
+Show\ Tool\ Bar\ Text=\u5DE5\u5177\u56FE\u793A\u6587\u5B57
+Tabbed\ Document\ Interface=\u5355\u6587\u4EF6\u4ECB\u9762
+Toggle\ size\ of\ the\ tool\ bar\ icons=\u5207\u6362\u5DE5\u5177\u56FE\u793A
+Toggle\ the\ display\ of\ the\ tool\ bar=\u663E\u793A\u5DE5\u5177\u5217
+Toggle\ the\ display\ of\ the\ tool\ bar\ text=\u5207\u6362\u56FE\u793A\u6587\u5B57

Modified: trunk/bibledesktop/src/main/resources/config.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -41,6 +41,8 @@
 Bibles.DefaultHebrewParse.help=Which of the available Hebrew Morphology/Parsing Guides is the default.
 
 BibleDisplay.name=Bible Display
+BibleDisplay.FullBookName.name=Use Full Book Names
+BibleDisplay.FullBookName.help=Should full Bible book names or abbreviations be used.
 BibleDisplay.Reuse.name=Open links in same Bible View
 BibleDisplay.Reuse.help=Reuse Bible View for links.
 BibleDisplay.MaxPickers.name=Parallel Bible Limit
@@ -55,6 +57,7 @@
 BibleDisplay.RankedVerses.help=How many verses do you want to return from a Matched search.
 BibleDisplay.ConfigurableFont.name=Select Font
 BibleDisplay.ConfigurableFont.help=The font to be used to display books.
+BibleDisplay.AntiAliasDisplay.hidden=true
 BibleDisplay.AntiAliasDisplay.name=Font Smoothing
 BibleDisplay.AntiAliasDisplay.help=Font smoothing can be slow, but can help the appearance of some fonts.
 
@@ -64,15 +67,19 @@
 SwordBook.DownloadDirectory.name=Download Directory
 SwordBook.DownloadDirectory.help=Where should we store newly downloaded books.
 
+Passages.hidden=true
 Passages.name=Passages
+Passages.PersistentNaming.hidden=true
 Passages.PersistentNaming.name=Retain Book Names
 Passages.PersistentNaming.help=When set to 'no' the verse references entered in 'Show Passage' are rewritten
 Passages.FullBookName.name=Use Full Book Names
 Passages.FullBookName.help=Should full Bible book names or abbreviations be used.
+Passages.BlurringRules.hidden=true
 Passages.BlurringRules.name=Passage Expansion Rules
 Passages.BlurringRules.help=Stay within chapter boundaries or not.
 Passages.BlurringRules.alternative.0=None
 Passages.BlurringRules.alternative.1=Stay within chapter boundaries
+Passages.BookCase.hidden=true
 Passages.BookCase.name=Book Case
 Passages.BookCase.help=What case should we use to display the Bible book names.
 Passages.BookCase.alternative.0=lower

Modified: trunk/bibledesktop/src/main/resources/config.xml
===================================================================
--- trunk/bibledesktop/src/main/resources/config.xml	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config.xml	2014-01-28 16:07:15 UTC (rev 2308)
@@ -111,6 +111,10 @@
     <map name="hebrewparse-names"/>
   </option>
 
+  <option key="BibleDisplay.FullBookName" type="boolean">
+    <introspect class="org.crosswire.jsword.versification.BookName" property="FullBookName"/>
+  </option>
+
 <!-- At this time we only have one converter -->
   <option key="BibleDisplay.Converter" type="string-options">
     <introspect class="org.crosswire.jsword.util.ConverterFactory" property="CurrentConverterName"/>
@@ -178,12 +182,8 @@
     <introspect class="org.crosswire.jsword.passage.PassageUtil" property="PersistentNaming"/>
   </option>
 
-  <option key="Passages.FullBookName" type="boolean">
-    <introspect class="org.crosswire.jsword.versification.BibleInfo" property="FullBookName"/>
-  </option>
-
   <option key="Passages.BookCase" type="int-options">
-    <introspect class="org.crosswire.jsword.versification.BibleInfo" property="Case"/>
+    <introspect class="org.crosswire.jsword.versification.BookName" property="Case"/>
     <alternative number="0"/>
     <alternative number="1"/>
     <alternative number="2"/>

Modified: trunk/bibledesktop/src/main/resources/config_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_de.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_de.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -113,8 +113,8 @@
 Passages.BookCase.help=
 Passages.BookCase.ignore=
 Passages.BookCase.name=Gro\u00DF-/Kleinschreibung von Buchnamen
-Passages.FullBookName.help=Vollst\u00E4ndige Buchnamen oder Abk\u00FCrzungen verwenden
-Passages.FullBookName.name=Vollst\u00E4ndige Buchnamen verwenden
+BibleDisplay.FullBookName.help=Vollst\u00E4ndige Buchnamen oder Abk\u00FCrzungen verwenden
+BibleDisplay.FullBookName.name=Vollst\u00E4ndige Buchnamen verwenden
 Passages.PersistentNaming.help=Wenn ausgeschaltet, werden bei "Abschnitt zeigen" eingegebene Versreferenzen in eine Standardform umgeschrieben
 Passages.PersistentNaming.name=Eingegebene Buchnamen beibehalten
 Passages.name=Passagen

Modified: trunk/bibledesktop/src/main/resources/config_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_fa.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -69,8 +69,8 @@
 Passages.name=\u0642\u0633\u0645\u062A\u0647\u0627
 Passages.PersistentNaming.name=\u062D\u0633\u0645\u0647\u0627 \u0646\u0648\u0632\u06CC
 Passages.PersistentNaming.help=
-Passages.FullBookName.name=\u0627\u0633\u0645 \u06A9\u062A\u0627\u0628\u0647\u0627 \u06A9\u0627\u0645\u0644
-Passages.FullBookName.help=
+BibleDisplay.FullBookName.name=\u0627\u0633\u0645 \u06A9\u062A\u0627\u0628\u0647\u0627 \u06A9\u0627\u0645\u0644
+BibleDisplay.FullBookName.help=
 Passages.BlurringRules.name=\u062C\u0642\u062F\u0631 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0639\u0647
 Passages.BlurringRules.help=\u0628\u06CC\u0634\u062A\u0631 \u0627\u0633 \u06CC\u06A9 \u0628\u0627\u0628 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0639\u0647\u061F
 Passages.BlurringRules.alternative.0=\u0647\u06CC\u062C

Modified: trunk/bibledesktop/src/main/resources/config_fa.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.txt	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_fa.txt	2014-01-28 16:07:15 UTC (rev 2308)
@@ -75,8 +75,8 @@
 Passages.name=قسمتها
 Passages.PersistentNaming.name=حسمها نوزی
 Passages.PersistentNaming.help=
-Passages.FullBookName.name=اسم کتابها کامل
-Passages.FullBookName.help=
+BibleDisplay.FullBookName.name=اسم کتابها کامل
+BibleDisplay.FullBookName.help=
 Passages.BlurringRules.name=جقدر در هر صفعه
 Passages.BlurringRules.help=بیشتر اس یک باب در هر صفعه؟
 Passages.BlurringRules.alternative.0=هیج

Modified: trunk/bibledesktop/src/main/resources/config_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_in.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_in.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -67,8 +67,8 @@
 Passages.name=Ayat/Pasal
 Passages.PersistentNaming.name=Mengingat Nama Buku
 Passages.PersistentNaming.help=Ketika tidak di set, maka passage akan di tulis ulang
-Passages.FullBookName.name=Gunakan Nama Lengkan Buku
-Passages.FullBookName.help=Pengguaan nama lengkap buku atau singkatan.
+BibleDisplay.FullBookName.name=Gunakan Nama Lengkan Buku
+BibleDisplay.FullBookName.help=Pengguaan nama lengkap buku atau singkatan.
 Passages.BlurringRules.name=Aturan expansi dari Ayat
 Passages.BlurringRules.help=Dalam batasan pasal atau tidak.
 Passages.BlurringRules.alternative.0=Tidak

Modified: trunk/bibledesktop/src/main/resources/config_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_vi.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_vi.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -65,8 +65,8 @@
 Passages.name=Ph\u00E2n \u0110o\u1EA1n
 Passages.PersistentNaming.name=Gi\u1EEF H\u00ECnh Th\u1EE9c c\u1EE7a Ph\u00E2n \u0110o\u1EA1n T\u1EEB Ngu\u1ED3n
 Passages.PersistentNaming.help=Gi\u1EEF h\u00ECnh th\u1EE9c c\u1EE7a ph\u00E2n \u0111o\u1EA1n t\u1EEB ngu\u1ED3n hay kh\u00F4ng.
-Passages.FullBookName.name=D\u00F9ng T\u00EAn S\u00E1ch Kinh Th\u00E1nh Ho\u00E0n Ch\u1EC9nh
-Passages.FullBookName.help=D\u00F9ng t\u00EAn s\u00E1ch Kinh Th\u00E1nh ho\u00E0n ch\u1EC9nh hay kh\u00F4ng. 
+BibleDisplay.FullBookName.name=D\u00F9ng T\u00EAn S\u00E1ch Kinh Th\u00E1nh Ho\u00E0n Ch\u1EC9nh
+BibleDisplay.FullBookName.help=D\u00F9ng t\u00EAn s\u00E1ch Kinh Th\u00E1nh ho\u00E0n ch\u1EC9nh hay kh\u00F4ng. 
 Passages.BlurringRules.name=Quy T\u1EAFc M\u1EDF R\u1ED9ng Ph\u00E2n \u0110o\u1EA1n 
 Passages.BlurringRules.help=Quy t\u1EAFc m\u1EDF r\u1ED9ng ph\u00E2n \u0111o\u1EA1n m\u1EB7c \u0111\u1ECBnh \u002D ch\u1EC9 hi\u1EC7n theo ch\u01B0\u01A1ng hay kh\u00F4ng. 
 Passages.BlurringRules.alternative.0=Kh\u00F4ng 

Modified: trunk/bibledesktop/src/main/resources/config_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_zh.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_zh.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -113,8 +113,8 @@
 Passages.BookCase.help=\u4F7F\u7528\u90A3\u3127\u500B\u66F8\u6AC3\u986F\u793A\u8056\u7D93\u7684\u66F8\u5377\u540D\u7A31
 Passages.BookCase.ignore=
 Passages.BookCase.name=\u66F8\u6AC3
-Passages.FullBookName.help=\u986F\u793A\u5B8C\u6574\u7684\u66F8\u5377\u540D
-Passages.FullBookName.name=\u4F7F\u7528\u5B8C\u6574\u7684\u66F8\u5377\u540D
+BibleDisplay.FullBookName.help=\u986F\u793A\u5B8C\u6574\u7684\u66F8\u5377\u540D
+BibleDisplay.FullBookName.name=\u4F7F\u7528\u5B8C\u6574\u7684\u66F8\u5377\u540D
 Passages.PersistentNaming.help=\u8F38\u5165\u540D\u7A31
 Passages.PersistentNaming.name=\u6301\u7E8C\u547D\u540D
 Passages.name=\u4E3B\u984C\u95B1\u8B80

Modified: trunk/bibledesktop/src/main/resources/config_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_zh_CN.properties	2013-03-18 17:59:44 UTC (rev 2307)
+++ trunk/bibledesktop/src/main/resources/config_zh_CN.properties	2014-01-28 16:07:15 UTC (rev 2308)
@@ -113,8 +113,8 @@
 Passages.BookCase.help=\u4F7F\u7528\u90A3\u3127\u4E2A\u4E66\u67DC\u663E\u793A\u5723\u7ECF\u7684\u4E66\u5377\u540D\u79F0
 Passages.BookCase.ignore=
 Passages.BookCase.name=\u4E66\u67DC
-Passages.FullBookName.help=\u663E\u793A\u5B8C\u6574\u7684\u4E66\u5377\u540D
-Passages.FullBookName.name=\u663E\u793A\u5B8C\u6574\u7684\u4E66\u5377\u540D
+BibleDisplay.FullBookName.help=\u663E\u793A\u5B8C\u6574\u7684\u4E66\u5377\u540D
+BibleDisplay.FullBookName.name=\u663E\u793A\u5B8C\u6574\u7684\u4E66\u5377\u540D
 Passages.PersistentNaming.help=\u8F93\u5165\u540D\u79F0
 Passages.PersistentNaming.name=\u6301\u7EED\u547D\u540D
 Passages.name=\u4E3B\u9898\u9605\u8BFB




More information about the jsword-svn mailing list