merge of '2640744244f35bbe1cfa2738209238b69696c3aa'

.tx/config

apps/desktopgui/locale/messages_ru.po

apps/desktopgui/src/net/i2p/desktopgui/Main.java

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

apps/i2psnark/locale/messages_ru.po

apps/i2ptunnel/locale/messages_ru.po

...sole/java/src/net/i2p/router/web/RouterConsoleRunner.java

apps/routerconsole/locale/messages_ru.po

core/java/src/net/i2p/data/DateAndFlags.java

core/java/src/net/i2p/util/Executor.java

core/java/src/net/i2p/util/SimpleScheduler.java

core/java/src/net/i2p/util/SimpleTimer.java

core/java/src/net/i2p/util/SimpleTimer2.java

history.txt

router/java/src/net/i2p/router/RouterVersion.java

...va/src/net/i2p/router/peermanager/CapacityCalculator.java