propagate from branch 'i2p.i2p.tuna.tmp' (head 1bba286bdb7f8ba879c4db3f356676151674a201)

to branch 'i2p.i2p' (head 5698b31632398b8156a3b4cc215fed677cf205bf)
This commit is contained in:
dev
2015-04-15 16:08:29 +00:00
161 changed files with 33674 additions and 25999 deletions

View File

@@ -973,8 +973,9 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
* @param t may be null
*/
public void notifyTaskFailed(UpdateTask task, String reason, Throwable t) {
if (_log.shouldLog(Log.ERROR))
_log.error("Failed " + task + " for " + task.getType() + ": " + reason, t);
int level = task.getType() == TYPE_DUMMY ? Log.WARN : Log.ERROR;
if (_log.shouldLog(level))
_log.log(level, "Failed " + task + " for " + task.getType() + ": " + reason, t);
List<RegisteredUpdater> toTry = _downloaders.get(task);
if (toTry != null) {
UpdateItem ui = new UpdateItem(task.getType(), task.getID());

View File

@@ -27,6 +27,7 @@ public class ConfigNavHelper extends HelperBase {
_x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
_x("Reseeding"), _x("Advanced") };
/** @since 0.9.19 */
private static class Tab {
public final String page, title;
public Tab(String p, String t) {
@@ -34,6 +35,7 @@ public class ConfigNavHelper extends HelperBase {
}
}
/** @since 0.9.19 */
private class TabComparator implements Comparator<Tab> {
private static final long serialVersionUID = 1L;
private final Collator coll;

View File

@@ -86,6 +86,7 @@ public class ConfigUIHelper extends HelperBase {
{ "hu", "hu", _x("Hungarian"), null },
{ "it", "it", _x("Italian"), null },
{ "ja", "jp", _x("Japanese"), null },
{ "mg", "mg", _x("Malagasy"), null },
{ "nl", "nl", _x("Dutch"), null },
{ "nb", "no", _x("Norwegian Bokmaal"), null },
{ "pl", "pl", _x("Polish"), null },

View File

@@ -69,7 +69,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
"http://inr.i2p/i2p/i2pupdate.su2\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
"http://stats.i2p/i2p/i2pupdate.su2\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
"http://update.dg.i2p/files/i2pupdate.su2\r\n" +
@@ -79,7 +79,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String NO_PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
"http://inr.i2p/i2p/i2pupdate.sud\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
"http://stats.i2p/i2p/i2pupdate.sud\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
"http://update.dg.i2p/files/i2pupdate.sud\r\n" +
@@ -113,7 +113,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String DEFAULT_SU3_UPDATE_URLS =
"http://echelon.i2p/i2p/i2pupdate.su3\r\n" +
"http://inr.i2p/i2p/i2pupdate.su3\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
"http://stats.i2p/i2p/i2pupdate.su3\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
"http://update.dg.i2p/files/i2pupdate.su3\r\n" +

View File

@@ -44,8 +44,9 @@
<a href="/console?lang=fr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
<a href="/console?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="ελληνικά" alt="ελληνικά"></a>
<a href="/console?lang=hu&amp;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=it&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a><br>
<a href="/console?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a>
<a href="/console?lang=it&amp;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&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a><br>
<a href="/console?lang=mg&amp;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=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Bokmål" alt="Norwegian Bokmaal"></a>
<a href="/console?lang=nl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/console?lang=pl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a>

View File

@@ -71,13 +71,14 @@
<a href="/home?lang=fr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
<a href="/home?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="ελληνικά" alt="ελληνικά"></a>
<a href="/home?lang=hu&amp;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=it&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a><br>
<a href="/home?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a>
<a href="/home?lang=it&amp;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&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a><br>
<a href="/home?lang=mg&amp;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=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Bokmål" alt="Norwegian Bokmaal"></a>
<a href="/home?lang=nl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/home?lang=pl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a>
<a href="/home?lang=pt_BR&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=br" title="Português brasileiro" alt="Português brasileiro"></a>
<a href="/home?lang=pt&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pt" title="Português" alt="Português"></a>
<a href="/home?lang=pt_BR&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=br" title="Português brasileiro" alt="Português brasileiro"></a>
<a href="/home?lang=ro&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ro" title="Română" alt="Română"></a>
<a href="/home?lang=ru&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a>
<a href="/home?lang=sk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=sk" title="Slovenčina" alt="Slovenčina"></a>

View File

@@ -2,21 +2,22 @@
# Copyright (C) 2009 The I2P Project
# This file is distributed under the same license as the routerconsole package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
#
# Translators:
# topdog101 <topdog101@free.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-14 13:33+0000\n"
"POT-Creation-Date: 2015-03-30 19:59+0000\n"
"PO-Revision-Date: 2014-02-20 15:52+0000\n"
"Last-Translator: topdog101 <topdog101@free.fr>\n"
"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/mg/)\n"
"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/"
"mg/)\n"
"Language: mg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mg\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
msgid "Anonymous Proxy"

View File

@@ -0,0 +1,72 @@
# I2P
# Copyright (C) 2009 The I2P Project
# This file is distributed under the same license as the routerconsole package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# Translators:
# topdog101 <topdog101@free.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-30 19:59+0000\n"
"PO-Revision-Date: 2014-03-15 08:13+0000\n"
"Last-Translator: topdog101 <topdog101@free.fr>\n"
"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/"
"mg/)\n"
"Language: mg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
msgid "Congratulations on getting I2P installed!"
msgstr "Arahabaina fa tontosa ny fametrahana an'i I2P!"
msgid "Welcome to I2P!"
msgstr "Tongasoa eto amin'i I2P!"
#, java-format
msgid "Please {0}have patience{1} as I2P boots up and finds peers."
msgstr ""
"Azafady{0}miandrasa kely{1}mbola mamelona tena sy mitady olona "
"hifandraisana i I2P."
#, java-format
msgid "While you are waiting, please {0}adjust your bandwidth settings{1} on the {2} configuration page{3}."
msgstr "Mandra-piandry, mba {0} amboary ny bandwidth{1} eo amin''ny {2} pejy fanitsiana{3}"
msgid "Also you can setup your browser to use the I2P proxy to reach eepsites."
msgstr "Azonao atao koa ny manomana ny fiejerena tranonkala ny mba ampiasa ny proxy I2P rehefa hijery eepsites."
msgid ""
"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
"browser settings."
msgstr ""
"Ampidiro fotsiny ny 127.0.0.1(na localhost) sy port 4444 mba ho proxy http "
"ao anatin'ny fanitsiana ny firejena tranon-kalanao."
msgid "Do not use SOCKS for this."
msgstr "Aza mampiasa SOCKS amin'ity."
#, java-format
msgid ""
"More information can be found on the {0}I2P browser proxy setup page{1}."
msgstr ""
"Misy filazana hafa koa azo jerena ao amin''ny {0}Pejy fanitsian''ny proxy "
"hoan''ny I2P{1}."
#, java-format
msgid ""
"Once you have a \"shared clients\" destination listed on the left, please {0}"
"check out{1} our {2}FAQ{3}."
msgstr ""
"Rehefa mahita \"shared clients\" eo amin'ny lisitra amin'ny ankavia , dia "
"{0}jereo ny{1} misy ny {2}Fanontaniana mateti-pitranga{3}."
#, java-format
msgid ""
"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p{3}."
msgstr ""
"Tondroy ny fampiresahana IRC eo amin''ny {0}localhost:6668{1} dia miresaha "
"aminay eo amin''ny {2}#i2p{3}."

View File

@@ -4,15 +4,16 @@
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# Translators:
# tuliouel, 2013
# wtfisthis <low_fps11@yahoo.com>, 2015
# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
# tuliouel, 2013
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-13 21:46+0000\n"
"PO-Revision-Date: 2014-02-23 16:51+0000\n"
"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
"PO-Revision-Date: 2015-03-31 20:55+0000\n"
"Last-Translator: wtfisthis <low_fps11@yahoo.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,4 +64,4 @@ msgstr "Quando você vê uma conexão no lado esquerdo chamada \"shared clients\
msgid ""
"Point your IRC client to {0}localhost:6668{1} and say hi to us on "
"{2}#i2p{3}."
msgstr ""
msgstr "Redireciona o teu cliente de IRC para {0}localhost:6668{1} e vem dizer ola em {2}#i2p{3}."

View File

@@ -6,7 +6,7 @@
# Translators:
# blueboy, 2013
# blueboy, 2013
# blueboy, 2014
# blueboy, 2014-2015
# blueboy, 2013-2014
# thefabio <thefabioluiz@bol.com.br>, 2014
msgid ""
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-13 21:46+0000\n"
"PO-Revision-Date: 2014-11-29 12:03+0000\n"
"PO-Revision-Date: 2015-04-05 13:58+0000\n"
"Last-Translator: blueboy\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Seja bem-vindo à I2P!"
#, java-format
msgid "Please {0}have patience{1} as I2P boots up and finds peers."
msgstr "Por favor, {0}tenha paciência{1}: a I2P está sendo inicializada e procurando por nodos."
msgstr "Por favor, {0}tenha paciência{1}: o roteador I2P está sendo inicializado e em busca de pares."
#, java-format
msgid ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff