diff --git a/.tx/config b/.tx/config index 34fcefe498..c237a289a9 100644 --- a/.tx/config +++ b/.tx/config @@ -64,6 +64,18 @@ trans.uk_UA = apps/routerconsole/locale/messages_uk.po trans.vi = apps/routerconsole/locale/messages_vi.po trans.zh_CN = apps/routerconsole/locale/messages_zh.po +[I2P.news] +source_file = apps/routerconsole/locale-news/messages_en.po +source_lang = en +trans.ar = apps/routerconsole/locale-news/messages_ar.po +trans.de = apps/routerconsole/locale-news/messages_de.po +trans.es = apps/routerconsole/locale-news/messages_es.po +trans.fr = apps/routerconsole/locale-news/messages_fr.po +trans.nl = apps/routerconsole/locale-news/messages_nl.po +trans.pt = apps/routerconsole/locale-news/messages_pt.po +trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po +trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po + [I2P.i2psnark] source_file = apps/i2psnark/locale/messages_en.po source_lang = en diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index a5f4511678..aedb8fc9ab 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -97,7 +97,7 @@ - + @@ -134,7 +134,6 @@ - @@ -166,6 +165,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh new file mode 100755 index 0000000000..64a5b26318 --- /dev/null +++ b/apps/routerconsole/java/bundle-messages-news.sh @@ -0,0 +1,110 @@ +#!/bin/sh + +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. +# +# usage: +# bundle-messages.sh (generates the resource bundle from the .po file) +# bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle) +# +# zzz - public domain +# +CLASS=net.i2p.router.news.messages +TMPFILE=build/javafiles-news.txt +export TZ=UTC +RC=0 + +if [ "$1" = "-p" ] +then + POUPDATE=1 +fi + +# 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="../java/build/News.java" +for i in ../locale-news/messages_*.po +do + # get language + LG=${i#../locale-news/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 + # make list of java files newer than the .po file + find $JPATHS -name *.java -newer $i > $TMPFILE + fi + if [ -s build/obj/net/i2p/router/news/messages_$LG.class -a \ + build/obj/net/i2p/router/news/messages_$LG.class -nt $i -a \ + ! -s $TMPFILE ] + then + continue + fi + + if [ "$POUPDATE" = "1" ] + then + echo "Updating the $i file from the tags..." + # extract strings from java and jsp files, and update messages.po files + # translate calls must be one of the forms: + # _("foo") + # _x("foo") + # intl._("foo") + # intl.title("foo") + # 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. + find $JPATHS -name *.java > $TMPFILE + xgettext -f $TMPFILE -L java --from-code=UTF-8 --no-location\ + --keyword=_ \ + -o ${i}t + if [ $? -ne 0 ] + then + 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 "ERROR - msgmerge failed on ${i}, not updating translations" + rm -f ${i}t + RC=1 + break + fi + rm -f ${i}t + # so we don't do this again + touch $i + fi + + if [ "$LG" != "en" ] + then + # only generate for non-source language + echo "Generating ${CLASS}_$LG ResourceBundle..." + + # convert to class files in build/obj + msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $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/obj -name messages_${LG}.class -exec rm -f {} \; + RC=1 + break + fi + fi +done +rm -f $TMPFILE +exit $RC diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java index de5824bd36..c1fbf2b05c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java @@ -1,6 +1,9 @@ package net.i2p.router.web; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.Reader; import java.text.SimpleDateFormat; import java.util.Date; @@ -8,6 +11,7 @@ import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.router.update.ConsoleUpdateManager; import static net.i2p.update.UpdateType.*; +import net.i2p.util.TranslateReader; /** * If news file does not exist, use file from the initialNews directory @@ -138,11 +142,36 @@ public class NewsHelper extends ContentHelper { return mgr.getStatus(); } + private static final String BUNDLE_NAME = "net.i2p.router.news.messages"; + + /** + * If we haven't downloaded news yet, use the translated initial news file + */ @Override public String getContent() { File news = new File(_page); - if (!news.exists()) + if (!news.exists()) { _page = (new File(_context.getBaseDir(), "docs/initialNews/initialNews.xml")).getAbsolutePath(); + // don't use super, translate on-the-fly + Reader reader = null; + try { + char[] buf = new char[512]; + StringBuilder out = new StringBuilder(2048); + reader = new TranslateReader(_context, BUNDLE_NAME, new FileInputStream(_page)); + int len; + while((len = reader.read(buf)) > 0) { + out.append(buf, 0, len); + } + return out.toString(); + } catch (IOException ioe) { + return ""; + } finally { + try { + if (reader != null) + reader.close(); + } catch (IOException foo) {} + } + } return super.getContent(); } diff --git a/apps/routerconsole/locale-news/messages_ar.po b/apps/routerconsole/locale-news/messages_ar.po new file mode 100644 index 0000000000..255e8e81fd --- /dev/null +++ b/apps/routerconsole/locale-news/messages_ar.po @@ -0,0 +1,64 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P routerconsole\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2011-03-04 14:02-0000\n" +"Last-Translator: hamada \n" +"Language-Team: hamada@mail.i2p\n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Virtaal 0.6.1\n" + +msgid "Congratulations on getting I2P installed!" +msgstr "" + +msgid "Welcome to I2P!" +msgstr "!I2P مرحبا بك في شبكة" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "انتظر قليلا بينما يتم ربط الإتصال بباقي أعضاء الشبكة." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "بسنما يتم الإتصال بتغير بيانات سرعة الشبكة في قم صفحة الخيارات." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "عندما عندما تظهر عبارة \"shared clients\" على اليسار يمكنك حينها زيارة الأسئلة الشائعة." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "IRC اتصل بخادم الدردشة الفورية على localhost:6668 #i2p-help or #i2p." diff --git a/apps/routerconsole/locale-news/messages_de.po b/apps/routerconsole/locale-news/messages_de.po new file mode 100644 index 0000000000..0aee78a0d8 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_de.po @@ -0,0 +1,64 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2013-05-08 15:06+0000\n" +"Last-Translator: zeroflag \n" +"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/" +"de/)\n" +"Language: de\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" + +msgid "Congratulations on getting I2P installed!" +msgstr "Wir gratulieren zur erfolgreichen Installation von I2P!" + +msgid "Welcome to I2P!" +msgstr "Willkommen im I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "Hab noch {0}etwas Geduld{1}, während I2P startet und weitere I2P-Router findet." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Passe bitte in der Zwischenzeit {0}deine Einstellungen zur Bandbreite{1} auf der" +"{2}Einstellungsseite{3} an!" + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "Auch kannst Du gleich deinen Browser für die Nutzung von I2P einrichten." + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "Setze in den Einstellungen zum Browser ein HTTP Proxy ein mit 127.0.0.1 (oder localhost) mit Port 4444 als Ziel." + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "Mehr Informationen gibt es auf der {0}I2P browser proxy Setup Seite{1}." + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "Sobald auf der linken Seite eine Verbindung namens \"versch. Klienten\" aufgelistet ist, kannst Du unsere {0}{1} {2}FAQ{3} besuchen." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Verbinde deinen IRC-Klienten mit dem Server auf {0}localhost:6668{1} und schau bei uns im Kanal #i2p-de, {2}#i2p-help{3} oder {4}#i2p{5} vorbei!" diff --git a/apps/routerconsole/locale-news/messages_en.po b/apps/routerconsole/locale-news/messages_en.po new file mode 100644 index 0000000000..732a76c545 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_en.po @@ -0,0 +1,63 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P routerconsole\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2010-06-15 14:09+0100\n" +"Last-Translator: duck \n" +"Language-Team: duck \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" + +msgid "Congratulations on getting I2P installed!" +msgstr "" + +msgid "Welcome to I2P!" +msgstr "" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "" + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "" + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "" + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "" diff --git a/apps/routerconsole/locale-news/messages_es.po b/apps/routerconsole/locale-news/messages_es.po new file mode 100644 index 0000000000..daa3d7f7bd --- /dev/null +++ b/apps/routerconsole/locale-news/messages_es.po @@ -0,0 +1,63 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2013-04-15 11:10+0000\n" +"Last-Translator: trolly \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/" +"es/)\n" +"Language: es\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" + +msgid "Congratulations on getting I2P installed!" +msgstr "¡Felicidades!, has instalado el enrutador I2P con éxito." + +msgid "Welcome to I2P!" +msgstr "¡Bienvenido a I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "¡Ten todavía {0}paciencia{1} mientras I2P esté arrancando y encontrando otros enrutadores I2P!" + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Este es el momento ideal para adaptar tu {0}configuración del ancho de banda{1} en la {2}página de configuración{3}." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "En cuanto veas a la izquierda una conexión llamada \"clientes diferentes\", puedes visitar nuestros {0}{1} {2}FAQ{3}." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "¡Conécta tu cliente IRC con el servidor {0}localhost:6668{1} y ven a saludarnos en los canales #i2p-es, {2}#i2p-help{3} o {4}#i2p{5}!" diff --git a/apps/routerconsole/locale-news/messages_fr.po b/apps/routerconsole/locale-news/messages_fr.po new file mode 100644 index 0000000000..fa755ad0ca --- /dev/null +++ b/apps/routerconsole/locale-news/messages_fr.po @@ -0,0 +1,63 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P routerconsole\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2010-06-15 14:09+0100\n" +"Last-Translator: duck \n" +"Language-Team: duck \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" + +msgid "Congratulations on getting I2P installed!" +msgstr "Merci d'utiliser I2P !" + +msgid "Welcome to I2P!" +msgstr "Bienvenue sur I2P !" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "Merci de {0}patienter{1} le temps qu''I2P démarre et trouve des pairs." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Pendant ce temps, merci d''{0}adjuster vos réglages de bande passante{1} sur la page de {2}configuration{3}." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "Une fois que vous avez une indication \"clients partagés…\" listée sur la gauche, merci de {0}jeter un œil{1} à la {2}FAQ{3}." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Pointez votre client IRC sur {0}localhost:6668{1} et venez nous faire coucou sur {2}#i2p-help{3}, #i2p-fr ou {4}#i2p{5}." diff --git a/apps/routerconsole/locale-news/messages_nl.po b/apps/routerconsole/locale-news/messages_nl.po new file mode 100644 index 0000000000..4980bfbb80 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_nl.po @@ -0,0 +1,62 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2012-08-25 19:21+0000\n" +"Last-Translator: attesor \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" +"Language: nl\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" + +msgid "Congratulations on getting I2P installed!" +msgstr "Gefeliciteerd met de installatie van I2P!" + +msgid "Welcome to I2P!" +msgstr "Welkom bij I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "Heb {0}wat geduld{1} terwijl I2P opstart en peers zoekt." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Terwijl je wacht, {0}pas je bandbreedte instellingen aan{1} op de {2}configuratie pagina{3}." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "Wanneer je een \"gedeelde clients\" destination in de linker lijst hebt, {0}lees dan aub{1} onze {2}FAQ{3}." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Verbind je IRC client met {0}localhost:6668{1} en zeg Hallo in {2}#i2p-help{3} of {4}#i2p{5}." diff --git a/apps/routerconsole/locale-news/messages_pt.po b/apps/routerconsole/locale-news/messages_pt.po new file mode 100644 index 0000000000..d48d081076 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_pt.po @@ -0,0 +1,63 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2013-07-04 19:08+0000\n" +"Last-Translator: tuliouel\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/" +"pt/)\n" +"Language: pt\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" + +msgid "Congratulations on getting I2P installed!" +msgstr "Parabéns, você instalou o roteador I2P com êxito!" + +msgid "Welcome to I2P!" +msgstr "Bem-vindo ao I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "Seja {0}paciente{1} enquanto I2P ainda está iniciando-se e enquanto continuam sendo encontrados outros roteadores I2P!" + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Este é o momento ideal para personalizar a {0}configuração de largura de banda{1} na {2}página de configuração{3}." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "Quando você vê uma conexão no lado esquerdo chamada \"shared clients\", você pode visitar os nossos {0}{1} {2}FAQ{3}." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Conecte seu cliente de IRC para o servidor {0}localhost:6668{1} e vem para nos cumprimentar aos canais #i2p-br, {2}#i2p-help{3} ou {4}#i2p{5}!" diff --git a/apps/routerconsole/locale-news/messages_ru.po b/apps/routerconsole/locale-news/messages_ru.po new file mode 100644 index 0000000000..e1c2573615 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_ru.po @@ -0,0 +1,64 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2013-07-05 16:26+0000\n" +"Last-Translator: Roman Azarenko \n" +"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/" +"language/ru_RU/)\n" +"Language: ru_RU\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgid "Congratulations on getting I2P installed!" +msgstr "Поздравляем с успешным завершением установки I2P!" + +msgid "Welcome to I2P!" +msgstr "Добро пожаловать в I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "Немного терпения! {0}{1} I2P-маршрутизатору потребуется пара минут для запуска модулей и первого подключения к сети I2P." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Пока Вы ждете, самое время зайти в {2}сетевые настройки{3} и {0}выставить ограничение скорости{1} в соответствии со скоростью Вашего подключения к интернету. " + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "{0}Не забудьте заглянуть{1} в наш {2}{3} FAQ." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Как только в панели слева в разделе «Локальные туннели» появится запись «коллективные клиенты» — I2P готов к работе. Подключайте Ваш IRC-клиент к серверу {0}localhost:6668{1} и заходите сказать нам привет на канал {2}#i2p-help{3} и {4}#i2p{5}." diff --git a/apps/routerconsole/locale-news/messages_sv.po b/apps/routerconsole/locale-news/messages_sv.po new file mode 100644 index 0000000000..7fb7c36f95 --- /dev/null +++ b/apps/routerconsole/locale-news/messages_sv.po @@ -0,0 +1,63 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-13 21:46+0000\n" +"PO-Revision-Date: 2013-01-03 09:01+0000\n" +"Last-Translator: mon \n" +"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/" +"language/sv_SE/)\n" +"Language: sv_SE\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" + +msgid "Congratulations on getting I2P installed!" +msgstr "" + +msgid "Welcome to I2P!" +msgstr "Välkommen till I2P!" + +#, java-format +msgid "Please {0}have patience{1} as I2P boots up and finds peers." +msgstr "{0}Ha tålamod{1} medan I2P startar upp och letar upp peers." + +#, java-format +msgid "" +"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}" +"configuration page{3}." +msgstr "Medan du väntar, var god {0}ställ in dina bandbreddd och port inställningar{1} på {2}konfigurations-sidan{3}." + +msgid "Also you can setup your browser to use the I2P proxy to reach eepsites." +msgstr "" + +msgid "" +"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your " +"browser settings." +msgstr "" + +msgid "Do not use SOCKS for this." +msgstr "" + +#, java-format +msgid "" +"More information can be found on the {0}I2P browser proxy setup page{1}." +msgstr "" + +#, java-format +msgid "" +"Once you have a \"shared clients\" destination listed on the left, please {0}" +"check out{1} our {2}FAQ{3}." +msgstr "När du har en \"delade klienter\" distination listad på vänster sida, {0}kika på{1} vår {2}FAQ{3}." + +#, java-format +msgid "" +"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-" +"help{3} or {4}#i2p{5}." +msgstr "Rikta din IRC-klient till {0}localhost:6668{1} och säg hej till oss på {2}#i2p-help{3} eller {4}#i2p{5}." diff --git a/build.xml b/build.xml index 15a62eb393..1e9693868e 100644 --- a/build.xml +++ b/build.xml @@ -432,7 +432,10 @@ - + + + + diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt index 1d2c1d33cb..9c46c9bc76 100644 --- a/installer/resources/deletelist.txt +++ b/installer/resources/deletelist.txt @@ -3,3 +3,67 @@ certificates/r31453.ovh.net certificates/75.145.125.59.crt certificates/forum.i2p2.de.crt +# old translated proxy error pages +docs/ahelper-conflict-header_ar.ht +docs/ahelper-conflict-header_de.ht +docs/ahelper-conflict-header_fr.ht +docs/ahelper-conflict-header_nl.ht +docs/ahelper-conflict-header_ru.ht +docs/ahelper-conflict-header_zh.ht +docs/auth-header_de.ht +docs/auth-header_fr.ht +docs/denied-header_ar.ht +docs/denied-header_de.ht +docs/denied-header_fr.ht +docs/denied-header_nl.ht +docs/denied-header_ru.ht +docs/denied-header_zh.ht +docs/dnf-header_de.ht +docs/dnf-header_fr.ht +docs/dnf-header_nl.ht +docs/dnf-header_ru.ht +docs/dnf-header_zh.ht +docs/dnfb-header_ar.ht +docs/dnfb-header_de.ht +docs/dnfb-header_fr.ht +docs/dnfb-header_nl.ht +docs/dnfb-header_ru.ht +docs/dnfb-header_zh.ht +docs/dnfh-header_de.ht +docs/dnfh-header_fr.ht +docs/dnfh-header_nl.ht +docs/dnfh-header_ru.ht +docs/dnfh-header_zh.ht +docs/dnfp-header_ar.ht +docs/dnfp-header_de.ht +docs/dnfp-header_fr.ht +docs/dnfp-header_nl.ht +docs/dnfp-header_ru.ht +docs/dnfp-header_zh.ht +docs/localhost-header_ar.ht +docs/localhost-header_de.ht +docs/localhost-header_fr.ht +docs/localhost-header_nl.ht +docs/localhost-header_ru.ht +docs/localhost-header_zh.ht +docs/noproxy-header_ar.ht +docs/noproxy-header_de.ht +docs/noproxy-header_fr.ht +docs/noproxy-header_nl.ht +docs/noproxy-header_ru.ht +docs/noproxy-header_zh.ht +docs/protocol-header_ar.ht +docs/protocol-header_de.ht +docs/protocol-header_fr.ht +docs/protocol-header_nl.ht +docs/protocol-header_ru.ht +docs/protocol-header_zh.ht +# old translated initial news +docs/initialNews/initialNews_ar.xml +docs/initialNews/initialNews_de.xml +docs/initialNews/initialNews_es.xml +docs/initialNews/initialNews_fr.xml +docs/initialNews/initialNews_nl.xml +docs/initialNews/initialNews_pt.xml +docs/initialNews/initialNews_ru.xml +docs/initialNews/initialNews_sv.xml diff --git a/installer/resources/initialNews/initialNews.xml b/installer/resources/initialNews/initialNews.xml index ab4afe73a7..63199b9996 100644 --- a/installer/resources/initialNews/initialNews.xml +++ b/installer/resources/initialNews/initialNews.xml @@ -1,25 +1,22 @@ -
-

Congratulations on getting I2P installed!

+
+

_("Congratulations on getting I2P installed!")

-Welcome to I2P! -Please have patience as I2P boots up and finds peers. +_("Welcome to I2P!") +_("Please {0}have patience{1} as I2P boots up and finds peers.", "", "")

-While you are waiting, please adjust your bandwidth settings on the -configuration page. +_("While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}configuration page{3}.", "", "", "", "")

-Also you can setup your browser to use the I2P proxy to reach eepsites. Just enter 127.0.0.1 (or localhost) -port 4444 as a http proxy into your browser settings. Do not use SOCKS for this. More information -can be found on I2P browser proxy setup page. +_("Also you can setup your browser to use the I2P proxy to reach eepsites.") +_("Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your browser settings.") +_("Do not use SOCKS for this.") +_("More information can be found on the {0}I2P browser proxy setup page{1}.", "", "")

-Once you have a "shared clients" destination listed on the left, -please check out our -FAQ. +_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "", "", "", "")

-Point your IRC client to localhost:6668 and say hi to us on -#i2p-help or #i2p. +_("Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-help{3} or {4}#i2p{5}.", "", "", "", "", "", "")

diff --git a/installer/resources/initialNews/initialNews_ar.xml b/installer/resources/initialNews/initialNews_ar.xml deleted file mode 100644 index e21ae5cb8e..0000000000 --- a/installer/resources/initialNews/initialNews_ar.xml +++ /dev/null @@ -1,20 +0,0 @@ -
-

Congratulations on getting I2P installed!

-

- !I2P مرحبا بك في شبكة -انتظر قليلا بينما يتم ربط الإتصال بباقي أعضاء الشبكة. -

-

- -بسنما يتم الإتصال بتغير بيانات سرعة الشبكة في قم -صفحة الخيارات. -

-

-عندما تظهر عبارة "shared clients" على اليسار يمكنك حينها زيارة -الأسئلة الشائعة. -

-

IRC اتصل بخادم الدردشة الفورية على - localhost:6668 -#i2p-help or #i2p. -

-
diff --git a/installer/resources/initialNews/initialNews_de.xml b/installer/resources/initialNews/initialNews_de.xml deleted file mode 100644 index 4b548a97bc..0000000000 --- a/installer/resources/initialNews/initialNews_de.xml +++ /dev/null @@ -1,27 +0,0 @@ -
-

Wir gratulieren zur erfolgreichen Installation von I2P!

-

-Willkommen im I2P! -Hab noch etwas Geduld, während I2P startet und weitere I2P-Router findet. -

-

-Passe bitte in der Zwischenzeit deine Einstellungen zur Bandbreite auf der -Einstellungsseite an! -

-

-Auch kannst Du gleich deinen Browser für die Nutzung von I2P einrichten. Setze in den -Einstellungen zum Browser ein HTTP Proxy ein mit 127.0.0.1 (oder localhost) mit Port 4444 als Ziel. -Mehr Informationen gibt es auf der I2P browser proxy Setup Seite. -

- -

-Sobald auf der linken Seite eine Verbindung namens "versch. Klienten" aufgelistet ist, kannst Du unsere FAQ besuchen. -

-

-Verbinde deinen IRC-Klienten mit dem Server auf localhost:6668 und schau bei uns im Kanal -#i2p-de, #i2p-help oder #i2p vorbei! -

-

-Wir wünschen Dir viel Freude an unserem Netz und hoffen, Deine Erwartungen zu erfüllen. -

-
diff --git a/installer/resources/initialNews/initialNews_es.xml b/installer/resources/initialNews/initialNews_es.xml deleted file mode 100644 index 18283c408c..0000000000 --- a/installer/resources/initialNews/initialNews_es.xml +++ /dev/null @@ -1,21 +0,0 @@ -
-

¡Felicidades!, has instalado el enrutador I2P con éxito.

-

-¡Bienvenido a I2P!
-¡Ten todavía paciencia mientras I2P esté arrancando y encontrando otros enrutadores I2P! -

-

-Este es el momento ideal para adaptar tu configuración del ancho de banda en la -página de configuración. -

-

-En cuanto veas a la izquierda una conexión llamada "clientes diferentes", puedes visitar nuestros FAQ. -

-

-¡Conécta tu cliente IRC con el servidor localhost:6668 y ven a saludarnos en los canales -#i2p-es, #i2p-help o #i2p! -

-

-Esperemos que tengas una buena experiencia con y en I2P. -

-
diff --git a/installer/resources/initialNews/initialNews_fr.xml b/installer/resources/initialNews/initialNews_fr.xml deleted file mode 100644 index 8f027c2704..0000000000 --- a/installer/resources/initialNews/initialNews_fr.xml +++ /dev/null @@ -1,20 +0,0 @@ -
-

Merci d'utiliser I2P !

-

-Bienvenue sur I2P ! -Merci de patienter le temps qu'I2P démarre et trouve des pairs. -

-

-Pendant ce temps, merci d'adjuster vos réglages de bande passante sur la page de -configuration. -

-

-Une fois que vous avez une indication "clients partagés…" listée sur la gauche, -merci de jeter un œil à la FAQ. -

-

-Pointez votre client IRC sur localhost:6668 et venez nous faire coucou sur -#i2p-help, #i2p-fr -ou #i2p. -

-
diff --git a/installer/resources/initialNews/initialNews_nl.xml b/installer/resources/initialNews/initialNews_nl.xml deleted file mode 100644 index b888fb2966..0000000000 --- a/installer/resources/initialNews/initialNews_nl.xml +++ /dev/null @@ -1,19 +0,0 @@ -
-

Gefeliciteerd met de installatie van I2P!

-

-Welkom bij I2P! -Heb wat geduld terwijl I2P opstart en peers zoekt. -

-

-Terwijl je wacht, pas je bandbreedte instellingen aan op de -configuratie pagina. -

-

-Wanneer je een "gedeelde clients" destination in de linker lijst hebt, -lees dan aub onze FAQ. -

-

-Verbind je IRC client met localhost:6668 en zeg Hallo in -#i2p-help of #i2p. -

-
diff --git a/installer/resources/initialNews/initialNews_pt.xml b/installer/resources/initialNews/initialNews_pt.xml deleted file mode 100644 index 76b553e2db..0000000000 --- a/installer/resources/initialNews/initialNews_pt.xml +++ /dev/null @@ -1,21 +0,0 @@ -
-

Parabéns, você instalou o roteador I2P com êxito!

-

-Bem-vindo ao I2P!
-Seja paciente enquanto I2P ainda está iniciando-se e enquanto continuam sendo encontrados outros roteadores I2P! -

-

-Este é o momento ideal para personalizar a configuração de largura de banda na -página de configuração. -

-

-Quando você vê uma conexão no lado esquerdo chamada "shared clients", você pode visitar os nossos FAQ. -

-

-Conecte seu cliente de IRC para o servidor localhost:6668 e vem para nos cumprimentar aos canais -#i2p-br, #i2p-help ou #i2p! -

-

-Esperamos que você tenha uma boa experiência no I2P. -

-
diff --git a/installer/resources/initialNews/initialNews_ru.xml b/installer/resources/initialNews/initialNews_ru.xml deleted file mode 100644 index f82df2c7f7..0000000000 --- a/installer/resources/initialNews/initialNews_ru.xml +++ /dev/null @@ -1,16 +0,0 @@ -
-

Поздравляем с успешным завершением установки I2P!

-

-Добро пожаловать в I2P! Немного терпения! I2P-маршрутизатору потребуется пара минут для запуска модулей и первого подключения к сети I2P. -

-

-Пока Вы ждете, самое время зайти в сетевые настройки и выставить ограничение скорости в соответствии со скоростью Вашего подключения к интернету. -

-

-Как только в панели слева в разделе «Локальные туннели» появится запись «коллективные клиенты» — I2P готов к работе. Подключайте Ваш IRC-клиент к серверу localhost:6668 и заходите сказать нам привет на канал -#i2p-help и #i2p. -

-

-Не забудьте заглянуть в наш FAQ. -

-
diff --git a/installer/resources/initialNews/initialNews_sv.xml b/installer/resources/initialNews/initialNews_sv.xml deleted file mode 100644 index 6c272d3ced..0000000000 --- a/installer/resources/initialNews/initialNews_sv.xml +++ /dev/null @@ -1,20 +0,0 @@ -
-

Congratulations on getting I2P installed!

-

-Välkommen till I2P! -Ha tålamod medan I2P startar upp och letar upp peers. -

-

-Medan du väntar, var god ställ in dina bandbreddd och port inställningar på -konfigurations-sidan. -

-

-När du har en "delade klienter" distination listad på vänster sida, - kika på vår -FAQ. -

-

-Rikta din IRC-klient till localhost:6668 och säg hej till oss på -#i2p-help eller #i2p. -

-
diff --git a/tests/scripts/checkpo.sh b/tests/scripts/checkpo.sh index e55d2c7f5c..bc7d939d3e 100755 --- a/tests/scripts/checkpo.sh +++ b/tests/scripts/checkpo.sh @@ -10,6 +10,7 @@ cd `dirname $0`/../.. DIRS="\ apps/routerconsole/locale \ + apps/routerconsole/locale-news \ apps/i2ptunnel/locale \ apps/i2ptunnel/locale-proxy \ apps/i2psnark/locale \