From c93977bbc1561f1384152bbec28edff33ca30a6b Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 25 Jul 2011 12:51:46 +0000 Subject: [PATCH] Stole bundle-messages from desktopgui --- bundle-messages.sh | 60 +++++++---- locale/messages_en.po | 219 +++++++++++++++++++++++++++++++++++++++- locale/messages_sv.po | 225 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 482 insertions(+), 22 deletions(-) diff --git a/bundle-messages.sh b/bundle-messages.sh index 76b343744..745c8e76f 100755 --- a/bundle-messages.sh +++ b/bundle-messages.sh @@ -9,24 +9,37 @@ # # zzz - public domain # Mathiasdm - modifications for desktopgui -# hottuna - modifications for itoopie # CLASS=net.i2p.itoopie.messages TMPFILE=build/javafiles.txt export TZ=UTC +RC=0 if [ "$1" = "-p" ] then POUPDATE=1 fi -# add ../src/ so the refs will work in the po file +# on windows, one must specify the path of commnad find +# since windows has its own retarded version of find. +if which find|grep -q -i windows ; then + export PATH=.:/bin:/usr/local/bin:$PATH +fi +# Fast mode - update ondemond +# set LG2 to the language you need in envrionment varibales to enable this + +# add ../java/ so the refs will work in the po file JPATHS="src" for i in locale/messages_*.po do # get language LG=${i#locale/messages_} LG=${LG%.po} + + # skip, if specified + if [ $LG2 ]; then + [ $LG != $LG2 ] && continue || echo INFO: Language update is set to [$LG2] only. + fi if [ "$POUPDATE" = "1" ] then @@ -34,9 +47,8 @@ do find $JPATHS -name *.java -newer $i > $TMPFILE fi - echo $LG - if [ -s build/net/i2p/itoopie/messages_$LG.class -a \ - build/net/i2p/itoopie/messages_$LG.class -nt $i -a \ + if [ -s build/net/i2p/desktopgui/messages_$LG.class -a \ + build/net/i2p/desktopgui/messages_$LG.class -nt $i -a \ ! -s $TMPFILE ] then continue @@ -57,23 +69,25 @@ do # In a jsp, you must use a helper or handler that has the context set. # 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\ --keyword=._ + find $JPATHS -name *.java > $TMPFILE + xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ --keyword=handler._ --keyword=formhandler._ \ - --keyword=net.i2p.itoopie.i18n.ItoopieTranslator.getString \ + --keyword=net.i2p.router.web.Messages.getString \ -o ${i}t if [ $? -ne 0 ] then - echo 'Warning - xgettext failed, not updating translations' + echo "ERROR - xgettext failed on ${i}, not updating translations" rm -f ${i}t + RC=1 break fi msgmerge -U --backup=none $i ${i}t if [ $? -ne 0 ] then - echo 'Warning - msgmerge failed, not updating translations' + echo "ERROR - msgmerge failed on ${i}, not updating translations" rm -f ${i}t + RC=1 break fi rm -f ${i}t @@ -81,16 +95,22 @@ do touch $i fi - echo "Generating ${CLASS}_$LG ResourceBundle..." + if [ "$LG" != "en" ] + then + # only generate for non-source language + echo "Generating ${CLASS}_$LG ResourceBundle..." - # convert to class files in build - msgfmt --java --statistics -r $CLASS -l $LG -d build $i - if [ $? -ne 0 ] - then - echo 'Warning - msgfmt failed, not updating translations' - break - fi + # convert to class files in build + msgfmt --java --statistics -r $CLASS -l $LG -d build $i + if [ $? -ne 0 ] + then + echo "ERROR - msgfmt failed on ${i}, not updating translations" + # msgfmt leaves the class file there so the build would work the next time + find build -name messages_${LG}.class -exec rm -f {} \; + RC=1 + break + fi + fi done rm -f $TMPFILE -# todo: return failure -exit 0 +exit $RC diff --git a/locale/messages_en.po b/locale/messages_en.po index 65b1d6bf4..6d62add43 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 11:57+0000\n" +"POT-Creation-Date: 2011-07-25 12:51+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -18,15 +18,77 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: src/net/i2p/itoopie/gui/AboutTab.java:27 +msgid "" +"itoopie and I2PControl were sponsored by Relakks & Ipredator.\n" +"Development began during the summer of 2011 and the first alpha was launched " +"in Juli.\n" +"\n" +"I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping " +"privacy and anonymity online.\n" +"// hottuna" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:32 +msgid "New remote host detected" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:33 +msgid "Would you like permanently trust the certificate from the remote host " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:46 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:95 +msgid "Certificate info" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:47 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:96 +msgid "Name: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:48 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:97 +msgid "Algorithm: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:49 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:98 +msgid "Serial: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:50 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:99 +msgid "SHA-1 ID-hash: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:80 +msgid "Warning, new remote host detected" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:81 +msgid "The certificate of " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:113 +msgid "Are you sure that you trust the new certificate?" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:114 +msgid "Is that you final answer?" +msgstr "" + #: src/net/i2p/itoopie/gui/ConfigurationTab.java:46 msgid "Settings read from I2P router." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:48 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:53 msgid "Settings aren't valid, not saving." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:49 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:54 msgid "I2P router rejected settings." msgstr "" @@ -35,10 +97,12 @@ msgid "Not connected, unable to save." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:51 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:55 msgid "Saved settings on I2P router." msgstr "" #: src/net/i2p/itoopie/gui/ConfigurationTab.java:52 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:56 msgid "Saved settings on I2P router. I2P router needs to be restarted." msgstr "" @@ -101,6 +165,8 @@ 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 msgid "Invalid port." msgstr "" @@ -137,6 +203,157 @@ msgstr "" msgid "Restart failed: " msgstr "" +#: src/net/i2p/itoopie/gui/Main.java:90 +msgid "Overview" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:95 +msgid "Configuration" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:100 +msgid "Logs" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:104 +msgid "About" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:72 +msgid "Version:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:86 +msgid "Uptime:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:99 +msgid "Status:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:111 +msgid "Netstatus:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:57 +msgid "No changes found, settings not saved." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:168 +msgid "Settings saved." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:172 +msgid "Settings not saved, no changes found." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:211 +msgid "Discard" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 +msgid "New password:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:272 +msgid "Password:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:282 +msgid "Repeat:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:293 +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" +"\n" +"Try entering the ip address of the machine running i2p." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:338 +msgid "Invalid ip address." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:352 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:476 +msgid "" +" can not be interpreted as a port.\n" +"\n" +"A port has to be a number in the range 1-65535." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:369 +msgid "" +"The password was not accepted as valid by the specified host.\n" +"\n" +"(by default the password is, \"itoopie\")" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:371 +msgid "Rejected password." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:381 +msgid "" +"The remote host at the ip and port did not respond.\n" +"\n" +"Maybe I2PControl is not running on the remote I2P router, \n" +"maybe the I2P router is not started." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:384 +msgid "Connection failed." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:420 +msgid "The new password and the repeated new password do not match.\n" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:421 +msgid "Mistyped password." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:430 +msgid "The new password is the same as the old password.\n" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:431 +msgid "No new password." +msgstr "" + +#: src/net/i2p/itoopie/gui/TrayManager.java:87 +msgid "Exit itoopie" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:47 +msgid "Bandwidth In [KB/s]" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:56 +msgid "Bandwidth Out [KB/s]" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:65 +#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:56 +msgid "Time" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:46 +msgid "Number of tunnels we are participating in." +msgstr "" + +#: src/net/i2p/itoopie/security/CertificateHelper.java:78 +msgid "Unable to create hash of the given cert, " +msgstr "" + #~ msgid "Start I2P" #~ msgstr "Start I2P" diff --git a/locale/messages_sv.po b/locale/messages_sv.po index 38d493fec..16a7dad2d 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 11:57+0000\n" +"POT-Creation-Date: 2011-07-25 12:51+0000\n" "PO-Revision-Date: 2010-07-25 14:09+0100\n" "Last-Translator: hottuna \n" "Language-Team: hottuna \n" @@ -18,15 +18,77 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: src/net/i2p/itoopie/gui/AboutTab.java:27 +msgid "" +"itoopie and I2PControl were sponsored by Relakks & Ipredator.\n" +"Development began during the summer of 2011 and the first alpha was launched " +"in Juli.\n" +"\n" +"I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping " +"privacy and anonymity online.\n" +"// hottuna" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:32 +msgid "New remote host detected" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:33 +msgid "Would you like permanently trust the certificate from the remote host " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:46 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:95 +msgid "Certificate info" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:47 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:96 +msgid "Name: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:48 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:97 +msgid "Algorithm: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:49 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:98 +msgid "Serial: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:50 +#: src/net/i2p/itoopie/gui/CertificateGUI.java:99 +msgid "SHA-1 ID-hash: " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:80 +msgid "Warning, new remote host detected" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:81 +msgid "The certificate of " +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:113 +msgid "Are you sure that you trust the new certificate?" +msgstr "" + +#: src/net/i2p/itoopie/gui/CertificateGUI.java:114 +msgid "Is that you final answer?" +msgstr "" + #: 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 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:53 msgid "Settings aren't valid, not saving." msgstr "Ogiltiga inställningar, sparar ej." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:49 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:54 msgid "I2P router rejected settings." msgstr "I2P routern avvisade inställningar." @@ -35,10 +97,12 @@ msgid "Not connected, unable to save." msgstr "Ej ansluten, kan inte spara." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:51 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:55 msgid "Saved settings on I2P router." msgstr "Inställningar sparades till I2P router." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:52 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:56 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." @@ -101,6 +165,8 @@ 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 msgid "Invalid port." msgstr "Ogiltig port." @@ -141,3 +207,160 @@ msgstr "Startar om I2P nod.." #: src/net/i2p/itoopie/gui/ConfigurationTab.java:404 msgid "Restart failed: " msgstr "Omstart misslyckades: " + +#: src/net/i2p/itoopie/gui/Main.java:90 +msgid "Overview" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:95 +msgid "Configuration" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:100 +msgid "Logs" +msgstr "" + +#: src/net/i2p/itoopie/gui/Main.java:104 +msgid "About" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:72 +msgid "Version:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:86 +msgid "Uptime:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:99 +msgid "Status:" +msgstr "" + +#: src/net/i2p/itoopie/gui/OverviewTab.java:111 +msgid "Netstatus:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:57 +msgid "No changes found, settings not saved." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:168 +msgid "Settings saved." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:172 +#, fuzzy +msgid "Settings not saved, no changes found." +msgstr "Ogiltiga inställningar, sparar ej." + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:211 +msgid "Discard" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:266 +msgid "New password:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:272 +msgid "Password:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:282 +msgid "Repeat:" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:293 +#, fuzzy +msgid "New port:" +msgstr "TCP port:" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:299 +#, fuzzy +msgid "Port:" +msgstr "TCP port:" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:336 +msgid "" +" can not be interpreted as an ip address.\n" +"\n" +"Try entering the ip address of the machine running i2p." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:338 +#, fuzzy +msgid "Invalid ip address." +msgstr "Ogiltig port." + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:352 +#: src/net/i2p/itoopie/gui/SettingsFrame.java:476 +msgid "" +" can not be interpreted as a port.\n" +"\n" +"A port has to be a number in the range 1-65535." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:369 +msgid "" +"The password was not accepted as valid by the specified host.\n" +"\n" +"(by default the password is, \"itoopie\")" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:371 +msgid "Rejected password." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:381 +msgid "" +"The remote host at the ip and port did not respond.\n" +"\n" +"Maybe I2PControl is not running on the remote I2P router, \n" +"maybe the I2P router is not started." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:384 +msgid "Connection failed." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:420 +msgid "The new password and the repeated new password do not match.\n" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:421 +msgid "Mistyped password." +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:430 +msgid "The new password is the same as the old password.\n" +msgstr "" + +#: src/net/i2p/itoopie/gui/SettingsFrame.java:431 +msgid "No new password." +msgstr "" + +#: src/net/i2p/itoopie/gui/TrayManager.java:87 +msgid "Exit itoopie" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:47 +#, fuzzy +msgid "Bandwidth In [KB/s]" +msgstr "Bandbredd:" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:56 +#, fuzzy +msgid "Bandwidth Out [KB/s]" +msgstr "Bandbredd:" + +#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:65 +#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:56 +msgid "Time" +msgstr "" + +#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:46 +msgid "Number of tunnels we are participating in." +msgstr "" + +#: src/net/i2p/itoopie/security/CertificateHelper.java:78 +msgid "Unable to create hash of the given cert, " +msgstr ""