From 68c9c72ae93c8dd388a3c65c26fc01ffb1b8a127 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 12 Jan 2015 18:47:12 +0000 Subject: [PATCH] string fixes --- locale/messages_en.po | 16 +++++++--------- locale/messages_sv.po | 15 ++++++--------- src/net/i2p/itoopie/gui/CertificateGUI.java | 2 +- src/net/i2p/itoopie/gui/ConfigurationTab.java | 2 +- src/net/i2p/itoopie/gui/OverviewTab.java | 2 +- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/locale/messages_en.po b/locale/messages_en.po index 1fef52569..1993f2862 100644 --- a/locale/messages_en.po +++ b/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: itoopie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-11 19:28+0000\n" +"POT-Creation-Date: 2015-01-12 18:44+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -38,7 +38,9 @@ msgid "New remote host detected" msgstr "" #: src/net/i2p/itoopie/gui/CertificateGUI.java:31 -msgid "Would you like permanently trust the certificate from the remote host " +#, java-format +msgid "" +"Would you like permanently trust the certificate from the remote host {0}?" msgstr "" #: src/net/i2p/itoopie/gui/CertificateGUI.java:44 @@ -186,8 +188,9 @@ msgid "Invalid port." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:319 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336 #, java-format -msgid "\"{0}\" cannot be interpreted as a spped." +msgid "\"{0}\" cannot be interpreted as a speed." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:320 @@ -199,11 +202,6 @@ msgstr "" msgid "Invalid download speed." msgstr "" -#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336 -#, java-format -msgid "\"{0}\" cannot be interpreted as a speed." -msgstr "" - #: src/net/i2p/itoopie/gui/ConfigurationTab.java:338 msgid "Invalid upload speed." msgstr "" @@ -267,7 +265,7 @@ msgid "Status:" msgstr "" #: src/net/i2p/itoopie/gui/OverviewTab.java:113 -msgid "Netstatus:" +msgid "Net Status:" msgstr "" #: src/net/i2p/itoopie/gui/SettingsFrame.java:64 diff --git a/locale/messages_sv.po b/locale/messages_sv.po index 775aa4169..a5aeb46cd 100644 --- a/locale/messages_sv.po +++ b/locale/messages_sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: itoopie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-11 19:28+0000\n" +"POT-Creation-Date: 2015-01-12 18:44+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -38,7 +38,8 @@ msgid "New remote host detected" msgstr "Ny fjärrvärd upptäckt" #: src/net/i2p/itoopie/gui/CertificateGUI.java:31 -msgid "Would you like permanently trust the certificate from the remote host " +msgid "" +"Would you like permanently trust the certificate from the remote host {0}?" msgstr "Vill du permanent lite på certifikatet från fjärrvärden " #: src/net/i2p/itoopie/gui/CertificateGUI.java:44 @@ -190,8 +191,9 @@ msgid "Invalid port." msgstr "Ogiltig port." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:319 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336 #, java-format -msgid "\"{0}\" cannot be interpreted as a spped." +msgid "\"{0}\" cannot be interpreted as a speed." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:320 @@ -207,11 +209,6 @@ msgstr "" msgid "Invalid download speed." msgstr "Ogiltig nerladdningshastighet." -#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336 -#, java-format -msgid "\"{0}\" cannot be interpreted as a speed." -msgstr "" - #: src/net/i2p/itoopie/gui/ConfigurationTab.java:338 msgid "Invalid upload speed." msgstr "Ogiltig uppladdningshastighet." @@ -279,7 +276,7 @@ msgid "Status:" msgstr "Status:" #: src/net/i2p/itoopie/gui/OverviewTab.java:113 -msgid "Netstatus:" +msgid "Net Status:" msgstr "Nätstatus:" #: src/net/i2p/itoopie/gui/SettingsFrame.java:64 diff --git a/src/net/i2p/itoopie/gui/CertificateGUI.java b/src/net/i2p/itoopie/gui/CertificateGUI.java index 51fa84594..a4785d2b0 100644 --- a/src/net/i2p/itoopie/gui/CertificateGUI.java +++ b/src/net/i2p/itoopie/gui/CertificateGUI.java @@ -28,7 +28,7 @@ public class CertificateGUI { frame.add(bt, BorderLayout.NORTH); String title = Transl._("New remote host detected"); - String hostString = Transl._("Would you like permanently trust the certificate from the remote host " + hostname + "?"); + String hostString = Transl._("Would you like permanently trust the certificate from the remote host {0}?", hostname); String certName = "N/A"; String certAlgo = "N/A"; diff --git a/src/net/i2p/itoopie/gui/ConfigurationTab.java b/src/net/i2p/itoopie/gui/ConfigurationTab.java index 4dcb9d4f7..8a52af028 100644 --- a/src/net/i2p/itoopie/gui/ConfigurationTab.java +++ b/src/net/i2p/itoopie/gui/ConfigurationTab.java @@ -316,7 +316,7 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("\"{0}\" cannot be interpreted as a spped.", download) + "\n\n" + + Transl._("\"{0}\" cannot be interpreted as a speed.", download) + "\n\n" + Transl._("Speed must be a number larger than 0."), Transl._("Invalid download speed."), JOptionPane.DEFAULT_OPTION, diff --git a/src/net/i2p/itoopie/gui/OverviewTab.java b/src/net/i2p/itoopie/gui/OverviewTab.java index 3298fbf8b..64d6e3cec 100644 --- a/src/net/i2p/itoopie/gui/OverviewTab.java +++ b/src/net/i2p/itoopie/gui/OverviewTab.java @@ -110,7 +110,7 @@ public class OverviewTab extends TabLogoPanel { add(lblNetworkStatus); lblNetworkStatus.setBounds(290, 110, 100, 15); lblNetworkStatus.setHorizontalAlignment(SwingConstants.RIGHT); - lblNetworkStatus.setText(Transl._("Netstatus:")); + lblNetworkStatus.setText(Transl._("Net Status:")); lblNetworkStatusSpecified = new MultiLineLabel(); add(lblNetworkStatusSpecified);