merge of '4a640f30d15df7a2253edd1ccf38064e909b052e'

     and '4d0b70127180614ecd593fe5a212cbe360238a97'

i2p2www/pages/site/docs/spec/configuration.html

@@ -138,7 +138,9 @@ and stopped with main() with the arguments specified.
 Configured via /configlogging in the router console.
 {%- endtrans %}</p>
 <p>
+{% trans -%}
 Properties are as follows:
+{%- endtrans %}
 <pre>
     logger.format={dctpm}*
         where d = date, c = class, t = thread name, p = priority, m = message
@@ -165,7 +167,26 @@ See <a href="{{ pluginspec }}">the plugin specification</a>.
 <h3>{% trans %}Plugins{% endtrans %} (plugins.config)</h3>
 <p>{% trans -%}
 Enable/disable for each installed plugin.
-{%- endtrans %}</p>
+{%- endtrans %}
+{% trans -%}
+Properties are as follows:
+{%- endtrans %}
+<pre>
+    plugin.{name}.startOnLoad=true|false
+</pre>
+</p>
+
+<h3>{% trans %}Webapps{% endtrans %} (webapps.config)</h3>
+<p>{% trans -%}
+Enable/disable for each installed webapp.
+{%- endtrans %}
+{% trans -%}
+Properties are as follows:
+{%- endtrans %}
+<pre>
+    webapps.{name}.startOnLoad=true|false
+</pre>
+</p>
 
 <h3>{% trans %}Router{% endtrans %} (router.config)</h3>
 <p>{% trans -%}

i2p2www/pages/site/get-involved/develop/developers-keys.html

@@ -250,6 +250,21 @@ ymQ2BgNzDenRz9xuSsrhVNqAjKVHs47J/qm7693NhnGlLxofeiF3py
 pLYjMbWl/TAdlxkWm+HgRCzhQe5vkLcx1R8nXCxmPjC0Ep3QIDAQAB
 [end]
 
+[pubkey echelon2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8JaZQ7KxawKeM83
+jxq4GtoPU3sjZnf+X9SKS5mhoBcmO7KdqWBTwTMs/p9xqKBiMWyr9T
+sUFq0XkUTW4bv2ac8u90CF7rbhhgUDDOF2HhaZrAOhVySnXBaIdmKM
+Y607XvCcarNPTCbd1RsD9AmkYUr4l/rgRdji16bWPaxVjFxQIDAQAB
+[end]
+
+[pubkey bokstafur@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6vH3eZvZfwNPQPo
+9TRhMwCidF6hDQWHwpY1taLwYs5me7RYsmW5F5mXc9IRHgz3yvy2v8
+DxN1mVRDDwcRaOdguxcPqLtM/vukOXX0dno8CQWa4VmQQlUB7fFaZB
+aWepQldKvqFIdpxLTaEUzAqGjz/4FR1lRBKXldHCLcoMVhkwIDAQAB
+[end]
+
+
 </pre>
 <h3 id="transport">{{ _('Developer Transport Keys') }}</h3>
 <p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
@@ -426,6 +441,13 @@ PzTJpv6C0kKDavKddKxc4HIuNKnTsB1qd5zOpKBNlxm6TT4N3Pdhb5
 CEXZ1lvlv4PloKFIti7ptAa4HpTs6Gd3a6nMQyHwgP0Ke44wIDAQAB
 [end]
 
+[pubkey bokstafur-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7VaVBtNi3uWzGtn
+xfPE7hncgbH20rZeL9QvG3D+FNwfIHQsvwwMJpHSZZJnMVQf6k1/8q
+WY19eyYhqJYC3nOByyuLPtxqZ6fn4d1odXq+HhYohezHqwZ50nAoai
+1/mtC1Sd4GSashQhP0jr0vMNjZoikXfcX9yeHb/18F0NO1XwIDAQAB
+[end]
+
 </pre>
 
 {% endblock %}

i2p2www/translations/he/LC_MESSAGES/research.po

+# Russian (Russia) translations for I2P.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the I2P project.
+#
+# Translators:
+# keedley <zhopa@mita.pp.ru>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version:  I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2013-11-21 23:32+0000\n"
+"PO-Revision-Date: 2013-09-21 16:10+0000\n"
+"Last-Translator: keedley <zhopa@mita.pp.ru>\n"
+"Language-Team: Russian (Russia) "
+"(http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: i2p2www/pages/site/research/index.html:2
+msgid "Academic Research"
+msgstr "Научные исследования"
+
+#: i2p2www/pages/site/research/index.html:4
+msgid ""
+"Academic research and analysis of I2P is an important part of ensuring "
+"that the software and network performs as expected and is safe for users "
+"in hostile environments."
+msgstr ""
+"Научное исследование и анализ I2P это важная часть процесса контроля "
+"безопасности програмного обеспечения и сети в целом, в опасных условиях "
+"современного мира."
+
+#: i2p2www/pages/site/research/index.html:8
+#, python-format
+msgid ""
+"\n"
+"There is a large research community investigating a wide range of aspects"
+" of\n"
+"anonymity. For a current and comprehensive list of relevant papers, see "
+"the\n"
+"<a href=\"%(anonbib)s\">Free Haven Anonymity Bibliography</a>.\n"
+"I2P benefits from much of the research into Tor and onion routing, but "
+"there is\n"
+"little dedicated research interest into the theory behind I2P, and the "
+"choices\n"
+"and tradeoffs that the network makes. This presents a unique opportunity "
+"for\n"
+"original research.\n"
+msgstr ""
+
+#: i2p2www/pages/site/research/index.html:18
+#, python-format
+msgid ""
+"A list of known published papers about I2P is available <a "
+"href=\"%(papers)s\">here</a>."
+msgstr ""
+"Список известных публикаций про I2P доступен <a href=\"%(papers)s\">вот "
+"тут</a>."
+
+#: i2p2www/pages/site/research/index.html:22
+msgid "Testing Attacks on I2P"
+msgstr "Тестовые атаки на I2P"
+
+#: i2p2www/pages/site/research/index.html:24
+msgid ""
+"I2P can be run as a separate test network by controlling the locations "
+"that a new router reseeds from so that it only finds other test routers."
+msgstr ""
+"I2P можно запускать как отдельную сеть, контролируя расположения, откуда "
+"новые маршрутизаторы получают свои сиды, так чтобы тестовые "
+"маршрутизаторы работали только с тестовыми маршрутизаторами."
+
+#: i2p2www/pages/site/research/index.html:28
+msgid ""
+"The standard mode of operation is to have one JVM per router instance; "
+"hence running multiple copies of I2P on a single machine is inadvisable, "
+"both due to the potential resource drain and the certain port conflicts. "
+"To better facilitate setting up small test networks, I2P has a "
+"multirouter mode which enables multiple distinct routers to be run in the"
+" same JVM."
+msgstr ""
+"Стандартный способ работы это использовать одну JVM на один экземпляр "
+"маршрутизатора. Запуск нескольких копий I2P на одной машине не "
+"рекомендуется, как с точки зрения ресурсов, так и с точки зрения "
+"конфликтов по портам. Для лучшего развертывания небольших тестовых сетей,"
+" I2P может работать в режиме multirouter, который реализует запуск "
+"нескольких маршрутизаторов в рамках одной JVM."
+
+#: i2p2www/pages/site/research/index.html:32
+msgid ""
+"MultiRouter can be started from the i2p base directory by running the "
+"below command."
+msgstr ""
+"MultiRouter можно запустить из базовой директории I2P с помощью команды "
+"ниже:"
+
+#: i2p2www/pages/site/research/index.html:37
+msgid ""
+"Additionally, I2P can be started in a virtual network mode. This mode "
+"disables all transports, allowing the router to be tested in isolation "
+"without network traffic. To enable this mode, add "
+"<code>i2p.vmCommSystem=true</code> to the router.config before starting."
+msgstr ""
+"I2P можно также запускать в режиме виртуальной сети. Этот режим отключает"
+" все транспорты, позволяя тестировать маршрутизатор без сетевого доступа."
+" Чтобы включить такой режим, добавьме  <code>i2p.vmCommSystem=true</code>"
+" в router.config до запуска"
+
+#: i2p2www/pages/site/research/index.html:41
+msgid "Testing the Live I2P Network"
+msgstr "Тестирование работающей I2P сети"
+
+#: i2p2www/pages/site/research/index.html:43
+#, python-format
+msgid ""
+"If you are planning on conducting research on the live I2P network, "
+"please <a href=\"%(contact)s\">contact us</a> before you commence your "
+"testing. While we do not discourage researchers from responsibly testing "
+"their ideas on the live network, if an attack becomes apparent and we "
+"don't have any line of communication then we will end up taking "
+"countermeasures which could interfere with the test."
+msgstr ""
+"Если вы планируете произоводить исследования на живой I2P сети, "
+"пожалуйста, <a href=\"%(contact)s\">свяжитесь с нами</a> заранее. Хотя мы"
+" не против ответственных исследователей, которые проверяют свои идеи на "
+"живой сети, если мы заметим вмешательство и у нас не будет способа "
+"связаться, исследование может быть испорчено применяемыми нами "
+"контр-мерами."
+
+#: i2p2www/pages/site/research/questions.html:2
+msgid "Open research questions"
+msgstr ""
+
+#: i2p2www/pages/site/research/questions.html:4
+msgid "Network database"
+msgstr ""
+
+#: i2p2www/pages/site/research/questions.html:6
+msgid "Peer selection"
+msgstr ""
+
+#: i2p2www/pages/site/research/questions.html:8
+msgid "Tunnels and Destinations"
+msgstr ""
+
+#: i2p2www/pages/site/research/questions.html:10
+msgid "Unidirectional tunnels"
+msgstr ""
+
+#: i2p2www/pages/site/research/questions.html:16
+msgid "Multihoming"
+msgstr ""
+