[jsword-svn] r2105 - in trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop: book book/install desktop display/basic passage
dmsmith at crosswire.org
dmsmith at crosswire.org
Mon Mar 7 14:13:32 MST 2011
Author: dmsmith
Date: 2011-03-07 14:13:31 -0700 (Mon, 07 Mar 2011)
New Revision: 2105
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.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/InternetWarning.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
Log:
BD-156 Added translator instructions to strings in bibledesktop
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -282,7 +282,7 @@
scrSummary = new CWScrollPane(txtSummary);
scrSummary.setVisible(false);
- // TRANSLATOR: Button to initiate the close the window and initiate search.
+ // TRANSLATOR: Button to initiate closing the window and initiating search.
btnGo = new JButton(actions.addAction("Done", BDMsg.gettext("Search")));
this.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -149,14 +149,15 @@
quickPicker.add(cboBooks);
quickPicker.add(cboChaps);
- // I18N(DMS)
+ // TRANSLATOR: This is the label for the Bible pickers
JLabel lblBible = CWLabel.createJLabel(BDMsg.gettext("Bible:"));
lblBible.setLabelFor(biblePicker);
- // I18N(DMS)
+ // TRANSLATOR: This is the label for the text box that show the passage
JLabel lblKey = CWLabel.createJLabel(BDMsg.gettext("Show Passage:"));
- CWAction action = actions.addAction("PassageAction", BDMsg.gettext("Passage"));
+ CWAction action = actions.addAction("PassageAction");
+ // TRANSLATOR: This is the tooltip for the Show Passage text box
action.setTooltip(BDMsg.gettext("Enter a passage to display. Press CTRL+ENTER or press the ... button for a Passage selection window."));
txtKey = new JTextField();
txtKey.setAction(action);
@@ -171,28 +172,39 @@
}
}
});
+ // TRANSLATOR: This labels a button that brings up a dialog box
+ // to select Bible book, chapter and verses
action = actions.addAction("More", BDMsg.gettext("Select"));
action.setTooltip(BDMsg.gettext("Pick a passage to display"));
btnKey = new JButton(action);
+ // TRANSLATOR: The label of the button tied to the Show Passage text box
+ // Note: The " (passage)" is not to be translated.
+ // It is here because some languages translate "Go" differently depending on context.
action = actions.addAction("GoPassage", BDMsg.gettext("Go (passage)"));
action.setTooltip(BDMsg.gettext("Display the passage"));
btnKeyGo = new JButton(action);
- action = actions.addAction("SearchAction", BDMsg.gettext("Search (text)"));
+ // FIXME(DMS): remove "Search (text)" from translations
+ action = actions.addAction("SearchAction"); // , BDMsg.gettext("Search (text)"));
+ // TRANSLATOR: The tooltip for the Search text box.
action.setTooltip(BDMsg.gettext("Search for a passage."));
txtSearch = new JTextField();
txtSearch.setAction(action);
- // I18N(DMS)
+ // TRANSLATOR: The label for the Search text box.
JLabel lblSearch = CWLabel.createJLabel(BDMsg.gettext("Search:"));
lblSearch.setLabelFor(txtSearch);
+ // TRANSLATOR: The label of the button tied to the Search text box
+ // Note: The " (search)" is not to be translated.
+ // It is here because some languages translate "Go" differently depending on context.
action = actions.addAction("GoSearch", BDMsg.gettext("Go (search)"));
action.setTooltip(BDMsg.gettext("Search for a passage."));
btnSearch = new JButton(action);
action = actions.addAction("HelpAction");
+ // TRANSLATOR: The tooltip for the help button that brings up Quick Search Tips
action.setTooltip(BDMsg.gettext("Quick Search Help"));
action.setSmallIcon("toolbarButtonGraphics/general/ContextualHelp16.gif");
JButton btnHelp = GuiUtil.flatten(new JButton(action));
@@ -204,11 +216,15 @@
String msg = BDMsg.gettext("<html><b>Search Tips.</b><br>You can use || to join phrases, for example \"<code>balaam || balak</code>\" finds passages containing Balak OR Balaam<br>Using && requires both words, e.g. \"<code>aaron && moses</code>\" finds passages containing both Aaron AND Moses<br>Using a ! removes words from the result e.g. \"<code>lord ! jesus</code>\" is passages containing Lord BUT NOT Jesus<br>Using ~2 widens the passage by 2 verses either side on any match. So \"<code>amminadab ~1 perez</code>\" finds<br>verses containting Amminadab within 1 verse of mention of Perez.<br>Using +[Gen-Exo] at the beginning will restrict a search to that range of verses.");
dlgHelp = new QuickHelpDialog(GuiUtil.getFrame(this), dialogTitle, msg);
+ // TRANSLATOR: The label for the button that brings up the Advanced Search dialog
action = actions.addAction("Advanced", BDMsg.gettext("Advanced"));
+ // TRANSLATOR: The tooltip for the button that brings up the Advanced Search dialog
action.setTooltip(BDMsg.gettext("Advanced Search"));
btnAdvanced = new JButton(action);
+ // TRANSLATOR: The label for the button that creates a search index for the selected book.
action = actions.addAction("Index", BDMsg.gettext("Enable Search"));
+ // TRANSLATOR: The tooltip for the button that creates a search index for the selected book.
action.setTooltip(BDMsg.gettext("Create a search index"));
btnIndex = new JButton(action);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -80,11 +80,15 @@
JPanel buttonBox = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0));
CWAction action = actions.addAction("RemovePicker");
+ // TRANSLATOR: This is a tooltip for an icon that allows one to
+ // remove a Bible from the parallel Bible view
action.setTooltip(BDMsg.gettext("Remove a parallel Bible"));
action.setSmallIcon("images/subtract-13.png");
buttonBox.add(GuiUtil.flatten(new JButton(action)));
action = actions.addAction("AddPicker");
+ // TRANSLATOR: This is a tooltip for an icon that allows one to
+ // add a Bible from the parallel Bible view
action.setTooltip(BDMsg.gettext("Add a parallel Bible"));
action.setSmallIcon("images/add-13.png");
buttonBox.add(GuiUtil.flatten(new JButton(action)));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -97,14 +97,18 @@
actions = new ActionFactory(this);
CWAction action;
- // I18N(DMS)
+ // TRANSLATOR: This is the label of the Book/Chapter/Verse tree of the entire Bible
JLabel lblAll = CWLabel.createJLabel(BDMsg.gettext("All Verses"));
- // I18N(DMS)
+ // TRANSLATOR: This is the label of the Book/Chapter/Verse tree of the chosen verses
JLabel lblSel = CWLabel.createJLabel(BDMsg.gettext("Selected Verses"));
+ // TRANSLATOR: This is the label for the button that moves Books/Chapter/Verses from the Selected Verses tree
action = actions.addAction("DeleteVerse", BDMsg.gettext("Remove <"));
+ // TRANSLATOR: This is the tooltip for the button that moves Books/Chapter/Verses from the Selected Verses tree
action.setTooltip(BDMsg.gettext("Delete verses from the list selected."));
JButton deleteButton = new JButton(action);
+ // TRANSLATOR: This is the label for the button that moves Books/Chapter/Verses to the Selected Verses tree
action = actions.addAction("AddVerse", BDMsg.gettext("Add >"));
+ // TRANSLATOR: This is the tooltip for the button that moves Books/Chapter/Verses to the Selected Verses tree
action.setTooltip(BDMsg.gettext("Add verses to list selected."));
JButton addButton = new JButton(action);
@@ -167,7 +171,8 @@
txtDisplay = new JTextField();
txtDisplay.getDocument().addDocumentListener(new CustomDocumentEvent());
- // I18N(DMS)
+ // TRANSLATOR: This is the label for the text box showing a compact representation
+ // of the verses in the Selected Verses tree
JLabel lblDisplay = CWLabel.createJLabel(BDMsg.gettext("Verses"));
lblDisplay.setLabelFor(txtDisplay);
@@ -295,7 +300,9 @@
KeyStroke esc = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
bailout = true;
+ // TRANSLATOR: This is the label for the button that closes the window and returns the selected verses
CWAction action = actions.addAction("Done", BDMsg.gettext("OK"));
+ // TRANSLATOR: This is the tooltip for the button that closes the window and returns the selected verses
action.setTooltip(BDMsg.gettext("Close this window."));
JButton btnGo = new JButton(action);
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 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -109,15 +109,21 @@
}
});
+ // TRANSLATOR: This is the label for the button that allows the user to add a new download site
CWAction action = actions.addAction("Add", BDMsg.gettext("Add"));
+ // TRANSLATOR: This is the tooltip for the button that allows the user to add a new download site
action.setTooltip(BDMsg.gettext("Add a new installation site."));
JButton btnAdd = new JButton(action);
+ // TRANSLATOR: This is the label for the button that allows the user to edit an existing download site
action = actions.addAction("Edit", BDMsg.gettext("Edit"));
+ // TRANSLATOR: This is the tooltip for the button that allows the user to edit an existing download site
action.setTooltip(BDMsg.gettext("Edit the current installation site."));
JButton btnEdit = new JButton(action);
+ // TRANSLATOR: This is the label for the button that allows the user to remove an existing download site
action = actions.addAction("Delete", BDMsg.gettext("Delete"));
+ // TRANSLATOR: This is the tooltip for the button that allows the user to remove an existing download site
action.setTooltip(BDMsg.gettext("Delete Site?"));
JButton btnDelete = new JButton(action);
@@ -147,7 +153,7 @@
}
});
- // I18N(DMS)
+ // TRANSLATOR: This is the label for a Site Name text box
JLabel lblName = CWLabel.createJLabel(BDMsg.gettext("Site Name:"));
lblName.setLabelFor(txtName);
@@ -160,18 +166,26 @@
}
});
- // I18N(DMS)
+ // TRANSLATOR: This is the label for the dropdown giving the type of the site
+ // either FTP or HTTP
+ // This is currently unused, as we only do HTTP, but will be present soon.
JLabel lblType = CWLabel.createJLabel(BDMsg.gettext("Site Type"));
lblType.setLabelFor(cboType);
lblMesg = new JLabel();
lblMesg.setText(" ");
+ // TRANSLATOR: This is the label for a button that resets the details for a download site
+ // to what was last saved.
action = actions.addAction("Reset", BDMsg.gettext("Reset"));
+ // TRANSLATOR: This is the tooltip for a button that resets the details for a download site
+ // to what was last saved.
action.setTooltip(BDMsg.gettext("Reset the details."));
JButton btnReset = new JButton(action);
+ // TRANSLATOR: This is the label for a button that saves the details for a download site
action = actions.addAction("Save", BDMsg.gettext("Save"));
+ // TRANSLATOR: This is the tooltip for a button that saves the details for a download site
action.setTooltip(BDMsg.gettext("Save the current changes."));
JButton btnSave = new JButton(action);
@@ -206,6 +220,7 @@
this.setLayout(new BorderLayout());
this.add(sptMain, BorderLayout.CENTER);
+ // TRANSLATOR: This is the label for a button that closes the dialog
btnClose = new JButton(actions.addAction("Close", BDMsg.gettext("Close")));
pnlAction = new JPanel();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -84,7 +84,9 @@
final InternetWarning webWarning = new InternetWarning();
JPanel buttons = new JPanel();
+ // TRANSLATOR: This is the text on a "Yes" button.
JButton yesButton = new JButton(webWarning.actions.addAction("Yes", BDMsg.gettext("Yes")));
+ // TRANSLATOR: This is the text on a "No" button.
JButton noButton = new JButton(webWarning.actions.addAction("No", BDMsg.gettext("No")));
buttons.add(yesButton);
buttons.add(noButton);
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 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -85,7 +85,7 @@
* For local installations
*/
public SitePane() {
- // I18N(DMS)
+ // TRANSLATOR: This is the label for a list of installed books
this(null, BDMsg.gettext("Installed Books:"));
}
@@ -93,7 +93,7 @@
* For remote installations
*/
public SitePane(Installer bookListInstaller) {
- // I18N(DMS)
+ // TRANSLATOR: This is the label for a list of available books
this(bookListInstaller, BDMsg.gettext("Available Books:"));
}
@@ -193,7 +193,7 @@
*/
private Component createSelectedPanel() {
- // I18N(DMS)
+ // TRANSLATOR: This is the label for the display of information about the selected book
JLabel lblSelected = CWLabel.createJLabel(BDMsg.gettext("Selected Book:"));
display = new TextPaneBookMetaDataDisplay();
lblSelected.setLabelFor(display.getComponent());
@@ -270,7 +270,9 @@
if (installer != null) {
panel.setLayout(new GridLayout(1, 2, 3, 3));
+ // TRANSLATOR: This is the text on an "Install" button.
action = actions.addAction("Install", BDMsg.gettext("Install"));
+ // TRANSLATOR: This is the tooltip for an "Install" button.
action.setTooltip(BDMsg.gettext("Install the selected book"));
action.enable(false);
panel.add(new JButton(action));
@@ -281,33 +283,46 @@
// action.enable(false);
// panel.add(new JButton(action));
+ // TRANSLATOR: This is the text on a button that will refresh the list of available books
+ // from a download site
action = actions.addAction("Refresh", BDMsg.gettext("Update Available Books"));
action.setTooltip(BDMsg.gettext("Download a current listing of books."));
panel.add(new JButton(action));
} else {
panel.setLayout(new GridLayout(3, 2, 3, 3));
+ // TRANSLATOR: This is the text on a "Delete Book" button.
action = actions.addAction("Delete", BDMsg.gettext("Delete Book"));
+ // TRANSLATOR: This is the tooltip for a "Delete Book" button.
action.setTooltip(BDMsg.gettext("Delete the selected book"));
action.enable(false);
panel.add(new JButton(action));
+ // TRANSLATOR: This is the text on a "Remove Search Index" button.
action = actions.addAction("Unindex", BDMsg.gettext("Remove Search Index"));
+ // TRANSLATOR: This is the tooltip for a "Remove Search Index" button.
action.setTooltip(BDMsg.gettext("Remove the search index of the selected book"));
action.enable(false);
panel.add(new JButton(action));
+ // TRANSLATOR: This is the text on a "Font..." button that brings up a font selection dialog.
action = actions.addAction("ChooseFont", BDMsg.gettext("Font..."));
+ // TRANSLATOR: This is the tooltip for a "Font..." button that brings up a font selection dialog.
action.setTooltip(BDMsg.gettext("Choose a font for the language or book"));
action.enable(false);
panel.add(new JButton(action));
+ // TRANSLATOR: This is the text on an "Unlock" button that brings up a dialog box to enter an unlock key.
action = actions.addAction("Unlock", BDMsg.gettext("Unlock"));
+ // TRANSLATOR: This is the tooltip for an "Unlock" button that brings up a dialog box to enter an unlock key.
action.setTooltip(BDMsg.gettext("Unlock the selected book"));
action.enable(false);
panel.add(new JButton(action));
+ // TRANSLATOR: This is the text on a "Reset Font" button.
+ // Clicking on this button will restore the original font for the language or book
action = actions.addAction("ResetFont", BDMsg.gettext("Reset Font"));
+ // TRANSLATOR: This is the tooltip for a "Reset Font" button.
action.setTooltip(BDMsg.gettext("Reset the custom font set for this language or book"));
action.enable(false);
panel.add(new JButton(action));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -178,8 +178,10 @@
*/
private Component createButtons() {
if (pnlButtons == null) {
+ // TRANSLATOR: This is the text of an "OK" button that dismisses the dialog
JButton btnOK = new JButton(actions.addAction("SitesClose", BDMsg.gettext("OK")));
+ // TRANSLATOR: This is the text of an "Edit Sites ..." button brings up a download site editor
JButton btnAdd = new JButton(actions.addAction("ManageSites", BDMsg.gettext("Edit Sites ...")));
pnlButtons = new JPanel();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -92,7 +92,9 @@
lblInfo.setText(BDMsg.getVersionInfo());
ActionFactory actions = new ActionFactory(this);
+ // TRANSLATOR: This is the text of an "OK" button that dismisses the dialog
CWAction action = actions.addAction("AboutOK", BDMsg.gettext("OK"));
+ // TRANSLATOR: This is the tooltip for an "OK" button that dismisses the dialog
action.setTooltip(BDMsg.gettext("Close this window"));
JButton btnOk = new JButton(action);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -244,28 +244,39 @@
private ActionFactory getViewActions(ViewManager viewMgr) {
ActionFactory viewActions = new ActionFactory(viewMgr);
+ // TRANSLATOR: This is the label for the view option to show multiple tabs
CWAction cwAction = viewActions.addAction(ViewManager.TAB_MODE, BDMsg.gettext("Tabbed Mode"));
+ // TRANSLATOR: This is the tooltip for the view option to show multiple tabs
cwAction.setTooltip(BDMsg.gettext("View passages using tabs"));
+ // TRANSLATOR: This is the label for the view option to show multiple windows
cwAction = viewActions.addAction(ViewManager.WINDOW_MODE, BDMsg.gettext("Sub-Window Mode"));
+ // TRANSLATOR: This is the tooltip for the view option to show multiple windows
cwAction.setTooltip(BDMsg.gettext("View passages using sub-windows"));
+ // TRANSLATOR: This is the label for the menu and/or button to open a new Bible view
cwAction = viewActions.addAction(ViewManager.NEW_TAB, BDMsg.gettext("New Bible View"));
+ // TRANSLATOR: This is the tooltip for the view option to open a new Bible view
cwAction.setTooltip(BDMsg.gettext("Open a new Bible View"));
cwAction.setSmallIcon("toolbarButtonGraphics/general/New16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/New24.gif");
cwAction.setAccelerator("N,ctrl");
+ // TRANSLATOR: This is the label for the menu and/or button to close the current Bible view.
cwAction = viewActions.addAction(ViewManager.CLOSE_VIEW, BDMsg.gettext("Close the Current View"));
cwAction.setAccelerator("0x73,ctrl");
+ // TRANSLATOR: This is the label for the menu and/or button to clear the contents of the current Bible view
cwAction = viewActions.addAction(ViewManager.CLEAR_VIEW, BDMsg.gettext("Clear the Current View"));
cwAction.setTooltip(BDMsg.gettext("Clear the current view's passages"));
+ // TRANSLATOR: This is the label for the menu and/or button to close all Bible views.
cwAction = viewActions.addAction(ViewManager.CLOSE_ALL_VIEWS, BDMsg.gettext("Close All Views"));
cwAction.setTooltip(BDMsg.gettext("Close all passages"));
+ // TRANSLATOR: This is the label for the menu and/or button to close Bible views other than the current one.
cwAction = viewActions.addAction(ViewManager.CLOSE_OTHER_VIEWS, BDMsg.gettext("Close Other Views"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to close Bible views other than the current one.
cwAction.setTooltip(BDMsg.gettext("Close all the other passages."));
return viewActions;
}
@@ -334,133 +345,195 @@
private void buildActionMap() {
// File menu and it's items
+ // TRANSLATOR: This is the label of the top level "File" menu
CWAction cwAction = actions.addAction("File", BDMsg.gettext("File"));
+ // TRANSLATOR: This is the label for the menu and/or button to open a save passage list.
cwAction = actions.addAction("Open", BDMsg.gettext("Open"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to open a save passage list.
cwAction.setTooltip(BDMsg.gettext("Open a saved passage."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Open16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Open24.gif");
cwAction.setAccelerator("O,ctrl");
+ // TRANSLATOR: This is the label for the menu and/or button to save a passage list for the current Bible view.
cwAction = actions.addAction("Save", BDMsg.gettext("Save"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to save a passage list for the current Bible view.
cwAction.setTooltip(BDMsg.gettext("Save the current passage."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Save16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Save24.gif");
cwAction.setAccelerator("S,ctrl");
+ // TRANSLATOR: This is the label for the menu and/or button to save a passage list under a different name.
cwAction = actions.addAction("SaveAs", BDMsg.gettext("Save As"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to save a passage list under a different name.
cwAction.setTooltip(BDMsg.gettext("Save the current passage under a different name."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/SaveAs16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/SaveAs24.gif");
cwAction.setAccelerator("A,ctrl,shift");
+ // TRANSLATOR: This is the label for the menu and/or button to save a passage list for each Bible view.
cwAction = actions.addAction("SaveAll", BDMsg.gettext("Save All"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to save a passage list for each Bible view.
cwAction.setTooltip(BDMsg.gettext("Save all passages."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/SaveAll16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/SaveAll24.gif");
cwAction.setAccelerator("S,ctrl,shift");
-
+ // TRANSLATOR: This is the label for the menu and/or button to exit Bible Desktop.
cwAction = actions.addAction("Exit", BDMsg.gettext("Exit"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to exit Bible Desktop.
cwAction.setTooltip(BDMsg.gettext("Exit the Desktop application."));
cwAction.setAccelerator("0x73,alt");
// Edit menu and it's items
+ // TRANSLATOR: This is the label of the top level "Edit" menu
cwAction = actions.addAction("Edit", BDMsg.gettext("Edit"));
+ // TRANSLATOR: This is the label for the standard Cut menu and/or button item
// cwAction = actions.addAction("Cut", UserMsg.gettext("Cut"));
+// // TRANSLATOR: This is the tooltip for the standard Cut menu and/or button item
// cwAction.setTooltip(UserMsg.gettext("Cut the selection."));
// cwAction.setSmallIcon("toolbarButtonGraphics/general/Cut16.gif");
// cwAction.setLargeIcon("toolbarButtonGraphics/general/Cut24.gif");
// cwAction.setAccelerator("X,ctrl");
+ // TRANSLATOR: This is the label for the standard Copy menu and/or button item
cwAction = actions.addAction("Copy", BDMsg.gettext("Copy"));
+ // TRANSLATOR: This is the tooltip for the standard Copy menu and/or button item
cwAction.setTooltip(BDMsg.gettext("Copy the selection."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Copy16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Copy24.gif");
cwAction.setAccelerator("C,ctrl");
+ // TRANSLATOR: This is the label for the standard Paste menu and/or button item
// cwAction = actions.addAction("Paste", UserMsg.gettext("Paste"));
+// // TRANSLATOR: This is the tooltip for the standard Paste menu and/or button item
// cwAction.setTooltip(UserMsg.gettext("Paste the selection."));
// cwAction.setSmallIcon("toolbarButtonGraphics/general/Paste16.gif");
// cwAction.setLargeIcon("toolbarButtonGraphics/general/Paste24.gif");
// cwAction.setAccelerator("V,ctrl");
// Navigate menu and it's items
+ // TRANSLATOR: This is the label of the top level "Navigate" menu
cwAction = actions.addAction("Navigate", BDMsg.gettext("Navigate"));
+ // TRANSLATOR: This is the label for the menu and/or button to navigate to a prior Bible View content
cwAction = actions.addAction("Back", BDMsg.gettext("Back"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to navigate to a prior Bible View content
cwAction.setTooltip(BDMsg.gettext("Go back to previous passage."));
cwAction.setSmallIcon("toolbarButtonGraphics/navigation/Back16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/navigation/Back24.gif");
+ // TRANSLATOR: This is the label for the menu and/or button to navigate to a next Bible View content
cwAction = actions.addAction("Forward", BDMsg.gettext("Forward"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to navigate to a next Bible View content
cwAction.setTooltip(BDMsg.gettext("Go forward to next passage."));
cwAction.setSmallIcon("toolbarButtonGraphics/navigation/Forward16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/navigation/Forward24.gif");
// Verse sub-menu and it's items
+ // TRANSLATOR: This is the label of the "Verse Numbers" sub-menu
cwAction = actions.addAction("Verse", BDMsg.gettext("Verse Numbers"));
+ // TRANSLATOR: This is the tooltip of the "Verse Numbers" sub-menu
cwAction.setTooltip(BDMsg.gettext("Set the style for verse numbers"));
+ // TRANSLATOR: This is the label for the radio button to show verse numbers
cwAction = actions.addAction(XSLTProperty.VERSE_NUMBERS.getName(), BDMsg.gettext("Show Verse Numbers"));
+ // TRANSLATOR: This is the label for the radio button to show chapter and verse numbers
cwAction = actions.addAction(XSLTProperty.CV.getName(), BDMsg.gettext("Show Chapter and Verse Numbers"));
+ // TRANSLATOR: This is the label for the radio button to show book name with chapter and verse numbers
cwAction = actions.addAction(XSLTProperty.BCV.getName(), BDMsg.gettext("Show Book, Chapter and Verse Numbers"));
+ // TRANSLATOR: This is the label for the radio button to hide verse numbers
cwAction = actions.addAction(XSLTProperty.NO_VERSE_NUMBERS.getName(), BDMsg.gettext("Hide Verse Numbers"));
// View menu and it's items
+ // TRANSLATOR: This is the label of the top level "View" menu
cwAction = actions.addAction("View", BDMsg.gettext("View"));
+ // TRANSLATOR: This is the label for the checkbox to toggle between showing tiny and large verse numbers.
cwAction = actions.addAction(XSLTProperty.TINY_VERSE_NUMBERS.getName(), BDMsg.gettext("Use Small Verse Numbers"));
+ // TRANSLATOR: This is the label for the checkbox to start each verse on a new line
cwAction = actions.addAction(XSLTProperty.START_VERSE_ON_NEWLINE.getName(), BDMsg.gettext("Start Verses on Separate Lines"));
+ // TRANSLATOR: This is the tooltip for the checkbox to start each verse on a new line
cwAction.setTooltip(BDMsg.gettext("Start each verses on a new line"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide differences between parallel Bibles
cwAction = actions.addAction("CompareToggle", BDMsg.gettext("Show Differences"));
+ // TRANSLATOR: This is the tooltip for the checkbox to show/hide differences between parallel Bibles
cwAction.setTooltip(BDMsg.gettext("Toggle display of differences between different Bibles"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide headings
cwAction = actions.addAction(XSLTProperty.HEADINGS.getName(), BDMsg.gettext("Show Headings"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide notes
cwAction = actions.addAction(XSLTProperty.NOTES.getName(), BDMsg.gettext("Show Study Notes"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide cross references
cwAction = actions.addAction(XSLTProperty.XREF.getName(), BDMsg.gettext("Use Cross Reference Linkings"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide Strong's Numbers
cwAction = actions.addAction(XSLTProperty.STRONGS_NUMBERS.getName(), BDMsg.gettext("Show Strong's Numbers"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide word morphology
cwAction = actions.addAction(XSLTProperty.MORPH.getName(), BDMsg.gettext("Show Word Morphology"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide tooltips
cwAction = actions.addAction("ToolTipToggle", BDMsg.gettext("Show Tool Tips"));
+ // TRANSLATOR: This is the tooltip for the checkbox to show/hide tooltips
+ // which, of course, only shows when tooltips are showing :)
cwAction.setTooltip(BDMsg.gettext("Toggle display of tool tips"));
cwAction.setAccelerator("T,ctrl");
+ // TRANSLATOR: This is the label for the checkbox to show/hide the status area
cwAction = actions.addAction("StatusToggle", BDMsg.gettext("Show the Status Area"));
+ // TRANSLATOR: This is the tooltip for the checkbox to show/hide the status area
cwAction.setTooltip(BDMsg.gettext("Toggle display of the status area"));
+ // TRANSLATOR: This is the label for the checkbox to show/hide the passage side bar
cwAction = actions.addAction("SidebarToggle", BDMsg.gettext("Show the Passage Sidebar"));
+ // TRANSLATOR: This is the tooltip for the checkbox to show/hide the passage side bar
cwAction.setTooltip(BDMsg.gettext("Toggle display of the Passage Sidebar"));
cwAction.setAccelerator("B,ctrl");
+ // TRANSLATOR: This is the label for the menu and/or button to show the view source dialog
cwAction = actions.addAction("ViewSource", BDMsg.gettext("View Source"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to show the view source dialog
cwAction.setTooltip(BDMsg.gettext("View the HTML and OSIS source to the current window"));
cwAction.setAccelerator("U,ctrl");
// Tools menu and it's items
+ // TRANSLATOR: This is the label of the top level "Tools" menu
cwAction = actions.addAction("Tools", BDMsg.gettext("Tools"));
+ // TRANSLATOR: This is the label for the menu and/or button to show the book installer dialog
cwAction = actions.addAction("Books", BDMsg.gettext("Books"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to show the book installer dialog
cwAction.setTooltip(BDMsg.gettext("Display/Install Books"));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Import16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Import24.gif");
+ // TRANSLATOR: This is the label for the menu and/or button to show the Options/Preferences dialog
+ // Note: on a Mac, it is called Preferences located on the "Bible Desktop" menu
+ // and the operating system provides the translation.
cwAction = actions.addAction("Options", BDMsg.gettext("Options"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to show the Options/Preferences dialog
cwAction.setTooltip(BDMsg.gettext("Alter system settings."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Properties16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Properties24.gif");
// Help menu and it's items
+ // TRANSLATOR: This is the label of the top level "Help" menu
cwAction = actions.addAction("Help", BDMsg.gettext("Help"));
+ // TRANSLATOR: This is the label for the menu and/or button to show the Help dialog
cwAction = actions.addAction("Contents", BDMsg.gettext("Contents"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to show the Help dialog
cwAction.setTooltip(BDMsg.gettext("Help file contents."));
cwAction.setSmallIcon("toolbarButtonGraphics/general/Help16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/Help24.gif");
cwAction.setAccelerator("0x70");
+ // TRANSLATOR: This is the label for the menu and/or button to show the About dialog
+ // Note: on a Mac, it is located on the "Bible Desktop" menu
+ // and the operating system provides the translation.
cwAction = actions.addAction("About", BDMsg.gettext("About"));
+ // TRANSLATOR: This is the tooltip for the menu and/or button to show the About dialog
cwAction.setTooltip(BDMsg.gettext("Information about Bible Desktop"));
cwAction.setSmallIcon("toolbarButtonGraphics/general/About16.gif");
cwAction.setLargeIcon("toolbarButtonGraphics/general/About24.gif");
@@ -476,16 +549,13 @@
menu.setToolTipText(null);
menu.add(views.getContextAction(ViewManager.NEW_TAB)).addMouseListener(barStatus);
- menu.add(actions.findAction("Open")).addMouseListener(barStatus);
-
- menu.addSeparator();
-
menu.add(views.getContextAction(ViewManager.CLOSE_VIEW)).addMouseListener(barStatus);
menu.add(views.getContextAction(ViewManager.CLEAR_VIEW)).addMouseListener(barStatus);
menu.add(views.getContextAction(ViewManager.CLOSE_OTHER_VIEWS)).addMouseListener(barStatus);
menu.add(views.getContextAction(ViewManager.CLOSE_ALL_VIEWS)).addMouseListener(barStatus);
menu.addSeparator();
+ menu.add(actions.findAction("Open")).addMouseListener(barStatus);
menu.add(actions.findAction("Save")).addMouseListener(barStatus);
menu.add(actions.findAction("SaveAs")).addMouseListener(barStatus);
menu.add(actions.findAction("SaveAll")).addMouseListener(barStatus);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -46,6 +46,7 @@
import org.crosswire.bibledesktop.book.install.BookFont;
import org.crosswire.bibledesktop.util.ConfigurableSwingConverter;
import org.crosswire.common.swing.ActionFactory;
+import org.crosswire.common.swing.CWAction;
import org.crosswire.common.swing.CWScrollPane;
import org.crosswire.common.swing.GuiConvert;
import org.crosswire.common.swing.GuiUtil;
@@ -226,7 +227,11 @@
// TRANSLATOR: title for the Source View dialog
frame = new JDialog(parent, BDMsg.gettext("Source Viewer"));
- pnlButtons.add(new JButton(actions.addAction("SourceOK", BDMsg.gettext("OK")).setTooltip(BDMsg.gettext("Close this window"))), null);
+ // TRANSLATOR: This is the text of an "OK" button that dismisses the dialog
+ CWAction action = actions.addAction("SourceOK", BDMsg.gettext("OK"));
+ // TRANSLATOR: This is the tooltip for an "OK" button that dismisses the dialog
+ action.setTooltip(BDMsg.gettext("Close this window"));
+ pnlButtons.add(new JButton(action), null);
this.setBorder(BorderFactory.createEmptyBorder(5, 5, 0, 5));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -241,14 +241,12 @@
* @see org.crosswire.bibledesktop.display.URIEventListener#activateURI(org.crosswire.bibledesktop.display.URIEvent)
*/
public void activateURI(URIEvent ev) {
- // TODO Auto-generated method stub
}
/* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.URIEventListener#enterURI(org.crosswire.bibledesktop.display.URIEvent)
*/
public void enterURI(URIEvent ev) {
- // TODO Auto-generated method stub
System.out.println(ev);
if (interested(ev) && lastb == MouseEvent.BUTTON3) {
updateText(ev);
@@ -260,7 +258,6 @@
* @see org.crosswire.bibledesktop.display.URIEventListener#leaveURI(org.crosswire.bibledesktop.display.URIEvent)
*/
public void leaveURI(URIEvent ev) {
- // TODO Auto-generated method stub
this.hideTip();
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -325,7 +325,6 @@
*/
@Override
public void mouseDragged(MouseEvent e) {
- // TODO Auto-generated method stub
}
/* (non-Javadoc)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2011-03-07 18:54:34 UTC (rev 2104)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2011-03-07 21:13:31 UTC (rev 2105)
@@ -30,7 +30,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.swing.Action;
import javax.swing.JButton;
import javax.swing.JList;
import javax.swing.JPanel;
@@ -42,6 +41,7 @@
import org.crosswire.bibledesktop.book.DisplaySelectEvent;
import org.crosswire.bibledesktop.book.DisplaySelectListener;
import org.crosswire.common.swing.ActionFactory;
+import org.crosswire.common.swing.CWAction;
import org.crosswire.common.swing.CWScrollPane;
import org.crosswire.common.swing.GuiUtil;
import org.crosswire.jsword.book.Book;
@@ -90,14 +90,22 @@
ActionFactory actions = new ActionFactory(this);
- actDelete = actions.addAction("DeleteSelected").setTooltip(BDMsg.gettext("Remove the selected passages in the current passage list."))
- .setSmallIcon("toolbarButtonGraphics/general/Remove16.gif")
- .setLargeIcon("toolbarButtonGraphics/general/Remove24.gif");
- actBlur1 = actions.addAction("Blur1").setTooltip(BDMsg.gettext("Expand all or the selected passage by 1 verse."))
- .setSmallIcon("images/Blur1_16.gif");
- actBlur5 = actions.addAction("Blur5").setTooltip(BDMsg.gettext("Expand all or the selected passage by 5 verses."))
- .setSmallIcon("images/Blur5_16.gif");
+ actDelete = actions.addAction("DeleteSelected");
+ // TRANSLATOR: This is the tooltip for the delete selected icon button in the Passage Sidebar
+ actDelete.setTooltip(BDMsg.gettext("Remove the selected passages in the current passage list."));
+ actDelete.setSmallIcon("toolbarButtonGraphics/general/Remove16.gif");
+ actDelete.setLargeIcon("toolbarButtonGraphics/general/Remove24.gif");
+ actBlur1 = actions.addAction("Blur1");
+ // TRANSLATOR: This is the tooltip for the blur by 1 icon button in the Passage Sidebar
+ actBlur1.setTooltip(BDMsg.gettext("Expand all or the selected passage by 1 verse."));
+ actBlur1.setSmallIcon("images/Blur1_16.gif");
+
+ actBlur5 = actions.addAction("Blur5");
+ // TRANSLATOR: This is the tooltip for the blur by 5 icon button in the Passage Sidebar
+ actBlur5.setTooltip(BDMsg.gettext("Expand all or the selected passage by 5 verses."));
+ actBlur5.setSmallIcon("images/Blur5_16.gif");
+
JButton delete = new JButton(actDelete);
// delete.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
delete.setText(null);
@@ -372,9 +380,9 @@
*/
private JList list;
private RangeListModel model;
- private Action actDelete;
- private Action actBlur1;
- private Action actBlur5;
+ private CWAction actDelete;
+ private CWAction actBlur1;
+ private CWAction actBlur5;
/**
* Serialization ID
More information about the jsword-svn
mailing list