merge of '37bb29ce149260c55fb90ec8e56262262382fd9d'

and 'c4f7358a50c9982c5d63e9e5201f4e3f9562422f'

merge of '37bb29ce149260c55fb90ec8e56262262382fd9d'
f29c64cd · kytv · 9b361ac4 · aa4b4b9d · f29c64cd · f29c64cd
Commit f29c64cd authored 11 years ago by kytv
--- a/apps/i2ptunnel/locale/messages_ja.po
+++ b/apps/i2ptunnel/locale/messages_ja.po
--- a/apps/i2ptunnel/locale/messages_sv.po
+++ b/apps/i2ptunnel/locale/messages_sv.po
--- a/apps/i2ptunnel/locale/messages_zh.po
+++ b/apps/i2ptunnel/locale/messages_zh.po
--- a/apps/routerconsole/locale-news/messages_ja.po
+++ b/apps/routerconsole/locale-news/messages_ja.po
--- a/apps/routerconsole/locale/messages_en.po
+++ b/apps/routerconsole/locale/messages_en.po
--- a/apps/routerconsole/locale/messages_es.po
+++ b/apps/routerconsole/locale/messages_es.po
--- a/apps/routerconsole/locale/messages_fr.po
+++ b/apps/routerconsole/locale/messages_fr.po
--- a/apps/routerconsole/locale/messages_it.po
+++ b/apps/routerconsole/locale/messages_it.po
--- a/apps/routerconsole/locale/messages_ja.po
+++ b/apps/routerconsole/locale/messages_ja.po
--- a/apps/routerconsole/locale/messages_ro.po
+++ b/apps/routerconsole/locale/messages_ro.po
--- a/apps/routerconsole/locale/messages_sv.po
+++ b/apps/routerconsole/locale/messages_sv.po
--- a/apps/routerconsole/locale/messages_zh.po
+++ b/apps/routerconsole/locale/messages_zh.po
--- a/apps/susidns/locale/messages_en.po
+++ b/apps/susidns/locale/messages_en.po
--- a/apps/susidns/locale/messages_es.po
+++ b/apps/susidns/locale/messages_es.po
--- a/apps/susidns/locale/messages_fr.po
+++ b/apps/susidns/locale/messages_fr.po
--- a/apps/susidns/locale/messages_it.po
+++ b/apps/susidns/locale/messages_it.po
--- a/apps/susidns/locale/messages_ja.po
+++ b/apps/susidns/locale/messages_ja.po
--- a/apps/susidns/locale/messages_ro.po
+++ b/apps/susidns/locale/messages_ro.po
--- a/apps/susidns/locale/messages_sv.po
+++ b/apps/susidns/locale/messages_sv.po
--- a/apps/susidns/locale/messages_zh.po
+++ b/apps/susidns/locale/messages_zh.po