* Translations:

- Tag initialNews.xml for TranslateReader - Drop static translated initialNews pages - Add new routerconsole bundle for the news alone, shipped in the jar - Use TranslateReader in HTTP proxy for initial news - Initial translations created manually from translated xml filesx - Add translated proxy error pages and initial news to deletelist.txt TODO: ar translation fails checkpo.sh
2013-07-13 23:38:11 +00:00
parent 71038c311f
commit c1210b1c04
25 changed files with 840 additions and 182 deletions
--- 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
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@ -97,7 +97,7 @@
        </exec>
    </target>

-    <target name="jar1" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+    <target name="jar1" depends="compile, bundle-news, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
        <!-- set if unset -->
        <property name="workspace.changes.j.tr" value="" />
        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
@ -134,7 +134,6 @@
        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class" update="true" />
    </target>

-
    <target name="jarUpToDate">
        <uptodate property="jar.uptodate" targetfile="build/routerconsole.jar" >
            <srcfiles dir= "build/obj" includes="**/*.class" />
@ -166,6 +165,44 @@
        </exec>
    </target>

+    <target name="bundle-news" unless="no.bundle">
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <arg value="./bundle-messages-news.sh" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <arg value="./bundle-messages-news.sh" />
+        </exec>
+        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
+            <arg value="./bundle-messages-news.sh" />
+        </exec>
+    </target>
+
+    <target name="extractProxyTags">
+        <java classname="net.i2p.util.TranslateReader" fork="true" failonerror="true">
+            <classpath>
+                <pathelement location="../../../build/i2p.jar" />
+            </classpath>
+            <arg value="tag" />
+            <arg value="../../../installer/resources/initialNews/initialNews.xml" />
+            <arg value="build/News.java" />
+        </java>
+    </target>
+
+    <target name="poupdate-news" depends="extractProxyTags">
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-news.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-news.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-news.sh" />
+            <arg value="-p" />
+        </exec>
+    </target>
+
    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
            <arg value="list" />
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ 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
--- 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();
    }

--- a/apps/routerconsole/locale-news/messages_ar.po
+++ 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 <hamada@mail.i2p>\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 "بسنما يتم الإتصال <b>بتغير بيانات سرعة الشبكة في</b> قم <a href=\"config.jsp\">صفحة الخيارات</a>."
+
+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\" على اليسار يمكنك حينها <b>زيارة</b> <a href=\"http://www.i2p2.i2p/faq.html\">الأسئلة الشائعة</a>."
+
+#, 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 اتصل بخادم الدردشة الفورية  على <b>localhost:6668</b> <a href=\"irc://127.0.0.1:6668/i2p-help\">#i2p-help</a> or <a href=\"irc://127.0.0.1:6668/i2p\">#i2p</a>."
--- a/apps/routerconsole/locale-news/messages_de.po
+++ 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 <zeroflag@i2pmail.org>\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&auml;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&uuml;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 <a href=\"irc://127.0.0.1:6668/i2p-de\">#i2p-de</a>, {2}#i2p-help{3} oder {4}#i2p{5} vorbei!"
--- a/apps/routerconsole/locale-news/messages_en.po
+++ 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 <foo@bar>, 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 <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\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 ""
--- a/apps/routerconsole/locale-news/messages_es.po
+++ 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 <trolly@fastmail.fm>\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 "&iexcl;Felicidades!, has instalado el enrutador I2P con &eacute;xito."
+
+msgid "Welcome to I2P!"
+msgstr "&iexcl;Bienvenido a I2P!"
+
+#, java-format
+msgid "Please {0}have patience{1} as I2P boots up and finds peers."
+msgstr "&iexcl;Ten todav&iacute;a {0}paciencia{1} mientras I2P est&eacute; 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&oacute;n del ancho de banda{1} en la {2}p&aacute;gina de configuraci&oacute;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&oacute;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 "&iexcl;Con&eacute;cta tu cliente IRC con el servidor {0}localhost:6668{1} y ven a saludarnos en los canales <a href=\"irc://127.0.0.1:6668/i2p-es\">#i2p-es</a>, {2}#i2p-help{3} o {4}#i2p{5}!"
--- a/apps/routerconsole/locale-news/messages_fr.po
+++ 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 <foo@bar>, 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 <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\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&hellip;\" 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}, <a href=\"irc://127.0.0.1:6668/i2p-fr\">#i2p-fr</a> ou {4}#i2p{5}."
--- a/apps/routerconsole/locale-news/messages_nl.po
+++ 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 <random901@zoho.com>\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}."
--- a/apps/routerconsole/locale-news/messages_pt.po
+++ 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 <a href=\"irc://127.0.0.1:6668/i2p-br\">#i2p-br</a>, {2}#i2p-help{3} ou {4}#i2p{5}!"
--- a/apps/routerconsole/locale-news/messages_ru.po
+++ 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 <x12ozmouse@ya.ru>\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} <a href=\"http://www.i2p2.i2p/faq_ru.html\">FAQ</a>."
+
+#, 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}."
--- a/apps/routerconsole/locale-news/messages_sv.po
+++ 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 <mattias.ohlsson@inprose.com>\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}."
--- a/build.xml
+++ b/build.xml
@ -432,7 +432,10 @@
    <target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty, buildDesktopGui" >
        <echo message="Setting environment variable LG2 to a lang code (eg: de,zh,nl etc)" />
        <echo message=" will restrict language update to the language you specified, leaving other language untact." />
-        <ant dir="apps/routerconsole/java/" target="poupdate" />
+        <ant dir="apps/routerconsole/java/" >
+            <target name="poupdate" />
+            <target name="poupdate-news" />
+        </ant>
        <ant dir="apps/i2psnark/java/" target="poupdate" />
        <ant dir="apps/i2ptunnel/java/" >
            <target name="poupdate" />
--- 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
--- a/installer/resources/initialNews/initialNews.xml
+++ b/installer/resources/initialNews/initialNews.xml
@ -1,25 +1,22 @@
-<div lang="en">
-<h3>Congratulations on getting I2P installed!</h3>
+<div>
+<h3>_("Congratulations on getting I2P installed!")</h3>
 <p>
-<b>Welcome to I2P!</b>
-Please <b>have patience</b> as I2P boots up and finds peers.
+<b>_("Welcome to I2P!")</b>
+_("Please {0}have patience{1} as I2P boots up and finds peers.", "<b>", "</b>")
 </p>
 <p>
-While you are waiting, please <b>adjust your bandwidth settings</b> on the
-<a href="config.jsp">configuration page</a>.
+_("While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}configuration page{3}.", "<b>", "</b>", "<a href=\"config.jsp\">", "</a>")
 </p>
 <p>
-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 <a href="https://www.i2p2.de/htproxyports.html">I2P browser proxy setup page</a>.
+_("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}.", "<a href=\"https://www.i2p2.de/htproxyports.html\">", "</a>")
 </p>
 <p>
-Once you have a "shared clients" destination listed on the left,
-please <b>check out</b> our
-<a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
+_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "<b>", "</b>", "<a href=\"http://www.i2p2.i2p/faq.html\">", "</a>")
 </p>
 <p>
-Point your IRC client to <b>localhost:6668</b> and say hi to us on 
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> or <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
+_("Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-help{3} or {4}#i2p{5}.", "<b>", "</b>", "<a href=\"irc://127.0.0.1:6668/i2p-help\">", "</a>", "<a href=\"irc://127.0.0.1:6668/i2p\">", "</a>")
 </p>
 </div>
--- a/installer/resources/initialNews/initialNews_ar.xml
+++ b/installer/resources/initialNews/initialNews_ar.xml
@ -1,20 +0,0 @@
-<div lang="ar" dir="rtl">
-<h3>Congratulations on getting I2P installed!</h3>
-<p>
-<b> !I2P مرحبا بك في شبكة</b>
-انتظر قليلا بينما يتم ربط الإتصال بباقي أعضاء الشبكة.
-</p>
-<p>
-
-بسنما يتم الإتصال <b>بتغير بيانات سرعة الشبكة في</b> قم
-<a href="config.jsp">صفحة الخيارات</a>.
-</p>
-<p>
-عندما تظهر عبارة "shared clients" على اليسار يمكنك حينها <b>زيارة</b> 
-<a href="http://www.i2p2.i2p/faq.html">الأسئلة الشائعة</a>.
-</p>
-<p>IRC اتصل بخادم الدردشة الفورية  على
- <b>localhost:6668</b> 
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> or <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_de.xml
+++ b/installer/resources/initialNews/initialNews_de.xml
@ -1,27 +0,0 @@
-<div lang="de">
-<h3>Wir gratulieren zur erfolgreichen Installation von I2P!</h3>
-<p>
-<b>Willkommen im I2P!</b>
-Hab noch <b>etwas Geduld</b>, w&auml;hrend I2P startet und weitere I2P-Router findet.
-</p>
-<p>
-Passe bitte in der Zwischenzeit <b>deine Einstellungen zur Bandbreite</b> auf der
-<a href="config.jsp">Einstellungsseite</a> an!
-</p>
-<p>
-Auch kannst Du gleich deinen Browser f&uuml;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 <a href="https://www.i2p2.de/htproxyports.html">I2P browser proxy Setup Seite</a>.
-</p>
-
-<p>
-Sobald auf der linken Seite eine Verbindung namens "versch. Klienten" aufgelistet ist, kannst Du unsere <a href="http://www.i2p2.i2p/faq_de.html">FAQ</a> besuchen.
-</p>
-<p>
-Verbinde deinen IRC-Klienten mit dem Server auf <b>localhost:6668</b> und schau bei uns im Kanal 
-<a href="irc://127.0.0.1:6668/i2p-de">#i2p-de</a>, <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> oder <a href="irc://127.0.0.1:6668/i2p">#i2p</a> vorbei!
-</p>
-<p>
-Wir wünschen Dir viel Freude an unserem Netz und hoffen, Deine Erwartungen zu erfüllen.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_es.xml
+++ b/installer/resources/initialNews/initialNews_es.xml
@ -1,21 +0,0 @@
-<div lang="es">
-<h3>&iexcl;Felicidades!, has instalado el enrutador I2P con &eacute;xito.</h3>
-<p>
-<b>&iexcl;Bienvenido a I2P!</b><br>
-&iexcl;Ten todav&iacute;a <b>paciencia</b> mientras I2P est&eacute; arrancando y encontrando otros enrutadores I2P!
-</p>
-<p>
-Este es el momento ideal para adaptar tu <b>configuraci&oacute;n del ancho de banda</b> en la 
-<a href="config.jsp">p&aacute;gina de configuraci&oacute;n</a>.
-</p>
-<p>
-En cuanto veas a la izquierda una conexi&oacute;n llamada "clientes diferentes", puedes visitar nuestros <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
-</p>
-<p>
-&iexcl;Con&eacute;cta tu cliente IRC con el servidor <b>localhost:6668</b> y ven a saludarnos en los canales 
-<a href="irc://127.0.0.1:6668/i2p-es">#i2p-es</a>, <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> o <a href="irc://127.0.0.1:6668/i2p">#i2p</a>!
-</p>
-<p>
-Esperemos que tengas una buena experiencia con y en I2P.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_fr.xml
+++ b/installer/resources/initialNews/initialNews_fr.xml
@ -1,20 +0,0 @@
-<div lang="fr">
-<h3>Merci d'utiliser I2P !</h3>
-<p>
-<b>Bienvenue sur I2P !</b>
-Merci de <b>patienter</b> le temps qu'I2P démarre et trouve des pairs.
-</p>
-<p>
-Pendant ce temps, merci d'<b>adjuster vos réglages de bande passante</b> sur la page de 
-<a href="config.jsp">configuration</a>.
-</p>
-<p>
-Une fois que vous avez une indication "clients partagés&hellip;" listée sur la gauche,
-merci de <b>jeter un œil</b> à la <a href="http://www.i2p2.i2p/faq_fr.html">FAQ</a>.
-</p>
-<p>
-Pointez votre client IRC sur <b>localhost:6668</b> et venez nous faire coucou sur  
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p-fr">#i2p-fr</a> 
-ou <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_nl.xml
+++ b/installer/resources/initialNews/initialNews_nl.xml
@ -1,19 +0,0 @@
-<div lang="nl">
-<h3>Gefeliciteerd met de installatie van I2P!</h3>
-<p>
-<b>Welkom bij I2P!</b>
-Heb <b>wat geduld</b> terwijl I2P opstart en peers zoekt.
-</p>
-<p>
-Terwijl je wacht, <b>pas je bandbreedte instellingen aan</b> op de
-<a href="config.jsp">configuratie pagina</a>.
-</p>
-<p>
-Wanneer je een "gedeelde clients" destination in de linker lijst hebt,
-<b>lees dan aub</b> onze <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
-</p>
-<p>
-Verbind je IRC client met <b>localhost:6668</b> en zeg Hallo in
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> of <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_pt.xml
+++ b/installer/resources/initialNews/initialNews_pt.xml
@ -1,21 +0,0 @@
-<div lang="pt">
-<h3>Parabéns, você instalou o roteador I2P com êxito!</h3>
-<p>
-<b>Bem-vindo ao I2P!</b><br>
-Seja <b>paciente</b> enquanto I2P ainda está iniciando-se e enquanto continuam sendo encontrados outros roteadores I2P!
-</p>
-<p>
-Este é o momento ideal para personalizar a <b>configuração de largura de banda</b> na 
-<a href="config.jsp">página de configuração</a>.
-</p>
-<p>
-Quando você vê uma conexão no lado esquerdo chamada "shared clients", você pode visitar os nossos <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
-</p>
-<p>
-Conecte seu cliente de IRC para o servidor <b>localhost:6668</b> e vem para nos cumprimentar aos canais
-<a href="irc://127.0.0.1:6668/i2p-br">#i2p-br</a>, <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> ou <a href="irc://127.0.0.1:6668/i2p">#i2p</a>!
-</p>
-<p>
-Esperamos que você tenha uma boa experiência no I2P.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_ru.xml
+++ b/installer/resources/initialNews/initialNews_ru.xml
@ -1,16 +0,0 @@
-<div lang="ru">
-<h3>Поздравляем с успешным завершением установки I2P!</h3>
-<p>
-<b>Добро пожаловать в I2P!</b> Немного терпения! I2P-маршрутизатору потребуется пара минут для запуска модулей и первого подключения к сети I2P. 
-</p>
-<p>
-Пока Вы ждете, самое время зайти в <a href="config.jsp">сетевые настройки</a> и <b>выставить ограничение скорости</b> в соответствии со скоростью Вашего подключения к интернету. 
-</p>
-<p>
-Как только в панели слева в разделе «Локальные туннели» появится запись «коллективные клиенты» — I2P готов к работе. Подключайте Ваш IRC-клиент к серверу <b>localhost:6668</b> и заходите сказать нам привет на канал 
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> и <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
-</p>
-<p>
-<b>Не забудьте заглянуть</b> в наш <a href="http://www.i2p2.i2p/faq_ru.html">FAQ</a>.
-</p>
-</div>
--- a/installer/resources/initialNews/initialNews_sv.xml
+++ b/installer/resources/initialNews/initialNews_sv.xml
@ -1,20 +0,0 @@
-<div lang="en">
-<h3>Congratulations on getting I2P installed!</h3>
-<p>
-<b>Välkommen till I2P!</b>
-<b>Ha tålamod</b> medan I2P startar upp och letar upp peers. 
-</p>
-<p>
-Medan du väntar, var god <b>ställ in dina bandbreddd och port inställningar</b> på
-<a href="config.jsp">konfigurations-sidan</a>.
-</p>
-<p>
-När du har en "delade klienter" distination listad på vänster sida,
- <b>kika på</b> vår
-<a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
-</p>
-<p>
-Rikta din IRC-klient till <b>localhost:6668</b> och säg hej till oss på 
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> eller <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
-</p>
-</div>
--- 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 \