diff --git a/locale/messages_en.po b/locale/messages_en.po index 6d62add43..e99db9d6c 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: 2011-07-25 12:51+0000\n" +"POT-Creation-Date: 2011-07-25 13:18+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -29,6 +29,11 @@ msgid "" "// hottuna" msgstr "" +#: src/net/i2p/itoopie/gui/AboutTab.java:41 +#: src/net/i2p/itoopie/gui/OverviewTab.java:72 +msgid "Version:" +msgstr "" + #: src/net/i2p/itoopie/gui/CertificateGUI.java:32 msgid "New remote host detected" msgstr "" @@ -107,6 +112,7 @@ msgid "Saved settings on I2P router. I2P router needs to be restarted." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:96 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:160 msgid "Apply" msgstr "" @@ -136,6 +142,7 @@ msgid "%" msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:184 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:228 msgid "Network:" msgstr "" @@ -166,7 +173,7 @@ msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:281 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:298 #: src/net/i2p/itoopie/gui/SettingsFrame.java:354 -#: src/net/i2p/itoopie/gui/SettingsFrame.java:478 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:475 msgid "Invalid port." msgstr "" @@ -219,9 +226,10 @@ msgstr "" msgid "About" msgstr "" -#: src/net/i2p/itoopie/gui/OverviewTab.java:72 -msgid "Version:" -msgstr "" +#: src/net/i2p/itoopie/gui/Main.java:122 +#, fuzzy +msgid "Settings" +msgstr "Starting" #: src/net/i2p/itoopie/gui/OverviewTab.java:86 msgid "Uptime:" @@ -247,18 +255,40 @@ msgstr "" msgid "Settings not saved, no changes found." msgstr "" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:178 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:181 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:184 +msgid "New remote port: " +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:191 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:194 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:197 +msgid "New remote password: " +msgstr "" + #: src/net/i2p/itoopie/gui/SettingsFrame.java:211 msgid "Discard" msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 -msgid "New password:" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:234 +msgid "IP address:" msgstr "" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:244 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:299 +msgid "Port:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:254 #: src/net/i2p/itoopie/gui/SettingsFrame.java:272 msgid "Password:" msgstr "" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 +msgid "New password:" +msgstr "" + #: src/net/i2p/itoopie/gui/SettingsFrame.java:282 msgid "Repeat:" msgstr "" @@ -267,10 +297,6 @@ msgstr "" msgid "New port:" msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:299 -msgid "Port:" -msgstr "" - #: src/net/i2p/itoopie/gui/SettingsFrame.java:336 msgid "" " can not be interpreted as an ip address.\n" @@ -283,7 +309,7 @@ msgid "Invalid ip address." msgstr "" #: src/net/i2p/itoopie/gui/SettingsFrame.java:352 -#: src/net/i2p/itoopie/gui/SettingsFrame.java:476 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:473 msgid "" " can not be interpreted as a port.\n" "\n" @@ -313,22 +339,34 @@ msgstr "" msgid "Connection failed." msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:420 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:417 msgid "The new password and the repeated new password do not match.\n" msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:421 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:418 msgid "Mistyped password." msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:430 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:427 msgid "The new password is the same as the old password.\n" msgstr "" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:431 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:428 msgid "No new password." msgstr "" +#: src/net/i2p/itoopie/gui/StatusHandler.java:13 +msgid "Connected to I2P router." +msgstr "" + +#: src/net/i2p/itoopie/gui/StatusHandler.java:14 +msgid "Unable to connect to I2P router." +msgstr "" + +#: src/net/i2p/itoopie/gui/StatusHandler.java:15 +msgid "I2P router rejected password." +msgstr "" + #: src/net/i2p/itoopie/gui/TrayManager.java:87 msgid "Exit itoopie" msgstr "" @@ -364,9 +402,6 @@ msgstr "" #~ msgid "I2P is starting!" #~ msgstr "I2P is starting!" -#~ msgid "Starting" -#~ msgstr "Starting" - #~ msgid "Launch I2P Browser" #~ msgstr "Launch I2P Browser" diff --git a/locale/messages_sv.po b/locale/messages_sv.po index 8c9d2c019..d2f4dee20 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: 2011-07-25 12:51+0000\n" +"POT-Creation-Date: 2011-07-25 13:18+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -29,6 +29,11 @@ msgid "" "// hottuna" msgstr "" +#: src/net/i2p/itoopie/gui/AboutTab.java:41 +#: src/net/i2p/itoopie/gui/OverviewTab.java:72 +msgid "Version:" +msgstr "Version:" + #: src/net/i2p/itoopie/gui/CertificateGUI.java:32 msgid "New remote host detected" msgstr "Ny fjärrvärd upptäckt" @@ -107,6 +112,7 @@ msgid "Saved settings on I2P router. I2P router needs to be restarted." msgstr "Sparade inställningar på I2P routern. I2P routern behöver startas om." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:96 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:160 msgid "Apply" msgstr "Verkställ" @@ -136,6 +142,7 @@ msgid "%" msgstr "%" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:184 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:228 msgid "Network:" msgstr "Nätverk:" @@ -166,7 +173,7 @@ msgstr "' " #: src/net/i2p/itoopie/gui/ConfigurationTab.java:281 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:298 #: src/net/i2p/itoopie/gui/SettingsFrame.java:354 -#: src/net/i2p/itoopie/gui/SettingsFrame.java:478 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:475 msgid "Invalid port." msgstr "Ogiltig port." @@ -223,9 +230,9 @@ msgstr "Loggar" msgid "About" msgstr "Om" -#: src/net/i2p/itoopie/gui/OverviewTab.java:72 -msgid "Version:" -msgstr "Version:" +#: src/net/i2p/itoopie/gui/Main.java:122 +msgid "Settings" +msgstr "Inställningar." #: src/net/i2p/itoopie/gui/OverviewTab.java:86 msgid "Uptime:" @@ -248,22 +255,43 @@ msgid "Settings saved." msgstr "Inställningar sparade." #: src/net/i2p/itoopie/gui/SettingsFrame.java:172 -#, fuzzy msgid "Settings not saved, no changes found." -msgstr "Ogiltiga inställningar, sparar ej." +msgstr "Inställningar ej sparade, inga förändringar funna." + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:178 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:181 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:184 +msgid "New remote port: " +msgstr "Ny fjärrport:" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:191 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:194 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:197 +msgid "New remote password: " +msgstr "Nytt fjärrlösen:" #: src/net/i2p/itoopie/gui/SettingsFrame.java:211 msgid "Discard" msgstr "Avbryt" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 -msgid "New password:" -msgstr "Nytt lösen:" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:234 +msgid "IP address:" +msgstr "Ipadress." +#: src/net/i2p/itoopie/gui/SettingsFrame.java:244 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:299 +msgid "Port:" +msgstr "Port:" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:254 #: src/net/i2p/itoopie/gui/SettingsFrame.java:272 msgid "Password:" msgstr "Lösen:" +#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 +msgid "New password:" +msgstr "Nytt lösen:" + #: src/net/i2p/itoopie/gui/SettingsFrame.java:282 msgid "Repeat:" msgstr "Upprepa:" @@ -272,10 +300,6 @@ msgstr "Upprepa:" msgid "New port:" msgstr "Ny port:" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:299 -msgid "Port:" -msgstr "Port:" - #: src/net/i2p/itoopie/gui/SettingsFrame.java:336 msgid "" " can not be interpreted as an ip address.\n" @@ -291,7 +315,7 @@ msgid "Invalid ip address." msgstr "Ogiltig ipadress." #: src/net/i2p/itoopie/gui/SettingsFrame.java:352 -#: src/net/i2p/itoopie/gui/SettingsFrame.java:476 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:473 msgid "" " can not be interpreted as a port.\n" "\n" @@ -330,22 +354,35 @@ msgstr "" msgid "Connection failed." msgstr "Anslutning misslyckades." -#: src/net/i2p/itoopie/gui/SettingsFrame.java:420 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:417 msgid "The new password and the repeated new password do not match.\n" -msgstr "Det nya lösenordet och det upprepade lösenordert överensstämmer inte.\n" +msgstr "" +"Det nya lösenordet och det upprepade lösenordert överensstämmer inte.\n" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:421 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:418 msgid "Mistyped password." msgstr "Felskrivet lösenord." -#: src/net/i2p/itoopie/gui/SettingsFrame.java:430 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:427 msgid "The new password is the same as the old password.\n" msgstr "Det nya lösenordet är samma som det gamla lösenorder.\n" -#: src/net/i2p/itoopie/gui/SettingsFrame.java:431 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:428 msgid "No new password." msgstr "Inget nytt lösenord." +#: src/net/i2p/itoopie/gui/StatusHandler.java:13 +msgid "Connected to I2P router." +msgstr "Ansluten till I2P router." + +#: src/net/i2p/itoopie/gui/StatusHandler.java:14 +msgid "Unable to connect to I2P router." +msgstr "Kunde ej ansluta till I2P router." + +#: src/net/i2p/itoopie/gui/StatusHandler.java:15 +msgid "I2P router rejected password." +msgstr "I2P routern avvisade lösenord." + #: src/net/i2p/itoopie/gui/TrayManager.java:87 msgid "Exit itoopie" msgstr "Avsluta itoopie" diff --git a/src/net/i2p/itoopie/Main.java b/src/net/i2p/itoopie/Main.java index 165e75aa5..0356051ad 100644 --- a/src/net/i2p/itoopie/Main.java +++ b/src/net/i2p/itoopie/Main.java @@ -64,6 +64,7 @@ public class Main { } public static void main(String[] args) { + Locale.setDefault(new Locale("sv", "SE")); beginStartup(args); } diff --git a/src/net/i2p/itoopie/gui/AboutTab.java b/src/net/i2p/itoopie/gui/AboutTab.java index a16063f38..a853b60af 100644 --- a/src/net/i2p/itoopie/gui/AboutTab.java +++ b/src/net/i2p/itoopie/gui/AboutTab.java @@ -38,7 +38,7 @@ public class AboutTab extends TabLogoPanel { lblVersion = new JLabel(); add(lblVersion); lblVersion.setBounds(285, 50, 100, 15); - lblVersion.setText("Version:"); + lblVersion.setText(Transl._("Version:")); lblVersion.setHorizontalAlignment(SwingConstants.RIGHT); diff --git a/src/net/i2p/itoopie/gui/Main.java b/src/net/i2p/itoopie/gui/Main.java index b0142250b..93c890994 100644 --- a/src/net/i2p/itoopie/gui/Main.java +++ b/src/net/i2p/itoopie/gui/Main.java @@ -119,7 +119,7 @@ public class Main { flowLayout.setVgap(0); statusPanel.add(buttonWrapper, BorderLayout.EAST); - JButton settingsBtn = new JButton("Settings"); + JButton settingsBtn = new JButton(Transl._("Settings")); buttonWrapper.add(settingsBtn); settingsBtn.setIcon(new ImageIcon(IconLoader.getIcon("cogwheel", 16))); settingsBtn.addActionListener(new ActionListener(){ diff --git a/src/net/i2p/itoopie/gui/SettingsFrame.java b/src/net/i2p/itoopie/gui/SettingsFrame.java index 3648813b8..2abe1ec4e 100644 --- a/src/net/i2p/itoopie/gui/SettingsFrame.java +++ b/src/net/i2p/itoopie/gui/SettingsFrame.java @@ -157,7 +157,7 @@ public class SettingsFrame extends RegisteredFrame{ getContentPane().add(buttonPanel); - JButton btnDone = new JButton("Apply"); + JButton btnDone = new JButton(Transl._("Apply")); buttonPanel.add(btnDone); btnDone.addActionListener(new ActionListener(){ @Override @@ -175,26 +175,26 @@ public class SettingsFrame extends RegisteredFrame{ REMOTE_SAVE_STATUS newPortStatus = saveNewPort(); switch (newPortStatus){ case SAVED_OK: - StatusHandler.setStatus("New remote port: " + REMOTE_SAVE_STATUS.SAVED_OK); + StatusHandler.setStatus(Transl._("New remote port: ") + REMOTE_SAVE_STATUS.SAVED_OK); break; case SAVE_FAILED_LOCALLY: - StatusHandler.setStatus("New remote port: " + REMOTE_SAVE_STATUS.SAVE_FAILED_LOCALLY); + StatusHandler.setStatus(Transl._("New remote port: ") + REMOTE_SAVE_STATUS.SAVE_FAILED_LOCALLY); break; case SAVE_FAILED_REMOTELY: - StatusHandler.setStatus("New remote port: " + REMOTE_SAVE_STATUS.SAVE_FAILED_REMOTELY); + StatusHandler.setStatus(Transl._("New remote port: ") + REMOTE_SAVE_STATUS.SAVE_FAILED_REMOTELY); break; } REMOTE_SAVE_STATUS newPasswordStatus = saveNewPassword(); switch (newPasswordStatus){ case SAVED_OK: - StatusHandler.setStatus("New remote password: " + REMOTE_SAVE_STATUS.SAVED_OK); + StatusHandler.setStatus(Transl._("New remote password: ") + REMOTE_SAVE_STATUS.SAVED_OK); break; case SAVE_FAILED_LOCALLY: - StatusHandler.setStatus("New remote password: " + REMOTE_SAVE_STATUS.SAVE_FAILED_LOCALLY); + StatusHandler.setStatus(Transl._("New remote password: ") + REMOTE_SAVE_STATUS.SAVE_FAILED_LOCALLY); break; case SAVE_FAILED_REMOTELY: - StatusHandler.setStatus("New remote password: " + REMOTE_SAVE_STATUS.SAVE_FAILED_REMOTELY); + StatusHandler.setStatus(Transl._("New remote password: ") + REMOTE_SAVE_STATUS.SAVE_FAILED_REMOTELY); break; } @@ -225,13 +225,13 @@ public class SettingsFrame extends RegisteredFrame{ } private void setupNetworkPanel(JPanel networkPanel){ - JLabel lblI2PControl = new JLabel("Network:"); + JLabel lblI2PControl = new JLabel(Transl._("Network:")); lblI2PControl.setBounds(10, 10, 120, 15); networkPanel.add(lblI2PControl); lblI2PControl.setHorizontalAlignment(SwingConstants.RIGHT); - JLabel lblRouterIP = new JLabel("IP address:"); + JLabel lblRouterIP = new JLabel(Transl._("IP address:")); lblRouterIP.setBounds(138, 10, 100, 15); networkPanel.add(lblRouterIP); lblRouterIP.setHorizontalAlignment(SwingConstants.LEFT); @@ -241,7 +241,7 @@ public class SettingsFrame extends RegisteredFrame{ networkPanel.add(txtRouterIP); - JLabel lblRouterPort = new JLabel("Port:"); + JLabel lblRouterPort = new JLabel(Transl._("Port:")); lblRouterPort.setBounds(138, 35, 100, 15); networkPanel.add(lblRouterPort); lblRouterPort.setHorizontalAlignment(SwingConstants.LEFT); @@ -251,7 +251,7 @@ public class SettingsFrame extends RegisteredFrame{ networkPanel.add(txtRouterPort); - JLabel lblRouterPassword = new JLabel("Password:"); + JLabel lblRouterPassword = new JLabel(Transl._("Password:")); lblRouterPassword.setBounds(138, 60, 100, 15); networkPanel.add(lblRouterPassword); lblRouterPassword.setHorizontalAlignment(SwingConstants.LEFT); @@ -391,9 +391,6 @@ public class SettingsFrame extends RegisteredFrame{ _conf.setConf("server.port", port); _conf.setConf("server.password", pwText); - _log.debug("Ip old->new: \""+_conf.getConf("server.hostname","127.0.0.1")+"\"->\"" + ipText + "\""); - _log.debug("Port old->new: \""+_conf.getConf("server.port",7650)+"\"->\"" + portText + "\""); - _log.debug("Password old->new: \""+oldPW+"\"->\"" + pwText + "\""); (new Thread() { diff --git a/src/net/i2p/itoopie/gui/StatusHandler.java b/src/net/i2p/itoopie/gui/StatusHandler.java index d6113238c..5cf14f4d2 100644 --- a/src/net/i2p/itoopie/gui/StatusHandler.java +++ b/src/net/i2p/itoopie/gui/StatusHandler.java @@ -2,15 +2,17 @@ package net.i2p.itoopie.gui; import javax.swing.JLabel; +import net.i2p.itoopie.i18n.Transl; + public class StatusHandler { private static final JLabel statusLbl; private static final String DEFAULT_STATUS = "Status"; private interface StatusMessage{ public String getStatusMessage(); }; public static enum DEFAULT_STATUS implements StatusMessage { - CONNECTED { public String getStatusMessage(){ return "Connected to I2P router."; }}, - NOT_CONNECTED { public String getStatusMessage(){ return "Unable to connect to I2P router."; }}, - INVALID_PASSWORD { public String getStatusMessage(){ return "I2P router rejected password."; }} + CONNECTED { public String getStatusMessage(){ return Transl._("Connected to I2P router."); }}, + NOT_CONNECTED { public String getStatusMessage(){ return Transl._("Unable to connect to I2P router."); }}, + INVALID_PASSWORD { public String getStatusMessage(){ return Transl._("I2P router rejected password."); }} } static{