From 7073bd19144d1ce478bee77ec240157264bdb85d Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 25 Jul 2011 12:26:09 +0000 Subject: [PATCH] Translation work... --- bundle-messages.sh | 2 +- locale/messages_en.po | 149 +++++++++++++++- locale/messages_nl.po | 15 -- locale/messages_sv.po | 159 +++++++++++++++--- src/net/i2p/itoopie/Main.java | 1 + src/net/i2p/itoopie/gui/ConfigurationTab.java | 26 +-- src/net/i2p/itoopie/gui/SettingsFrame.java | 24 +-- 7 files changed, 308 insertions(+), 68 deletions(-) delete mode 100644 locale/messages_nl.po diff --git a/bundle-messages.sh b/bundle-messages.sh index 0d27a43f5..76b343744 100755 --- a/bundle-messages.sh +++ b/bundle-messages.sh @@ -58,7 +58,7 @@ do # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. - xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ + xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ --keyword=._ --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ --keyword=handler._ --keyword=formhandler._ \ --keyword=net.i2p.itoopie.i18n.ItoopieTranslator.getString \ diff --git a/locale/messages_en.po b/locale/messages_en.po index f41032d6b..65b1d6bf4 100644 --- a/locale/messages_en.po +++ b/locale/messages_en.po @@ -1,11 +1,148 @@ -#: src/net/i2p/itoopie/gui/main.java:53 -msgid "Start I2P" -msgstr "Start I2P" +# itoopie +# Copyright (C) 2011 itoopie +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# hottuna , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: itoopie\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-25 11:57+0000\n" +"PO-Revision-Date: 2010-07-25 14:09+0100\n" +"Last-Translator: hottuna \n" +"Language-Team: hottuna \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:46 +msgid "Settings read from I2P router." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:48 +msgid "Settings aren't valid, not saving." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49 +msgid "I2P router rejected settings." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50 +msgid "Not connected, unable to save." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51 +msgid "Saved settings on I2P router." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52 +msgid "Saved settings on I2P router. I2P router needs to be restarted." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:96 +msgid "Apply" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:132 +msgid "Bandwidth:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:137 +msgid "Download:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:146 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:160 +msgid "KB/s" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:151 +msgid "Upload:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:165 +msgid "Share:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:174 +msgid "%" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:184 +msgid "Network:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:189 +msgid "TCP port:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:199 +msgid "UDP port:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:209 +msgid "UPNP:" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:211 +msgid "Enable UPNP" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:279 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:296 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:313 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:330 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:347 +msgid "' " +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:281 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:298 +msgid "Invalid port." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:315 +msgid "Invalid download speed." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:332 +msgid "Invalid upload speed." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:349 +msgid "Invalid share percentage." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:391 +msgid "" +"The new settings have been applied,\n" +"but the I2P router needs to be restarted for some to take effect.\n" +"\n" +"Would you like to restart the I2P router now?" +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:394 +msgid "Restart needed for new settings." +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:400 +msgid "Restarting I2P node.. " +msgstr "" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:402 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:404 +msgid "Restart failed: " +msgstr "" + +#~ msgid "Start I2P" +#~ msgstr "Start I2P" -#: src/net/i2p/itoopie/gui/main.java:80 #, fuzzy -msgid "Push to start I2P" -msgstr "Push to start I2P" +#~ msgid "Push to start I2P" +#~ msgstr "Push to start I2P" #~ msgid "I2P is starting!" #~ msgstr "I2P is starting!" diff --git a/locale/messages_nl.po b/locale/messages_nl.po deleted file mode 100644 index e1e101d04..000000000 --- a/locale/messages_nl.po +++ /dev/null @@ -1,15 +0,0 @@ -#: src/net/i2p/itoopie/gui/main.java:53 -#, fuzzy -msgid "Start I2P" -msgstr "I2P herstarten" - -#: src/net/i2p/itoopie/gui/main.java:80 -#, fuzzy -msgid "Push to start I2P" -msgstr "I2P herstarten" - -#~ msgid "Launch I2P Browser" -#~ msgstr "Start I2P Browser" - -#~ msgid "Stop I2P" -#~ msgstr "I2P stoppen" diff --git a/locale/messages_sv.po b/locale/messages_sv.po index 2dafabbff..38d493fec 100644 --- a/locale/messages_sv.po +++ b/locale/messages_sv.po @@ -1,26 +1,143 @@ -#: src/net/i2p/itoopie/gui/main.java:53 -msgid "Start I2P" -msgstr "Starta I2P" +# itoopie +# Copyright (C) 2011 itoopie +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# hottuna , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: itoopie\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-25 11:57+0000\n" +"PO-Revision-Date: 2010-07-25 14:09+0100\n" +"Last-Translator: hottuna \n" +"Language-Team: hottuna \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/net/i2p/itoopie/gui/main.java:80 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:46 +msgid "Settings read from I2P router." +msgstr "Inställningar lästa från I2P routern." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:48 +msgid "Settings aren't valid, not saving." +msgstr "Ogiltiga inställningar, sparar ej." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49 +msgid "I2P router rejected settings." +msgstr "I2P routern avvisade inställningar." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50 +msgid "Not connected, unable to save." +msgstr "Ej ansluten, kan inte spara." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51 +msgid "Saved settings on I2P router." +msgstr "Inställningar sparades till I2P router." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52 +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 +msgid "Apply" +msgstr "Verkställ" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:132 +msgid "Bandwidth:" +msgstr "Bandbredd:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:137 +msgid "Download:" +msgstr "Nerladdning:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:146 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:160 +msgid "KB/s" +msgstr "KB/s" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:151 +msgid "Upload:" +msgstr "Uppladdning:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:165 +msgid "Share:" +msgstr "Utdelning:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:174 +msgid "%" +msgstr "%" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:184 +msgid "Network:" +msgstr "Nätverk:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:189 +msgid "TCP port:" +msgstr "TCP port:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:199 +msgid "UDP port:" +msgstr "UDP port:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:209 +msgid "UPNP:" +msgstr "UPNP:" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:211 +msgid "Enable UPNP" +msgstr "Slå på UPNP" + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:279 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:296 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:313 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:330 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:347 +msgid "' " +msgstr "' " + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:281 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:298 +msgid "Invalid port." +msgstr "Ogiltig port." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:315 +msgid "Invalid download speed." +msgstr "Ogiltig nerladdningshastighet." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:332 +msgid "Invalid upload speed." +msgstr "Ogiltig uppladdningshastighet." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:349 +msgid "Invalid share percentage." +msgstr "Ogiltig utdelningsprocent." + +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:391 #, fuzzy -msgid "Push to start I2P" -msgstr "Tryck för att starta I2P" +msgid "" +"The new settings have been applied,\n" +"but the I2P router needs to be restarted for some to take effect.\n" +"\n" +"Would you like to restart the I2P router now?" +msgstr "" +"De nya inställningarna har sparats,\n" +"men I2P routern måste startas om för att verkställa.\n" +"\n" +"Vill du starta om I2P routern nu?" -#~ msgid "I2P is starting!" -#~ msgstr "I2P is startar!" +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:394 +msgid "Restart needed for new settings." +msgstr "Omstart krävs för nya inställningar." -#~ msgid "Starting" -#~ msgstr "Startar" +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:400 +msgid "Restarting I2P node.. " +msgstr "Startar om I2P nod.." -#~ msgid "Launch I2P Browser" -#~ msgstr "Starta I2P browser" - -#~ msgid "Stop I2P" -#~ msgstr "Stoppa I2P" - -#~ msgid "Browser not found" -#~ msgstr "Browser niet gevonden" - -#~ msgid "The default browser for your system was not found." -#~ msgstr "De standaard webbrowser voor je systeem werd niet gevonden." +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:402 +#: src/net/i2p/itoopie/gui/ConfigurationTab.java:404 +msgid "Restart failed: " +msgstr "Omstart misslyckades: " diff --git a/src/net/i2p/itoopie/Main.java b/src/net/i2p/itoopie/Main.java index 515b2a903..165e75aa5 100644 --- a/src/net/i2p/itoopie/Main.java +++ b/src/net/i2p/itoopie/Main.java @@ -8,6 +8,7 @@ import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map.Entry; import java.util.Set; diff --git a/src/net/i2p/itoopie/gui/ConfigurationTab.java b/src/net/i2p/itoopie/gui/ConfigurationTab.java index 4acf83006..c629ccf02 100644 --- a/src/net/i2p/itoopie/gui/ConfigurationTab.java +++ b/src/net/i2p/itoopie/gui/ConfigurationTab.java @@ -276,8 +276,8 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("' "+udpPort + " ' can not be interpreted as a UDP port.\r\n" + - "\r\nA port has to be a number in the range 1-65535."), + Transl._("' "+udpPort + " ' can not be interpreted as a UDP port.\n" + + "\nA port has to be a number in the range 1-65535."), Transl._("Invalid port."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -293,8 +293,8 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("' "+udpPort + " ' can not be interpreted as a UDP port.\r\n" + - "\r\nA port has to be a number in the range 1-65535."), + Transl._("' "+udpPort + " ' can not be interpreted as a UDP port.\n" + + "\nA port has to be a number in the range 1-65535."), Transl._("Invalid port."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -310,8 +310,8 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("' "+download + " ' can not be interpreted as an download spped.\r\n" + - "\r\nA port has to be a number larger than 0."), + Transl._("' "+download + " ' can not be interpreted as an download spped.\n" + + "\nA port has to be a number larger than 0."), Transl._("Invalid download speed."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -327,8 +327,8 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("' "+upload + " ' can not be interpreted as an upload spped.\r\n" + - "\r\nA port has to be a number larger than 0."), + Transl._("' "+upload + " ' can not be interpreted as an upload spped.\n" + + "\nA port has to be a number larger than 0."), Transl._("Invalid upload speed."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -344,8 +344,8 @@ public class ConfigurationTab extends TabLogoPanel { } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._("' "+share + " ' can not be interpreted as a percentage.\r\n" + - "\r\nThe percentage has to be a number in the range 0-100."), + Transl._("' "+share + " ' can not be interpreted as a percentage.\n" + + "\nThe percentage has to be a number in the range 0-100."), Transl._("Invalid share percentage."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -388,9 +388,9 @@ public class ConfigurationTab extends TabLogoPanel { StatusHandler.setStatus(SAVE_STATUS.SAVED_RESTART_NEEDED.toString()); int n = JOptionPane.showConfirmDialog( this, - Transl._("The new settings have been applied,\r\n" + "" + - "but the I2P router needs to be restarted for some to take effect.\r\n" + - "\r\nWould you like to restart the I2P router now?"), + Transl._("The new settings have been applied,\n" + "" + + "but the I2P router needs to be restarted for some to take effect.\n" + + "\nWould you like to restart the I2P router now?"), Transl._("Restart needed for new settings."), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE); diff --git a/src/net/i2p/itoopie/gui/SettingsFrame.java b/src/net/i2p/itoopie/gui/SettingsFrame.java index b2da4c53d..3648813b8 100644 --- a/src/net/i2p/itoopie/gui/SettingsFrame.java +++ b/src/net/i2p/itoopie/gui/SettingsFrame.java @@ -333,8 +333,8 @@ public class SettingsFrame extends RegisteredFrame{ } catch (UnknownHostException e) { JOptionPane.showConfirmDialog( this, - Transl._(ipText + " can not be interpreted as an ip address.\r\n" + - "\r\nTry entering the ip address of the machine running i2p."), + Transl._(ipText + " can not be interpreted as an ip address.\n" + + "\nTry entering the ip address of the machine running i2p."), Transl._("Invalid ip address."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -349,8 +349,8 @@ public class SettingsFrame extends RegisteredFrame{ } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._(portText + " can not be interpreted as a port.\r\n" + - "\r\nA port has to be a number in the range 1-65535."), + Transl._(portText + " can not be interpreted as a port.\n" + + "\nA port has to be a number in the range 1-65535."), Transl._("Invalid port."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -366,8 +366,8 @@ public class SettingsFrame extends RegisteredFrame{ _conf.setConf("server.password", oldPW); JOptionPane.showConfirmDialog( this, - Transl._("The password was not accepted as valid by the specified host.\r\n" + - "\r\n(by default the password is, \"itoopie\")"), + Transl._("The password was not accepted as valid by the specified host.\n" + + "\n(by default the password is, \"itoopie\")"), Transl._("Rejected password."), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); @@ -378,8 +378,8 @@ public class SettingsFrame extends RegisteredFrame{ _conf.setConf("server.password", oldPW); JOptionPane.showConfirmDialog( this, - Transl._("The remote host at the ip and port did not respond.\r\n" + - "\r\nMaybe I2PControl is not running on the remote I2P router, \r\n" + + Transl._("The remote host at the ip and port did not respond.\n" + + "\nMaybe I2PControl is not running on the remote I2P router, \n" + "maybe the I2P router is not started."), Transl._("Connection failed."), JOptionPane.DEFAULT_OPTION, @@ -417,7 +417,7 @@ public class SettingsFrame extends RegisteredFrame{ if (!pw.equals(pwRepeat)){ JOptionPane.showConfirmDialog( this, - Transl._("The new password and the repeated new password do not match.\r\n"), + Transl._("The new password and the repeated new password do not match.\n"), Transl._("Mistyped password."), JOptionPane.OK_OPTION, JOptionPane.ERROR_MESSAGE); @@ -427,7 +427,7 @@ public class SettingsFrame extends RegisteredFrame{ if (pw.equals(oldPW)){ JOptionPane.showConfirmDialog( this, - Transl._("The new password is the same as the old password.\r\n"), + Transl._("The new password is the same as the old password.\n"), Transl._("No new password."), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE); @@ -473,8 +473,8 @@ public class SettingsFrame extends RegisteredFrame{ } catch (NumberFormatException e){ JOptionPane.showConfirmDialog( this, - Transl._(port + " can not be interpreted as a port.\r\n" + - "\r\nA port has to be a number in the range 1-65535."), + Transl._(port + " can not be interpreted as a port.\n" + + "\nA port has to be a number in the range 1-65535."), Transl._("Invalid port."), JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE);