0.9.31

and '8e065cf86f719138e323815c38f249ed56941327'

.idea/ant.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+  </component>
+</project>

.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

.idea/libraries/javax_servlet_jsp_2_2_0_v201112011158.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="javax.servlet.jsp-2.2.0.v201112011158">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jettylib.xml

@@ -0,0 +1,22 @@
+<component name="libraryTable">
+  <library name="jettylib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/servlet-api-3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jrobin_1_5_9_1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jrobin-1.5.9.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jrobin/jrobin-1.5.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/lib.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/jstl.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/standard.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/start.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="start">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/systray4j.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="systray4j">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/systray/java/lib/systray4j.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/tomcat_coyote_util.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="tomcat-coyote-util">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/tomcat_lib.xml

@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="tomcat-lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/el-api.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/wrapper.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="wrapper">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/all/wrapper.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/wrapper_win.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="wrapper-win">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/win-all/wrapper.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/apps/BOB/BOB.iml" filepath="$PROJECT_DIR$/apps/BOB/BOB.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/addressbook/addressbook.iml" filepath="$PROJECT_DIR$/apps/addressbook/addressbook.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/admin/admin.iml" filepath="$PROJECT_DIR$/apps/admin/admin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" filepath="$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" filepath="$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" filepath="$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" filepath="$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" filepath="$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" />
+      <module fileurl="file://$PROJECT_DIR$/installer/installer.iml" filepath="$PROJECT_DIR$/installer/installer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/jetty/jetty.iml" filepath="$PROJECT_DIR$/apps/jetty/jetty.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" filepath="$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" />
+      <module fileurl="file://$PROJECT_DIR$/router/router.iml" filepath="$PROJECT_DIR$/router/router.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" filepath="$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/sam/sam.iml" filepath="$PROJECT_DIR$/apps/sam/sam.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/streaming/streaming.iml" filepath="$PROJECT_DIR$/apps/streaming/streaming.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/susidns/susidns.iml" filepath="$PROJECT_DIR$/apps/susidns/susidns.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/susimail/susimail.iml" filepath="$PROJECT_DIR$/apps/susimail/susimail.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/systray/systray.iml" filepath="$PROJECT_DIR$/apps/systray/systray.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" filepath="$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" />
+    </modules>
+  </component>
+</project>

.idea/runConfigurations/updater.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="updater" type="AntRunConfiguration" factoryName="Ant Target">
+    <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="updater" />
+    <method />
+  </configuration>
+</component>

.mtn-ignore

@@ -37,9 +37,14 @@ web-out.xml
 /tmp
 ^apps/jetty/jettylib
 
+# MSVC files
+core/c/jcpuid/msvc/*.opendb
+core/c/jcpuid/msvc/*.pdb
+core/c/jcpuid/msvc/*.sdf
+core/c/jcpuid/msvc/*.user
+
 # Debian-related
 ^debian/copyright
-^debian/changelog
 ^.pc/
 
 # Build property overrides

.tx/config

@@ -6,10 +6,12 @@ trans.cs = apps/i2ptunnel/locale/messages_cs.po
 trans.da = apps/i2ptunnel/locale/messages_da.po
 trans.de = apps/i2ptunnel/locale/messages_de.po
 trans.es = apps/i2ptunnel/locale/messages_es.po
+trans.fi = apps/i2ptunnel/locale/messages_fi.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
 trans.hu = apps/i2ptunnel/locale/messages_hu.po
 trans.it = apps/i2ptunnel/locale/messages_it.po
 trans.ja = apps/i2ptunnel/locale/messages_ja.po
+trans.ko = apps/i2ptunnel/locale/messages_ko.po
 trans.nb = apps/i2ptunnel/locale/messages_nb.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
 trans.nn = apps/i2ptunnel/locale/messages_nn.po
@@ -20,6 +22,7 @@ trans.ro = apps/i2ptunnel/locale/messages_ro.po
 trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
 trans.sk = apps/i2ptunnel/locale/messages_sk.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
+trans.tr_TR = apps/i2ptunnel/locale/messages_tr.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
 trans.vi = apps/i2ptunnel/locale/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po
@@ -32,11 +35,13 @@ trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
 trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
 trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.fi = apps/i2ptunnel/locale-proxy/messages_fi.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
 trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.ko = apps/i2ptunnel/locale-proxy/messages_ko.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
 trans.pl = apps/i2ptunnel/locale-proxy/messages_pl.po
@@ -46,6 +51,7 @@ trans.ro = apps/i2ptunnel/locale-proxy/messages_ro.po
 trans.ru_RU = apps/i2ptunnel/locale-proxy/messages_ru.po
 trans.sk = apps/i2ptunnel/locale-proxy/messages_sk.po
 trans.sv_SE = apps/i2ptunnel/locale-proxy/messages_sv.po
+trans.tr_TR = apps/i2ptunnel/locale-proxy/messages_tr.po
 trans.uk_UA = apps/i2ptunnel/locale-proxy/messages_uk.po
 trans.vi = apps/i2ptunnel/locale-proxy/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale-proxy/messages_zh.po
@@ -65,6 +71,7 @@ trans.fr = apps/routerconsole/locale/messages_fr.po
 trans.hu = apps/routerconsole/locale/messages_hu.po
 trans.it = apps/routerconsole/locale/messages_it.po
 trans.ja = apps/routerconsole/locale/messages_ja.po
+trans.ko = apps/routerconsole/locale/messages_ko.po
 trans.nb = apps/routerconsole/locale/messages_nb.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
 trans.pl = apps/routerconsole/locale/messages_pl.po
@@ -83,10 +90,13 @@ trans.zh_TW = apps/routerconsole/locale/messages_zh_TW.po
 source_file = apps/routerconsole/locale-news/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale-news/messages_ar.po
+trans.cs = apps/routerconsole/locale-news/messages_cs.po
 trans.de = apps/routerconsole/locale-news/messages_de.po
+trans.el = apps/routerconsole/locale-news/messages_el.po
 trans.es = apps/routerconsole/locale-news/messages_es.po
 trans.fi = apps/routerconsole/locale-news/messages_fi.po
 trans.fr = apps/routerconsole/locale-news/messages_fr.po
+trans.gl = apps/routerconsole/locale-news/messages_gl.po
 trans.he = apps/routerconsole/locale-news/messages_he.po
 ;; Java converts id to in
 trans.id = apps/routerconsole/locale-news/messages_in.po
@@ -103,6 +113,7 @@ trans.ro = apps/routerconsole/locale-news/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
 trans.sk = apps/routerconsole/locale-news/messages_sk.po
 trans.sq = apps/routerconsole/locale-news/messages_sq.po
+trans.sr = apps/routerconsole/locale-news/messages_sr.po
 trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
 trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale-news/messages_uk.po
@@ -119,11 +130,14 @@ trans.de = apps/routerconsole/locale-countries/messages_de.po
 trans.el = apps/routerconsole/locale-countries/messages_el.po
 trans.es = apps/routerconsole/locale-countries/messages_es.po
 trans.et_EE = apps/routerconsole/locale-countries/messages_et.po
+trans.fa = apps/routerconsole/locale-countries/messages_fa.po
 trans.fi = apps/routerconsole/locale-countries/messages_fi.po
 trans.fr = apps/routerconsole/locale-countries/messages_fr.po
+trans.gl = apps/routerconsole/locale-countries/messages_gl.po
 trans.hu = apps/routerconsole/locale-countries/messages_hu.po
 trans.it = apps/routerconsole/locale-countries/messages_it.po
 trans.ja = apps/routerconsole/locale-countries/messages_ja.po
+trans.ko = apps/routerconsole/locale-countries/messages_ko.po
 trans.mg = apps/routerconsole/locale-countries/messages_mg.po
 trans.nb = apps/routerconsole/locale-countries/messages_nb.po
 trans.nl = apps/routerconsole/locale-countries/messages_nl.po
@@ -135,8 +149,8 @@ trans.ru_RU = apps/routerconsole/locale-countries/messages_ru.po
 trans.sk = apps/routerconsole/locale-countries/messages_sk.po
 trans.sq = apps/routerconsole/locale-countries/messages_sq.po
 trans.sv_SE = apps/routerconsole/locale-countries/messages_sv.po
-trans.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
 trans.tr_TR = apps/routerconsole/locale-countries/messages_tr.po
+trans.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
 trans.vi = apps/routerconsole/locale-countries/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale-countries/messages_zh.po
 trans.zh_TW = apps/routerconsole/locale-countries/messages_zh_TW.po
@@ -148,18 +162,23 @@ trans.ar = apps/i2psnark/locale/messages_ar.po
 trans.cs = apps/i2psnark/locale/messages_cs.po
 trans.de = apps/i2psnark/locale/messages_de.po
 trans.es = apps/i2psnark/locale/messages_es.po
+trans.fi = apps/i2psnark/locale/messages_fi.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
 trans.hu = apps/i2psnark/locale/messages_hu.po
 trans.it = apps/i2psnark/locale/messages_it.po
+trans.ja = apps/i2psnark/locale/messages_ja.po
+trans.ko = apps/i2psnark/locale/messages_ko.po
 trans.nb = apps/i2psnark/locale/messages_nb.po
 trans.nl = apps/i2psnark/locale/messages_nl.po
 trans.pl = apps/i2psnark/locale/messages_pl.po
 trans.pt = apps/i2psnark/locale/messages_pt.po
-trans.pt_BR = apps/i2psnark/locale/messages_pt_bR.po
+trans.pt_BR = apps/i2psnark/locale/messages_pt_BR.po
 trans.ro = apps/i2psnark/locale/messages_ro.po
 trans.ru_RU = apps/i2psnark/locale/messages_ru.po
 trans.sk = apps/i2psnark/locale/messages_sk.po
 trans.sv_SE = apps/i2psnark/locale/messages_sv.po
+trans.tr_TR = apps/i2psnark/locale/messages_tr.po
+trans.uk_UA = apps/i2psnark/locale/messages_uk.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po
 
@@ -172,10 +191,13 @@ trans.da = apps/susidns/locale/messages_da.po
 trans.de = apps/susidns/locale/messages_de.po
 trans.el = apps/susidns/locale/messages_el.po
 trans.es = apps/susidns/locale/messages_es.po
+trans.fi = apps/susidns/locale/messages_fi.po
 trans.fr = apps/susidns/locale/messages_fr.po
+trans.gl = apps/susidns/locale/messages_gl.po
 trans.hu = apps/susidns/locale/messages_hu.po
 trans.it = apps/susidns/locale/messages_it.po
 trans.ja = apps/susidns/locale/messages_ja.po
+trans.ko = apps/susidns/locale/messages_ko.po
 trans.nl = apps/susidns/locale/messages_nl.po
 trans.pl = apps/susidns/locale/messages_pl.po
 trans.pt = apps/susidns/locale/messages_pt.po
@@ -187,27 +209,40 @@ trans.tr_TR = apps/susidns/locale/messages_tr.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
+trans.zh_TW = apps/susidns/locale/messages_zh_TW.po
 
 [I2P.desktopgui]
 source_file = apps/desktopgui/locale/messages_en.po
 source_lang = en
 trans.ar = apps/desktopgui/locale/messages_ar.po
+trans.bg = apps/desktopgui/locale/messages_bg.po
+trans.ca = apps/desktopgui/locale/messages_ca.po
 trans.cs = apps/desktopgui/locale/messages_cs.po
 trans.da = apps/desktopgui/locale/messages_da.po
 trans.de = apps/desktopgui/locale/messages_de.po
 trans.el = apps/desktopgui/locale/messages_el.po
 trans.es = apps/desktopgui/locale/messages_es.po
+trans.fa = apps/desktopgui/locale/messages_fa.po
+trans.fi = apps/desktopgui/locale/messages_fi.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
+trans.gl = apps/desktopgui/locale/messages_gl.po
 trans.hu = apps/desktopgui/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/desktopgui/locale/messages_in.po
 trans.it = apps/desktopgui/locale/messages_it.po
 trans.ja = apps/desktopgui/locale/messages_ja.po
+trans.ko = apps/desktopgui/locale/messages_ko.po
+trans.mg = apps/desktopgui/locale/messages_mg.po
+trans.nb = apps/desktopgui/locale/messages_nb.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
 trans.pl = apps/desktopgui/locale/messages_pl.po
+trans.pt = apps/desktopgui/locale/messages_pt.po
 trans.pt_BR = apps/desktopgui/locale/messages_pt_BR.po
 trans.ro = apps/desktopgui/locale/messages_ro.po
 trans.ru_RU = apps/desktopgui/locale/messages_ru.po
 trans.sk = apps/desktopgui/locale/messages_sk.po
 trans.sv_SE = apps/desktopgui/locale/messages_sv.po
+trans.sq = apps/desktopgui/locale/messages_sq.po
 trans.uk_UA = apps/desktopgui/locale/messages_uk.po
 trans.tr_TR = apps/desktopgui/locale/messages_tr.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
@@ -216,29 +251,37 @@ trans.zh_CN = apps/desktopgui/locale/messages_zh.po
 [I2P.susimail]
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
+trans.ar = apps/susimail/locale/messages_ar.po
 trans.cs = apps/susimail/locale/messages_cs.po
 trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
+trans.el = apps/susimail/locale/messages_el.po
 trans.es = apps/susimail/locale/messages_es.po
 trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
+trans.gl = apps/susimail/locale/messages_gl.po
 trans.hu = apps/susimail/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/susimail/locale/messages_in.po
 trans.it = apps/susimail/locale/messages_it.po
 trans.ja = apps/susimail/locale/messages_ja.po
+trans.ko = apps/susimail/locale/messages_ko.po
 trans.mg = apps/susimail/locale/messages_mg.po
+trans.nb = apps/susimail/locale/messages_nb.po
 trans.nl = apps/susimail/locale/messages_nl.po
 trans.pl = apps/susimail/locale/messages_pl.po
 trans.pt = apps/susimail/locale/messages_pt.po
 trans.pt_BR = apps/susimail/locale/messages_pt_BR.po
 trans.ro = apps/susimail/locale/messages_ro.po
 trans.ru_RU = apps/susimail/locale/messages_ru.po
+trans.sk = apps/susimail/locale/messages_sk.po
 trans.sq = apps/susimail/locale/messages_sq.po
 trans.sv_SE = apps/susimail/locale/messages_sv.po
+trans.tr_TR = apps/susimail/locale/messages_tr.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
+trans.zh_TW = apps/susimail/locale/messages_zh_TW.po
 
 [I2P.debconf]
 source_file = debian/po/templates.pot
@@ -249,6 +292,7 @@ trans.el = debian/po/el.po
 trans.es = debian/po/es.po
 trans.fi = debian/po/fi.po
 trans.fr = debian/po/fr.po
+trans.gl = debian/po/gl.po
 trans.id = debian/po/id.po
 trans.it = debian/po/it.po
 trans.hu = debian/po/hu.po
@@ -263,26 +307,23 @@ trans.ru_RU = debian/po/ru.po
 trans.sk = debian/po/sk.po
 trans.sq = debian/po/sq.po
 trans.sv_SE = debian/po/sv.po
-trans.uk_UA = debian/po/uk.po
 trans.tr_TR = debian/po/tr.po
+trans.uk_UA = debian/po/uk.po
 trans.zh_CN = debian/po/zh.po
+trans.zh_TW = debian/po/zh_TW.po
 
 [I2P.i2prouter-script]
 source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
-;; currently fails check
-;;trans.ca = installer/resources/locale/po/messages_ca.po
+trans.ca = installer/resources/locale/po/messages_ca.po
 trans.de = installer/resources/locale/po/messages_de.po
 trans.es = installer/resources/locale/po/messages_es.po
-;; currently fails check
-;;trans.fi = installer/resources/locale/po/messages_fi.po
+trans.fi = installer/resources/locale/po/messages_fi.po
 trans.fr = installer/resources/locale/po/messages_fr.po
 trans.id = installer/resources/locale/po/messages_id.po
 trans.it = installer/resources/locale/po/messages_it.po
-trans.pl = installer/resources/locale/po/messages_pl.po
 trans.ja = installer/resources/locale/po/messages_ja.po
-;; currently fails check
-;;trans.ko = installer/resources/locale/po/messages_ko.po
+trans.ko = installer/resources/locale/po/messages_ko.po
 trans.nl = installer/resources/locale/po/messages_nl.po
 trans.pl = installer/resources/locale/po/messages_pl.po
 trans.pt = installer/resources/locale/po/messages_pt.po
@@ -292,8 +333,7 @@ trans.ru_RU = installer/resources/locale/po/messages_ru.po
 trans.sk = installer/resources/locale/po/messages_sk.po
 trans.sv_SE = installer/resources/locale/po/messages_sv.po
 trans.tr_TR = installer/resources/locale/po/messages_tr.po
-;; currently fails check
-;;trans.uk_UA = installer/resources/locale/po/messages_uk.po
+trans.uk_UA = installer/resources/locale/po/messages_uk.po
 trans.zh_CN = installer/resources/locale/po/messages_zh.po
 
 [I2P.getopt]
@@ -305,6 +345,8 @@ trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
 trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
 trans.fi = core/java/src/gnu/getopt/MessagesBundle_fi.properties
 trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
+;; currently corrupt, non-UTF-8
+;;trans.gl = core/java/src/gnu/getopt/MessagesBundle_gl.properties
 trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
 ;; Java converts id to in
 trans.id = core/java/src/gnu/getopt/MessagesBundle_in.properties
@@ -323,6 +365,8 @@ trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
 trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
 ;; currently corrupt, non-UTF-8
 ;;trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
+;; currently corrupt, non-UTF-8
+;;trans.tr_TR = core/java/src/gnu/getopt/MessagesBundle_tr.properties
 trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
 trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
 
@@ -330,20 +374,47 @@ trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
 source_file = apps/ministreaming/locale/messages_en.po
 source_lang = en
 trans.ca = apps/ministreaming/locale/messages_ca.po
+trans.cs = apps/ministreaming/locale/messages_cs.po
 trans.de = apps/ministreaming/locale/messages_de.po
 trans.es = apps/ministreaming/locale/messages_es.po
+trans.fi = apps/ministreaming/locale/messages_fi.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
+trans.gl = apps/ministreaming/locale/messages_gl.po
 ;; Java converts id to in
 trans.id = apps/ministreaming/locale/messages_in.po
 trans.it = apps/ministreaming/locale/messages_it.po
+trans.ko = apps/ministreaming/locale/messages_ko.po
 trans.nb = apps/ministreaming/locale/messages_nb.po
+trans.nl = apps/ministreaming/locale/messages_nl.po
 trans.pl = apps/ministreaming/locale/messages_pl.po
+trans.pt = apps/ministreaming/locale/messages_pt.po
+trans.pt_BR = apps/ministreaming/locale/messages_pt_BR.po
 trans.ro = apps/ministreaming/locale/messages_ro.po
 trans.ru_RU = apps/ministreaming/locale/messages_ru.po
 trans.sv_SE = apps/ministreaming/locale/messages_sv.po
+trans.tr_TR = apps/ministreaming/locale/messages_tr.po
 trans.uk_UA = apps/ministreaming/locale/messages_uk.po
 trans.zh_CN = apps/ministreaming/locale/messages_zh.po
 
+[I2P.manpages]
+type = PO
+source_file = installer/resources/locale-man/man.pot
+source_lang = en
+; after adding languages here, add to debian/*.manpages also
+trans.de = installer/resources/locale-man/man_de.po
+trans.es = installer/resources/locale-man/man_es.po
+trans.fi = installer/resources/locale-man/man_fi.po
+trans.fr = installer/resources/locale-man/man_fr.po
+trans.it = installer/resources/locale-man/man_it.po
+trans.ko = installer/resources/locale-man/man_ko.po
+trans.nl = installer/resources/locale-man/man_nl.po
+trans.pl = installer/resources/locale-man/man_pl.po
+trans.pt = installer/resources/locale-man/man_pt.po
+trans.pt_BR = installer/resources/locale-man/man_pt_BR.po
+trans.ru_RU = installer/resources/locale-man/man_ru.po
+trans.sv_SE = installer/resources/locale-man/man_sv.po
+trans.zh_CN = installer/resources/locale-man/man_zh.po
+
 [main]
 host = https://www.transifex.com
 

Docker.entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+export JAVA_HOME=/opt/jdk/jre
+
+# Ensure user rights
+chown -R i2p:nobody /opt/i2p
+chmod -R u+rwx /opt/i2p
+
+gosu i2p /opt/i2p/i2psvc /opt/i2p/wrapper.config wrapper.pidfile=/var/tmp/i2p.pid \
+   wrapper.name=i2p \
+   wrapper.displayname="I2P Service" \
+   wrapper.statusfile=/var/tmp/i2p.status \
+   wrapper.java.statusfile=/var/tmp/i2p.java.status \
+   wrapper.logfile=/var/tmp/wrapper.log

Docker.expt

@@ -0,0 +1,7 @@
+#!/usr/bin/expect
+set timeout 15;
+spawn java -jar /tmp/i2pinstall.jar -console
+expect {
+ -re ".*press 1 to continue, 2 to quit, 3 to redisplay" {send "1\r"; exp_continue;}
+ -re "Select target path *" {send "/opt/i2p\r"; exp_continue;}
+}

Dockerfile

@@ -0,0 +1,62 @@
+FROM meeh/java8server:latest
+# Docker image based on Alpine with Java.
+
+# We use Oracle Java to run I2P, but uses the openjdk to build it.
+
+
+MAINTAINER Mikal Villa <mikal@sigterm.no>
+
+ENV GIT_BRANCH="master"
+ENV I2P_PREFIX="/opt/i2p"
+ENV PATH=${I2P_PREFIX}/bin:$PATH
+ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+
+ENV GOSU_VERSION=1.7
+ENV GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50  /usr/local/bin/gosu"
+
+RUN mkdir /user && adduser -S -h /user i2p && chown -R i2p:nobody /user
+
+# Adding files first, since Docker.expt is required for installation
+ADD Docker.expt /tmp/Docker.expt
+ADD Docker.entrypoint.sh /entrypoint.sh
+
+# Required for wget https
+RUN apk add --no-cache openssl
+# Gosu is a replacement for su/sudo in docker and not a backdoor :) See https://github.com/tianon/gosu
+RUN wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
+    && echo "${GOSU_SHASUM}" | sha256sum -c && chmod +x /usr/local/bin/gosu
+
+#
+# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
+# image under 200mb we need to remove all the build dependencies in the same "RUN" / layer.
+#
+
+# The main layer
+RUN apk --no-cache add build-base git gettext tar bzip2 apache-ant openjdk8 expect \
+    && mkdir -p /usr/src/build \
+    && cd /usr/src/build \
+    && git clone -b ${GIT_BRANCH} https://github.com/i2p/i2p.i2p.git \
+    && cd /usr/src/build/i2p.i2p \
+    && echo "noExe=true" >> build.properties \
+    && ant installer-linux \
+    && cp i2pinstall*.jar /tmp/i2pinstall.jar \
+    && mkdir -p /opt \
+    && chown i2p:root /opt \
+    && chmod u+rw /opt \
+    && gosu i2p expect -f /tmp/Docker.expt \
+    && cd ${I2P_PREFIX} \
+    && rm -fr man docs *.bat *.command *.app /tmp/i2pinstall.jar /tmp/Docker.expt \
+    && rm -fr /usr/src/build \
+    && apk --purge del build-base apache-ant expect tcl expat git openjdk8 openjdk8-jre openjdk8-jre-base openjdk8-jre-lib bzip2 tar \
+      binutils-libs binutils pkgconfig libcurl libc-dev musl-dev g++ make fortify-headers pkgconf giflib libssh2 libxdmcp libxcb \
+      libx11 pcre alsa-lib libxi libxrender libxml2 readline bash openssl \
+    && rm -fr /usr/lib/jvm/default-jre \
+    && ln -sf /opt/jdk/jre /usr/lib/jvm/default-jre \
+    && chmod a+x /entrypoint.sh
+
+
+
+EXPOSE 7654 7656 7657 7658 4444 6668 8998 7659 7660 4445 15000-20000
+
+ENTRYPOINT [ "/entrypoint.sh" ]
+

INSTALL-headless.txt

@@ -11,7 +11,7 @@ you may use:
   lynx http://localhost:7657/
 to configure the router.
 
-If you're having trouble, swing by http://forum.i2p/, check the
+If you're having trouble, check the
 website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p
 
 I2P will create and store files and configuration data in the user directory

LICENSE.txt

@@ -36,7 +36,7 @@ Public domain except as listed below:
    Copyright (c) 2003, TheCrypto
    See licenses/LICENSE-ElGamalDSA.txt
 
-   SHA256 and HMAC:
+   HMAC:
    Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
    See licenses/LICENSE-SHA256.txt
 
@@ -58,13 +58,13 @@ Public domain except as listed below:
 
    PRNG:
    Copyright (C) 2001, 2002, Free Software Foundation, Inc.
-   See licenses/LICENSE-LGPLv2.1.txt
+   See licenses/LICENSE-LGPLv2.1.txt or /usr/share/common-licenses/LGPL-2.1
 
    HashCash code:
    Copyright 2006 Gregory Rubin grrubin@gmail.com
    See licenses/LICENSE-HashCash.txt
 
-   GettextResource from gettext v0.18:
+   GettextResource from gettext v0.19.8:
    Copyright (C) 2001, 2007 Free Software Foundation, Inc.
    See licenses/LICENSE-LGPLv2.1.txt
 
@@ -103,9 +103,14 @@ Public domain except as listed below:
    http://creativecommons.org/licenses/by-sa/3.0/
    This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
 
+   GeoIP API 1.3.1:
+   See licenses/LICENSE-LGPLv2.1.txt
+
 
 Installer:
    Launch4j 3.0.1:
+   (Launch4j is only included in the upstream source package and Windows binaries.
+    Not applicable for non-Windows binaries or Debian/Launchpad packages.)
    Copyright (c) 2004, 2008 Grzegorz Kowal
    See licenses/LICENSE-Launch4j.txt (in binary packages)
    See installer/lib/launch4j/LICENSE.txt (in source packages)
@@ -145,8 +150,8 @@ Installer:
 
 
 
-Java Service Wrapper Community Edition 32-bit 3.5.25:
-   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
+Java Service Wrapper Community Edition 32-bit 3.5.30:
+   Copyright (C) 1999-2016 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
 
@@ -156,6 +161,8 @@ Jbigi Libraries (jbigi.jar):
    GMP 4.3.2 / 5.0.2:
    Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
    See licenses/LICENSE-LGPLv3.txt
+   GMP 6.0.0:
+   See licenses/LICENSE-GPLv2.txt
 
 
 Applications:
@@ -168,6 +175,10 @@ Applications:
    Copyright (C) sponge
    See licenses/COPYING-BOB.txt
 
+   Desktopgui
+   Copyright (c) Mathias De Maré
+   See licenses/LICENSE-DesktopGUI.txt
+
    I2PSnark:
    Copyright (C) 2003 Mark J. Wielaard
    GPLv2 (or any later version)
@@ -198,18 +209,22 @@ Applications:
        Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
        Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
        See licenses/LICENSE-BSD.txt
-     Zxing:
+     Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 8.1.17.v20150415:
+   Jetty 9.2.21.v20170120:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-ECLIPSE-1.0.html
-   See licenses/NOTICE-Commons-Logging.txt
 
-   JRobin 1.5.9.1:
+   JRobin 1.6.0-1:
+   Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
+   Copyright (c) 2011 The OpenNMS Group, Inc.
    See licenses/LICENSE-LGPLv2.1.txt
+   DeallocationHelper:
+   Copyright (c) 2006-2016 Julien Gouesse
+   See licenses/LICENSE-GPLv2.txt
 
    Ministreaming Lib:
    By mihi.
@@ -229,6 +244,7 @@ Applications:
          - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
        Silk icons: See licenses/LICENSE-SilkIcons.txt
        FatCow icons: See licenses/LICENSE-FatCowIcons.txt
+       Fugue Icons: See licenses/LICENSE-FugueIcons.txt
 
        GeoIP Data:
        This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
@@ -267,8 +283,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.44:
-   Copyright 1999-2015 The Apache Software Foundation
+   Tomcat 8.0.33:
+   Copyright 1999-2016 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -286,10 +302,6 @@ distributions. See the source package for the additional license information.
    Copyright (C) sponge
    DWTFYWTPL
 
-   Desktopgui
-   Copyright (c) Mathias De Maré
-   See apps/desktopgui/LICENSE
-
    SAM C Library:
    Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>
    See apps/sam/c/doc/license.txt

README.md

@@ -0,0 +1,62 @@
+# I2P
+
+This is the source code for the reference Java implementation of I2P.
+
+Latest release: https://geti2p.net/download
+
+## Installing
+
+See INSTALL.txt or https://geti2p.net/download for installation instructions.
+
+## Documentation
+
+https://geti2p.net/how
+
+FAQ: https://geti2p.net/faq
+
+API: http://docs.i2p-projekt.de/javadoc/
+or run 'ant javadoc' then start at build/javadoc/index.html
+
+## Building packages from source
+
+To get development branch from source control: https://geti2p.net/newdevelopers
+
+### Prerequisites
+
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+  - Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+  - Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel)
+    require only Java 1.6
+- Apache Ant 1.7.0 or higher
+- The xgettext, msgfmt, and msgmerge tools installed from the GNU gettext package
+  http://www.gnu.org/software/gettext/
+- Build environment must use a UTF-8 locale.
+
+### Build process
+
+On x86 systems do:
+
+    ant pkg
+
+On non-x86, use one of the following instead:
+
+    ant installer-linux
+    ant installer-freebsd
+    ant installer-osx
+
+Run 'ant' with no arguments to see other build options.
+
+## Contact info
+
+Need help? See the IRC channel #i2p on irc.freenode.net
+
+Bug reports: https://trac.i2p2.de/report/1
+
+Contact information, security issues, press inquiries: https://geti2p.net/en/contact
+
+Twitter: @i2p, @geti2p
+
+## Licenses
+
+See LICENSE.txt
+

README.txt

@@ -35,7 +35,6 @@ FAQ:
 
 Need help?
 	IRC irc.freenode.net #i2p
-	http://forum.i2p/
 
 Bug reports:
 	https://trac.i2p2.de/report/1

Slackware/i2p/doinst.sh

@@ -49,7 +49,7 @@ config /etc/rc.d/rc.i2p.new
 config $INST_DIR/wrapper.config.new
 
 if [ -e /var/log/packages/i2p-base* ]; then
-    echo "Warning: This package supercedes the 'i2p-base' package." >&2
+    echo "Warning: This package supersedes the 'i2p-base' package." >&2
     echo
     echo "You may want to 'removepkg i2p-base'" >&2
     echo "and check the contents of /etc/rc.d/rc.local*" >&2

apps/BOB/BOB.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="ministreaming" />
+  </component>
+</module>

apps/BOB/nbproject/project.properties

@@ -48,8 +48,9 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.version=1.7
+javac.source=${javac.version}
+javac.target=${javac.version}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

apps/BOB/src/net/i2p/BOB/BOB.java

@@ -155,7 +155,6 @@ public class BOB implements Runnable, ClientApp {
 	 *
 	 *  @param mgr may be null
 	 *  @param args non-null
-	 *  @throws Exception on bad args
 	 *  @since 0.9.10
 	 */
 	public BOB(I2PAppContext context, ClientAppManager mgr, String[] args) {
@@ -165,7 +164,7 @@ public class BOB implements Runnable, ClientApp {
 		if (classResource != null) {
 		    String classPath = classResource.toString();
 		    if (classPath.startsWith("jar")) {
-		        String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) +
+		        String manifestPath = classPath.substring(0, classPath.lastIndexOf('!') + 1) +
 		                "/META-INF/MANIFEST.MF";
 		        try {
 		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
@@ -364,25 +363,30 @@ public class BOB implements Runnable, ClientApp {
 			// We could order them to stop, but that could cause nasty issues in the locks.
 			visitAllThreads();
 			database.getReadLock();
-			int all = database.getcount();
-			database.releaseReadLock();
 			NamedDB nickinfo;
-			for (i = 0; i < all; i++) {
-				database.getReadLock();
-				nickinfo = (NamedDB) database.getnext(i);
-				nickinfo.getReadLock();
-				if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
-					database.getWriteLock();
-					nickinfo.getWriteLock();
-					nickinfo.add(P_STOPPING, Boolean.valueOf(true));
-					nickinfo.releaseWriteLock();
-					database.releaseWriteLock();
-				} else {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
+			try {
+				for (Object ndb : database.values()) {
+					nickinfo = (NamedDB) ndb;
+					nickinfo.getReadLock();
+					boolean released = false;
+					try {
+						if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
+							nickinfo.releaseReadLock();
+							released = true;
+							nickinfo.getWriteLock();
+							try {
+								nickinfo.add(P_STOPPING, Boolean.TRUE);
+							} finally {
+								nickinfo.releaseWriteLock();
+							}
+						}
+					} finally {
+						if (!released)
+							nickinfo.releaseReadLock();
+					}
 				}
+			} finally {
+				database.releaseReadLock();
 			}
 			changeState(STOPPED);
 			_log.info("BOB is now stopped.");

apps/BOB/src/net/i2p/BOB/I2PtoTCP.java

@@ -25,16 +25,16 @@ import net.i2p.data.DataHelper;
 import net.i2p.util.I2PAppThread;
 
 /**
- * Process I2P->TCP
+ * Process I2P->TCP
  *
  * @author sponge
  */
 public class I2PtoTCP implements Runnable {
 
 	private I2PSocket I2P;
-	private NamedDB info,  database;
+	private final NamedDB info, database;
 	private Socket sock;
-	private AtomicBoolean lives;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
@@ -56,8 +56,8 @@ public class I2PtoTCP implements Runnable {
 	}
 
 	private void runlock() {
-		database.releaseReadLock();
 		info.releaseReadLock();
+		database.releaseReadLock();
 	}
 
 	/**
@@ -78,23 +78,15 @@ public class I2PtoTCP implements Runnable {
 			die:
 			{
 				try {
-					try {
-						rlock();
-					} catch (Exception e) {
-						break die;
-					}
+					rlock();
 					try {
 						host = info.get("OUTHOST").toString();
 						port = Integer.parseInt(info.get("OUTPORT").toString());
 						tell = info.get("QUIET").equals(Boolean.FALSE);
 					} catch (Exception e) {
-						runlock();
 						break die;
-					}
-					try {
+					} finally {
 						runlock();
-					} catch (Exception e) {
-						break die;
 					}
 					sock = new Socket(host, port);
 					sock.setKeepAlive(true);

apps/BOB/src/net/i2p/BOB/MUXlisten.java

@@ -38,18 +38,18 @@ import net.i2p.util.Log;
  */
 public class MUXlisten implements Runnable {
 
-	private NamedDB database,  info;
-	private Logger _log;
-	private I2PSocketManager socketManager;
-	private ByteArrayInputStream prikey;
+	private final NamedDB database, info;
+	private final Logger _log;
+	private final I2PSocketManager socketManager;
+	private final ByteArrayInputStream prikey;
 	private ThreadGroup tg;
-	private String N;
-	private ServerSocket listener = null;
-	private int backlog = 50; // should this be more? less?
-	boolean go_out;
-	boolean come_in;
-	private AtomicBoolean lock;
-	private AtomicBoolean lives;
+	private final String N;
+	private ServerSocket listener;
+	private final int backlog = 50; // should this be more? less?
+	private final boolean go_out;
+	private final boolean come_in;
+	private final AtomicBoolean lock;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor Will fail if INPORT is occupied.
@@ -61,43 +61,39 @@ public class MUXlisten implements Runnable {
 	 * @throws java.io.IOException
 	 */
 	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Logger _log) throws I2PException, IOException, RuntimeException {
+		int port = 0;
+		InetAddress host = null;
+		this.lock = lock;
+		this.tg = null;
+		this.database = database;
+		this.info = info;
+		this._log = _log;
+		lives = new AtomicBoolean(false);
 		try {
-			int port = 0;
-			InetAddress host = null;
-			this.lock = lock;
-			this.tg = null;
-			this.database = database;
-			this.info = info;
-			this._log = _log;
-			lives = new AtomicBoolean(false);
-
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(true));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			this.database.getReadLock();
-			this.info.getReadLock();
-
-			N = this.info.get("NICKNAME").toString();
-			prikey = new ByteArrayInputStream((byte[]) info.get("KEYS"));
-			// Make a new copy so that anything else won't muck with our database.
-			Properties R = (Properties) info.get("PROPERTIES");
-			Properties Q = new Properties();
-			Lifted.copyProperties(R, Q);
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
-
-			this.database.getReadLock();
-			this.info.getReadLock();
-			this.go_out = info.exists("OUTPORT");
-			this.come_in = info.exists("INPORT");
-			if (this.come_in) {
-				port = Integer.parseInt(info.get("INPORT").toString());
-				host = InetAddress.getByName(info.get("INHOST").toString());
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.TRUE);
+			} finally {
+				wunlock();
+			}
+			Properties Q = new Properties();
+			rlock();
+			try {
+				N = this.info.get("NICKNAME").toString();
+				prikey = new ByteArrayInputStream((byte[]) info.get("KEYS"));
+				// Make a new copy so that anything else won't muck with our database.
+				Properties R = (Properties) info.get("PROPERTIES");
+				Lifted.copyProperties(R, Q);
+
+				this.go_out = info.exists("OUTPORT");
+				this.come_in = info.exists("INPORT");
+				if (this.come_in) {
+					port = Integer.parseInt(info.get("INPORT").toString());
+					host = InetAddress.getByName(info.get("INHOST").toString());
+				}
+			} finally {
+				runlock();
 			}
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
 
 			String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
 			int i2cpPort = 7654;
@@ -115,48 +111,51 @@ public class MUXlisten implements Runnable {
 					prikey, i2cpHost, i2cpPort, Q);
 		} catch (IOException e) {
 			// Something went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			throw new IOException(e.toString());
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
+			throw e;
 		} catch (RuntimeException e) {
 			// Something went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			throw new RuntimeException(e);
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
+			throw e;
 		} catch (Exception e) {
 			// Something else went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
 			e.printStackTrace();
 			throw new RuntimeException(e);
 		}
 	}
 
-	private void rlock() throws Exception {
+	private void rlock() {
 		database.getReadLock();
 		info.getReadLock();
 	}
 
-	private void runlock() throws Exception {
-		database.releaseReadLock();
+	private void runlock() {
 		info.releaseReadLock();
+		database.releaseReadLock();
 	}
 
-	private void wlock() throws Exception {
+	private void wlock() {
 		database.getWriteLock();
 		info.getWriteLock();
 	}
 
-	private void wunlock() throws Exception {
+	private void wunlock() {
 		info.releaseWriteLock();
 		database.releaseWriteLock();
 	}
@@ -170,24 +169,19 @@ public class MUXlisten implements Runnable {
 		Thread t = null;
 		Thread q = null;
 		try {
+			wlock();
 			try {
-				wlock();
 				try {
-					info.add("RUNNING", Boolean.valueOf(true));
+					info.add("RUNNING", Boolean.TRUE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
 				}
 			} catch (Exception e) {
 				lock.set(false);
 				return;
-			}
-			try {
+			} finally {
 				wunlock();
-			} catch (Exception e) {
-				lock.set(false);
-				return;
 			}
 			lives.set(true);
 			lock.set(false);
@@ -214,21 +208,17 @@ public class MUXlisten implements Runnable {
 							q.start();
 						}
 
+						wlock();
 						try {
-							wlock();
 							try {
-								info.add("STARTING", Boolean.valueOf(false));
+								info.add("STARTING", Boolean.FALSE);
 							} catch (Exception e) {
-								wunlock();
 								break quit;
 							}
 						} catch (Exception e) {
 							break quit;
-						}
-						try {
+						} finally {
 							wunlock();
-						} catch (Exception e) {
-							break quit;
 						}
 						boolean spin = true;
 						while (spin && lives.get()) {
@@ -237,21 +227,17 @@ public class MUXlisten implements Runnable {
 							} catch (InterruptedException e) {
 								break quit;
 							}
+							rlock();
 							try {
-								rlock();
 								try {
 									spin = info.get("STOPPING").equals(Boolean.FALSE);
 								} catch (Exception e) {
-									runlock();
 									break quit;
 								}
 							} catch (Exception e) {
 								break quit;
-							}
-							try {
+							} finally {
 								runlock();
-							} catch (Exception e) {
-								break quit;
 							}
 						}
 					} // die
@@ -271,16 +257,16 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", Boolean.valueOf(false));
-					info.add("STOPPING", Boolean.valueOf(true));
-					info.add("RUNNING", Boolean.valueOf(false));
+					info.add("STARTING", Boolean.FALSE);
+					info.add("STOPPING", Boolean.TRUE);
+					info.add("RUNNING", Boolean.FALSE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
 				}
-				wunlock();
 			} catch (Exception e) {
+			} finally {
+				wunlock();
 			}
 			// Start cleanup.
 			while (!lock.compareAndSet(false, true)) {
@@ -322,15 +308,15 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", Boolean.valueOf(false));
-					info.add("STOPPING", Boolean.valueOf(false));
-					info.add("RUNNING", Boolean.valueOf(false));
+					info.add("STARTING", Boolean.FALSE);
+					info.add("STOPPING", Boolean.FALSE);
+					info.add("RUNNING", Boolean.FALSE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
-				}
-				wunlock();
+				} finally {
+					wunlock();
+				}	
 			} catch (Exception e) {
 			}
 

apps/BOB/src/net/i2p/BOB/NamedDB.java

@@ -15,6 +15,12 @@
  */
 package net.i2p.BOB;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+
 /**
  * Internal database to relate nicknames to options to values
  *
@@ -22,129 +28,62 @@ package net.i2p.BOB;
  */
 public class NamedDB {
 
-	private volatile Object[][] data;
-	private int index,  writersWaiting,  readers;
+	private final Map<String, Object> data;
+	private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(false);
 
 	/**
-	 * make initial NULL object
 	 *
 	 */
 	public NamedDB() {
-		this.data = new Object[1][2];
+		this.data = new HashMap<String, Object>();
 	}
 
-	synchronized public void getReadLock() {
-		while ((writersWaiting != 0)) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
-		readers++;
+	public void getReadLock() {
+		lock.readLock().lock();
 	}
 
-	synchronized public void releaseReadLock() {
-		readers--;
-		notifyAll();
+	public void releaseReadLock() {
+		lock.readLock().unlock();
 	}
 
-	synchronized public void getWriteLock() {
-		writersWaiting++;
-		while (readers != 0 && writersWaiting != 1) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
+	public void getWriteLock() {
+		lock.writeLock().lock();
 	}
 
-	synchronized public void releaseWriteLock() {
-		writersWaiting--;
-		notifyAll();
+	public void releaseWriteLock() {
+		lock.writeLock().unlock();
 	}
 
 	/**
-	 * Find objects in the array, returns its index or throws exception
-	 * @param key
-	 * @return an objects index
-	 * @throws ArrayIndexOutOfBoundsException when key does not exist
-	 */
-	public int idx(Object key) throws ArrayIndexOutOfBoundsException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return i;
-			}
-		}
-		throw new ArrayIndexOutOfBoundsException("Can't locate key for index");
-	}
-
-	/**
-	 * Delete an object from array if it exists
+	 * Delete an object if it exists
 	 *
 	 * @param key
 	 */
-	public void kill(Object key) {
-
-		int i, j, k, l;
-		Object[][] olddata;
-		int didsomething = 0;
-
-		try {
-			k = idx(key);
-		} catch (ArrayIndexOutOfBoundsException b) {
-			return;
-		}
-		olddata = new Object[index + 2][2];
-		// copy to olddata, skipping 'k'
-		for (i = 0, l = 0; l < index; i++, l++) {
-			if (i == k) {
-				l++;
-				didsomething++;
-			}
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[l][j];
-			}
-		}
-		index -= didsomething;
-		data = olddata;
+	public void kill(String key) {
+		data.remove(key);
 	}
 
 	/**
-	 * Add object to the array, deletes the old one if it exists
+	 * Add object, deletes the old one if it exists
 	 *
 	 * @param key
 	 * @param val
 	 */
-	public void add(Object key, Object val) {
-		Object[][] olddata;
-		int i, j;
-		i = 0;
-		kill(key);
-
-		olddata = new Object[index + 2][2];
-		// copy to olddata
-		for (i = 0; i < index; i++) {
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[i][j];
-			}
-		}
-		data = olddata;
-		data[index++] = new Object[]{key, val};
+	public void add(String key, Object val) {
+		data.put(key, val);
 	}
 
 	/**
-	 * Get the object, and return it, throws RuntimeException
+	 * Get the object, and return it, throws RuntimeException if not found
 	 *
-	 * @param key
-	 * @return Object
-	 * @throws java.lang.RuntimeException
+	 * @param key non-null
+	 * @return Object non-null
+	 * @throws java.lang.RuntimeException if not found
 	 */
-	public Object get(Object key) throws RuntimeException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return data[i][1];
-			}
-		}
+	public Object get(String key) throws RuntimeException {
+		Object rv = data.get(key);
+		if (rv != null)
+			return rv;
 		throw new RuntimeException("Key not found");
 	}
 
@@ -154,33 +93,14 @@ public class NamedDB {
 	 * @param key
 	 * @return true if an object exists, else returns false
 	 */
-	public boolean exists(Object key) {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return true;
-			}
-		}
-		return false;
-
+	public boolean exists(String key) {
+		return data.containsKey(key);
 	}
 
 	/**
-	 *
-	 * @param i index
-	 * @return an indexed Object
-	 * @throws java.lang.RuntimeException
+	 * @since 0.9.29 replaces getcount() and getnext(int)
 	 */
-	public Object getnext(int i) throws RuntimeException {
-		if (i < index && i > -1) {
-			return data[i][1];
-		}
-		throw new RuntimeException("No more data");
-	}
-
-	/**
-	 * @return the count of how many objects
-	 */
-	public int getcount() {
-		return index;
+	public Collection<Object> values() {
+		return data.values();
 	}
 }

apps/BOB/src/net/i2p/BOB/TCPio.java

@@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class TCPio implements Runnable {
 
-	private InputStream Ain;
-	private OutputStream Aout;
-	private AtomicBoolean lives;
+	private final InputStream Ain;
+	private final OutputStream Aout;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor

apps/BOB/src/net/i2p/BOB/TCPtoI2P.java

@@ -35,29 +35,26 @@ import net.i2p.util.I2PAppThread;
 
 /**
  *
- * Process TCP->I2P
+ * Process TCP->I2P
  *
  * @author sponge
  */
 public class TCPtoI2P implements Runnable {
 
 	private I2PSocket I2P;
-	private NamedDB info,  database;
-	private Socket sock;
-	private I2PSocketManager socketManager;
-	private AtomicBoolean lives;
+	private final Socket sock;
+	private final I2PSocketManager socketManager;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
 	 * @param i2p
 	 * @param socket
-	 * param info
-	 * param database
+	 * @param info unused
+	 * @param database unused
 	 */
 	TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database, AtomicBoolean lives) {
 		this.sock = socket;
-		this.info = info;
-		this.database = database;
 		this.socketManager = i2p;
 		this.lives = lives;
 	}
@@ -106,16 +103,6 @@ public class TCPtoI2P implements Runnable {
 		out.flush();
 	}
 
-	private void rlock() {
-		database.getReadLock();
-		info.getReadLock();
-	}
-
-	private void runlock() {
-		info.releaseReadLock();
-		database.releaseReadLock();
-	}
-
 	/**
 	 * TCP stream to I2P stream thread starter
 	 *

apps/addressbook/addressbook.iml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$" relative="/WEB-INF" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jettylib" level="project" />
+    <orderEntry type="module" module-name="core" />
+  </component>
+</module>

apps/addressbook/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="addressbook" default="war" basedir=".">
+<project name="addressbook" default="all" basedir=".">
 
 	<property name="src" value="java/src"/>
 	<property name="build" value="build"/>
@@ -7,7 +7,9 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
-	<property name="javac.version" value="1.6" />
+	<property name="javac.version" value="1.7" />
+
+	<target name="all" depends="jar, emptyWar"/> 
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -36,24 +38,10 @@
             </depend>
         </target>
 
-        <target name="dependServlet" if="depend.available">
-            <depend
-                cache="../../build"
-                srcdir="${src}"
-                destdir="${build}" >
-                <!-- Depend on classes instead of jars where available -->
-                <classpath>
-                    <pathelement location="../../core/java/build/obj" />
-                    <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-                </classpath>
-            </depend>
-        </target>
-
-	<target name="compile" depends="init, depend">
+	<target name="compile" depends="init, depend, warUpToDate">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}"
-                       excludes="net/i2p/addressbook/Servlet.java">
+                       srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../../core/java/build/i2p.jar" />
@@ -61,55 +49,30 @@
 		</javac>
 	</target>
 
-	<target name="compileServlet" depends="init, dependServlet, compile">
-            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
-                       includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}"
-                       includes="net/i2p/addressbook/Servlet.java">
-            <compilerarg line="${javac.compilerargs}" />
-            <classpath>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-            </classpath>
-		</javac>
-	</target>
-
-        <!-- unused for now (except for Android), as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
 		<!-- set if unset -->
-		<property name="workspace.changes" value="" />
+		<property name="workspace.changes.tr" value="" />
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
-				<attribute name="Main-Class" value="addressbook.Daemon"/>
-				<attribute name="Implementation-Version" value="${full.version}" />
-				<attribute name="Built-By" value="${build.built-by}" />
-		                <attribute name="Build-Date" value="${build.timestamp}" />
-		                <attribute name="Base-Revision" value="${workspace.version}" />
-		                <attribute name="Workspace-Changes" value="${workspace.changes}" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<target name="war" depends="compileServlet, changes, warUpToDate" unless="war.uptodate">
-		<mkdir dir="${dist}/tmp"/>
-		<mkdir dir="${dist}/tmp/WEB-INF"/>
-		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
-		<copy todir="${dist}/tmp/WEB-INF/classes">
-			<fileset dir="${build}"/>
-		</copy>
-		<!-- set if unset -->
-		<property name="workspace.changes.tr" value="" />
-		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
-			<manifest>
+				<attribute name="Main-Class" value="net.i2p.addressbook.Daemon"/>
 				<attribute name="Implementation-Version" value="${full.version}" />
 				<attribute name="Built-By" value="${build.built-by}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+				<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
+				<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
 			</manifest>
-		</war>
-		<delete dir="${dist}/tmp"/>
+		</jar>
 	</target>
+
+        <target name="emptyWar" depends="init">
+            <jar destfile="${dist}/${war}" >
+                <manifest>
+                    <attribute name="Note" value="Intentionally empty" />
+                </manifest>
+            </jar>
+        </target>
 	
 	<target name="warUpToDate">
 	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.util.EepGet;
 import net.i2p.util.SecureFile;
 
@@ -38,14 +39,16 @@ import net.i2p.util.SecureFile;
  * destinations. AddressBooks can be created from local and remote files, merged
  * together, and written out to local files.
  * 
+ * Methods are NOT thread-safe.
+ * 
  * @author Ragnarok
  *  
  */
-class AddressBook {
+class AddressBook implements Iterable<Map.Entry<String, HostTxtEntry>> {
 
     private final String location;
     /** either addresses or subFile will be non-null, but not both */
-    private final Map<String, String> addresses;
+    private final Map<String, HostTxtEntry> addresses;
     private final File subFile;
     private boolean modified;
     private static final boolean DEBUG = false;
@@ -77,7 +80,7 @@ class AddressBook {
      *            A Map containing human readable addresses as keys, mapped to
      *            base64 i2p destinations.
      */
-    public AddressBook(Map<String, String> addresses) {
+    public AddressBook(Map<String, HostTxtEntry> addresses) {
         this.addresses = addresses;
         this.subFile = null;
         this.location = null;
@@ -107,7 +110,7 @@ class AddressBook {
         new File("addressbook.tmp").delete();
     }
 */
-    static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts
+    static final long MAX_SUB_SIZE = 5 * 1024 * 1024l; //about 8,000 hosts
 
     /**
      * Construct an AddressBook from the Subscription subscription. If the
@@ -128,7 +131,7 @@ class AddressBook {
      * @param proxyPort port number of proxy
      */
     public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
-        Map<String, String> a = null;
+        Map<String, HostTxtEntry> a = null;
         File subf = null;
         try {
             File tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
@@ -165,28 +168,40 @@ class AddressBook {
      */
     public AddressBook(File file) {
         this.location = file.toString();
-        Map<String, String> a;
+        Map<String, HostTxtEntry> a;
         try {
-            a = ConfigParser.parse(file);
+            a = HostTxtParser.parse(file);
         } catch (IOException exp) {
-            a = new HashMap<String, String>();
+            a = new HashMap<String, HostTxtEntry>();
         }
         this.addresses = a;
         this.subFile = null;
     }
 
+    /**
+     * Test only.
+     * 
+     * @param testsubfile path to a file containing the simulated fetch of a subscription
+     * @since 0.9.26
+     */
+    public AddressBook(String testsubfile) {
+        this.location = testsubfile;
+        this.addresses = null;
+        this.subFile = new File(testsubfile);
+    }
+
     /**
      * Return an iterator over the addresses in the AddressBook.
      * @since 0.8.7
      */
-    public Iterator<Map.Entry<String, String>> iterator() {
+    public Iterator<Map.Entry<String, HostTxtEntry>> iterator() {
         if (this.subFile != null) {
             try {
-                return new ConfigIterator(this.subFile);
+                return new HostTxtIterator(this.subFile);
             } catch (IOException ioe) {
-                return new ConfigIterator();
+                return new HostTxtIterator();
             }
-       }
+        }
         return this.addresses.entrySet().iterator();
     }
 
@@ -229,7 +244,7 @@ class AddressBook {
 
     /**
      * Do basic validation of the hostname
-     * hostname was already converted to lower case by ConfigParser.parse()
+     * hostname was already converted to lower case by HostTxtParser.parse()
      */
     public static boolean isValidKey(String host) {
 	return
@@ -291,15 +306,15 @@ class AddressBook {
     public void merge(AddressBook other, boolean overwrite, Log log) {
         if (this.addresses == null)
             throw new IllegalStateException();
-        for (Iterator<Map.Entry<String, String>> iter = other.iterator(); iter.hasNext(); ) {
-            Map.Entry<String, String> entry = iter.next();
+        for (Iterator<Map.Entry<String, HostTxtEntry>> iter = other.iterator(); iter.hasNext(); ) {
+            Map.Entry<String, HostTxtEntry> entry = iter.next();
             String otherKey = entry.getKey();
-            String otherValue = entry.getValue();
+            HostTxtEntry otherValue = entry.getValue();
 
-            if (isValidKey(otherKey) && isValidDest(otherValue)) {
+            if (isValidKey(otherKey) && isValidDest(otherValue.getDest())) {
                 if (this.addresses.containsKey(otherKey) && !overwrite) {
                     if (DEBUG && log != null &&
-                        !this.addresses.get(otherKey).equals(otherValue)) {
+                        !this.addresses.get(otherKey).equals(otherValue.getDest())) {
                         log.append("Conflict for " + otherKey + " from "
                                 + other.location
                                 + ". Destination in remote address book is "
@@ -332,7 +347,7 @@ class AddressBook {
             throw new IllegalStateException();
         if (this.modified) {
             try {
-                ConfigParser.write(this.addresses, file);
+                HostTxtParser.write(this.addresses, file);
             } catch (IOException exp) {
                 System.err.println("Error writing addressbook " + file.getAbsolutePath() + " : " + exp.toString());
             }

apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java

@@ -29,8 +29,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -44,8 +44,7 @@ import net.i2p.util.SystemVersion;
  * Utility class providing methods to parse and write files in config file
  * format, and subscription file format.
  * 
- * TODO: Change file encoding from default to UTF-8?
- *       Or switch to the DataHelper loadProps/storeProps methods?
+ * TODO: switch to the DataHelper loadProps/storeProps methods?
  * 
  * @author Ragnarok
  */
@@ -88,20 +87,23 @@ class ConfigParser {
      *             if the BufferedReader cannot be read.
      *  
      */
-    public static Map<String, String>  parse(BufferedReader input) throws IOException {
-        Map<String, String>  result = new HashMap<String, String>();
-        String inputLine;
-        inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = stripComments(inputLine);
-            String[] splitLine = DataHelper.split(inputLine, "=");
-            if (splitLine.length == 2) {
-                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+    private static Map<String, String> parse(BufferedReader input) throws IOException {
+        try {
+            Map<String, String> result = new HashMap<String, String>();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                inputLine = stripComments(inputLine);
+                if (inputLine.length() == 0)
+                    continue;
+                String[] splitLine = DataHelper.split(inputLine, "=", 2);
+                if (splitLine.length == 2) {
+                    result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+                }
             }
-            inputLine = input.readLine();
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
         }
-        input.close();
-        return result;
     }
 
     /**
@@ -114,15 +116,21 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static Map<String, String>  parse(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream, "UTF-8"));
-        Map<String, String>  rv = parse(input);
+    public static Map<String, String> parse(File file) throws IOException {
+        FileInputStream fileStream = null;
         try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            Map<String, String> rv = parse(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
     }
 
     /**
@@ -135,11 +143,13 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static Map<String, String>  parse(String string) throws IOException {
+/****
+    public static Map<String, String> parse(String string) throws IOException {
         StringReader stringReader = new StringReader(string);
         BufferedReader input = new BufferedReader(stringReader);
         return parse(input);
     }
+****/
     
     /**
      * Return a Map using the contents of the File file. If file cannot be read,
@@ -152,8 +162,8 @@ class ConfigParser {
      * @return A Map containing the key, value pairs from file, or if file
      *         cannot be read, map.
      */
-    public static Map<String, String>  parse(File file, Map<String, String>  map) {
-        Map<String, String>  result;
+    public static Map<String, String> parse(File file, Map<String, String> map) {
+        Map<String, String> result;
         try {
             result = parse(file);
             for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -179,19 +189,21 @@ class ConfigParser {
      * @throws IOException
      *             if input cannot be read.
      */
-    public static List<String> parseSubscriptions(BufferedReader input)
+    private static List<String> parseSubscriptions(BufferedReader input)
             throws IOException {
-        List<String> result = new LinkedList<String>();
-        String inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = stripComments(inputLine).trim();
-            if (inputLine.length() > 0) {
-                result.add(inputLine);
+        try {
+            List<String> result = new ArrayList<String>(4);
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                inputLine = stripComments(inputLine).trim();
+                if (inputLine.length() > 0) {
+                    result.add(inputLine);
+                }
             }
-            inputLine = input.readLine();
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
         }
-        input.close();
-        return result;
     }
 
     /**
@@ -203,15 +215,21 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static List<String> parseSubscriptions(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream, "UTF-8"));
-        List<String> rv = parseSubscriptions(input);
+    private static List<String> parseSubscriptions(File file) throws IOException {
+        FileInputStream fileStream = null;
         try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            List<String> rv = parseSubscriptions(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
     }
 
     /**
@@ -223,11 +241,13 @@ class ConfigParser {
      * @throws IOException
      *             if string cannot be read.
      */
+/****
     public static List<String> parseSubscriptions(String string) throws IOException {
         StringReader stringReader = new StringReader(string);
         BufferedReader input = new BufferedReader(stringReader);
         return parseSubscriptions(input);
     }
+****/
     
     /**
      * Return a List using the contents of the File file. If file cannot be
@@ -277,12 +297,15 @@ class ConfigParser {
      * @throws IOException
      *             if the BufferedWriter cannot be written to.
      */
-    public static void write(Map<String, String>  map, BufferedWriter output) throws IOException {
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            output.write(entry.getKey() + '=' + entry.getValue());
-            output.newLine();
+    private static void write(Map<String, String> map, BufferedWriter output) throws IOException {
+        try {
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                output.write(entry.getKey() + '=' + entry.getValue());
+                output.newLine();
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
         }
-        output.close();
     }
 
     /**
@@ -299,7 +322,7 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be written to.
      */
-    public static void write(Map<String, String>  map, File file) throws IOException {
+    public static void write(Map<String, String> map, File file) throws IOException {
         boolean success = false;
         if (!isWindows) {
             File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
@@ -327,13 +350,16 @@ class ConfigParser {
      * @throws IOException
      *             if output cannot be written to.
      */
-    public static void writeSubscriptions(List<String> list, BufferedWriter output)
+    private static void writeSubscriptions(List<String> list, BufferedWriter output)
             throws IOException {
-        for (String s : list) {
-            output.write(s);
-            output.newLine();
+        try {
+            for (String s : list) {
+                output.write(s);
+                output.newLine();
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
         }
-        output.close();
     }
     
     /**
@@ -347,7 +373,7 @@ class ConfigParser {
      * @throws IOException
      *             if output cannot be written to.
      */
-    public static void writeSubscriptions(List<String> list, File file)
+    private static void writeSubscriptions(List<String> list, File file)
             throws IOException {
         writeSubscriptions(list, new BufferedWriter(
                 new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -23,36 +23,45 @@ package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.client.naming.NamingService;
 import net.i2p.client.naming.SingleFileNamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
+import net.i2p.util.OrderedProperties;
 import net.i2p.util.SecureDirectory;
 import net.i2p.util.SystemVersion;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
+ * As of 0.9.30, package private, run with DaemonThread.
  * 
  * @author Ragnarok
  *
  */
-public class Daemon {
+class Daemon {
     public static final String VERSION = "2.0.4";
-    private static final Daemon _instance = new Daemon();
     private volatile boolean _running;
     private static final boolean DEBUG = false;
+    // If you change this, change in SusiDNS SubscriptionBean also
     private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
     /** @since 0.9.12 */
     static final String OLD_DEFAULT_SUB = "http://www.i2p2.i2p/hosts.txt";
+    /** Any properties we receive from the subscription, we store to the
+     *  addressbook with this prefix, so it knows it's part of the signature.
+     *  This is also chosen so that it can't be spoofed.
+     */
+    private static final String RCVD_PROP_PREFIX = "=";
+    private static final boolean MUST_VALIDATE = false;
     
     /**
      * Update the router and published address books using remote data from the
@@ -80,10 +89,9 @@ public class Daemon {
      */
     public static void update(AddressBook master, AddressBook router,
             File published, SubscriptionList subscriptions, Log log) {
-        Iterator<AddressBook> iter = subscriptions.iterator();
-        while (iter.hasNext()) {
+        for (AddressBook book : subscriptions) {
             // yes, the EepGet fetch() is done in next()
-            router.merge(iter.next(), false, log);
+            router.merge(book, false, log);
         }
         router.write();
         if (published != null) {
@@ -129,18 +137,22 @@ public class Daemon {
         while (iter.hasNext()) {
             // yes, the EepGet fetch() is done in next()
             long start = System.currentTimeMillis();
-            AddressBook sub = iter.next();
-            long end = System.currentTimeMillis();
+            AddressBook addressbook = iter.next();
             // SubscriptionIterator puts in a dummy AddressBook with no location if no fetch is done
-            if (DEBUG && log != null && sub.getLocation() != null)
-                log.append("Fetch of " + sub.getLocation() + " took " + (end - start));
-            start = end;
+            if (DEBUG && log != null && addressbook.getLocation() != null) {
+                long end = System.currentTimeMillis();
+                log.append("Fetch of " + addressbook.getLocation() + " took " + (end - start));
+                start = end;
+            }
             int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
-            for (Iterator<Map.Entry<String, String>> eIter = sub.iterator(); eIter.hasNext(); ) {
-                Map.Entry<String, String> entry = eIter.next();
+            int deleted = 0;
+            for (Map.Entry<String, HostTxtEntry> entry : addressbook) {
+                total++;
+                // may be null for 'remove' entries
                 String key = entry.getKey();
                 boolean isKnown;
-                Destination oldDest = null;
+                // NOT set for text file NamingService
+                Destination oldDest;
                 if (isTextFile) {
                     if (knownNames == null) {
                         // load the hostname set
@@ -148,22 +160,305 @@ public class Daemon {
                         opts.setProperty("file", "hosts.txt");
                         knownNames = router.getNames(opts);
                     }
-                    isKnown = knownNames.contains(key);
+                    oldDest = null;
+                    isKnown = key != null ? knownNames.contains(key) : null;
                 } else {
-                    oldDest = router.lookup(key);
+                    oldDest = key != null ? router.lookup(key) : null;
                     isKnown = oldDest != null;
                 }
                 try {
-                    if (!isKnown) {
-                        if (AddressBook.isValidKey(key)) {
-                            Destination dest = new Destination(entry.getValue());
-                            Properties props = new Properties();
-                            props.setProperty("s", sub.getLocation());
+                    HostTxtEntry he = entry.getValue();
+                    Properties hprops = he.getProps();
+                    boolean mustValidate = MUST_VALIDATE || hprops != null;
+                    String action = hprops != null ? hprops.getProperty(HostTxtEntry.PROP_ACTION) : null;
+                    if (key == null && !he.hasValidRemoveSig()) {
+                        if (log != null) {
+                            log.append("Bad signature of action " + action + " for key " +
+                                       hprops.getProperty(HostTxtEntry.PROP_NAME) +
+                                       ". From: " + addressbook.getLocation());
+                        }
+                        invalid++;
+                    } else if (key != null && mustValidate && !he.hasValidSig()) {
+                        if (log != null) {
+                            log.append("Bad signature of action " + action + " for key " + key +
+                                       ". From: " + addressbook.getLocation());
+                        }
+                        invalid++;
+                    } else if (action != null || !isKnown) {
+                        if (key != null && AddressBook.isValidKey(key)) {
+                            Destination dest = new Destination(he.getDest());
+                            Properties props = new OrderedProperties();
+                            props.setProperty("s", addressbook.getLocation());
+                            boolean allowExistingKeyInPublished = false;
+                            if (mustValidate) {
+                                // sig checked above
+                                props.setProperty("v", "true");
+                            }
+                            if (hprops != null) {
+                                // merge in all the received properties
+                                for (Map.Entry<Object, Object> e : hprops.entrySet()) {
+                                    // Add prefix to indicate received property
+                                    props.setProperty(RCVD_PROP_PREFIX + e.getKey(), (String) e.getValue());
+                                }
+                            }
+                            if (action != null) {
+                                // Process commands. hprops is non-null.
+                                // Must handle isKnown in each case.
+                                if (action.equals(HostTxtEntry.ACTION_ADDDEST)) {
+                                    // Add an alternate destination (new crypto) for existing hostname
+                                    // Requires new NamingService support if the key exists
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(key);
+                                        if (pod2 == null) {
+                                            // we didn't know it before, so we'll add it
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(dest)) {
+                                            // we knew it before, with the same dest
+                                            old++;
+                                            continue;
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                            // TODO Requires NamingService support
+                                            // if (isTextFile), do we replace or not? check sigType.isAvailable()
+                                            boolean success = router.addDestination(key, dest, props);
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Additional address for " + key +
+                                                               " added to address book. From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Failed to add additional address for " + key +
+                                                               " From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            // ditto
+                                            if (published != null) {
+                                                if (publishedNS == null)
+                                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                                // FIXME this fails, no support in SFNS
+                                                success = publishedNS.addDestination(key, dest, props);
+                                                if (log != null && !success)
+                                                    log.append("Add to published address book " + published.getAbsolutePath() + " failed for " + key);
+                                            }
+                                            nnew++;
+                                            continue;
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, he.getDest(), addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_ADDNAME)) {
+                                    // Add an alias for an existing hostname, same dest
+                                    if (isKnown) {
+                                        // could be same or different dest
+                                        old++;
+                                        continue;
+                                    }
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (poldname != null) {
+                                        List<Destination> pod = router.lookupAll(poldname);
+                                        if (pod == null) {
+                                            // we didn't have the old one, so we'll add the new one
+                                        } else if (pod.contains(dest)) {
+                                            // checks out, so we'll add the new one
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod, he.getDest(), addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_ADDSUBDOMAIN)) {
+                                    // add a subdomain with verification
+                                    if (isKnown) {
+                                        old++;
+                                        continue;
+                                    }
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (polddest != null && poldname != null) {
+                                        // check for valid subdomain
+                                        if (!AddressBook.isValidKey(poldname) ||
+                                            key.indexOf('.' + poldname) <= 0) {
+                                            if (log != null)
+                                                log.append("Action: " + action + " failed because" +
+                                                           " old name " + poldname +
+                                                           " is invalid" +
+                                                           ". From: " + addressbook.getLocation());
+                                            invalid++;
+                                            continue;
+                                        }
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(poldname);
+                                        if (pod2 == null) {
+                                            // we didn't have the old name
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_CHANGEDEST)) {
+                                    // change destination on an existing entry
+                                    // This removes all previous destinations under that hostname,
+                                    // is this what we want?
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(key);
+                                        if (pod2 == null) {
+                                            // we didn't have the old name
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(dest)) {
+                                            // we already have the new dest
+                                            old++;
+                                            continue;
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                            if (log != null) {
+                                                if (pod2.size() == 1)
+                                                    log.append("Changing destination for " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Replacing " + pod2.size() + " destinations for " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            allowExistingKeyInPublished = true;
+                                            props.setProperty("m", Long.toString(I2PAppContext.getGlobalContext().clock().now()));
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_CHANGENAME)) {
+                                    // Delete old name, replace with new
+                                    // This removes all previous destinations under that hostname,
+                                    // is this what we want?
+                                    if (isKnown) {
+                                        old++;
+                                        continue;
+                                    }
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (poldname != null) {
+                                        List<Destination> pod = router.lookupAll(poldname);
+                                        if (pod == null) {
+                                            // we didn't have the old name
+                                        } else if (pod.contains(dest)) {
+                                            // checks out, so we'll delete it
+                                            if (knownNames != null)
+                                                knownNames.remove(poldname);
+                                            boolean success = router.remove(poldname, dest);
+                                            if (success)
+                                                deleted++;
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Removed: " + poldname +
+                                                               " to be replaced with " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Remove failed for: " + poldname +
+                                                               " to be replaced with " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            if (published != null) {
+                                                if (publishedNS == null)
+                                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                                success = publishedNS.remove(poldname, dest);
+                                                if (log != null && !success)
+                                                    log.append("Remove from published address book " + published.getAbsolutePath() + " failed for " + poldname);
+                                            }
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod, he.getDest(), addressbook);
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_REMOVE) ||
+                                           action.equals(HostTxtEntry.ACTION_REMOVEALL)) {
+                                    // w/o name=dest handled below
+                                    if (log != null)
+                                        log.append("Action: " + action + " with name=dest invalid" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                    continue;
+                                } else if (action.equals(HostTxtEntry.ACTION_UPDATE)) {
+                                    if (isKnown) {
+                                        allowExistingKeyInPublished = true;
+                                        props.setProperty("m", Long.toString(I2PAppContext.getGlobalContext().clock().now()));
+                                    }
+                                } else {
+                                    if (log != null)
+                                        log.append("Action: " + action + " unrecognized" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                    continue;
+                                }
+                            } // action != null
                             boolean success = router.put(key, dest, props);
                             if (log != null) {
                                 if (success)
                                     log.append("New address " + key +
-                                               " added to address book. From: " + sub.getLocation());
+                                               " added to address book. From: " + addressbook.getLocation());
                                 else
                                     log.append("Save to naming service " + router + " failed for new key " + key);
                             }
@@ -171,59 +466,236 @@ public class Daemon {
                             if (published != null) {
                                 if (publishedNS == null)
                                     publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
-                                success = publishedNS.putIfAbsent(key, dest);
+                                if (allowExistingKeyInPublished)
+                                    success = publishedNS.put(key, dest, props);
+                                else
+                                    success = publishedNS.putIfAbsent(key, dest, props);
                                 if (log != null && !success) {
-                                    try {
-                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
-                                    } catch (IOException ioe) {}
+                                    log.append("Save to published address book " + published.getAbsolutePath() + " failed for new key " + key);
                                 }
                             }
                             if (isTextFile)
                                 // keep track for later dup check
                                 knownNames.add(key);
                             nnew++;
+                        } else if (key == null) {
+                            // 'remove' actions
+                            // isKnown is false
+                            if (action != null) {
+                                // Process commands. hprops is non-null.
+                                if (action.equals(HostTxtEntry.ACTION_REMOVE)) {
+                                    // delete this entry
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_DEST);
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_NAME);
+                                    if (polddest != null && poldname != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(poldname);
+                                        if (pod2 != null && pod2.contains(pod)) {
+                                            if (knownNames != null && pod2.size() == 1)
+                                                knownNames.remove(poldname);
+                                            boolean success = router.remove(poldname, pod);
+                                            if (success)
+                                                deleted++;
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Removed: " + poldname +
+                                                               " as requested" +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Remove failed for: " + poldname +
+                                                               " as requested" +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            if (published != null) {
+                                                if (publishedNS == null)
+                                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                                success = publishedNS.remove(poldname, pod);
+                                                if (log != null && !success)
+                                                    log.append("Remove from published address book " + published.getAbsolutePath() + " failed for " + poldname);
+                                            }
+                                        } else if (pod2 != null) {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                        } else {
+                                            old++;
+                                        }
+                                    } else {
+                                        logMissing(log, action, "delete", addressbook);
+                                        invalid++;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_REMOVEALL)) {
+                                    // delete all entries with this destination
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_DEST);
+                                    // oldname is optional, but nice because not all books support reverse lookup
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        String poldname = hprops.getProperty(HostTxtEntry.PROP_NAME);
+                                        if (poldname != null) {
+                                            List<Destination> pod2 = router.lookupAll(poldname);
+                                            if (pod2 != null && pod2.contains(pod)) {
+                                                if (knownNames != null)
+                                                    knownNames.remove(poldname);
+                                                boolean success = router.remove(poldname, pod);
+                                                if (success)
+                                                    deleted++;
+                                                if (log != null) {
+                                                    if (success)
+                                                        log.append("Removed: " + poldname +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                    else
+                                                        log.append("Remove failed for: " + poldname +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                }
+                                                // now update the published addressbook
+                                                if (published != null) {
+                                                    if (publishedNS == null)
+                                                        publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                                    success = publishedNS.remove(poldname, pod);
+                                                    if (log != null && !success)
+                                                        log.append("Remove from published address book " + published.getAbsolutePath() + " failed for " + poldname);
+                                                }
+                                            } else if (pod2 != null) {
+                                                // mismatch, disallow
+                                                logMismatch(log, action, key, pod2, polddest, addressbook);
+                                                invalid++;
+                                            } else {
+                                                old++;
+                                            }
+                                        }
+                                        // reverse lookup, delete all
+                                        List<String> revs = router.reverseLookupAll(pod);
+                                        if (revs != null) {
+                                            for (String rev : revs) {
+                                                if (knownNames != null)
+                                                    knownNames.remove(rev);
+                                                boolean success = router.remove(rev, pod);
+                                                if (success)
+                                                    deleted++;
+                                                if (log != null) {
+                                                    if (success)
+                                                        log.append("Removed: " + rev +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                    else
+                                                        log.append("Remove failed for: " + rev +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                }
+                                                // now update the published addressbook
+                                                if (published != null) {
+                                                    if (publishedNS == null)
+                                                        publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                                    success = publishedNS.remove(rev, pod);
+                                                    if (log != null && !success)
+                                                        log.append("Remove from published address book " + published.getAbsolutePath() + " failed for " + rev);
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        logMissing(log, action, "delete", addressbook);
+                                        invalid++;
+                                    }
+                                } else {
+                                    if (log != null)
+                                        log.append("Action: " + action + " w/o name=dest unrecognized" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                }
+                                continue;
+                            } else {
+                                if (log != null)
+                                    log.append("No action in command line" +
+                                               ". From: " + addressbook.getLocation());
+                                invalid++;
+                                continue;
+                            }
                         } else if (log != null) {
-                            log.append("Bad hostname " + key + " from "
-                                   + sub.getLocation());
+                            log.append("Bad hostname " + key + ". From: "
+                                   + addressbook.getLocation());
                             invalid++;
                         }        
+                  /****
                     } else if (false && DEBUG && log != null) {
                         // lookup the conflict if we haven't yet (O(n**2) for text file)
                         if (isTextFile)
                             oldDest = router.lookup(key);
                         if (oldDest != null && !oldDest.toBase64().equals(entry.getValue())) {
-                            log.append("Conflict for " + key + " from "
-                                       + sub.getLocation()
+                            log.append("Conflict for " + key + ". From: "
+                                       + addressbook.getLocation()
                                        + ". Destination in remote address book is "
                                        + entry.getValue());
                             conflict++;
                         } else {
                             old++;
                         }
+                   ****/
                     } else {
                         old++;
                     }
                 } catch (DataFormatException dfe) {
                     if (log != null)
-                        log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
+                        log.append("Invalid b64 for " + key + " From: " + addressbook.getLocation());
                     invalid++;
                 }
-                total++;
             }
             if (DEBUG && log != null && total > 0) {
-                log.append("Merge of " + sub.getLocation() + " into " + router +
+                log.append("Merge of " + addressbook.getLocation() + " into " + router +
                            " took " + (System.currentTimeMillis() - start) + " ms with " +
                            total + " total, " +
                            nnew + " new, " +
                            old + " old, " +
+                           deleted + " deleted, " +
                            invalid + " invalid, " +
                            conflict + " conflicts");
-            }
-            sub.delete();
-        }
+            }  // entries
+            addressbook.delete();
+        }  // subscriptions
         subscriptions.write();
     }
 
+    /** @since 0.9.26 */
+    private static void logInner(Log log, String action, String name, AddressBook addressbook) {
+        if (log != null) {
+            log.append("Action: " + action + " failed because" +
+                       " inner signature for key " + name +
+                       " failed" +
+                       ". From: " + addressbook.getLocation());
+        }
+    }
+
+    /** @since 0.9.26 */
+    private static void logMissing(Log log, String action, String name, AddressBook addressbook) {
+        if (log != null) {
+            log.append("Action: " + action + " for " + name +
+                       " failed, missing required parameters" +
+                       ". From: " + addressbook.getLocation());
+        }
+    }
+
+    /** @since 0.9.26 */
+    private static void logMismatch(Log log, String action, String name, List<Destination> dests,
+                                    String olddest, AddressBook addressbook) {
+        if (log != null) {
+            StringBuilder buf = new StringBuilder(16);
+            final int sz = dests.size();
+            for (int i = 0; i < sz; i++) {
+                buf.append(dests.get(i).toBase64().substring(0, 6));
+                if (i != sz - 1)
+                    buf.append(", ");
+            }
+            log.append("Action: " + action + " failed because" +
+                       " destinations for " + name +
+                       " (" + buf + ')' +
+                       " do not include" +
+                       " (" + olddest.substring(0, 6) + ')' +
+                       ". From: " + addressbook.getLocation());
+        }
+    }
+
     /**
      * Run an update, using the Map settings to provide the parameters.
      * 
@@ -236,16 +708,12 @@ public class Daemon {
         File published = null;
         boolean should_publish = Boolean.parseBoolean(settings.get("should_publish"));
         if (should_publish) 
-            published = new File(home, settings
-                .get("published_addressbook"));
-        File subscriptionFile = new File(home, settings
-                .get("subscriptions"));
+            published = new File(home, settings.get("published_addressbook"));
+        File subscriptionFile = new File(home, settings.get("subscriptions"));
         File logFile = new File(home, settings.get("log"));
         File etagsFile = new File(home, settings.get("etags"));
-        File lastModifiedFile = new File(home, settings
-                .get("last_modified"));
-        File lastFetchedFile = new File(home, settings
-                .get("last_fetched"));
+        File lastModifiedFile = new File(home, settings.get("last_modified"));
+        File lastFetchedFile = new File(home, settings.get("last_fetched"));
         long delay;
         try {
             delay = Long.parseLong(settings.get("update_delay"));
@@ -254,13 +722,14 @@ public class Daemon {
         }
         delay *= 60 * 60 * 1000;
         
-        List<String> defaultSubs = new LinkedList<String>();
+        List<String> defaultSubs = new ArrayList<String>(4);
         // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
         defaultSubs.add(DEFAULT_SUB);
         
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
-                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
+                                                              etagsFile, lastModifiedFile, lastFetchedFile,
+                                                              delay, defaultSubs, settings.get("proxy_host"),
+                                                              Integer.parseInt(settings.get("proxy_port")));
         Log log = SystemVersion.isAndroid() ? null : new Log(logFile);
 
         // If false, add hosts via naming service; if true, write hosts.txt file directly
@@ -319,7 +788,25 @@ public class Daemon {
      *            others are ignored.
      */
     public static void main(String[] args) {
-        _instance.run(args);
+        Daemon daemon = new Daemon();
+        if (args != null && args.length > 0 && args[0].equals("test"))
+            daemon.test(args);
+        else
+            daemon.run(args);
+    }
+
+    /** @since 0.9.26 */
+    public static void test(String[] args) {
+        Properties ctxProps = new Properties();
+        String PROP_FORCE = "i2p.naming.blockfile.writeInAppContext";
+        ctxProps.setProperty(PROP_FORCE, "true");
+        I2PAppContext ctx = new I2PAppContext(ctxProps);
+        NamingService ns = getNamingService("hosts.txt");
+        File published = new File("test-published.txt");
+        Log log = new Log(new File("test-log.txt"));
+        SubscriptionList subscriptions = new SubscriptionList("test-sub.txt");
+        update(ns, published, subscriptions, log);
+        ctx.logManager().flush();
     }
     
     public void run(String[] args) {
@@ -390,14 +877,14 @@ public class Daemon {
      * Call this to get the addressbook to reread its config and 
      * refetch its subscriptions.
      */
-    public static void wakeup() {
-        synchronized (_instance) {
-            _instance.notifyAll();
+    public void wakeup() {
+        synchronized (this) {
+            notifyAll();
         }
     }
 
-    public static void stop() {
-        _instance._running = false;
+    public void stop() {
+        _running = false;
         wakeup();
     }
 }

apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java

@@ -35,7 +35,8 @@ import net.i2p.util.I2PAppThread;
  */
 public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
 
-    private String[] args;
+    private final String[] args;
+    private final Daemon daemon;
 
     /**
      * Construct a DaemonThread with the command line arguments args.
@@ -44,6 +45,7 @@ public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
      */
     public DaemonThread(String[] args) {
         this.args = args;
+        daemon = new Daemon();
     }
 
     /* (non-Javadoc)
@@ -56,18 +58,28 @@ public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
         //} catch (InterruptedException exp) {
         //}
         I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
-        Daemon.main(this.args);
-        I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        try {
+            if (args != null && args.length > 0 && args[0].equals("test"))
+                daemon.test(args);
+            else
+                daemon.run(args);
+        } finally {
+            I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        }
     }
 
     public void halt() {
-        Daemon.stop();
+        daemon.stop();
         interrupt();
     }
 
     /**
-     *  The NamingServiceUpdater interface
-     *  @param options ignored
+     *  The NamingServiceUpdater interface.
+     *  While this may be called directly, the recommended way
+     *  is to call I2PAppContext.namingService().requestUpdate(Properties)
+     *  which will call this.
+     *
+     *  @param options ignored, may be null
      *  @since 0.8.7
      */
     public void update(Properties options) {

apps/addressbook/java/src/net/i2p/addressbook/HostTxtIterator.java

@@ -32,6 +32,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.data.DataHelper;
 
 /**
@@ -42,22 +43,25 @@ import net.i2p.data.DataHelper;
  *  Callers should iterate all the way through or call close()
  *  to ensure the underlying stream is closed.
  *
- *  @since 0.8.7
+ *  This is not used for config files.
+ *  It is only used for subscriptions.
+ *
+ *  @since 0.8.7, renamed from ConfigIterator in 0.9.26
  */
-class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
+class HostTxtIterator implements Iterator<Map.Entry<String, HostTxtEntry>>, Closeable {
 
     private BufferedReader input;
-    private ConfigEntry next;
+    private MapEntry next;
 
     /**
      *  A dummy iterator in which hasNext() is always false.
      */
-    public ConfigIterator() {}
+    public HostTxtIterator() {}
 
     /**
      *  An iterator over the key/value pairs in the file.
      */
-    public ConfigIterator(File file) throws IOException {
+    public HostTxtIterator(File file) throws IOException {
             FileInputStream fileStream = new FileInputStream(file);
             input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8"));
     }
@@ -68,15 +72,13 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
         if (next != null)
             return true;
         try {
-            String inputLine = input.readLine();
-            while (inputLine != null) {
-                inputLine = ConfigParser.stripComments(inputLine);
-                String[] splitLine = DataHelper.split(inputLine, "=");
-                if (splitLine.length == 2) {
-                    next = new ConfigEntry(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
-                    return true;
-                }
-                inputLine = input.readLine();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                HostTxtEntry he = HostTxtParser.parse(inputLine, true);
+                if (he == null)
+                    continue;
+                next = new MapEntry(he.getName(), he);
+                return true;
             }
         } catch (IOException ioe) {}
         try { input.close(); } catch (IOException ioe) {}
@@ -85,10 +87,15 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
         return false;
     }
 
-    public Map.Entry<String, String> next() {
+    /**
+     *  'remove' entries will be returned with a null key,
+     *  and the value will contain a null name, null dest,
+     *  and non-null props.
+     */
+    public Map.Entry<String, HostTxtEntry> next() {
         if (!hasNext())
             throw new NoSuchElementException();
-        Map.Entry<String, String> rv = next;
+        Map.Entry<String, HostTxtEntry> rv = next;
         next = null;
         return rv;
     }
@@ -111,11 +118,11 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
     /**
      *  The object returned by the iterator.
      */
-    private static class ConfigEntry implements Map.Entry<String, String> {
+    private static class MapEntry implements Map.Entry<String, HostTxtEntry> {
         private final String key;
-        private final String value;
+        private final HostTxtEntry value;
 
-        public ConfigEntry(String k, String v) {
+        public MapEntry(String k, HostTxtEntry v) {
             key = k;
             value = v;
         }
@@ -124,11 +131,11 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
             return key;
         }
 
-        public String getValue() {
+        public HostTxtEntry getValue() {
             return value;
         }
 
-        public String setValue(String v) {
+        public HostTxtEntry setValue(HostTxtEntry v) {
             throw new UnsupportedOperationException();
         }
 

apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java

@@ -0,0 +1,294 @@
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.client.naming.HostTxtEntry;
+import net.i2p.data.DataHelper;
+import net.i2p.util.SecureFile;
+import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;
+
+/**
+ * Utility class providing methods to parse and write files in a hosts.txt file
+ * format, and subscription file format.
+ * 
+ * @since 0.9.26 modified from ConfigParser
+ */
+class HostTxtParser {
+
+    private static final boolean isWindows = SystemVersion.isWindows();
+
+    /**
+     * Return a Map using the contents of BufferedReader input. input must have
+     * a single key, value pair on each line, in the format: key=value. Lines
+     * starting with '#' or ';' are considered comments, and ignored. Lines that
+     * are obviously not in the format key=value are also ignored.
+     * The key is converted to lower case.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param input
+     *            A BufferedReader with lines in key=value format to parse into
+     *            a Map.
+     * @return A Map containing the key, value pairs from input.
+     * @throws IOException
+     *             if the BufferedReader cannot be read.
+     *  
+     */
+    private static Map<String, HostTxtEntry> parse(BufferedReader input) throws IOException {
+        try {
+            Map<String, HostTxtEntry> result = new HashMap<String, HostTxtEntry>();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                HostTxtEntry he = parse(inputLine, false);
+                if (he == null)
+                    continue;
+                result.put(he.getName(), he);
+            }
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     * Return a HostTxtEntry from the contents of the inputLine.
+     * 
+     * @param inputLine key=value[#!k1=v1#k2=v2...]
+     * @param allowCommandOnly if true, a line starting with #! will return
+     *                         a HostTxtEntry with a null name and dest and non-null props.
+     *                         If false, these lines will return null.
+     * @return null if no entry found or on error
+     */
+    public static HostTxtEntry parse(String inputLine, boolean allowCommandOnly) {
+        if (inputLine.startsWith(";"))
+            return null;
+        int comment = inputLine.indexOf('#');
+        String kv;
+        String sprops;
+        if (comment >= 0) {
+            int shebang = inputLine.indexOf(HostTxtEntry.PROPS_SEPARATOR);
+            if (shebang == comment && shebang + 2 < inputLine.length()) {
+                if (comment == 0 && !allowCommandOnly)
+                    return null;
+                sprops = inputLine.substring(shebang + 2);
+            } else {
+                if (comment == 0)
+                    return null;
+                sprops = null;
+            }
+            kv = inputLine.substring(0, comment);
+        } else {
+            sprops = null;
+            kv = inputLine;
+        }
+        String name, dest;
+        if (comment != 0) {
+            // we have a name=dest
+            String[] splitLine = DataHelper.split(kv, "=", 2);
+            if (splitLine.length < 2)
+                return null;
+            name = splitLine[0].trim().toLowerCase(Locale.US);
+            dest = splitLine[1].trim();
+            if (name.length() == 0 || dest.length() == 0)
+                return null;
+        } else {
+            // line starts with #!, rv will contain props only
+            name = null;
+            dest = null;
+        }
+        HostTxtEntry he;
+        if (sprops != null) {
+            try {
+                he = new HostTxtEntry(name, dest, sprops);
+            } catch (IllegalArgumentException iae) {
+                return null;
+            }
+        } else {
+            he = new HostTxtEntry(name, dest);
+        }
+        return he;
+    }
+
+    /**
+     * Return a Map using the contents of the File file. See parse(BufferedReader)
+     * for details of the input format.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param file
+     *            A File to parse.
+     * @return A Map containing the key, value pairs from file.
+     * @throws IOException
+     *             if file cannot be read.
+     */
+    public static Map<String, HostTxtEntry> parse(File file) throws IOException {
+        FileInputStream fileStream = null;
+        try {
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            Map<String, HostTxtEntry> rv = parse(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
+    }
+
+    /**
+     * Return a Map using the contents of the File file. If file cannot be read,
+     * use map instead, and write the result to where file should have been.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param file
+     *            A File to attempt to parse.
+     * @param map
+     *            A Map containing values to use as defaults.
+     * @return A Map containing the key, value pairs from file, or if file
+     *         cannot be read, map.
+     */
+    public static Map<String, HostTxtEntry> parse(File file, Map<String, HostTxtEntry> map) {
+        Map<String, HostTxtEntry> result;
+        try {
+            result = parse(file);
+            for (Map.Entry<String, HostTxtEntry> entry : map.entrySet()) {
+                if (!result.containsKey(entry.getKey()))
+                    result.put(entry.getKey(), entry.getValue());
+            }
+        } catch (IOException exp) {
+            result = map;
+            try {
+                write(result, file);
+            } catch (IOException exp2) {
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Write contents of Map map to BufferedWriter output. Output is written
+     * with one key, value pair on each line, in the format: key=value.
+     * 
+     * @param map
+     *            A Map to write to output.
+     * @param output
+     *            A BufferedWriter to write the Map to.
+     * @throws IOException
+     *             if the BufferedWriter cannot be written to.
+     */
+    private static void write(Map<String, HostTxtEntry> map, BufferedWriter output) throws IOException {
+        try {
+            for (Map.Entry<String, HostTxtEntry> entry : map.entrySet()) {
+                entry.getValue().write(output);
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     * Write contents of Map map to the File file. Output is written
+     * with one key, value pair on each line, in the format: key=value.
+     * Write to a temp file in the same directory and then rename, to not corrupt
+     * simultaneous accesses by the router. Except on Windows where renameTo()
+     * will fail if the target exists.
+     *
+     * @param map
+     *            A Map to write to file.
+     * @param file
+     *            A File to write the Map to.
+     * @throws IOException
+     *             if file cannot be written to.
+     */
+    public static void write(Map<String, HostTxtEntry> map, File file) throws IOException {
+        boolean success = false;
+        if (!isWindows) {
+            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            success = tmp.renameTo(file);
+            if (!success) {
+                tmp.delete();
+                //System.out.println("Warning: addressbook rename fail from " + tmp + " to " + file);
+            }
+        }
+        if (!success) {
+            // hmm, that didn't work, try it the old way
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+        }
+    }
+
+    /**
+     * Usage: HostTxtParser [-q] validate example.i2p=b64dest[#!key1=val1#key2=val2]
+     */
+    public static void main(String[] args) throws Exception {
+        boolean quiet = false;
+        if (args.length > 0 && args[0].equals("-q")) {
+            quiet = true;
+            args = java.util.Arrays.copyOfRange(args, 1, args.length);
+        }
+        if (args.length != 2 || !args[0].equals("validate")) {
+            System.err.println("Usage: HostTxtParser validate example.i2p=b64dest[#!key1=val1#key2=val2]");
+            System.exit(1);
+        }
+        HostTxtEntry e = parse(args[1].trim(), false);
+        if (e == null) {
+            if (!quiet)
+                System.err.println("Bad format");
+            System.exit(2);
+        }
+        if (!e.hasValidSig()) {
+            if (!quiet)
+                System.err.println("Bad signature");
+            System.exit(3);
+        }
+        Properties p = e.getProps();
+        if (p != null) {
+            if (p.containsKey(HostTxtEntry.PROP_ACTION) ||
+                p.containsKey(HostTxtEntry.PROP_OLDDEST) ||
+                p.containsKey(HostTxtEntry.PROP_OLDNAME) ||
+                p.containsKey(HostTxtEntry.PROP_OLDSIG)) {
+                if (!e.hasValidSig()) {
+                    if (!quiet)
+                        System.err.println("Bad inner signature");
+                    System.exit(4);
+                }
+            }
+        }
+        if (!quiet)
+            System.err.println("Good signature for " + e.getName());
+        System.exit(0);
+    }
+
+/****
+    public static void test(String[] args) throws Exception {
+        File f = new File("tmp-hosts.txt");
+        Map<String, HostTxtEntry> map = parse(f);
+        for (HostTxtEntry e : map.values()) {
+            System.out.println("Host: " + e.getName() +
+                               "\nDest: " + e.getDest() +
+                               "\nAction: " + (e.getProps() != null ? e.getProps().getProperty("action") : "(none)") +
+                               "\nValid Inner? " + e.hasValidInnerSig() +
+                               "\nValid? " + e.hasValidSig() +
+                               '\n');
+        }
+    }
+****/
+}

apps/addressbook/java/src/net/i2p/addressbook/Log.java

@@ -36,7 +36,7 @@ import java.util.Date;
  */
 class Log {
 
-    private File file;
+    private final File file;
 
     /**
      * Construct a Log instance that writes to the File file.
@@ -74,7 +74,9 @@ class Log {
      * 
      * @return The File that the log is writing to.
      */
+/****
     public File getFile() {
         return this.file;
     }
+****/
 }

apps/addressbook/java/src/net/i2p/addressbook/Subscription.java

@@ -29,10 +29,8 @@ package net.i2p.addressbook;
  */
 class Subscription {
 
-    private String location;
-
+    private final String location;
     private String etag;
-
     private String lastModified;
     private long lastFetched;
 
@@ -41,14 +39,15 @@ class Subscription {
      * was last read at the time represented by etag and lastModified.
      * 
      * @param location
-     *            A String representing a url to a remote address book.
+     *            A String representing a url to a remote address book. Non-null.
      * @param etag
-     *            The etag header that we recieved the last time we read this
-     *            subscription.
+     *            The etag header that we received the last time we read this
+     *            subscription. May be null.
      * @param lastModified
-     *            the last-modified header we recieved the last time we read
-     *            this subscription.
-     * @param lastFetched when the subscription was last fetched (Java time, as a String)
+     *            the last-modified header we received the last time we read
+     *            this subscription. May be null.
+     * @param lastFetched when the subscription was last fetched (Java time, as a String).
+     *            May be null.
      */
     public Subscription(String location, String etag, String lastModified, String lastFetched) {
         this.location = location;
@@ -71,7 +70,7 @@ class Subscription {
     }
 
     /**
-     * Return the etag header that we recieved the last time we read this
+     * Return the etag header that we received the last time we read this
      * subscription.
      * 
      * @return A String containing the etag header.
@@ -91,7 +90,7 @@ class Subscription {
     }
 
     /**
-     * Return the last-modified header that we recieved the last time we read
+     * Return the last-modified header that we received the last time we read
      * this subscription.
      * 
      * @return A String containing the last-modified header.

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java

@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.util.PortMapper;
 
 /**
@@ -37,9 +38,9 @@ import net.i2p.util.PortMapper;
  */
 class SubscriptionIterator implements Iterator<AddressBook> {
 
-    private Iterator<Subscription> subIterator;
-    private String proxyHost;
-    private int proxyPort;
+    private final Iterator<Subscription> subIterator;
+    private final String proxyHost;
+    private final int proxyPort;
     private final long delay;
 
     /**
@@ -75,7 +76,10 @@ class SubscriptionIterator implements Iterator<AddressBook> {
      */
     public AddressBook next() {
         Subscription sub = this.subIterator.next();
-        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
+        if (sub.getLocation().startsWith("file:")) {
+            // test only
+            return new AddressBook(sub.getLocation().substring(5));
+        } else if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
             I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
             !I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
             //System.err.println("Fetching addressbook from " + sub.getLocation());
@@ -85,7 +89,7 @@ class SubscriptionIterator implements Iterator<AddressBook> {
             //                   DataHelper.formatDuration(I2PAppContext.getGlobalContext().clock().now() - sub.getLastFetched()) +
             //                   " ago but the minimum delay is " +
             //                   DataHelper.formatDuration(this.delay));
-            return new AddressBook(Collections.<String, String> emptyMap());
+            return new AddressBook(Collections.<String, HostTxtEntry>emptyMap());
         }
     }
 

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java

@@ -23,8 +23,9 @@ package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,19 +35,15 @@ import java.util.Map;
  * @author Ragnarok
  *  
  */
-class SubscriptionList {
+class SubscriptionList implements Iterable<AddressBook> {
 
-    private List<Subscription> subscriptions;
-
-    private File etagsFile;
-
-    private File lastModifiedFile;
-    private File lastFetchedFile;
+    private final List<Subscription> subscriptions;
+    private final File etagsFile;
+    private final File lastModifiedFile;
+    private final File lastFetchedFile;
     private final long delay;
-    
-    private String proxyHost;
-    
-    private int proxyPort;
+    private final String proxyHost;
+    private final int proxyPort;
 
     /**
      * Construct a SubscriptionList using the urls from locationsFile and, if
@@ -69,7 +66,7 @@ class SubscriptionList {
     public SubscriptionList(File locationsFile, File etagsFile,
             File lastModifiedFile, File lastFetchedFile, long delay, List<String> defaultSubs, String proxyHost, 
             int proxyPort) {
-        this.subscriptions = new LinkedList<Subscription>();
+        this.subscriptions = new ArrayList<Subscription>(4);
         this.etagsFile = etagsFile;
         this.lastModifiedFile = lastModifiedFile;
         this.lastFetchedFile = lastFetchedFile;
@@ -84,17 +81,17 @@ class SubscriptionList {
         try {
             etags = ConfigParser.parse(etagsFile);
         } catch (IOException exp) {
-            etags = new HashMap<String, String>();
+            etags = Collections.<String, String>emptyMap();
         }
         try {
             lastModified = ConfigParser.parse(lastModifiedFile);
         } catch (IOException exp) {
-            lastModified = new HashMap<String, String>();
+            lastModified = Collections.<String, String>emptyMap();
         }
         try {
             lastFetched = ConfigParser.parse(lastFetchedFile);
         } catch (IOException exp) {
-            lastFetched = new HashMap<String, String>();
+            lastFetched = Collections.<String, String>emptyMap();
         }
         for (String location : locations) {
             this.subscriptions.add(new Subscription(location, etags.get(location),
@@ -103,6 +100,24 @@ class SubscriptionList {
         }
     }
     
+    /**
+     * Testing only.
+     * 
+     * @param hoststxt path to a local file used as the test 'subscription' input
+     * @since 0.9.26
+     */
+    public SubscriptionList(String hoststxt) {
+        File dummy = new File("/dev/null");
+        this.etagsFile = dummy;
+        this.lastModifiedFile = dummy;
+        this.lastFetchedFile = dummy;
+        this.delay = 0;
+        this.proxyHost = "127.0.0.1";
+        this.proxyPort = 4444;
+        Subscription sub = new Subscription("file:" + hoststxt, null, null, null);
+        this.subscriptions = Collections.singletonList(sub);
+    }
+    
     /**
      * Return an iterator over the AddressBooks represented by the Subscriptions
      * in this SubscriptionList.
@@ -121,9 +136,10 @@ class SubscriptionList {
      * won't be read back correctly; the '=' should be escaped.
      */
     public void write() {
-        Map<String, String> etags = new HashMap<String, String>();
-        Map<String, String>  lastModified = new HashMap<String, String>();
-        Map<String, String>  lastFetched = new HashMap<String, String>();
+        int sz = subscriptions.size();
+        Map<String, String> etags = new HashMap<String, String>(sz);
+        Map<String, String> lastModified = new HashMap<String, String>(sz);
+        Map<String, String> lastFetched = new HashMap<String, String>(sz);
         for (Subscription sub : this.subscriptions) {
             if (sub.getEtag() != null) {
                 etags.put(sub.getLocation(), sub.getEtag());
@@ -131,13 +147,16 @@ class SubscriptionList {
             if (sub.getLastModified() != null) {
                 lastModified.put(sub.getLocation(), sub.getLastModified());
             }
-            lastFetched.put(sub.getLocation(), "" + sub.getLastFetched());
+            lastFetched.put(sub.getLocation(), Long.toString(sub.getLastFetched()));
         }
         try {
             ConfigParser.write(etags, this.etagsFile);
+        } catch (IOException exp) {}
+        try {
             ConfigParser.write(lastModified, this.lastModifiedFile);
+        } catch (IOException exp) {}
+        try {
             ConfigParser.write(lastFetched, this.lastFetchedFile);
-        } catch (IOException exp) {
-        }
+        } catch (IOException exp) {}
     }
 }

apps/addressbook/java/src/net/i2p/addressbook/package.html

@@ -1,7 +1,7 @@
 <html>
 <body>
 <p>
-The addressbook application, which fetches hosts.txt files from subscription URLS via
+The addressbook application, which fetches hosts.txt files from subscription URLs via
 HTTP and adds new hosts to the local database.
 While implemented as a webapp, this application contains no user interface.
 May also be packaged as a jar, as is done for Android.

apps/addressbook/java/src/net/metanotion/io/RAIFile.java

@@ -36,8 +36,8 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 
 public class RAIFile implements RandomAccessInterface, DataInput, DataOutput {
-	private File f;
-	private RandomAccessFile delegate;
+	private final File f;
+	private final RandomAccessFile delegate;
 	private final boolean r, w;
 
 	public RAIFile(RandomAccessFile file) throws FileNotFoundException {

apps/addressbook/java/src/net/metanotion/io/Serializer.java

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.io;
 
-public interface Serializer {
-	public byte[] getBytes(Object o);
-	public Object construct(byte[] b);
+public interface Serializer<T> {
+	public byte[] getBytes(T o);
+	public T construct(byte[] b);
 }

apps/addressbook/java/src/net/metanotion/io/block/BlockFile.java

@@ -32,8 +32,11 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import net.metanotion.io.RAIFile;
@@ -94,7 +97,7 @@ public class BlockFile implements Closeable {
 	/** I2P was the file locked when we opened it? */
 	private final boolean _wasMounted;
 
-	private final BSkipList metaIndex;
+	private final BSkipList<String, Integer> metaIndex;
 	private boolean _isClosed;
 	/** cached list of free pages, only valid if freListStart > 0 */
 	private FreeListBlock flb;
@@ -320,7 +323,7 @@ public class BlockFile implements Closeable {
 		if (rai.canWrite())
 			mount();
 
-		metaIndex = new BSkipList(spanSize, this, METAINDEX_PAGE, new StringBytes(), new IntBytes());
+		metaIndex = new BSkipList<String, Integer>(spanSize, this, METAINDEX_PAGE, new StringBytes(), new IntBytes());
 	}
 
 	/**
@@ -334,7 +337,7 @@ public class BlockFile implements Closeable {
 	/**
 	 *  Go to any page but the superblock.
 	 *  Page 1 is the superblock, must use file.seek(0) to get there.
-	 *  @param page >= 2
+	 *  @param page &gt;= 2
 	 */
 	public static void pageSeek(RandomAccessInterface file, int page) throws IOException {
 		if (page < METAINDEX_PAGE)
@@ -431,18 +434,25 @@ public class BlockFile implements Closeable {
 	}
 
 	/**
+	 *  Open a skiplist if it exists.
+	 *  Returns null if the skiplist does not exist.
+	 *  Empty skiplists are not preserved after close.
+	 *
 	 *  If the file is writable, this runs an integrity check and repair
 	 *  on first open.
+	 *
+	 *  @return null if not found
 	 */
-	public BSkipList getIndex(String name, Serializer key, Serializer val) throws IOException {
+	@SuppressWarnings("unchecked")
+	public <K extends Comparable<? super K>, V> BSkipList<K, V> getIndex(String name, Serializer<K> key, Serializer<V> val) throws IOException {
 		// added I2P
-		BSkipList bsl = openIndices.get(name);
+		BSkipList<K, V> bsl = (BSkipList<K, V>) openIndices.get(name);
 		if (bsl != null)
 			return bsl;
 
-		Integer page = (Integer) metaIndex.get(name);
+		Integer page = metaIndex.get(name);
 		if (page == null) { return null; }
-		bsl = new BSkipList(spanSize, this, page.intValue(), key, val, true);
+		bsl = new BSkipList<K, V>(spanSize, this, page.intValue(), key, val, true);
 		if (file.canWrite()) {
 			log.info("Checking skiplist " + name + " in blockfile " + file);
 			if (bsl.bslck(true, false))
@@ -454,25 +464,43 @@ public class BlockFile implements Closeable {
 		return bsl;
 	}
 
-	public BSkipList makeIndex(String name, Serializer key, Serializer val) throws IOException {
+	/**
+	 *  Create and open a new skiplist if it does not exist.
+	 *  Throws IOException if it already exists.
+	 *
+	 *  @throws IOException if already exists or other errors
+	 */
+	public <K extends Comparable<? super K>, V> BSkipList<K, V> makeIndex(String name, Serializer<K> key, Serializer<V> val) throws IOException {
 		if(metaIndex.get(name) != null) { throw new IOException("Index already exists"); }
 		int page = allocPage();
 		metaIndex.put(name, Integer.valueOf(page));
 		BSkipList.init(this, page, spanSize);
-		BSkipList bsl = new BSkipList(spanSize, this, page, key, val, true);
+		BSkipList<K, V> bsl = new BSkipList<K, V>(spanSize, this, page, key, val, true);
 		openIndices.put(name, bsl);
 		return bsl;
 	}
 
+	/**
+	 *  Delete a skiplist if it exists.
+	 *  Must be open. Throws IOException if exists but is closed.
+	 *  Broken before 0.9.26.
+	 *
+	 *  @throws IOException if it is closed.
+	 */
 	public void delIndex(String name) throws IOException {
-		Integer page = (Integer) metaIndex.remove(name);
-		if (page == null) { return; }
-		Serializer nb = new IdentityBytes();
-		BSkipList bsl = new BSkipList(spanSize, this, page.intValue(), nb, nb, true);
+		if (metaIndex.get(name) == null)
+                    return;
+		BSkipList bsl = openIndices.get(name);
+		if (bsl == null)
+			throw new IOException("Cannot delete closed skiplist, open it first: " + name);
 		bsl.delete();
+		openIndices.remove(name);
+		metaIndex.remove(name);
 	}
 
 	/**
+	 *  Close a skiplist if it is open.
+	 *
 	 *  Added I2P
 	 */
 	public void closeIndex(String name) {
@@ -482,8 +510,75 @@ public class BlockFile implements Closeable {
 	}
 
 	/**
+	 *  Reformat a skiplist with new Serializers if it exists.
+	 *  The skiplist must be closed.
+	 *  Throws IOException if the skiplist is open.
+	 *  The skiplist will remain closed after completion.
+	 *
+	 *  @throws IOException if it is open or on errors
+	 *  @since 0.9.26
+	 */
+	public <K extends Comparable<? super K>, V> void reformatIndex(String name, Serializer<K> oldKey, Serializer<V> oldVal,
+	                          Serializer<K> newKey, Serializer<V> newVal) throws IOException {
+		if (openIndices.containsKey(name))
+			throw new IOException("Cannot reformat open skiplist " + name);
+		BSkipList<K, V> old = getIndex(name, oldKey, oldVal);
+		if (old == null)
+			return;
+		long start = System.currentTimeMillis();
+		String tmpName = "---tmp---" + name + "---tmp---";
+		BSkipList<K, V> tmp = getIndex(tmpName, newKey, newVal);
+		if (tmp != null) {
+			log.logAlways(Log.WARN, "Continuing on aborted reformat of list " + name);
+		} else {
+			tmp = makeIndex(tmpName, newKey, newVal);
+		}
+
+		// It could be much more efficient to do this at the
+		// SkipSpan layer but that's way too hard.
+		final int loop = 32;
+		List<K> keys = new ArrayList<K>(loop);
+		List<V> vals = new ArrayList<V>(loop);
+		while (true) {
+			SkipIterator<K, V> iter = old.iterator();
+			for (int i = 0; iter.hasNext() && i < loop; i++) {
+				try {
+					keys.add(iter.nextKey());
+					vals.add(iter.next());
+				} catch (NoSuchElementException nsee) {
+					throw new IOException("Unable to reformat corrupt list " + name, nsee);
+				}
+			}
+			// save state, as deleting corrupts the iterator
+			boolean done = !iter.hasNext();
+			for (int i = 0; i < keys.size(); i++) {
+				tmp.put(keys.get(i), vals.get(i));
+			}
+			for (int i = keys.size() - 1; i >= 0; i--) {
+				old.remove(keys.get(i));
+			}
+			if (done)
+				break;
+			keys.clear();
+			vals.clear();
+		}
+
+		delIndex(name);
+		closeIndex(name);
+		closeIndex(tmpName);
+		Integer page = metaIndex.get(tmpName);
+		metaIndex.put(name, page);
+		metaIndex.remove(tmpName);
+		if (log.shouldWarn())
+			log.warn("reformatted list: " + name + " in " +
+			         (System.currentTimeMillis() - start) + "ms");
+	}
+
+	/**
+	 *  Closes all open skiplists and then the blockfile itself.
+	 *
 	 *  Note (I2P)
-         *  Does NOT close the RAF / RAI.
+	 *  Does NOT close the RAF / RAI.
 	 */
 	public void close() throws IOException {
 		// added I2P
@@ -539,9 +634,15 @@ public class BlockFile implements Closeable {
 			try {
 				// This uses IdentityBytes, so the value class won't be right, but at least
 				// it won't fail the out-of-order check
-				Serializer keyser = slname.equals("%%__REVERSE__%%") ? new IntBytes() : new UTF8StringBytes();
-				BSkipList bsl = getIndex(slname, keyser, new IdentityBytes());
-				if (bsl == null) {
+				boolean fail;
+				if (slname.equals("%%__REVERSE__%%")) {
+					Serializer<Integer> keyser = new IntBytes();
+					fail = getIndex(slname, keyser, new IdentityBytes()) == null;
+				} else {
+					Serializer<String> keyser = new UTF8StringBytes();
+					fail = getIndex(slname, keyser, new IdentityBytes()) == null;
+				}
+				if (fail) {
 					log.error("Can't find list? " + slname);
 					continue;
 				}

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipLevels.java

@@ -55,13 +55,13 @@ import net.i2p.util.Log;
  *
  * Always fits on one page.
  */
-public class BSkipLevels extends SkipLevels {
+public class BSkipLevels<K extends Comparable<? super K>, V> extends SkipLevels<K, V> {
 	private static final long MAGIC = 0x42534c6576656c73l;  // "BSLevels"
 	static final int HEADER_LEN = 16;
 	public final int levelPage;
 	public final int spanPage;
 	public final BlockFile bf;
-	private final BSkipList bsl;
+	private final BSkipList<K, V> bsl;
 	private boolean isKilled;
 	// the level pages, passed from the constructor to initializeLevels(),
 	// NOT kept up to date
@@ -73,7 +73,8 @@ public class BSkipLevels extends SkipLevels {
 	 *  after the constructor, unless it's a new empty
 	 *  level and init() was previously called.
 	 */
-	public BSkipLevels(BlockFile bf, int levelPage, BSkipList bsl) throws IOException {
+	@SuppressWarnings("unchecked")
+	public BSkipLevels(BlockFile bf, int levelPage, BSkipList<K, V> bsl) throws IOException {
 		this.levelPage = levelPage;
 		this.bf = bf;
 		this.bsl = bsl;
@@ -97,7 +98,7 @@ public class BSkipLevels extends SkipLevels {
 			throw new IOException("No span found in cache???");
 		}
 
-		this.levels = new BSkipLevels[maxLen];
+		this.levels = (BSkipLevels<K, V>[]) new BSkipLevels[maxLen];
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Reading New BSkipLevels with " + nonNull + " / " + maxLen + " valid levels page " + levelPage +
 				     " in skiplist " + bsl);
@@ -118,14 +119,14 @@ public class BSkipLevels extends SkipLevels {
 	 *  @since 0.9.20
 	 */
 	public void initializeLevels() {
-		List<BSkipLevels> toInit = new ArrayList<BSkipLevels>(32);
-		List<BSkipLevels> nextInit = new ArrayList<BSkipLevels>(32);
+		List<BSkipLevels<K, V>> toInit = new ArrayList<BSkipLevels<K, V>>(32);
+		List<BSkipLevels<K, V>> nextInit = new ArrayList<BSkipLevels<K, V>>(32);
 		initializeLevels(toInit);
 		while (!toInit.isEmpty()) {
-			for (BSkipLevels bsl : toInit) {
+			for (BSkipLevels<K, V> bsl : toInit) {
 				bsl.initializeLevels(nextInit);
 			}
-			List<BSkipLevels> tmp = toInit;
+			List<BSkipLevels<K, V>> tmp = toInit;
 			toInit = nextInit;
 			nextInit = tmp;
 			nextInit.clear();
@@ -139,7 +140,7 @@ public class BSkipLevels extends SkipLevels {
 	 *  @param nextInit out parameter, next levels to initialize
 	 *  @since 0.9.20
 	 */
-	private void initializeLevels(List<BSkipLevels> nextInit) {
+	private void initializeLevels(List<BSkipLevels<K, V>> nextInit) {
 		boolean fail = false;
 		for(int i = 0; i < lps.length; i++) {
 			int lp = lps[i];
@@ -147,7 +148,7 @@ public class BSkipLevels extends SkipLevels {
 				levels[i] = bsl.levelHash.get(Integer.valueOf(lp));
 				if(levels[i] == null) {
 					try {
-						BSkipLevels lev = new BSkipLevels(bf, lp, bsl);
+						BSkipLevels<K, V> lev = new BSkipLevels<K, V>(bf, lp, bsl);
 						levels[i] = lev;
 						nextInit.add(lev);
 					} catch (IOException ioe) {
@@ -158,8 +159,8 @@ public class BSkipLevels extends SkipLevels {
 						continue;
 					}
 				}
-				Comparable ourKey = key();
-				Comparable nextKey = levels[i].key();
+				K ourKey = key();
+				K nextKey = levels[i].key();
 				if (ourKey != null && nextKey != null &&
 				    ourKey.compareTo(nextKey) >= 0) {
 					bf.log.warn("Corrupt database, level out of order " + this +
@@ -172,7 +173,7 @@ public class BSkipLevels extends SkipLevels {
 				// TODO also check that the level[] array is not out-of-order
 			} else {
 				if (bf.log.shouldLog(Log.WARN))
-					bf.log.warn("WTF " + this + " i = " + i + " of " +
+					bf.log.warn(this + " i = " + i + " of " +
 						    lps.length + " / " + levels.length +
 						    " valid levels but page is zero");
 				levels[i] = null;
@@ -215,9 +216,9 @@ public class BSkipLevels extends SkipLevels {
 					break;
 			}
 			bf.file.writeShort(i);
-			bf.file.writeInt(((BSkipSpan) bottom).page);
+			bf.file.writeInt(((BSkipSpan<K, V>) bottom).page);
 			for(int j = 0; j < i; j++) {
-				bf.file.writeInt(((BSkipLevels) levels[j]).levelPage);
+				bf.file.writeInt(((BSkipLevels<K, V>) levels[j]).levelPage);
 			}
 		} catch (IOException ioe) { throw new RuntimeException("Error writing to database", ioe); }
 	}
@@ -229,22 +230,22 @@ public class BSkipLevels extends SkipLevels {
 			return;
 		}
 		if (bf.log.shouldLog(Log.DEBUG))
-			bf.log.debug("Killing " + this + ' ' + print(), new Exception());
+			bf.log.debug("Killing " + this + ' ' + print() /* , new Exception() */ );
 		isKilled = true;
 		bsl.levelHash.remove(Integer.valueOf(levelPage));
 		bf.freePage(levelPage);
 	}
 
 	@Override
-	public SkipLevels newInstance(int levels, SkipSpan ss, SkipList sl) {
+	public SkipLevels<K, V> newInstance(int levels, SkipSpan<K, V> ss, SkipList<K, V> sl) {
 		try {
-			BSkipSpan bss = (BSkipSpan) ss;
-			BSkipList bsl = (BSkipList) sl;
+			BSkipSpan<K, V> bss = (BSkipSpan<K, V>) ss;
+			BSkipList<K, V> bsl = (BSkipList<K, V>) sl;
 			int page = bf.allocPage();
 			BSkipLevels.init(bf, page, bss.page, levels);
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("New BSkipLevels height " + levels + " page " + page);
-			return new BSkipLevels(bf, page, bsl);
+			return new BSkipLevels<K, V>(bf, page, bsl);
 			// do not need to call initLevels() here
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
@@ -273,7 +274,7 @@ public class BSkipLevels extends SkipLevels {
 	 *  @since 0.8.8
 	 */
 	private boolean blvlfix() {
-		TreeSet<SkipLevels> lvls = new TreeSet<SkipLevels>(new LevelComparator());
+		TreeSet<SkipLevels<K, V>> lvls = new TreeSet<SkipLevels<K, V>>(new LevelComparator<K, V>());
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Starting level search");
 		getAllLevels(this, lvls);
@@ -285,15 +286,15 @@ public class BSkipLevels extends SkipLevels {
 		}
 		// traverse the levels, back-to-front
 		boolean rv = false;
-		SkipLevels after = null;
-		for (SkipLevels lv : lvls) {
+		SkipLevels<K, V> after = null;
+		for (SkipLevels<K, V> lv : lvls) {
 			boolean modified = false;
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("Checking " + lv.print());
 			if (after != null) {
 				int min = Math.min(after.levels.length, lv.levels.length);
 				for (int i = 0; i < min; i++) {
-					SkipLevels cur = lv.levels[i];
+					SkipLevels<K, V> cur = lv.levels[i];
 					if (cur != after) {
 						if (cur != null)
 							bf.log.warn("Level " + i + " was wrong, fixing for " + lv.print());
@@ -331,12 +332,12 @@ public class BSkipLevels extends SkipLevels {
 	 *  @param lvlSet out parameter, the result
 	 *  @since 0.8.8
 	 */
-	private void getAllLevels(SkipLevels l, Set<SkipLevels> lvlSet) {
+	private void getAllLevels(SkipLevels<K, V> l, Set<SkipLevels<K, V>> lvlSet) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("GAL " + l.print());
 		// Do level 0 without recursion, on the assumption everything is findable
 		// from the root
-		SkipLevels cur = l;
+		SkipLevels<K, V> cur = l;
 		while (cur != null && lvlSet.add(cur)) {
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("Adding " + cur.print());
@@ -347,7 +348,7 @@ public class BSkipLevels extends SkipLevels {
 		// If there were no nulls at level 0 in the middle,
 		// i.e. there are no problems, this won't find anything
 		for (int i = 1; i < l.levels.length; i++) {
-			SkipLevels lv = l.levels[i];
+			SkipLevels<K, V> lv = l.levels[i];
 			if (lv != null && !lvlSet.contains(lv))
 				getAllLevels(lv, lvlSet);
 		}
@@ -358,10 +359,10 @@ public class BSkipLevels extends SkipLevels {
          *  Sorts in REVERSE order.
 	 *  @since 0.8.8
 	 */
-	private static class LevelComparator implements Comparator<SkipLevels>, Serializable {
-		public int compare(SkipLevels l, SkipLevels r) {
-			Comparable lk = l.key();
-			Comparable rk = r.key();
+	private static class LevelComparator<K extends Comparable<? super K>, V> implements Comparator<SkipLevels<K, V>>, Serializable {
+		public int compare(SkipLevels<K, V> l, SkipLevels<K, V> r) {
+			K lk = l.key();
+			K rk = r.key();
 			if (lk == null && rk == null)
 				return 0;
 			if (lk == null)
@@ -378,13 +379,14 @@ public class BSkipLevels extends SkipLevels {
 	 *  This needs work.
 	 */
 	@Override
-	public boolean blvlck(boolean fix, int width, SkipLevels[] prevLevels) {
+	@SuppressWarnings("unchecked")
+	public boolean blvlck(boolean fix, int width, SkipLevels<K, V>[] prevLevels) {
 		bf.log.warn("    Skip level at width " + width);
 		bf.log.warn("        levels " + this.levels.length);
 		bf.log.warn("        first key " + this.key());
 		bf.log.warn("        spanPage " + this.spanPage);
 		bf.log.warn("        levelPage " + this.levelPage);
-		SkipLevels higher = null;
+		SkipLevels<K, V> higher = null;
 		for (int i = levels.length - 1; i >= 0; i--) {
 			if (levels[i] != null) {
 				bf.log.info("                level " + i + " -> " + levels[i].key() + " ");
@@ -418,7 +420,7 @@ public class BSkipLevels extends SkipLevels {
 				}
 			}
 		} else {
-			prevLevels = new SkipLevels[levels.length];
+			prevLevels = (SkipLevels<K, V>[]) new SkipLevels[levels.length];
 			System.arraycopy(levels, 0, prevLevels, 0, levels.length);
 		}
 		if (levels[0] != null)

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipList.java

@@ -51,7 +51,7 @@ import net.i2p.util.Log;
  *
  * Always fits on one page.
  */
-public class BSkipList extends SkipList implements Closeable {
+public class BSkipList<K extends Comparable<? super K>, V> extends SkipList<K, V> implements Closeable {
 	private static final long MAGIC = 0x536b69704c697374l;  // "SkipList"
 	public int firstSpanPage = 0;
 	public int firstLevelPage = 0;
@@ -59,16 +59,16 @@ public class BSkipList extends SkipList implements Closeable {
 	public final BlockFile bf;
 	private boolean isClosed;
 
-	final HashMap<Integer, BSkipSpan> spanHash = new HashMap<Integer, BSkipSpan>();
-	final HashMap<Integer, SkipLevels> levelHash = new HashMap<Integer, SkipLevels>();
+	final HashMap<Integer, BSkipSpan<K, V>> spanHash = new HashMap<Integer, BSkipSpan<K, V>>();
+	final HashMap<Integer, SkipLevels<K, V>> levelHash = new HashMap<Integer, SkipLevels<K, V>>();
 
 	private final boolean fileOnly;
 
-	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer key, Serializer val) throws IOException {
+	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		this(spanSize, bf, skipPage, key, val, false);
 	}
 
-	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer key, Serializer val, boolean fileOnly) throws IOException {
+	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer<K> key, Serializer<V> val, boolean fileOnly) throws IOException {
 		if(spanSize < 1) { throw new RuntimeException("Span size too small"); }
 
 		this.skipPage = skipPage;
@@ -89,10 +89,10 @@ public class BSkipList extends SkipList implements Closeable {
 
 		this.fileOnly = fileOnly;
 		if (fileOnly)
-			first = new IBSkipSpan(bf, this, firstSpanPage, key, val);
+			first = new IBSkipSpan<K, V>(bf, this, firstSpanPage, key, val);
 		else
-			first = new BSkipSpan(bf, this, firstSpanPage, key, val);
-		BSkipLevels bstack = new BSkipLevels(bf, firstLevelPage, this);
+			first = new BSkipSpan<K, V>(bf, this, firstSpanPage, key, val);
+		BSkipLevels<K, V> bstack = new BSkipLevels<K, V>(bf, firstLevelPage, this);
 		bstack.initializeLevels();
 		stack = bstack;
 		int total = 0;
@@ -104,7 +104,8 @@ public class BSkipList extends SkipList implements Closeable {
 		if (bf.file.canWrite() &&
 		    (levelCount != levelHash.size() || spans != spanHash.size() || size != total)) {
 			if (bf.log.shouldLog(Log.WARN))
-				bf.log.warn("On-disk counts were " + levelCount + " / " + spans + " / " +  size + ", correcting");
+				bf.log.warn("On-disk counts were " + levelCount + " levels / " + spans +
+				            " spans / " +  size + " entries, correcting to " + total + " entries");
 			size = total;
 			flush();
 		}
@@ -151,7 +152,6 @@ public class BSkipList extends SkipList implements Closeable {
 			curLevel.killInstance();
 			curLevel = nextLevel;
 		}
-		stack.killInstance();
 
 		SkipSpan curSpan = first;
 		while(curSpan != null) {
@@ -200,33 +200,36 @@ public class BSkipList extends SkipList implements Closeable {
 	}
 
 	@Override
-	public SkipIterator iterator() {
+	public SkipIterator<K, V> iterator() {
 		if (!this.fileOnly)
 			return super.iterator();
-		return new IBSkipIterator(first, 0);
+		return new IBSkipIterator<K, V>(first, 0);
 	}
 
-	@Override
-	public SkipIterator min() {
+/****
+	//@Override
+	public SkipIterator<K, V> min() {
 		return iterator();
 	}
 
-	@Override
-	public SkipIterator max() {
+	//@Override
+	public SkipIterator<K, V> max() {
 		if (!this.fileOnly)
 			return super.max();
-		SkipSpan ss = stack.getEnd();
-		return new IBSkipIterator(ss, ss.nKeys - 1);
+		SkipSpan<K, V> ss = stack.getEnd();
+		return new IBSkipIterator<K, V>(ss, ss.nKeys - 1);
 	}
+****/
 
+	/** find */
 	@Override
-	public SkipIterator find(Comparable key) {
+	public SkipIterator<K, V> find(K key) {
 		if (!this.fileOnly)
 			return super.find(key);
 		int[] search = new int[1];
-		SkipSpan ss = stack.getSpan(stack.levels.length - 1, key, search);
+		SkipSpan<K, V> ss = stack.getSpan(stack.levels.length - 1, key, search);
 		if(search[0] < 0) { search[0] = -1 * (search[0] + 1); }
-		return new IBSkipIterator(ss, search[0]);
+		return new IBSkipIterator<K, V>(ss, search[0]);
 	}
 
 	/**

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipSpan.java

@@ -59,19 +59,19 @@ import net.i2p.util.Log;
  *     next overflow page (unsigned int)
  *</pre>
  */
-public class BSkipSpan extends SkipSpan {
+public class BSkipSpan<K extends Comparable<? super K>, V> extends SkipSpan<K, V> {
 	protected static final int MAGIC = 0x5370616e;  // "Span"
 	protected static final int HEADER_LEN = 20;
 	public static final int CONT_HEADER_LEN = 8;
 	protected final BlockFile bf;
-	private final BSkipList bsl;
+	private final BSkipList<K, V> bsl;
 	protected int page;
 	protected int overflowPage;
 
 	protected int prevPage;
 	protected int nextPage = 0;
-	protected Serializer keySer;
-	protected Serializer valSer;
+	protected Serializer<K> keySer;
+	protected Serializer<V> valSer;
 
 	// I2P
 	protected int spanSize;
@@ -88,11 +88,11 @@ public class BSkipSpan extends SkipSpan {
 	}
 
 	@Override
-	public SkipSpan newInstance(SkipList sl) {
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) {
 		try {
 			int newPage = bf.allocPage();
 			init(bf, newPage, bf.spanSize);
-			return new BSkipSpan(bf, (BSkipList) sl, newPage, keySer, valSer);
+			return new BSkipSpan<K, V>(bf, (BSkipList<K, V>) sl, newPage, keySer, valSer);
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
 
@@ -237,7 +237,8 @@ public class BSkipSpan extends SkipSpan {
 		//bsl.flush();
 	}
 
-	private static void load(BSkipSpan bss, BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	private static <X extends Comparable<? super X>, Y> void load(BSkipSpan<X, Y> bss, BlockFile bf, BSkipList<X, Y> bsl,
+	                                                   int spanPage, Serializer<X> key, Serializer<Y> val) throws IOException {
 		loadInit(bss, bf, bsl, spanPage, key, val);
 		bss.loadData();
 	}
@@ -246,7 +247,8 @@ public class BSkipSpan extends SkipSpan {
 	 * I2P - first half of load()
 	 * Only read the span headers
 	 */
-	protected static void loadInit(BSkipSpan bss, BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	protected static <X extends Comparable<? super X>, Y> void loadInit(BSkipSpan<X, Y> bss, BlockFile bf, BSkipList<X, Y> bsl,
+	                                                         int spanPage, Serializer<X> key, Serializer<Y> val) throws IOException {
 		if (bss.isKilled)
 			throw new IOException("Already killed!! " + bss);
 		bss.page = spanPage;
@@ -285,11 +287,12 @@ public class BSkipSpan extends SkipSpan {
 	 * Load the whole span's keys and values into memory
 	 * @param flushOnError set to false if you are going to flush anyway
 	 */
+	@SuppressWarnings("unchecked")
 	protected void loadData(boolean flushOnError) throws IOException {
 		if (isKilled)
 			throw new IOException("Already killed!! " + this);
-		this.keys = new Comparable[this.spanSize];
-		this.vals = new Object[this.spanSize];
+		this.keys = (K[]) new Comparable[this.spanSize];
+		this.vals = (V[]) new Object[this.spanSize];
 
 		int ksz, vsz;
 		int curPage = this.page;
@@ -327,7 +330,7 @@ public class BSkipSpan extends SkipSpan {
 				break;
 			}
 //			System.out.println("i=" + i + ", Page " + curPage + ", offset " + pageCounter[0] + " ksz " + ksz + " vsz " + vsz);
-			this.keys[i] = (Comparable) this.keySer.construct(k);
+			this.keys[i] = this.keySer.construct(k);
 			this.vals[i] = this.valSer.construct(v);
 			// Drop bad entry without throwing exception
 			if (this.keys[i] == null || this.vals[i] == null) {
@@ -377,31 +380,31 @@ public class BSkipSpan extends SkipSpan {
 		}
 	}
 
-	protected BSkipSpan(BlockFile bf, BSkipList bsl) {
+	protected BSkipSpan(BlockFile bf, BSkipList<K, V> bsl) {
 		this.bf = bf;
 		this.bsl = bsl;
 	}
 
-	public BSkipSpan(BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	public BSkipSpan(BlockFile bf, BSkipList<K, V> bsl, int spanPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		this.bf = bf;
 		this.bsl = bsl;
 		BSkipSpan.load(this, bf, bsl, spanPage, key, val);
 		this.next = null;
 		this.prev = null;
 
-		BSkipSpan bss = this;
+		BSkipSpan<K, V> bss = this;
 		// findbugs ok (set in load() above)
 		int np = nextPage;
 		while(np != 0) {
-			BSkipSpan temp = bsl.spanHash.get(Integer.valueOf(np));
+			BSkipSpan<K, V> temp = bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.next = temp;
 				break;
 			}
-			bss.next = new BSkipSpan(bf, bsl);
+			bss.next = new BSkipSpan<K, V>(bf, bsl);
 			bss.next.next = null;
 			bss.next.prev = bss;
-			bss = (BSkipSpan) bss.next;
+			bss = (BSkipSpan<K, V>) bss.next;
 			
 			BSkipSpan.load(bss, bf, bsl, np, key, val);
 			np = bss.nextPage;
@@ -411,15 +414,15 @@ public class BSkipSpan extends SkipSpan {
 		bss = this;
 		np = prevPage;
 		while(np != 0) {
-			BSkipSpan temp = bsl.spanHash.get(Integer.valueOf(np));
+			BSkipSpan<K, V> temp = bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.prev = temp;
 				break;
 			}
-			bss.prev = new BSkipSpan(bf, bsl);
+			bss.prev = new BSkipSpan<K, V>(bf, bsl);
 			bss.prev.next = bss;
 			bss.prev.prev = null;
-			bss = (BSkipSpan) bss.prev;
+			bss = (BSkipSpan<K, V>) bss.prev;
 			
 			BSkipSpan.load(bss, bf, bsl, np, key, val);
 			np = bss.prevPage;

apps/addressbook/java/src/net/metanotion/io/block/index/IBSkipIterator.java

@@ -41,9 +41,9 @@ import net.metanotion.util.skiplist.SkipSpan;
 	If the caller does not iterate all the way through, the last span
 	will remain in memory.
 */
-public class IBSkipIterator extends SkipIterator {
+public class IBSkipIterator<K extends Comparable<? super K>, V> extends SkipIterator<K, V> {
 
-	public IBSkipIterator(SkipSpan ss, int index) {
+	public IBSkipIterator(SkipSpan<K, V> ss, int index) {
 		super(ss, index);
 	}
 
@@ -53,8 +53,8 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Object next() {
-		Object o;
+	public V next() {
+		V o;
 		if(index < ss.nKeys) {
 			if (ss.vals == null) {
 				try {
@@ -90,7 +90,7 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Comparable nextKey() {
+	public K nextKey() {
 		if(index < ss.nKeys) {
 			if (ss.keys == null) {
 				try {
@@ -110,7 +110,7 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Object previous() {
+	public V previous() {
 		if(index > 0) {
 			index--;
 		} else if(ss.prev != null) {

apps/addressbook/java/src/net/metanotion/io/block/index/IBSkipSpan.java

@@ -54,21 +54,22 @@ import net.i2p.util.Log;
  *
  * @author zzz
  */
-public class IBSkipSpan extends BSkipSpan {
+public class IBSkipSpan<K extends Comparable<? super K>, V> extends BSkipSpan<K, V> {
 
-	private Comparable firstKey;
+	private K firstKey;
 
 	@Override
-	public SkipSpan newInstance(SkipList sl) {
+	@SuppressWarnings("unchecked")
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Splitting page " + this.page + " containing " + this.nKeys + '/' + this.spanSize);
 		try {
 			int newPage = bf.allocPage();
 			init(bf, newPage, bf.spanSize);
-			SkipSpan rv = new IBSkipSpan(bf, (BSkipList) sl, newPage, keySer, valSer);
+			SkipSpan<K, V> rv = new IBSkipSpan<K, V>(bf, (BSkipList<K, V>) sl, newPage, keySer, valSer);
 			// this is called after a split, so we need the data arrays initialized
-			rv.keys = new Comparable[bf.spanSize];
-			rv.vals = new Object[bf.spanSize];
+			rv.keys = (K[]) new Comparable[bf.spanSize];
+			rv.vals = (V[]) new Object[bf.spanSize];
 			return rv;
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
@@ -125,7 +126,7 @@ public class IBSkipSpan extends BSkipSpan {
 		pageCounter[0] +=4;
 		byte[] k = new byte[ksz];
 		curPage = this.bf.readMultiPageData(k, curPage, pageCounter, curNextPage);
-		this.firstKey = (Comparable) this.keySer.construct(k);
+		this.firstKey = this.keySer.construct(k);
 		if (this.firstKey == null) {
 			bf.log.error("Null deserialized first key in page " + curPage);
 			repair(1);
@@ -160,7 +161,7 @@ public class IBSkipSpan extends BSkipSpan {
 	/**
 	 * Linear search through the span in the file for the value.
 	 */
-	private Object getData(Comparable key) throws IOException {
+	private V getData(K key) throws IOException {
 		seekData();
 		int curPage = this.page;
 		int[] curNextPage = new int[1];
@@ -194,7 +195,7 @@ public class IBSkipSpan extends BSkipSpan {
 				break;
 			}
 			//System.out.println("i=" + i + ", Page " + curPage + ", offset " + pageCounter[0] + " ksz " + ksz + " vsz " + vsz);
-			Comparable ckey = (Comparable) this.keySer.construct(k);
+			K ckey = this.keySer.construct(k);
 			if (ckey == null) {
 				// skip the value and keep going
 				curPage = this.bf.skipMultiPageBytes(vsz, curPage, pageCounter, curNextPage);
@@ -213,7 +214,7 @@ public class IBSkipSpan extends BSkipSpan {
 					lostEntries(i, curPage);
 					break;
 				}
-				Object rv = this.valSer.construct(v);
+				V rv = this.valSer.construct(v);
 				if (rv == null) {
 					bf.log.error("Null deserialized value in entry " + i + " page " + curPage +
 					                    " key=" + ckey);
@@ -252,11 +253,11 @@ public class IBSkipSpan extends BSkipSpan {
 	*****/
 	}
 
-	private IBSkipSpan(BlockFile bf, BSkipList bsl) {
+	private IBSkipSpan(BlockFile bf, BSkipList<K, V> bsl) {
 		super(bf, bsl);
 	}
 
-	public IBSkipSpan(BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	public IBSkipSpan(BlockFile bf, BSkipList<K, V> bsl, int spanPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		super(bf, bsl);
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("New ibss page " + spanPage);
@@ -265,24 +266,24 @@ public class IBSkipSpan extends BSkipSpan {
 		this.next = null;
 		this.prev = null;
 
-		IBSkipSpan bss = this;
-		IBSkipSpan temp;
+		IBSkipSpan<K, V> bss = this;
+		IBSkipSpan<K, V> temp;
 		int np = nextPage;
 		while(np != 0) {
-			temp = (IBSkipSpan) bsl.spanHash.get(Integer.valueOf(np));
+			temp = (IBSkipSpan<K, V>) bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.next = temp;
 				break;
 			}
-			bss.next = new IBSkipSpan(bf, bsl);
+			bss.next = new IBSkipSpan<K, V>(bf, bsl);
 			bss.next.next = null;
 			bss.next.prev = bss;
-			Comparable previousFirstKey = bss.firstKey;
-			bss = (IBSkipSpan) bss.next;
+			K previousFirstKey = bss.firstKey;
+			bss = (IBSkipSpan<K, V>) bss.next;
 			
 			BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
 			bss.loadFirstKey();
-			Comparable nextFirstKey = bss.firstKey;
+			K nextFirstKey = bss.firstKey;
 			if (previousFirstKey == null || nextFirstKey == null ||
 			    previousFirstKey.compareTo(nextFirstKey) >= 0) {
 				// TODO remove, but if we are at the bottom of a level
@@ -299,20 +300,20 @@ public class IBSkipSpan extends BSkipSpan {
 		bss = this;
 		np = prevPage;
 		while(np != 0) {
-			temp = (IBSkipSpan) bsl.spanHash.get(Integer.valueOf(np));
+			temp = (IBSkipSpan<K, V>) bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.prev = temp;
 				break;
 			}
-			bss.prev = new IBSkipSpan(bf, bsl);
+			bss.prev = new IBSkipSpan<K, V>(bf, bsl);
 			bss.prev.next = bss;
 			bss.prev.prev = null;
-			Comparable nextFirstKey = bss.firstKey;
-			bss = (IBSkipSpan) bss.prev;
+			K nextFirstKey = bss.firstKey;
+			bss = (IBSkipSpan<K, V>) bss.prev;
 			
 			BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
 			bss.loadFirstKey();
-			Comparable previousFirstKey = bss.firstKey;
+			K previousFirstKey = bss.firstKey;
 			if (previousFirstKey == null || nextFirstKey == null ||
 			    previousFirstKey.compareTo(nextFirstKey) >= 0) {
 				// TODO remove, but if we are at the bottom of a level
@@ -330,7 +331,7 @@ public class IBSkipSpan extends BSkipSpan {
          * Does not call super, we always store first key here
 	 */
 	@Override
-	public Comparable firstKey() {
+	public K firstKey() {
 		return this.firstKey;
 	}
 
@@ -339,13 +340,13 @@ public class IBSkipSpan extends BSkipSpan {
 	 * This is called only via SkipList.find()
 	 */
 	@Override
-	public SkipSpan getSpan(Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(K key, int[] search) {
 		try {
 			seekAndLoadData();
 		} catch (IOException ioe) {
 			throw new RuntimeException("Error reading database", ioe);
 		}
-		SkipSpan rv = super.getSpan(key, search);
+		SkipSpan<K, V> rv = super.getSpan(key, search);
 		this.keys = null;
 		this.vals = null;
 		return rv;
@@ -355,7 +356,7 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Linear search if in file, Binary search if in memory
 	 */
 	@Override
-	public Object get(Comparable key) {
+	public V get(K key) {
 		try {
 			if (nKeys == 0) { return null; }
 			if (this.next != null && this.next.firstKey().compareTo(key) <= 0)
@@ -370,13 +371,13 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Load whole span from file, do the operation, flush out, then null out in-memory data again.
 	 */
 	@Override
-	public SkipSpan put(Comparable key, Object val, SkipList sl)	{
+	public SkipSpan<K, V> put(K key, V val, SkipList<K, V> sl)	{
 		try {
 			seekAndLoadData();
 		} catch (IOException ioe) {
 			throw new RuntimeException("Error reading database", ioe);
 		}
-		SkipSpan rv = super.put(key, val, sl);
+		SkipSpan<K, V> rv = super.put(key, val, sl);
 		// flush() nulls out the data
 		return rv;
 	}
@@ -385,7 +386,7 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Load whole span from file, do the operation, flush out, then null out in-memory data again.
 	 */
 	@Override
-	public Object[] remove(Comparable key, SkipList sl) {
+	public Object[] remove(K key, SkipList<K, V> sl) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Remove " + key + " in " + this);
 		if (nKeys <= 0)

apps/addressbook/java/src/net/metanotion/io/data/IdentityBytes.java

@@ -35,11 +35,11 @@ import net.metanotion.io.Serializer;
  * Will never return null.
  * Added by I2P.
  */
-public class IdentityBytes implements Serializer {
+public class IdentityBytes implements Serializer<byte[]> {
 
 	/** @return byte[] */
-	public byte[] getBytes(Object o) { return (byte[])o; }
+	public byte[] getBytes(byte[] o) { return o; }
 
 	/** @return b */
-	public Object construct(byte[] b) { return b; }
+	public byte[] construct(byte[] b) { return b; }
 }

apps/addressbook/java/src/net/metanotion/io/data/IntBytes.java

@@ -30,10 +30,10 @@ package net.metanotion.io.data;
 
 import net.metanotion.io.Serializer;
 
-public class IntBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class IntBytes implements Serializer<Integer> {
+	public byte[] getBytes(Integer o) {
 		byte[] b = new byte[4];
-		int v = ((Integer) o).intValue();
+		int v = o.intValue();
  		b[0] = (byte)(0xff & (v >> 24));
  		b[1] = (byte)(0xff & (v >> 16));
 		b[2] = (byte)(0xff & (v >>  8));
@@ -41,7 +41,7 @@ public class IntBytes implements Serializer {
  		return b;
 	}
 
-	public Object construct(byte[] b) {
+	public Integer construct(byte[] b) {
 		int v = (((b[0] & 0xff) << 24) |
 				 ((b[1] & 0xff) << 16) |
 				 ((b[2] & 0xff) <<  8) |

apps/addressbook/java/src/net/metanotion/io/data/StringBytes.java

@@ -32,14 +32,14 @@ import java.io.UnsupportedEncodingException;
 
 import net.metanotion.io.Serializer;
 
-public class StringBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class StringBytes implements Serializer<String> {
+	public byte[] getBytes(String o) {
 		try {
-			return ((String) o).getBytes("US-ASCII");
+			return o.getBytes("US-ASCII");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }
 	}
 
-	public Object construct(byte[] b) {
+	public String construct(byte[] b) {
 		try {
 			return new String(b, "US-ASCII");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }

apps/addressbook/java/src/net/metanotion/io/data/UTF8StringBytes.java

@@ -35,14 +35,14 @@ import net.metanotion.io.Serializer;
 /**
  * Added by I2P
  */
-public class UTF8StringBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class UTF8StringBytes implements Serializer<String> {
+	public byte[] getBytes(String o) {
 		try {
-			return ((String) o).getBytes("UTF-8");
+			return o.getBytes("UTF-8");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }
 	}
 
-	public Object construct(byte[] b) {
+	public String construct(byte[] b) {
 		try {
 			return new String(b, "UTF-8");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipIterator.java

@@ -39,12 +39,13 @@ import java.util.NoSuchElementException;
 	To be clear, this is an iterator through the values.
 	To get the key, call nextKey() BEFORE calling next().
 */
-public class SkipIterator implements ListIterator {
-	protected SkipSpan ss;
+public class SkipIterator<K extends Comparable<? super K>, V> implements ListIterator<V> {
+	protected SkipSpan<K, V> ss;
 	protected int index;
 
 	protected SkipIterator() { }
-	public SkipIterator(SkipSpan ss, int index) {
+
+	public SkipIterator(SkipSpan<K, V> ss, int index) {
 		if(ss==null) { throw new NullPointerException(); }
 		this.ss = ss;
 		this.index = index;
@@ -59,8 +60,8 @@ public class SkipIterator implements ListIterator {
 	 * @return the next value, and advances the index
 	 * @throws NoSuchElementException
 	 */
-	public Object next() {
-		Object o;
+	public V next() {
+		V o;
 		if(index < ss.nKeys) {
 			o = ss.vals[index];
 		} else {
@@ -83,7 +84,7 @@ public class SkipIterator implements ListIterator {
 	 * @return the key for which the value will be returned in the subsequent call to next()
 	 * @throws NoSuchElementException
 	 */
-	public Comparable nextKey() {
+	public K nextKey() {
 		if(index < ss.nKeys) { return ss.keys[index]; }
 		throw new NoSuchElementException();
 	}
@@ -98,7 +99,7 @@ public class SkipIterator implements ListIterator {
 	 * @return the previous value, and decrements the index
 	 * @throws NoSuchElementException
 	 */
-	public Object previous() {
+	public V previous() {
 		if(index > 0) {
 			index--;
 		} else if(ss.prev != null) {
@@ -111,9 +112,9 @@ public class SkipIterator implements ListIterator {
 
 
 	// Optional methods
-	public void add(Object o)	{ throw new UnsupportedOperationException(); }
+	public void add(V o)	{ throw new UnsupportedOperationException(); }
 	public void remove()		{ throw new UnsupportedOperationException(); }
-	public void set(Object o)	{ throw new UnsupportedOperationException(); }
+	public void set(V o)	{ throw new UnsupportedOperationException(); }
 	public int nextIndex()		{ throw new UnsupportedOperationException(); }
 	public int previousIndex()	{ throw new UnsupportedOperationException(); }
 

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipLevels.java

@@ -35,7 +35,7 @@ import net.metanotion.io.block.BlockFile;
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
-public class SkipLevels implements Flushable {
+public class SkipLevels<K extends Comparable<? super K>, V> implements Flushable {
 	/** We can't have more than 2**32 pages */
 	public static final int MAX_SIZE = 32;
 
@@ -45,12 +45,15 @@ public class SkipLevels implements Flushable {
 	 *	The "bottom" level is the direct pointer to a SkipSpan.
 	 */
 	// levels is almost final
-	public SkipLevels[] levels;
+	public SkipLevels<K, V>[] levels;
 	// bottom is final
-	public SkipSpan bottom;
+	public SkipSpan<K, V> bottom;
 	private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(BlockFile.class);
 
-	public SkipLevels newInstance(int levels, SkipSpan ss, SkipList sl) { return new SkipLevels(levels, ss); }
+	public SkipLevels<K, V> newInstance(int levels, SkipSpan<K, V> ss, SkipList<K, V> sl) {
+		return new SkipLevels<K, V>(levels, ss);
+	}
+
 	public void killInstance() { }
 	public void flush() { }
 
@@ -59,10 +62,11 @@ public class SkipLevels implements Flushable {
 	/*
 	 *  @throws IllegalArgumentException if size too big or too small
 	 */
-	public SkipLevels(int size, SkipSpan span) {
+	@SuppressWarnings("unchecked")
+	public SkipLevels(int size, SkipSpan<K, V> span) {
 		if(size < 1 || size > MAX_SIZE)
 			throw new IllegalArgumentException("Invalid Level Skip size");
-		levels = new SkipLevels[size];
+		levels = (SkipLevels<K, V>[]) new SkipLevels[size];
 		bottom = span;
 	}
 
@@ -92,14 +96,14 @@ public class SkipLevels implements Flushable {
 		return buf.toString();
 	}
 
-	public SkipSpan getEnd() {
+	public SkipSpan<K, V> getEnd() {
 		for(int i=(levels.length - 1);i>=0;i--) {
 			if(levels[i] != null) { return levels[i].getEnd(); }
 		}
 		return bottom.getEnd();
 	}
 
-	public SkipSpan getSpan(int start, Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(int start, K key, int[] search) {
 		for(int i=Math.min(start, levels.length - 1);i>=0;i--) {
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
 				return levels[i].getSpan(i,key,search);
@@ -108,9 +112,9 @@ public class SkipLevels implements Flushable {
 		return bottom.getSpan(key, search);
 	}
 
-	public Comparable key() { return bottom.firstKey(); }
+	public K key() { return bottom.firstKey(); }
 
-	public Object get(int start, Comparable key) {
+	public V get(int start, K key) {
 		for(int i=Math.min(start, levels.length - 1);i>=0;i--) {
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
 				return levels[i].get(i,key);
@@ -126,16 +130,17 @@ public class SkipLevels implements Flushable {
 	 *                and the deleted SkipLevels is taller than this SkipLevels.
 	 *          rv is null if no object was removed.
 	 */
-	public Object[] remove(int start, Comparable key, SkipList sl) {
+	@SuppressWarnings("unchecked")
+	public Object[] remove(int start, K key, SkipList<K, V> sl) {
 		Object[] res = null;
-		SkipLevels slvls = null;
+		SkipLevels<K, V> slvls = null;
 		for(int i = Math.min(start, levels.length - 1); i >= 0; i--) {
 			if(levels[i] != null) {
 				int cmp = levels[i].key().compareTo(key);
 				if((cmp < 0) || ((i==0) && (cmp <= 0)))  {
 					res = levels[i].remove(i, key, sl);
 					if((res != null) && (res[1] != null)) {
-						slvls = (SkipLevels) res[1];
+						slvls = (SkipLevels<K, V>) res[1];
 						if(levels.length >= slvls.levels.length) {
 							res[1] = null;
 						}
@@ -159,7 +164,7 @@ public class SkipLevels implements Flushable {
 				// if the returned SkipSpan was already copied to us
 				boolean isFirst = sl.first == bottom;
 				if (isFirst && levels[0] != null) {
-					SkipSpan ssres = (SkipSpan)res[1];
+					SkipSpan<K, V> ssres = (SkipSpan<K, V>)res[1];
 					if (bottom.firstKey().equals(ssres.firstKey())) {
 						// bottom copied the next span to itself
 						if (_log.shouldLog(Log.INFO)) {
@@ -171,7 +176,7 @@ public class SkipLevels implements Flushable {
 							_log.info("FIXUP TIME");
 						}
 						
-						SkipLevels replace = levels[0];
+						SkipLevels<K, V> replace = levels[0];
 						for (int i = 0; i < levels.length; i++) {
 							if (levels[i] == null)
 								break;
@@ -197,11 +202,11 @@ public class SkipLevels implements Flushable {
 		if((bottom.nKeys == 0) && (sl.first != bottom)) {
 			// from debugging other problems
 			if (res == null) {
-				_log.warn("WTF killing with no return value " + print());
+				_log.warn("killing with no return value " + print());
 			} else if (res[1] == null) {
-				_log.warn("WTF killing with no return value 1 " + print());
+				_log.warn("killing with no return value 1 " + print());
 			} else if (res[1] != this) {
-				_log.warn("WTF killing with return value not us " + res[1] + ' ' + print());
+				_log.warn("killing with return value not us " + res[1] + ' ' + print());
 			}
 			this.killInstance();
 		}
@@ -213,12 +218,12 @@ public class SkipLevels implements Flushable {
 	 *          and the new level is taller than our level;
 	 *          else null if it went in an existing level or the new level is our height or less.
 	 */
-	public SkipLevels put(int start, Comparable key, Object val, SkipList sl) {
+	public SkipLevels<K, V> put(int start, K key, V val, SkipList<K, V> sl) {
 		boolean modified = false;
 		for(int i = Math.min(start, levels.length - 1); i >= 0; i--) {
 			// is key equal to or after the start of the level?
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
-				SkipLevels slvls = levels[i].put(i, key, val, sl);
+				SkipLevels<K, V> slvls = levels[i].put(i, key, val, sl);
 				if(slvls != null) {
 					for (int j = i + 1; j < Math.min(slvls.levels.length, levels.length); j++) {
 						// he points to where we used to point
@@ -243,11 +248,11 @@ public class SkipLevels implements Flushable {
 				return null;
 			}
 		}
-		SkipSpan ss = bottom.put(key,val,sl);
+		SkipSpan<K, V> ss = bottom.put(key,val,sl);
 		if(ss!=null) {
 			int height = sl.generateColHeight();
 			if(height != 0) {
-				SkipLevels slvls = this.newInstance(height, ss, sl);
+				SkipLevels<K, V> slvls = this.newInstance(height, ss, sl);
 				for(int i=0;i<(Math.min(height,levels.length));i++) {
 					// he points to where we used to point
 					// and we now point to him
@@ -267,6 +272,6 @@ public class SkipLevels implements Flushable {
 	}
 
 	public boolean blvlck(boolean fix) { return false; }
-	public boolean blvlck(boolean fix, int width, SkipLevels[] prevLevels) { return false; }
+	public boolean blvlck(boolean fix, int width, SkipLevels<K, V>[] prevLevels) { return false; }
 }
 

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipList.java

@@ -35,13 +35,13 @@ import net.i2p.util.RandomSource;
 
 //import net.metanotion.io.block.BlockFile;
 
-public class SkipList implements Flushable {
+public class SkipList<K extends Comparable<? super K>, V> implements Flushable, Iterable<V> {
 	/** the probability of each next higher level */
 	protected static final int P = 2;
 	private static final int MIN_SLOTS = 4;
 	// these two are really final
-	protected SkipSpan first;
-	protected SkipLevels stack;
+	protected SkipSpan<K, V> first;
+	protected SkipLevels<K, V> stack;
 	// I2P mod
 	public static final Random rng = RandomSource.getInstance();
 
@@ -57,8 +57,8 @@ public class SkipList implements Flushable {
 	public SkipList(int span) {
 		if(span < 1 || span > SkipSpan.MAX_SIZE)
 			throw new IllegalArgumentException("Invalid span size");
-		first = new SkipSpan(span);
-		stack = new SkipLevels(1, first);
+		first = new SkipSpan<K, V>(span);
+		stack = new SkipLevels<K, V>(1, first);
 		//rng = new Random(System.currentTimeMillis());
 	}
 
@@ -95,14 +95,15 @@ public class SkipList implements Flushable {
 		return max;
 	}
 
-	public void put(Comparable key, Object val)	{
+	@SuppressWarnings("unchecked")
+	public void put(K key, V val)	{
 		if(key == null) { throw new NullPointerException(); }
 		if(val == null) { throw new NullPointerException(); }
-		SkipLevels slvls = stack.put(stack.levels.length - 1, key, val, this);
+		SkipLevels<K, V> slvls = stack.put(stack.levels.length - 1, key, val, this);
 		if(slvls != null) {
 			// grow our stack
 			//BlockFile.log.info("Top level old hgt " + stack.levels.length +  " new hgt " + slvls.levels.length);
-			SkipLevels[] levels = new SkipLevels[slvls.levels.length];
+			SkipLevels<K, V>[] levels = (SkipLevels<K, V>[]) new SkipLevels[slvls.levels.length];
 			for(int i=0;i < slvls.levels.length; i++) {
 				if(i < stack.levels.length) {
 					levels[i] = stack.levels[i];
@@ -116,12 +117,13 @@ public class SkipList implements Flushable {
 		}
 	}
 
-	public Object remove(Comparable key) {
+	@SuppressWarnings("unchecked")
+	public V remove(K key) {
 		if(key == null) { throw new NullPointerException(); }
 		Object[] res = stack.remove(stack.levels.length - 1, key, this);
 		if(res != null) {
 			if(res[1] != null) {
-				SkipLevels slvls = (SkipLevels) res[1];
+				SkipLevels<K, V> slvls = (SkipLevels<K, V>) res[1];
 				for(int i=0;i < slvls.levels.length; i++) {
 					if(stack.levels[i] == slvls) {
 						stack.levels[i] = slvls.levels[i];
@@ -130,7 +132,7 @@ public class SkipList implements Flushable {
 				stack.flush();
 			}
 			flush();
-			return res[0];
+			return (V) res[0];
 		}
 		return null;
 	}
@@ -149,34 +151,36 @@ public class SkipList implements Flushable {
 	 * dumps all the data
 	 * @deprecated goes to System.out
 	 */
+	@Deprecated
 	public void print() {
 		System.out.println("List size " + size);
 		System.out.println(first.print());
 	}
 
-	public Object get(Comparable key) {
+	public V get(K key) {
 		if(key == null) { throw new NullPointerException(); }
 		return stack.get(stack.levels.length - 1, key);
 	}
 
-	public SkipIterator iterator() { return new SkipIterator(first, 0); }
+	public SkipIterator<K, V> iterator() { return new SkipIterator<K, V>(first, 0); }
 
-	public SkipIterator min() { return new SkipIterator(first, 0); }
+/****
+	public SkipIterator<K, V> min() { return new SkipIterator<K, V>(first, 0); }
 
-	public SkipIterator max() {
-		SkipSpan ss = stack.getEnd();
-		return new SkipIterator(ss, ss.nKeys - 1);
+	public SkipIterator<K, V> max() {
+		SkipSpan<K, V> ss = stack.getEnd();
+		return new SkipIterator<K, V>(ss, ss.nKeys - 1);
 	}
+****/
 
 	/** @return an iterator where nextKey() is the first one greater than or equal to 'key' */
-	public SkipIterator find(Comparable key) {
+	public SkipIterator<K, V> find(K key) {
 		int[] search = new int[1];
-		SkipSpan ss = stack.getSpan(stack.levels.length - 1, key, search);
+		SkipSpan<K, V> ss = stack.getSpan(stack.levels.length - 1, key, search);
 		if(search[0] < 0) { search[0] = -1 * (search[0] + 1); }
-		return new SkipIterator(ss, search[0]);
+		return new SkipIterator<K, V>(ss, search[0]);
 	}
 
-
 	// Levels adjusted to guarantee O(log n) search
 	// This is expensive proportional to the number of spans.
 	public void balance() {

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipSpan.java

@@ -32,16 +32,16 @@ import java.io.Flushable;
 
 //import net.metanotion.io.block.BlockFile;
 
-public class SkipSpan implements Flushable {
+public class SkipSpan<K extends Comparable<? super K>, V> implements Flushable {
 	/** This is actually limited by BlockFile.spanSize which is much smaller */
 	public static final int MAX_SIZE = 256;
 
 	public int nKeys = 0;
-	public Comparable[] keys;
-	public Object[] vals;
-	public SkipSpan next, prev;
+	public K[] keys;
+	public V[] vals;
+	public SkipSpan<K, V> next, prev;
 
-	public SkipSpan newInstance(SkipList sl) { return new SkipSpan(keys.length); }
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) { return new SkipSpan<K, V>(keys.length); }
 	public void killInstance() { }
 	public void flush() { }
 
@@ -50,11 +50,12 @@ public class SkipSpan implements Flushable {
 	/*
 	 *  @throws IllegalArgumentException if size too big or too small
 	 */
+	@SuppressWarnings("unchecked")
 	public SkipSpan(int size) {
 		if(size < 1 || size > MAX_SIZE)
 			throw new IllegalArgumentException("Invalid span size " + size);
-		keys = new Comparable[size];
-		vals = new Object[size];
+		keys = (K[]) new Comparable[size];
+		vals = (V[]) new Object[size];
 	}
 
 	/** dumps all the data from here to the end */
@@ -70,7 +71,7 @@ public class SkipSpan implements Flushable {
 		return buf.toString();
 	}
 
-	private int binarySearch(Comparable key) {
+	private int binarySearch(K key) {
  		int high = nKeys - 1;
  		int low = 0;
  		int cur;
@@ -89,12 +90,12 @@ public class SkipSpan implements Flushable {
  		return (-1 * (low + 1));
 	}
 
-	public SkipSpan getEnd() {
+	public SkipSpan<K, V> getEnd() {
 		if(next == null) { return this; }
 		return next.getEnd();
 	}
 
-	public SkipSpan getSpan(Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(K key, int[] search) {
 		if(nKeys == 0) {
 			search[0] = -1;
 			return this;
@@ -111,7 +112,7 @@ public class SkipSpan implements Flushable {
 		return this;
 	}
 
-	public Object get(Comparable key) {
+	public V get(K key) {
 		if(nKeys == 0) { return null; }
 		if(keys[nKeys - 1].compareTo(key) < 0) {
 			if(next == null) { return null; }
@@ -138,8 +139,8 @@ public class SkipSpan implements Flushable {
 		nKeys++;
 	}
 
-	private void split(int loc, Comparable key, Object val, SkipList sl) {
-		SkipSpan right = newInstance(sl);
+	private void split(int loc, K key, V val, SkipList<K, V> sl) {
+		SkipSpan<K, V> right = newInstance(sl);
 
 		if(this.next != null) { this.next.prev = right; }
 		right.next = this.next;
@@ -175,7 +176,7 @@ public class SkipSpan implements Flushable {
 	/**
 	 *  @return the new span if it caused a split, else null if it went in this span
 	 */
-	private SkipSpan insert(int loc, Comparable key, Object val, SkipList sl) {
+	private SkipSpan<K, V> insert(int loc, K key, V val, SkipList<K, V> sl) {
 		sl.addItem();
 		if(nKeys == keys.length) {
 			// split.
@@ -193,7 +194,7 @@ public class SkipSpan implements Flushable {
 	/**
 	 *  @return the new span if it caused a split, else null if it went in an existing span
 	 */
-	public SkipSpan put(Comparable key, Object val, SkipList sl)	{
+	public SkipSpan<K, V> put(K key, V val, SkipList<K, V> sl)	{
 		if(nKeys == 0) {
 			sl.addItem();
 			keys[0] = key;
@@ -246,7 +247,7 @@ public class SkipSpan implements Flushable {
 	 *          rv[1] is the deleted SkipSpan if the removed object was the last in the SkipSpan.
 	 *          rv is null if no object was removed.
 	 */
-	public Object[] remove(Comparable key, SkipList sl) {
+	public Object[] remove(K key, SkipList<K, V> sl) {
 		if(nKeys == 0) { return null; }
 		if(keys[nKeys - 1].compareTo(key) < 0) {
 			if(next == null) { return null; }
@@ -270,7 +271,7 @@ public class SkipSpan implements Flushable {
 				nKeys = next.nKeys;
 				//BlockFile.log.error("Killing next span " + next + ") and copying to this span " + this + " in remove of " + key);
 				// Make us point to next.next and him point back to us
-				SkipSpan nn = next.next;
+				SkipSpan<K, V> nn = next.next;
 				next.killInstance();
 				if (nn != null) {
 					nn.prev = this;
@@ -311,7 +312,7 @@ public class SkipSpan implements Flushable {
 	}
 
 	/** I2P */
-	public Comparable firstKey() {
+	public K firstKey() {
 		return keys[0];
 	}
 }

apps/addressbook/java/test/junit/net/i2p/router/naming/BlockfileNamingServiceTest.java

@@ -1,4 +1,4 @@
-package net.i2p.client.naming;
+package net.i2p.router.naming;
 
 import junit.framework.TestCase;
 

apps/addressbook/web.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
-<web-app>
-    <filter>
-        <filter-name>XSSFilter</filter-name>
-        <filter-class>net.i2p.servlet.filters.XSSFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>XSSFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-	<servlet>
-		<servlet-name>addressbook</servlet-name>
-		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
-		<init-param>
-		    <param-name>home</param-name>
-		    <param-value>./addressbook</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-    <servlet-mapping> 
-      <servlet-name>addressbook</servlet-name>
-      <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- this webapp doesn't actually use sessions or cookies -->
-    <session-config>
-        <session-timeout>30</session-timeout>
-        <cookie-config>
-            <http-only>true</http-only>
-        </cookie-config>
-    </session-config>
-</web-app>

apps/admin/admin.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="router" />
+    <orderEntry type="module" module-name="routerconsole" />
+  </component>
+</module>

apps/admin/java/src/net/i2p/router/admin/AdminRunner.java

@@ -11,9 +11,10 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.data.DataHelper
+import net.i2p.data.DataHelper;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.router.web.StatsGenerator;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
@@ -49,7 +50,7 @@ class AdminRunner implements Runnable {
         } else if ( (command.indexOf("routerStats.html") >= 0) || (command.indexOf("oldstats.jsp") >= 0) ) {
             try {
                 out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
-                _generator.generateStatsPage(new OutputStreamWriter(out));
+                _generator.generateStatsPage(new OutputStreamWriter(out), true);
                 out.close();
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))
@@ -63,7 +64,8 @@ class AdminRunner implements Runnable {
         } else if (true || command.indexOf("routerConsole.html") > 0) {
             try {
                 out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
-                _context.router().renderStatusHTML(new OutputStreamWriter(out));
+                // TODO Not technically the same as router().renderStatusHTML() was
+                _context.routerAppManager().renderStatusHTML(new OutputStreamWriter(out));
                 out.close();
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))

apps/desktopgui/build.xml

@@ -5,10 +5,9 @@
 	<property name="build" value="build"/>
 	<property name="dist"  location="dist"/>
 	<property name="jar" value="desktopgui.jar"/>
-	<property name="resources" value="resources"/>
-    <property name="javadoc" value="javadoc"/>
+	<property name="javadoc" value="javadoc"/>
 	<property name="javac.compilerargs" value=""/>
-	<property name="javac.version" value="1.6" />
+	<property name="javac.version" value="1.7" />
 	<property name="require.gettext" value="true" />
 
     <condition property="no.bundle">
@@ -17,9 +16,8 @@
 
 	<target name="init">
 	<mkdir dir="${build}"/>
-	<mkdir dir="${build}/${resources}"/>
-        <mkdir dir="${build}/${javadoc}"/>
-		<mkdir dir="${dist}"/>
+	<mkdir dir="${build}/messages-src"/>
+	<mkdir dir="${dist}"/>
 	</target>
 
 	<target name="clean">
@@ -27,35 +25,36 @@
 		<delete dir="${dist}"/>
 	</target>
 
-	<target name="compile" depends="init">
+        <target name="compile" depends="init">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
                        srcdir="${src}" destdir="${build}">
-            <compilerarg line="${javac.compilerargs}" />
-            <classpath>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
-            	<pathelement location="../../router/java/build/router.jar" />
-            </classpath>
-		</javac>
-        <copy todir="${build}/desktopgui/${resources}">
-            <fileset dir="${resources}" />
-        </copy>
-	</target>
+                <compilerarg line="${javac.compilerargs}" />
+                <classpath>
+                    <pathelement location="../../core/java/build/i2p.jar" />
+                    <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
+                    <pathelement location="../../router/java/build/router.jar" />
+                </classpath>
+            </javac>
+        </target>
 
-	<target name="bundle" unless="no.bundle">
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg value="./bundle-messages.sh" />
-        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-		<!-- multi-lang is optional -->
-        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-	</target>
+        <target name="bundle" unless="no.bundle" depends="init">
+            <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+                <env key="JAVA_HOME" value="${java.home}" />
+                <arg value="./bundle-messages.sh" />
+            </exec>
+            <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
+                <arg value="./bundle-messages.sh" />
+            </exec>
+            <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
+                <arg value="./bundle-messages.sh" />
+            </exec>
+            <javac source="${javac.version}" target="${javac.version}" 
+                   includeAntRuntime="false"
+                   srcdir="${build}/messages-src" destdir="${build}">
+                <compilerarg line="${javac.compilerargs}" />
+            </javac>
+        </target>
 
         <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
@@ -74,12 +73,18 @@
 	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
 		<!-- set if unset -->
 		<property name="workspace.changes.tr" value="" />
-		<jar basedir="${build}" destfile="${dist}/${jar}">
+                <!-- ideal for linux: 24x24, but transparency doesn't work -->
+                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../installer/resources/themes/console/images/itoopie_xsm.png" />
+                <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_black_24.png" />
+                <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_white_24.png" />
+		<jar basedir="${build}" excludes="messages-src/**" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
 				<attribute name="Build-Date" value="${build.timestamp}" />
 				<attribute name="Base-Revision" value="${workspace.version}" />
 				<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+				<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
+				<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
 			</manifest>
 		</jar>
 	</target>

apps/desktopgui/bundle-messages.sh

@@ -105,15 +105,40 @@ do
         # 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
+        msgfmt -V | grep -q '0\.19'
         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
+            # slow way
+            # 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
+        else
+            # fast way
+            # convert to java files in build/messages-src
+            TD=build/messages-src-tmp
+            TDX=$TD/net/i2p/desktopgui
+            TD2=build/messages-src
+            TDY=$TD2/net/i2p/desktopgui
+            rm -rf $TD
+            mkdir -p $TD $TDY
+            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $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
+            mv $TDX/messages_$LG.java $TDY
+            rm -rf $TD
         fi
     fi
 done

apps/desktopgui/desktopgui.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="router" />
+  </component>
+</module>

apps/desktopgui/locale/messages_ar.po

@@ -2,55 +2,94 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 11:53+0000\n"
-"PO-Revision-Date: 2011-02-26 19:46-0000\n"
-"Last-Translator: hamada <hamada@mail.i2p>\n"
-"Language: ar\n"
-"Language-Team: duck <duck@mail.i2p>\n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Arabic (http://www.transifex.com/otf/I2P/language/ar/)\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"
+"Language: ar\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 && n%100<=99 ? 4 : 5;\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "ابدأ I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "جاري تشغيل I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "جاري البدأ"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr " تشغيل متصفح I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "اعدادات"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "ألغي"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "اعادة تشغيل"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "توقيف I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "اعدادات الأيقونة"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "هل ترغب في تفعيل الأيقونة؟"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
 
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "توقف في مدة {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "إغلاق وشيك"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "الشبكة"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_bg.po

@@ -0,0 +1,94 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Gabriel Radev <gabosss@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Bulgarian (http://www.transifex.com/otf/I2P/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Стартиране на I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P е стартиран!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Стартиране"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Стартиране на I2P Браузер"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Рестартиране на I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Спиране на I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr ""
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_ca.po

@@ -0,0 +1,93 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Catalan (http://www.transifex.com/otf/I2P/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Iniciar I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P s'està iniciant."
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Iniciant"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Iniciar navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Reiniciar I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Aturar I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Xarxa"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_cs.po

@@ -7,49 +7,87 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2012-02-12 19:44+0000\n"
-"Last-Translator: Waseihou Watashi <waseihou@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/I2P/language/cs/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Czech (http://www.transifex.com/otf/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Spustit I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P startuje!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Startuji"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Spouštím I2P Browser"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Nastavuji desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Restart I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Zastavit I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Nastavení ikony na liště (tray icon)"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Zapnout ikonu na liště?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Síť"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_da.po

@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2016-01-08 07:54+0000\n"
-"Last-Translator: Aesthese\n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
 "Language-Team: Danish (http://www.transifex.com/otf/I2P/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +20,76 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Start I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P starter!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Starter"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Start I2P Browseren"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Konfigurer desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Deaktivere"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Genstart I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Stop I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
-msgid "Tray icon configuration"
-msgstr "Konfiguration af processbar ikonet"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
-msgid "Should tray icon be enabled?"
-msgstr "Skal processbar ikonet være aktivt?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Lukker ned om {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Lukker ned om et øjeblik"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Netværk"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_de.po

@@ -2,54 +2,96 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# blabla <blabla@trash-mail.com>, 2011
+# Ettore Atalan <atalanttore@googlemail.com>, 2016
+# foo <foo@bar>, 2009
+# Lars Schimmer <echelon@i2pmail.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 18:07+0000\n"
-"PO-Revision-Date: 2011-03-22 15:49+0000\n"
-"Last-Translator: blabla <blabla@trash-mail.com>\n"
-"Language-Team: German <>\n"
-"Language: de\n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
+"Language-Team: German (http://www.transifex.com/otf/I2P/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"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "I2P starten"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P startet gerade!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Startend"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "I2P-Browser öffnen"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Desktopgui konfigurieren"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "I2P System Tray konfigurieren"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "I2P neustarten"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "I2P beenden"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
-msgid "Tray icon configuration"
-msgstr "Systemleistensymbol konfigurieren"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "I2P sofort neustarten"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
-msgid "Should tray icon be enabled?"
-msgstr "Systemleistensymbol aktivieren?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "I2P sofort beenden"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Herunterfahren von I2P abbrechen"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Herunterfahren in {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Herunterfahren bevorstehend"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Netzwerk"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Rechtsklick für Menü"

apps/desktopgui/locale/messages_el.po

@@ -4,53 +4,91 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-#   <lixtetrax@grhack.net>, 2012.
+# lixtetrax <lixtetrax@grhack.net>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2012-07-02 11:28+0000\n"
-"Last-Translator: lixtetrax <lixtetrax@grhack.net>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Greek (http://www.transifex.com/otf/I2P/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Έναρξη Ι2Ρ"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "Το Ι2Ρ ξεκίνησε!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Έναρξη"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Έναρξη φυλλομετρητή Ι2Ρ"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Παραμετροποίηση desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Απενεργοποίηση"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Επανεκκίνηση Ι2Ρ"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Τερματισμός Ι2Ρ"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Παραμετροποίηση εικονιδίου"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Ενεργοποίηση εικονιδίου;"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Σβήσιμο σε {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Επίκειται σβήσιμο"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Δίκτυο "
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_en.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P desktopgui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"POT-Creation-Date: 2016-05-25 12:29+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"
@@ -18,38 +18,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr ""
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
-msgid "Tray icon configuration"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
 msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
-msgid "Should tray icon be enabled?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr ""
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
 msgstr ""

apps/desktopgui/locale/messages_es.po

@@ -2,55 +2,96 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# punkibastardo <punkibastardo@gmail.com>, 2011
+# strel, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-04-02 23:57+0100\n"
-"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
-"Language-Team: Spanish (Castilian) <None>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: strel\n"
+"Language-Team: Spanish (http://www.transifex.com/otf/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Iniciar I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P está iniciando!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Iniciando"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Lanzar navegador I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Configurar desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Configurar la bandeja de sistema de I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Reiniciar I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Detener I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Configuración del ícono de la barra de tareas"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Reiniciar I2P inmediatamente"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "¿Debería estar activado el ícono de la barra de tareas?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Detener I2P inmediatamente"
 
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Cancelar el cierre de I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Cierre en {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Cierre inminente"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Red"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Clic secundario para menú"

apps/desktopgui/locale/messages_fa.po

@@ -0,0 +1,95 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Amir H. Firouzian, 2017
+# NoProfile, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: Amir H. Firouzian\n"
+"Language-Team: Persian (http://www.transifex.com/otf/I2P/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "شروع I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P راه اندازی شد!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "راه اندازی"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "راه اندازی مرورگر I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "توقف I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr ""
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_fi.po

@@ -0,0 +1,95 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2015
+# outolumo <outolumo@gmail.com>, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: outolumo <outolumo@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/otf/I2P/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Käynnistä I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P on käynnistyy!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Käynnistetään"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Käynnistä I2P-selain"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "I2P tehtäväpalkin asetukset"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Poista käytöstä"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Käynnistä I2P uudelleen"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Pysäytä I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Käynnistä I2P uudelleen heti"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Pysäytä I2P heti"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Peruuta I2P:n sammutus"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Sammuta {0} kuluttua..."
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Sammutus välittömästi"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Verkko"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Valikko hiiren kakkosnapilla"

apps/desktopgui/locale/messages_fr.po

@@ -2,59 +2,100 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 # blabla <blabla@trash-mail.com>, 2011
+# Boxoa590, 2013
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
+# French language coordinator <french.coordinator@rbox.me>, 2017
+# French language coordinator <french.coordinator@rbox.me>, 2017
 # Boxoa590, 2013
+# Towinet, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:14+0000\n"
-"PO-Revision-Date: 2013-06-08 04:50+0000\n"
-"Last-Translator: Boxoa590\n"
-"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
-"fr/)\n"
-"Language: fr\n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-07-04 12:05+0000\n"
+"Last-Translator: French language coordinator <french.coordinator@rbox.me>\n"
+"Language-Team: French (http://www.transifex.com/otf/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Démarrer I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P démarre !"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Démarrage"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
-msgstr "Lancer le navigateur I2P"
+msgstr "Lancer le navigateur d'I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Configurer l'interface de bureau"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Configurer la zone de notification d'I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Désactiver"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Redémarrer I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Arrêter I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
-msgid "Tray icon configuration"
-msgstr "Configuration de l'icône de notification"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Redémarrer I2P immédiatement"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
-msgid "Should tray icon be enabled?"
-msgstr "Activer l'icône de notification ?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Arrêter I2P immédiatement"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Annuler la fermeture d'I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Fermeture dans {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "La fermeture est imminente"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Réseau"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P : clic droit pour obtenir le menu"

apps/desktopgui/locale/messages_gl.po

@@ -0,0 +1,94 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Uberius Crypto <uberius@anonymail.tech>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: Uberius Crypto <uberius@anonymail.tech>\n"
+"Language-Team: Galician (http://www.transifex.com/otf/I2P/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Iniciar I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P está a se iniciar!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Iniciando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Lanzar Navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Configurar a Bandexa do Sistema I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Inhabilitar"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Reiniciar I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Deter I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Reiniciar I2P Inmediatamente"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Deter I2P Inmediatamente"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Cancelar Apagado I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Apagar en {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Apagar de contado"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Rede"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Clic co botón dereito para acceder ó menú"

apps/desktopgui/locale/messages_hu.po

@@ -7,49 +7,87 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2012-06-01 16:28+0000\n"
-"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/I2P/language/hu/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Hungarian (http://www.transifex.com/otf/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "I2P indítása"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P indul!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "indítás"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "I2P Böngésző Indítása"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Asztali Grafikus Felület Beállítása"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Kikapcsol"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "I2P Újraindítása"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "I2P Leállítása"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Tálcaikon beállítása"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Tálcaikon engedélyezve legyen?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Kikapcsolás: {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Kikapcsolás hamarosan"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Hálózat"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_in.po

@@ -0,0 +1,95 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+# Robert Dafis <robertdafis@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-07-27 00:14+0000\n"
+"Last-Translator: Robert Dafis <robertdafis@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/otf/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Mulai I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P sudah memulai!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Memulai"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Luncurkan Peramban I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Ubah pengaturan I2P System Tray"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Matikan"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Mulai ulang I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Hentikan I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Ulang kembali I2P sekarang"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Hentikan I2P sekarang"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Batal tutup I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Mematikan I2P dalam {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "I2P sedang dalam proses dimatikan"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Jaringan"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: klik kanan untuk menampilkan menu"

apps/desktopgui/locale/messages_it.po

@@ -4,54 +4,95 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-#   <bovas85@gmail.com>, 2012.
-#   <jokjok@hotmail.it>, 2011.
+# Leelium <bovas85@gmail.com>, 2012
+# mkkid <jokjok@hotmail.it>, 2011
+# Leelium <bovas85@gmail.com>, 2012
+# mkkid <jokjok@hotmail.it>, 2011
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2012-06-01 12:21+0000\n"
-"Last-Translator: Leelium <bovas85@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/language/it/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-07-30 07:04+0000\n"
+"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
+"Language-Team: Italian (http://www.transifex.com/otf/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Avvia I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "Avvio di I2P in corso!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
-msgstr "Avvio"
+msgstr "Avvio in corso"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
-msgstr "Avvia il Browser I2P"
+msgstr "Lancia il browser I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Configura desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Configura icona di I2P nella Barra di notifica"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Disabilita"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Riavvia I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
-msgstr "Ferma I2P"
+msgstr "Arresta I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Configurazione dell'icona nell'area di notifica"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Riavvia subito I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Vuoi che l'icona nelll'rea di notifica venga abilitata?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Arresta subito I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Annulla arresto di I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Arresto in {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Arresto imminente"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Rete"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Fai click destro per aprire il menu"

apps/desktopgui/locale/messages_ja.po

@@ -4,53 +4,91 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# plazmism <gomidori@live.jp>, 2013
+# タカハシ <indexial@outlook.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2013-11-26 10:38+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "I2P を開始"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P 起動中！"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "起動中"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "I2P ブラウザを起動"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "desktopgui を設定"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "無効"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "I2P を再起動"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "I2P を停止"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "トレイアイコン設定"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "トレイアイコンを有効にしますか？"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "{0} でシャットダウン"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "即時シャットダウン"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "ネットワーク"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_ko.po

@@ -0,0 +1,95 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# HelloKS <kqwe1859@gmail.com>, 2014
+# HelloKS <kqwe1859@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: HelloKS <kqwe1859@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/otf/I2P/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "I2P 시작"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P 시작중!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "시작중"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "I2P 브라우저 실행"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "I2P 시스템 트레이 설정"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "비활성화"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "I2P 재시작"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "I2P 정지"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "I2P 즉시 재시작"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "I2P 즉시 정지"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "I2P 종료 취소"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "{0} 안에 종료"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "즉시 종료"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "네트워크"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: 메뉴는 오른쪽 클릭"

apps/desktopgui/locale/messages_mg.po

@@ -0,0 +1,94 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# topdog101 <topdog101@free.fr>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Malagasy (http://www.transifex.com/otf/I2P/language/mg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Velomy i I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "Manomboka ho velona i I2P!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Velona"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Alefaso ny fijerena tranonkala I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Avereno alefa i I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Ajanony i I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr ""
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_nb.po

@@ -0,0 +1,95 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Allan Nordhøy <epost@anotheragency.no>, 2014
+# Allan Nordhøy <epost@anotheragency.no>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-07-17 16:52+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/I2P/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Start I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P starter opp!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Starter opp"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Kjør I2P-nettleser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Sett opp I2P systemkruv"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Skru av"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Omstart av I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Stopp I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Umiddelbar omstart av I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Umiddelbar stopp av I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Avbryt nedstenging av I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Skrur av om {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Skru av med en gang"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Nettverk"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "Høyreklikk-meny i I2P"

apps/desktopgui/locale/messages_nl.po

@@ -2,54 +2,95 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
 # 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Martijn de Boer, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: http://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-02-20 11:53+0000\n"
-"PO-Revision-Date: 2011-02-20 12:15+0000\n"
-"Last-Translator: ducki2p <ducki2p@gmail.com>\n"
-"Language-Team: Dutch <>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: Martijn de Boer\n"
+"Language-Team: Dutch (http://www.transifex.com/otf/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "I2P starten"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P is aan het starten!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Bezig met starten"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Start I2P Browser"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Configureer desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "Configureer I2P systeembalk"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Uitschakelen"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "I2P herstarten"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "I2P stoppen"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Systeemvak icoon configuratie"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Herstart I2P direct"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Systeemvak icoon inschakelen?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Stop I2P direct"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Annuleer afsluiten I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Afsluiten in {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Afsluiten op handen"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Netwerk"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Rechts klikken voor menu"