From e407c046d9dd49f83347fbce994c2d713dec6f58 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 19 Feb 2012 21:52:29 +0000 Subject: [PATCH 01/18] Add the correct flag for the Czech Republic Public domain from the Wikimedia Foundation --- LICENSE.txt | 1 + build.xml | 33 ++++++++++++++++++++++--- history.txt | 3 +++ installer/resources/icons/flags/cs.png | Bin 439 -> 831 bytes 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 4d6494366a..b27ecb8ba8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -193,6 +193,7 @@ Applications: Flag icons: - Jersey and EU flag icons: public domain, courtesy Xrmap flag collection http://www.arvernes.com/wiki/index.php/Xrmap + - Flag of the Czech Republic, public domain, courtesy of the Wikimedia Foundation - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/ Silk icons: See licenses/LICENSE-SilkIcons.txt diff --git a/build.xml b/build.xml index 64157cf9d9..2865c6f7b8 100644 --- a/build.xml +++ b/build.xml @@ -295,7 +295,20 @@ - + + + + + + + + + + + + + + @@ -650,6 +663,13 @@ + + + + + + + @@ -887,8 +907,8 @@ - - + + @@ -1154,6 +1174,13 @@ + + + + + + + diff --git a/history.txt b/history.txt index 67e5b6cfab..7c437804db 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2012-02-19 kytv + * console: Add correct flag for the Czech Republic + 2012-02-17 zzz * i2psnark: Escape fixes * netdb.jsp: Fix debug median calculation diff --git a/installer/resources/icons/flags/cs.png b/installer/resources/icons/flags/cs.png index 8254790ca72f98d9e79d94bdfcb8839b1fd434ad..cae55257d826f9d388610e704626ca64b8810fd6 100644 GIT binary patch delta 820 zcmdnayq|4?M7;nL0|UcK0XJPB#g^pl?(!cDI3vE_0g7-IctjQhX%8@VJDF|Az`(@o z>Eak-aeC{-K#$-=hSu}-@8@m{+qu=mF=@lnr$R<*ikpOrrzU(6*db=oWXP$hwpNK< zu-QxFgj|kcB_9-BHSRhqL|aH%o~}=s!mau|$#?ec+;zYI+kO$)yK~9=w|nOB zpKCl@TDtE3?}r5@vhP#=GuE{ghECQ0d-7!P{LpBdQxguY4xOHPRj*Dw+-XjP@tzvT z=_~BTv;R$teJ86a^<4RLr*(JVmj!h`(fhuBJSO~Fw)NOn4hszhcSidoxys^~?JiFE zTeLkhp zRzJ^Nk^Sl627U4U`$J|~&Rp;CLpw0QAgC=V=h4+Yt<@9eM4SEVC`qplUN7ZZyWoeZ zRg+cf!z~4ED?DYTU3hlZu*fhROPY|#{PmD?R+n60wpmHN&)2UftDQf8-hS@G(bD#B7Hp^snXovtR?@j<`QFUB@3Sx7s=Z&GcJ@zZS-0$x zxPwYN5?PKez3Qvd)a=9cK<%Q&u?+8XB})t!&Mb?Z%e}30+ofHihF_baI@;eXbWWL4 z;>5sw_AzsrOx2bU8G-u0ol|^;FSnb$UmsuMZfs=TeIe_l&n-*tsD(`|4Nt2L56rwZ z>6O3ux)Y1H*Ct-Rx#ZJgXN&WvGMP;$ml?G(8F>7>{_ml9%VE`o*kj!0z*M4I;u=ws zl30>zm0Xkxq!^4042^URjC2hxLyU~AObo1y%(M-RtPBif50>yT)FbQ2%}>cps|4vV z)HSfwH8KF}Ft#!>);2H(>L_rGaRpkD0^IJ6EM9XT%4k7L+FCWG3qYZIJp}a06%|gQu&X%Q~loCICz+UQz%6 delta 425 zcmV;a0apIM2Dbx{7=H)?0002_fSPUq000DMK}|sb0I$e51&Zka000?uMObuGZ)S9N zVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003=Nkl92*9D3+W-K*sR0>r0`!|sM`x~eNg#P~i_4n8BzrTI~MgGdl@-i@d0|+1%Q&SyHO(9WH zu7Cgk{{@--A8b6x2B1zb1BygNIks=N00(`l&9s7Up9s@9dfaupR5P~q^B7c4}{Q1kEq5^a?Kmf4- z1C{Cb9|lQDpd3gPDEIp}BZ&Qn0YZX}hajM0fB<6r3L=RJ7-B%>qDcV(K!5=NbBt#i Tf9r=|00000NkvXXu0mjfLQSqj From a15e4c6c284eb5997446b4046959b5f48c7bc4cc Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 19 Feb 2012 22:07:12 +0000 Subject: [PATCH 02/18] Revert the last check-in and correct my earlier addition of Czech. The Czech language is CZ but the Czech country is CZ. --- LICENSE.txt | 1 - .../src/net/i2p/router/web/ConfigUIHelper.java | 2 +- apps/routerconsole/jsp/index.jsp | 2 +- build.xml | 4 ++-- history.txt | 3 --- installer/resources/icons/flags/cs.png | Bin 831 -> 439 bytes 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index b27ecb8ba8..4d6494366a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -193,7 +193,6 @@ Applications: Flag icons: - Jersey and EU flag icons: public domain, courtesy Xrmap flag collection http://www.arvernes.com/wiki/index.php/Xrmap - - Flag of the Czech Republic, public domain, courtesy of the Wikimedia Foundation - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/ Silk icons: See licenses/LICENSE-SilkIcons.txt diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 5f0be05796..7acae19630 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -56,7 +56,7 @@ public class ConfigUIHelper extends HelperBase { private static final String langs[] = {"ar", "cs", "da", "de", "ee", "en", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru", "sv", "uk", "vi", "zh"}; - private static final String flags[] = {"lang_ar", "cs", "dk", "de", "ee", "us", "es", "fi", + private static final String flags[] = {"lang_ar", "cz", "dk", "de", "ee", "us", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru", "se", "ua", "vn", "cn"}; private static final String xlangs[] = {_x("Arabic"), _x("Czech"), _x("Danish"), diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 238e454e75..722c2622a6 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -39,7 +39,7 @@ English عربية 中文 - Czech + Czech Danish Deutsch Eesti diff --git a/build.xml b/build.xml index 2865c6f7b8..c7282417af 100644 --- a/build.xml +++ b/build.xml @@ -907,8 +907,8 @@ - - + + diff --git a/history.txt b/history.txt index 7c437804db..67e5b6cfab 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,3 @@ -2012-02-19 kytv - * console: Add correct flag for the Czech Republic - 2012-02-17 zzz * i2psnark: Escape fixes * netdb.jsp: Fix debug median calculation diff --git a/installer/resources/icons/flags/cs.png b/installer/resources/icons/flags/cs.png index cae55257d826f9d388610e704626ca64b8810fd6..8254790ca72f98d9e79d94bdfcb8839b1fd434ad 100644 GIT binary patch delta 425 zcmV;a0apIM2Dbx{7=H)?0002_fSPUq000DMK}|sb0I$e51&Zka000?uMObuGZ)S9N zVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003=Nkl92*9D3+W-K*sR0>r0`!|sM`x~eNg#P~i_4n8BzrTI~MgGdl@-i@d0|+1%Q&SyHO(9WH zu7Cgk{{@--A8b6x2B1zb1BygNIks=N00(`l&9s7Up9s@9dfaupR5P~q^B7c4}{Q1kEq5^a?Kmf4- z1C{Cb9|lQDpd3gPDEIp}BZ&Qn0YZX}hajM0fB<6r3L=RJ7-B%>qDcV(K!5=NbBt#i Tf9r=|00000NkvXXu0mjfLQSqj delta 820 zcmdnayq|4?M7;nL0|UcK0XJPB#g^pl?(!cDI3vE_0g7-IctjQhX%8@VJDF|Az`(@o z>Eak-aeC{-K#$-=hSu}-@8@m{+qu=mF=@lnr$R<*ikpOrrzU(6*db=oWXP$hwpNK< zu-QxFgj|kcB_9-BHSRhqL|aH%o~}=s!mau|$#?ec+;zYI+kO$)yK~9=w|nOB zpKCl@TDtE3?}r5@vhP#=GuE{ghECQ0d-7!P{LpBdQxguY4xOHPRj*Dw+-XjP@tzvT z=_~BTv;R$teJ86a^<4RLr*(JVmj!h`(fhuBJSO~Fw)NOn4hszhcSidoxys^~?JiFE zTeLkhp zRzJ^Nk^Sl627U4U`$J|~&Rp;CLpw0QAgC=V=h4+Yt<@9eM4SEVC`qplUN7ZZyWoeZ zRg+cf!z~4ED?DYTU3hlZu*fhROPY|#{PmD?R+n60wpmHN&)2UftDQf8-hS@G(bD#B7Hp^snXovtR?@j<`QFUB@3Sx7s=Z&GcJ@zZS-0$x zxPwYN5?PKez3Qvd)a=9cK<%Q&u?+8XB})t!&Mb?Z%e}30+ofHihF_baI@;eXbWWL4 z;>5sw_AzsrOx2bU8G-u0ol|^;FSnb$UmsuMZfs=TeIe_l&n-*tsD(`|4Nt2L56rwZ z>6O3ux)Y1H*Ct-Rx#ZJgXN&WvGMP;$ml?G(8F>7>{_ml9%VE`o*kj!0z*M4I;u=ws zl30>zm0Xkxq!^4042^URjC2hxLyU~AObo1y%(M-RtPBif50>yT)FbQ2%}>cps|4vV z)HSfwH8KF}Ft#!>);2H(>L_rGaRpkD0^IJ6EM9XT%4k7L+FCWG3qYZIJp}a06%|gQu&X%Q~loCICz+UQz%6 From a314b2acc74ae8c908265d13e197147feaa654a0 Mon Sep 17 00:00:00 2001 From: str4d Date: Mon, 20 Feb 2012 08:36:03 +0000 Subject: [PATCH 03/18] Added a missing quotation mark in a
--- apps/i2ptunnel/jsp/wizard.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index 313f130c39..95699a73b4 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -518,7 +518,7 @@ http://i2jump.i2p/" /><%