move a number of translatable string from code into Messages.properties

2010-11-09  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
    ButAllow, ButClose, ButCopy, ButMoreInformation, ButProceed,
    ButRun, AlwaysAllowAction, Continue, Field, From, Name, Publisher,
    Value, Version, SNoAssociatedCertificate, SAlwaysTrustPublisher,
    SHttpsUnverified, SNotAllSignedSummary, SNotAllSignedDetail,
    SNotAllSignedQuestion, SCertificateDetails, SIssuer, SSerial,
    SMD5Fingerprint, SSHA1Fingerprint, SSignature, SSignatureAlgorithm,
    SSubject, SValidity, CVCertificateViewer, CVDetails, CVIssuedTo,
    CVExport, CVImport, CVIssuedBy, IssuedTo, CVRemove,
    CVRemoveConfirmMessage,CVRemoveConfirmTitle, CVUser, CVSystem,
    KS, KSCerts, KSJsseCerts, KSCaCerts, KSJsseCaCerts, and
    KSClientCerts.
    * netx/net/sourceforge/jnlp/security/AccessWarningPane.java
    (addComponents): Use localized strings.
    * netx/net/sourceforge/jnlp/security/CertWarningPane.java
    (addComponents): Likewise.
    * netx/net/sourceforge/jnlp/security/CertsInfoPane.java
    (parseCert): Likewise.
    (addComponents): Likewise.
    * netx/net/sourceforge/jnlp/security/MoreInfoPane.java
    (addComponents): Likewise.
    * netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java
    (addComponents): Likewise.
    * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java:
    Likewise.
    (addComponents): Likewise.
    (CertificateType.toString): Likewise.
    (RemoveButtonListener.actionPerformed): Likewise.

1 files changed, 8 insertions, 8 deletions

diff --git a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
index c822d12..68b1ef4 100644
--- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
+++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
@@ -99,12 +99,12 @@ public class AccessWarningPane extends SecurityDialogPanel {
                 //We don't worry about exceptions when trying to fill in
                 //these strings -- we just want to fill in as many as possible.
                 try {
-                        name = file.getInformation().getTitle() != null ? file.getInformation().getTitle() : "<no associated certificate>";
+                        name = file.getInformation().getTitle() != null ? file.getInformation().getTitle() : R("SNoAssociatedCertificate");
                 } catch (Exception e) {
                 }
 
                 try {
-                        publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : "<no associated certificate>";
+                        publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate");
                 } catch (Exception e) {
                 }
 
@@ -161,14 +161,14 @@ public class AccessWarningPane extends SecurityDialogPanel {
                 topPanel.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
 
                 //application info
-                JLabel nameLabel = new JLabel("Name:   " + name);
+                JLabel nameLabel = new JLabel(R("Name") + ":   " + name);
                 nameLabel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-                JLabel publisherLabel = new JLabel("Publisher: " + publisher);
+                JLabel publisherLabel = new JLabel(R("Publisher") + ": " + publisher);
                 publisherLabel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-                JLabel fromLabel = new JLabel("From:   " + from);
+                JLabel fromLabel = new JLabel(R("From") + ":   " + from);
                 fromLabel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 
-                alwaysAllow = new JCheckBox("Always allow this action");
+                alwaysAllow = new JCheckBox(R("AlwaysAllowAction"));
                 alwaysAllow.setEnabled(false);
 
                 JPanel infoPanel = new JPanel(new GridLayout(4,1));
@@ -181,8 +181,8 @@ public class AccessWarningPane extends SecurityDialogPanel {
                 //run and cancel buttons
                 JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
 
-                JButton run = new JButton("Allow");
-                JButton cancel = new JButton("Cancel");
+                JButton run = new JButton(R("ButAllow"));
+                JButton cancel = new JButton(R("ButCancel"));
                 run.addActionListener(createSetValueListener(parent,0));
                 run.addActionListener(new CheckBoxListener());
                 cancel.addActionListener(createSetValueListener(parent, 1));