From ec49901d9f4844acd69a51ebc0c7fa548be70ff3 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 10 Nov 2010 16:24:53 -0500 Subject: move a number of translatable string from code into Messages.properties 2010-11-09 Omair Majid * 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. --- .../sourceforge/jnlp/security/CertWarningPane.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'netx/net/sourceforge/jnlp/security/CertWarningPane.java') diff --git a/netx/net/sourceforge/jnlp/security/CertWarningPane.java b/netx/net/sourceforge/jnlp/security/CertWarningPane.java index b1101c2..bad2337 100644 --- a/netx/net/sourceforge/jnlp/security/CertWarningPane.java +++ b/netx/net/sourceforge/jnlp/security/CertWarningPane.java @@ -131,8 +131,8 @@ public class CertWarningPane extends SecurityDialogPanel { String propertyName = ""; if (certVerifier instanceof HttpsCertVerifier) { - topLabelText = "The website's certificate cannot be verified. " + - "Do you want to continue?"; + topLabelText = R("SHttpsUnverified") + " " + + R("Continue"); propertyName = "OptionPane.warningIcon"; } else @@ -162,15 +162,14 @@ public class CertWarningPane 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)); - alwaysTrust = new JCheckBox( - "Always trust content from this publisher"); + alwaysTrust = new JCheckBox(R("SAlwaysTrustPublisher")); alwaysTrust.setEnabled(true); JPanel infoPanel = new JPanel(new GridLayout(4,1)); @@ -185,8 +184,8 @@ public class CertWarningPane extends SecurityDialogPanel { //run and cancel buttons JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - JButton run = new JButton("Run"); - JButton cancel = new JButton("Cancel"); + JButton run = new JButton(R("ButRun")); + JButton cancel = new JButton(R("ButCancel")); int buttonWidth = Math.max(run.getMinimumSize().width, cancel.getMinimumSize().width); int buttonHeight = run.getMinimumSize().height; @@ -208,7 +207,7 @@ public class CertWarningPane extends SecurityDialogPanel { add(buttonPanel); JLabel bottomLabel; - JButton moreInfo = new JButton("More information..."); + JButton moreInfo = new JButton(R("ButMoreInformation")); moreInfo.addActionListener(new MoreInfoButtonListener()); if (parent.getJarSigner().getRootInCacerts()) -- cgit v1.2.3