propagate from branch 'i2p.i2p' (head f672021bb9871a728005be3bd9581710738b9e5f)

apps/BOB/nbproject/private/private.xml

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

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

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

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

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

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

...nnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

apps/routerconsole/java/build.xml

...console/java/src/net/i2p/router/web/ConfigNetHandler.java

...erconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

...outerconsole/java/src/net/i2p/router/web/NetDbHelper.java

...java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

apps/routerconsole/jsp/config.jsp

apps/routerconsole/jsp/configpeer.jsp

apps/routerconsole/jsp/i2ptunnel/index.jsp

apps/routerconsole/jsp/summary.jsi

apps/routerconsole/locale/messages_de.po

apps/routerconsole/locale/messages_fr.po