diff --git a/.tx/config b/.tx/config
index 9ac275ce3b10b5763b0667a5f8f115838cb2d2da..74301002e12c376b8f4d765072b5361eb38d5a8e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -94,6 +94,7 @@ 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.az = apps/routerconsole/locale-news/messages_az.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
@@ -128,6 +129,7 @@ trans.zh_TW = apps/routerconsole/locale-news/messages_zh_TW.po
type = PO
source_file = apps/routerconsole/locale-countries/messages_en.po
source_lang = en
+trans.az = apps/routerconsole/locale-countries/messages_az.po
trans.ca = apps/routerconsole/locale-countries/messages_ca.po
trans.da = apps/routerconsole/locale-countries/messages_da.po
trans.de = apps/routerconsole/locale-countries/messages_de.po
@@ -225,6 +227,7 @@ trans.zh_TW = apps/susidns/locale/messages_zh_TW.po
source_file = apps/desktopgui/locale/messages_en.po
source_lang = en
trans.ar = apps/desktopgui/locale/messages_ar.po
+trans.az = apps/desktopgui/locale/messages_az.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
@@ -262,6 +265,7 @@ trans.zh_CN = apps/desktopgui/locale/messages_zh.po
source_file = apps/susimail/locale/messages_en.po
source_lang = en
trans.ar = apps/susimail/locale/messages_ar.po
+trans.az = apps/susimail/locale/messages_az.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
@@ -296,6 +300,7 @@ trans.zh_TW = apps/susimail/locale/messages_zh_TW.po
[I2P.debconf]
source_file = debian/po/templates.pot
source_lang = en
+trans.az = debian/po/az.po
trans.cs = debian/po/cs.po
trans.de = debian/po/de.po
trans.el = debian/po/el.po
@@ -326,6 +331,7 @@ trans.zh_TW = debian/po/zh_TW.po
[I2P.i2prouter-script]
source_file = installer/resources/locale/po/messages_en.po
source_lang = en
+trans.az = installer/resources/locale/po/messages_az.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
@@ -367,6 +373,7 @@ trans.zh_CN = installer/resources/locale/po/messages_zh.po
source_file = core/java/src/gnu/getopt/MessagesBundle.properties
source_lang = en
type = PROPERTIES
+trans.az = core/java/src/gnu/getopt/MessagesBundle_az.properties
trans.cs = core/java/src/gnu/getopt/MessagesBundle_cs.properties
trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
@@ -398,6 +405,7 @@ trans.zh_TW = core/java/src/gnu/getopt/MessagesBundle_zh_TW.properties
[I2P.streaming]
source_file = apps/ministreaming/locale/messages_en.po
source_lang = en
+trans.az = apps/ministreaming/locale/messages_az.po
trans.ca = apps/ministreaming/locale/messages_ca.po
trans.cs = apps/ministreaming/locale/messages_cs.po
trans.de = apps/ministreaming/locale/messages_de.po
@@ -450,12 +458,18 @@ type = HTML
source_file = installer/resources/eepsite/docroot/help/index.html
source_lang = en
trans.de = installer/resources/eepsite/docroot/help/index_de.html
-trans.es = installer/resources/eepsite/docroot/help/index_es.html
+;; not yet translated on TX, use old page
+;;trans.es = installer/resources/eepsite/docroot/help/index_es.html
trans.fr = installer/resources/eepsite/docroot/help/index_fr.html
-trans.nl = installer/resources/eepsite/docroot/help/index_nl.html
+;; not yet translated on TX, use old page
+;;trans.nl = installer/resources/eepsite/docroot/help/index_nl.html
+trans.pl = installer/resources/eepsite/docroot/help/index_nl.html
+trans.pt = installer/resources/eepsite/docroot/help/index_nl.html
trans.ru_RU = installer/resources/eepsite/docroot/help/index_ru.html
-trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
-trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
+;; not yet translated on TX, use old page
+;;trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
+;; not yet translated on TX, use old page
+;;trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
[I2P.ztest]
;;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java b/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java
index 0a39362674ccae47b29ca28c8cd84451623a7525..fbd7f7e01a8f7223b2c455204ca685ea4d18f81e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java
@@ -28,6 +28,7 @@ public class ConfigUIHelper {
*/
private static final String langs[][] = {
{ "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
+ { "az", "az", "Azerbaijani", null },
{ "cs", "cz", "Čeština", null },
{ "zh", "cn", "Chinese ä¸æ–‡", null },
//{ "zh_TW", "tw", "Chinese ä¸æ–‡", "Taiwan" },
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
index 67c587f36c658df8c42ea5aeb5dcc85a487f66b5..29cc1c6b4ac5d7ec0f04ee255caadea27fc0fd35 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
@@ -106,6 +106,7 @@ public class ConfigUIHelper extends HelperBase {
//
{ "en", "us", "English", null },
{ "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
+ { "az", "az", "Azerbaijani", null },
{ "cs", "cz", "Čeština", null },
{ "zh", "cn", "Chinese ä¸æ–‡", null },
{ "zh_TW", "tw", "Chinese ä¸æ–‡", "Taiwan" },
diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp
index 271f82b739e26984882ba844ff86500654a2dc7b..c20a825506b16394f53705da0db0cd594c014625 100644
--- a/apps/routerconsole/jsp/console.jsp
+++ b/apps/routerconsole/jsp/console.jsp
@@ -34,6 +34,7 @@
<div class="langbox"> <% /* English, then alphabetical by English name please */ %>
<a href="/console?lang=en&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a>
<a href="/console?lang=ar&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="Arabic عربية" alt="Arabic عربية"></a>
+ <a href="/console?lang=az&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=az" title="Azerbaijani" alt="Azerbaijani"></a>
<a href="/console?lang=cs&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Čeština" alt="Čeština"></a>
<a href="/console?lang=zh&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="Chinese ä¸æ–‡" alt="Chinese ä¸æ–‡"></a>
<a href="/console?lang=zh_TW&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese ä¸æ–‡ (Taiwan)" alt="Chinese ä¸æ–‡ (Taiwan)"></a>
@@ -47,7 +48,8 @@
<a href="/console?lang=in&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=id" title="bahasa Indonesia" alt="bahasa Indonesia"></a>
<a href="/console?lang=it&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
<a href="/console?lang=ja&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a>
- <a href="/console?lang=ko&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean í•œêµì–´" alt="Korean í•œêµì–´"></a><br>
+<br>
+ <a href="/console?lang=ko&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean í•œêµì–´" alt="Korean í•œêµì–´"></a>
<a href="/console?lang=mg&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=mg" title="Malagasy" alt="Malagasy"></a>
<a href="/console?lang=hu&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
<a href="/console?lang=nb&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Norsk (bokmål)" alt="Norsk (bokmål)"></a>
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 7ecb9f8c5bb49d1eb07690a7ed3a46c2af31fcde..2e561a7b21318491212941afbbed7e89de26ec88 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -61,6 +61,7 @@
<div class="langbox" id="langbox">
<a href="/home?lang=en&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a>
<a href="/home?lang=ar&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="Arabic عربية" alt="Arabic عربية"></a>
+ <a href="/home?lang=az&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=az" title="Azerbaijani" alt="Azerbaijani"></a>
<a href="/home?lang=cs&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Čeština" alt="Čeština"></a>
<a href="/home?lang=zh&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="Chinese ä¸æ–‡" alt="Chinese ä¸æ–‡"></a>
<a href="/home?lang=zh_TW&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese ä¸æ–‡ (Taiwan)" alt="Chinese ä¸æ–‡ (Taiwan)"></a>
@@ -74,7 +75,8 @@
<a href="/home?lang=in&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=id" title="bahasa Indonesia" alt="bahasa Indonesia"></a>
<a href="/home?lang=it&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
<a href="/home?lang=ja&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a>
- <a href="/home?lang=ko&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean í•œêµì–´" alt="Korean í•œêµì–´"></a><br>
+<br>
+ <a href="/home?lang=ko&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean í•œêµì–´" alt="Korean í•œêµì–´"></a>
<a href="/home?lang=mg&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=mg" title="Malagasy" alt="Malagasy"></a>
<a href="/home?lang=hu&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
<a href="/home?lang=nb&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Norsk (bokmål)" alt="Norsk (bokmål)"></a>
diff --git a/build.xml b/build.xml
index cc02055cec98da4cb4a1c734c1831849724cadca..9161bbc7e010be6d8601ea32fd6c7ad98e8ba7ee 100644
--- a/build.xml
+++ b/build.xml
@@ -1326,7 +1326,7 @@
<fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
</copy>
<copy todir="pkg-temp/eepsite/docroot/help/lib/" >
- <fileset dir="installer/resources/icons/flags/" includes="cn.png de.png es.png fr.png ir.png it.png jp.png nl.png ru.png se.png us.png" />
+ <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" />
</copy>
<copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
<copy todir="pkg-temp/docs/icons/flags" >
diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html
index 35ad6a1ae2e7dd59f816fa828131c31aec4222af..5fdd4bb4b1a1a8e1ad12a2ab1ffebdd604731460 100644
--- a/installer/resources/eepsite/docroot/help/index.html
+++ b/installer/resources/eepsite/docroot/help/index.html
@@ -12,11 +12,14 @@
<div class="langbar">
<a href="index.html"><img src="lib/us.png" title="English" alt="English"></a>
+ <a href="index_az.html"><img src="lib/az.png" title="Azerbaijani" alt="Azerbaijani"></a>
<a href="index_zh.html"><img src="lib/cn.png" title="ä¸æ–‡" alt="ä¸æ–‡"></a>
<a href="index_de.html"><img src="lib/de.png" title="Deutsch" alt="Deutsch"></a>
<a href="index_es.html"><img src="lib/es.png" title="Español" alt="Español"></a>
<a href="index_fr.html"><img src="lib/fr.png" title="Français" alt="Français"></a>
<a href="index_nl.html"><img src="lib/nl.png" title="Nederlands" alt="Nederlands"></a>
+ <a href="index_pl.html"><img src="lib/pl.png" title="Polish" alt="Polish"></a>
+ <a href="index_pt.html"><img src="lib/pt.png" title="Português" alt="Português"></a>
<a href="index_ru.html"><img src="lib/ru.png" title="РуÑÑкий" alt="РуÑÑкий"></a>
<a href="index_sv.html"><img src="lib/se.png" title="Svenska" alt="Svenska"></a>
</div>
diff --git a/installer/resources/icons/flags48x48/az.png b/installer/resources/icons/flags48x48/az.png
new file mode 100644
index 0000000000000000000000000000000000000000..0796d4edeffd1fc384e7eab94df898aeda0b561c
Binary files /dev/null and b/installer/resources/icons/flags48x48/az.png differ