git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'JAL-1397' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
Preferences.java
diff --git
a/src/jalview/gui/Preferences.java
b/src/jalview/gui/Preferences.java
index
a0fa216
..
f8932d1
100755
(executable)
--- a/
src/jalview/gui/Preferences.java
+++ b/
src/jalview/gui/Preferences.java
@@
-28,6
+28,7
@@
import jalview.bin.*;
import jalview.io.*;
import jalview.jbgui.*;
import jalview.schemes.*;
import jalview.io.*;
import jalview.jbgui.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-553,7
+554,7
@@
public class Preferences extends GPreferences
while (!valid)
{
if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
while (!valid)
{
if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
- "New sequence URL link", JOptionPane.OK_CANCEL_OPTION, -1,
+ MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1,
null) == JOptionPane.OK_OPTION)
{
if (link.checkValid())
null) == JOptionPane.OK_OPTION)
{
if (link.checkValid())
@@
-579,7
+580,7
@@
public class Preferences extends GPreferences
if (index == -1)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
if (index == -1)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "No link selected!", "No link selected",
+ MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"),
JOptionPane.WARNING_MESSAGE);
return;
}
JOptionPane.WARNING_MESSAGE);
return;
}
@@
-592,7
+593,7
@@
public class Preferences extends GPreferences
{
if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
{
if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
- "New sequence URL link", JOptionPane.OK_CANCEL_OPTION, -1,
+ MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1,
null) == JOptionPane.OK_OPTION)
{
if (link.checkValid())
null) == JOptionPane.OK_OPTION)
{
if (link.checkValid())
@@
-617,7
+618,7
@@
public class Preferences extends GPreferences
if (index == -1)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
if (index == -1)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "No link selected!", "No link selected",
+ MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"),
JOptionPane.WARNING_MESSAGE);
return;
}
JOptionPane.WARNING_MESSAGE);
return;
}