[jsword-svn] r2048 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop biblemapper/src/main/java/org/crosswire/biblemapper/swing common-swing/src/main/java/org/crosswire/common/swing jsword/src/main/java/gnu/lgpl jsword/src/main/java/org/crosswire/jsword/book jsword/src/test/java/org/crosswire/jsword/passage jsword-limbo/src/main/java/org/crosswire/bibledesktop/book jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage jsword-limbo/src/main/java/org/crosswire/common/config/swing
dmsmith at crosswire.org
dmsmith at crosswire.org
Wed Dec 8 13:25:43 MST 2010
Author: dmsmith
Date: 2010-12-08 13:25:43 -0700 (Wed, 08 Dec 2010)
New Revision: 2048
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
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/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
trunk/jsword/src/main/java/gnu/lgpl/License.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookCategory.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java
Log:
Marked strings needing translators comments with I18N(DMS).
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -147,9 +147,11 @@
quickPicker.add(cboBooks);
quickPicker.add(cboChaps);
+ // I18N(DMS)
JLabel lblBible = CWLabel.createJLabel(Msg.gettext("Bible:"));
lblBible.setLabelFor(biblePicker);
+ // I18N(DMS)
JLabel lblKey = CWLabel.createJLabel(Msg.gettext("Show Passage:"));
txtKey = new JTextField();
txtKey.setAction(actions.getAction(PASSAGE_FIELD));
@@ -169,6 +171,7 @@
txtSearch = new JTextField();
txtSearch.setAction(actions.getAction(SEARCH_FIELD));
+ // I18N(DMS)
JLabel lblSearch = CWLabel.createJLabel(Msg.gettext("Search:"));
lblSearch.setLabelFor(txtSearch);
btnSearch = new JButton(actions.getAction(GO_SEARCH));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -94,7 +94,9 @@
private void init() {
actions = new ActionFactory(Msg.class, this);
+ // I18N(DMS)
JLabel lblAll = CWLabel.createJLabel(Msg.gettext("All Verses"));
+ // I18N(DMS)
JLabel lblSel = CWLabel.createJLabel(Msg.gettext("Selected Verses"));
this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -156,6 +158,7 @@
txtDisplay = new JTextField();
txtDisplay.getDocument().addDocumentListener(new CustomDocumentEvent());
+ // I18N(DMS)
JLabel lblDisplay = CWLabel.createJLabel(Msg.gettext("Verses"));
lblDisplay.setLabelFor(txtDisplay);
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 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -137,6 +137,7 @@
}
});
+ // I18N(DMS)
JLabel lblName = CWLabel.createJLabel(Msg.gettext("Site Name:"));
lblName.setLabelFor(txtName);
@@ -149,6 +150,7 @@
}
});
+ // I18N(DMS)
JLabel lblType = CWLabel.createJLabel(Msg.gettext("Site Type"));
lblType.setLabelFor(cboType);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -83,6 +83,7 @@
* For local installations
*/
public SitePane() {
+ // I18N(DMS)
this(null, Msg.gettext("Installed Books:"));
}
@@ -90,6 +91,7 @@
* For remote installations
*/
public SitePane(Installer bookListInstaller) {
+ // I18N(DMS)
this(bookListInstaller, Msg.gettext("Available Books:"));
}
@@ -193,6 +195,7 @@
*/
private Component createSelectedPanel() {
+ // I18N(DMS)
JLabel lblSelected = CWLabel.createJLabel(Msg.gettext("Selected Book:"));
display = new TextPaneBookMetaDataDisplay();
lblSelected.setLabelFor(display.getComponent());
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -77,7 +77,7 @@
}
private static String getVersion() {
- // TRANSLATOR the current version of the application.
+ // TRANSLATOR: the current version of the application.
// When translating use digits 0-9. They will be shaped appropriately.
return Msg.gettext("1.6");
}
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -92,6 +92,7 @@
});
// I18N: migrate this to an ActionFactory
+ // I18N(DMS)
btnOk.setText(Msg.gettext("OK"));
btnOk.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ev) {
@@ -102,6 +103,7 @@
btnOk.setDefaultCapable(true);
// I18N: migrate this to an ActionFactory
+ // I18N(DMS)
btnCancel.setText(Msg.gettext("Cancel"));
btnCancel.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ev) {
@@ -222,6 +224,7 @@
/**
* The title of the dialog
*/
+ // I18N(DMS)
private String title = Msg.gettext("Select a Bible");
/**
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -309,6 +309,7 @@
// The message in the exception
String msg = ex.getMessage();
if (msg == null || msg.equals("")) {
+ // I18N(DMS)
msg = UserMsg.gettext("No description available.");
}
String orig = XMLUtil.escape(msg);
Modified: trunk/jsword/src/main/java/gnu/lgpl/License.java
===================================================================
--- trunk/jsword/src/main/java/gnu/lgpl/License.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword/src/main/java/gnu/lgpl/License.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -549,6 +549,7 @@
* @return the warranty for this program
*/
public String getWarranty() {
+ // I18N(DMS)
return Msg.gettext("License.warranty", name);
}
@@ -558,6 +559,7 @@
* @return the details of this program's distribution license
*/
public String getDetails() {
+ // I18N(DMS)
return Msg.gettext("License.details", name);
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookCategory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookCategory.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookCategory.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -33,36 +33,47 @@
*/
public final class BookCategory implements Serializable, Comparable {
/** Books that are Bibles */
+ // I18N(DMS)
public static final BookCategory BIBLE = new BookCategory("Biblical Texts", UserMsg.gettext("Biblical Texts"));
/** Books that are Dictionaries */
+ // I18N(DMS)
public static final BookCategory DICTIONARY = new BookCategory("Lexicons / Dictionaries", UserMsg.gettext("Dictionaries"));
/** Books that are Commentaries */
+ // I18N(DMS)
public static final BookCategory COMMENTARY = new BookCategory("Commentaries", UserMsg.gettext("Commentaries"));
/** Books that are indexed by day. AKA, Daily Devotions */
+ // I18N(DMS)
public static final BookCategory DAILY_DEVOTIONS = new BookCategory("Daily Devotional", UserMsg.gettext("Daily Devotionals"));
/** Books that map words from one language to another. */
+ // I18N(DMS)
public static final BookCategory GLOSSARY = new BookCategory("Glossaries", UserMsg.gettext("Glossaries"));
/** Books that are questionable. */
+ // I18N(DMS)
public static final BookCategory QUESTIONABLE = new BookCategory("Cults / Unorthodox / Questionable Material", UserMsg.gettext("Cults / Unorthodox / Questionable Materials"));
/** Books that are just essays. */
+ // I18N(DMS)
public static final BookCategory ESSAYS = new BookCategory("Essays", UserMsg.gettext("Essays"));
/** Books that are predominately images. */
+ // I18N(DMS)
public static final BookCategory IMAGES = new BookCategory("Images", UserMsg.gettext("Images"));
/** Books that are a collection of maps. */
+ // I18N(DMS)
public static final BookCategory MAPS = new BookCategory("Maps", UserMsg.gettext("Maps"));
/** Books that are just books. */
+ // I18N(DMS)
public static final BookCategory GENERAL_BOOK = new BookCategory("Generic Books", UserMsg.gettext("General Books"));
/** Books that are not any of the above. This is a catch all for new book categories. */
+ // I18N(DMS)
public static final BookCategory OTHER = new BookCategory("Other", UserMsg.gettext("Other"));
/**
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -24,6 +24,7 @@
try {
AccuracyType.fromText("1:2:3:4", new String[] { "1", "2", "3", "4"}, null, null);
} catch (NoSuchVerseException nsve) {
+ // I18N(DMS)
NoSuchVerseException correctException = new NoSuchVerseException(UserMsg.gettext("Too many parts to the Verse. (Parts are separated by any of {0})", new Object[] {
"1:2:3:4, 1, 2, 3, 4"}));
assertEquals("Unexpected exception message", correctException.getMessage(), nsve.getMessage());
@@ -42,6 +43,7 @@
try {
AccuracyType.fromText("-1:2:3", new String[] { "-1", "2", "3"}, null, null);
} catch (NoSuchVerseException nsve) {
+ // I18N(DMS)
NoSuchVerseException correctException = new NoSuchVerseException(UserMsg.gettext("Too many parts to the Verse. (Parts are separated by any of {0})", new Object[] {
"-1:2:3, -1, 2, 3"}));
assertEquals("Unexpected exception message", correctException.getMessage(), nsve.getMessage());
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -75,8 +75,11 @@
set.setChapterComboBox(cboChaps);
set.setVerseComboBox(cboVerse);
+ // I18N(DMS)
cboBooks.setToolTipText(Msg.gettext("Select a book"));
+ // I18N(DMS)
cboChaps.setToolTipText(Msg.gettext("Select a chapter"));
+ // I18N(DMS)
cboVerse.setToolTipText(Msg.gettext("Select a verse"));
pnlSelect.setLayout(new FlowLayout());
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -145,13 +145,15 @@
}
/**
- * Returns the children of the reciever as an Enumeration.
+ * Returns the children of the receiver as an Enumeration.
*/
public String toString() {
if (ref == null) {
+ // I18N(DMS)
return Msg.gettext("The Whole Bible");
}
+ // I18N(DMS)
return Msg.gettext("Search ({0})", ref.getOverview());
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -90,6 +90,7 @@
label.setText(text);
} catch (Exception ex) {
Reporter.informUser(this, ex);
+ // TRANSLATOR: Unexpected error condition.
label.setText(Msg.gettext("Error"));
}
} else {
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2010-12-07 03:49:58 UTC (rev 2047)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2010-12-08 20:25:43 UTC (rev 2048)
@@ -82,6 +82,7 @@
layout = new CardLayout();
deck = new JPanel(layout);
+ // I18N(DMS)
title = new JLabel(UserMsg.gettext("Preferences"), SwingConstants.LEADING);
title.setIcon(TASK_ICON_LARGE);
title.setFont(getFont().deriveFont(Font.PLAIN, 16));
More information about the jsword-svn
mailing list