From 9c4b1cd6993332f20731c35a19b6d1968d8e9f29 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 14 Jul 2015 09:14:57 +0200 Subject: [PATCH 1/6] Updated zhtw translation --- src/main/resources/messages_zhtw.yml | 37 +++++++++++++++------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/resources/messages_zhtw.yml b/src/main/resources/messages_zhtw.yml index 2b159a24..2b2341cc 100644 --- a/src/main/resources/messages_zhtw.yml +++ b/src/main/resources/messages_zhtw.yml @@ -1,19 +1,22 @@ +# Translator: MineWolf50 +# Last Time Edit : 2015 / 7 / 14 , A.M.10:14 +# = = = = = = = = = = = = = = = = = = = = = = = # unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' not_logged_in: '&b【AuthMe】&6你還沒有登入!' reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' wrong_pwd: '&b【AuthMe】&6密碼錯誤!' -unregistered: '&b【AuthMe】&6你還沒有註冊!' +unregistered: '&b【AuthMe】&6你已經成功取消註冊。' reg_disabled: '&b【AuthMe】&6已關閉註冊功能' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -valid_session: '&b【AuthMe】&6憑證登入' +password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !' +password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼' +valid_session: '&b【AuthMe】&6你已經成功登入!' login: '&b【AuthMe】&6密碼正確，你已成功登入!' vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!' user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!' usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"' -max_reg: '&b【AuthMe】&6你註冊的帳號數量已達到最大。' +max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。' no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。' error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' @@ -24,36 +27,36 @@ pwd_changed: '&b【AuthMe】&6密碼變更成功!' user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' invalid_session: '&b【AuthMe】&6憑證日期不相符!' -reg_only: '&b【AuthMe】&6請訪問 http://example.com 進行註冊' +reg_only: '&b【AuthMe】&6請到下列網站 :「 http://example.com 」 進行註冊' logged_in: '&b【AuthMe】&6你已經登入了!' logout: '&b【AuthMe】&6你已成功登出' same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!' registered: '&b【AuthMe】&6你已成功註冊' pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數' reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' -timeout: '&b【AuthMe】&6超過登入時間，請再試一次' +timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次' usage_changepassword: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"' name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!' regex: '&b【AuthMe】&6暱稱裡包含不能使用的字符' -add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來增加Email' -bad_database_email: '&b【AuthMe】&6這個 &c"/email" &6指令只適用於有使用MySQL和SQLite的時候，請聯繫管理員' +add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email' +bad_database_email: '&b【AuthMe】&6此指令只適用於有使用MySQL和SQLite的伺服器。' recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"' -usage_captcha: '&b【AuthMe】&6請用 &c"/captcha " &6來輸入你的驗證碼' +usage_captcha: '&b【AuthMe】&6請用 &c"/captcha <驗證碼>" &6來輸入你的驗證碼' wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼' valid_captcha: '&b【AuthMe】&6驗證碼無效!' -kick_forvip: '&&b【AuthMe】&6VIP玩家只能在伺服器滿人時登入伺服器!' +kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器' kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次' -usage_email_add: '&b【AuthMe】&6用法: &c"/email add <你的Email> <重複輸入你的Email>"' -usage_email_change: '&b【AuthMe】&6用法: &c"/email change <現在的Email> <要替換的Email>"' +usage_email_add: '&b【AuthMe】&6用法: &c"/email add <你的Email> <重複Email>"' +usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"' usage_email_recovery: '&b【AuthMe】&6用法: &c"/email recovery <你的Email>"' new_email_invalid: '&b【AuthMe】&6新的Email無效!' old_email_invalid: '&b【AuthMe】&6舊的Email無效!' email_invalid: '&b【AuthMe】&6無效的Email!' email_added: '&b【AuthMe】&6已添加Email!' -email_confirm: '&b【AuthMe】&6驗證你的Email!' +email_confirm: '&b【AuthMe】&6請驗證你的Email!' email_changed: '&b【AuthMe】&6Email已變更!' -email_send: '&b【AuthMe】&6已經送出要求至你的Email!' +email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。' email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' -country_banned: '你所在的地區無法進入此伺服器' +country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' -antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' +antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' \ No newline at end of file From 052731fbd343916b10e461921c32de9ba7c28b9b Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 14 Jul 2015 09:19:19 +0200 Subject: [PATCH 2/6] Fixed format type --- src/main/resources/messages_zhcn.yml | Bin 3666 -> 4566 bytes src/main/resources/messages_zhhk.yml | Bin 5093 -> 6284 bytes src/main/resources/messages_zhtw.yml | Bin 4401 -> 6004 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/messages_zhcn.yml b/src/main/resources/messages_zhcn.yml index 85a818022c4109e2ddb1e09c3bf72ca7db6ca4e8..2571a88e637aa2323ca65b35c7dce1b94d166253 100644 GIT binary patch literal 4566 zcmbtYZD>U!Cj5FsxGNpV zZBEoOKYNDu+O)fq_E;pDW&QLFEmF24$R-|z{HfF7?v`0A?=%JNF~5E&-W~GIndv}G z3)W0@1fg}czAKk^9);HBzUt@N;nN`L&Cqv>J{Ieuw;n~m$vT2Jigl?GXSY!^$E5~n zUyAlQB$aVJ93-y>NG`+nc|5xxDd~Y2_wDlJSTK;gS*+8aHgD@C{rAk_(3-gywR)0- zz8;Ehke&tzl{eY<@tWbS?$eRb(V`V%`ucQ9w}(%}`N~>N-~)8vxrjm_V=^;s4+nDB zGu#S~5wS`ALdy_Y?V}Y$)lc|#J&D3(FC4pH$UCqqEZS8b12<`RRpMk=3wKTNJXWIC zml?w->W=2(50oV5<@OQeC3Z|-5Cq5S*BLOfQ|j~fl)2gx<9?;QD}z`WVCQft5= z{|!P6sBL2=Wv++nK}aO2YVyvi_J}AGXK1eq^vjp|EJ1&3EyFg*J}Y$`t@z0FAGOPjXEOR$(os{ zcX){`p_dQpB3|?_vNJ@;4Y>J2#iRNLTs(US%d~=HE3M?HVoj2>i7jdgX|2p48g(01 z(J?ly_fqCHSHI@+gldPQwYYVaYXpi(wzvnXOtsZ4`3n}~xEbUhkOWT{^pvH36Lw7Y zuz)_-*akK~BcN(HBiO@d3a{mw{?_xi!MivM#mq2aC&6<;GQVoFS}tOkHKJam&z?A9UbFEVE(B8I}36iiah%S=Ay6tQSgJ>&x=*4 zkWRX%gJ1vC@s+a#R$rO}lWfF!cM50iQ^xD<$o9^Wj|}|w^Qe*X<_Wy!J$_N?QKun#=$(dwLllE9i{~>}L!LKWm)7Gi* z{^H^I^)$~9&Kbn#MIy;=j&=mmZFy(bdTMVzH;nQLBbnVVp-(nX#4T&nOOWv+Be6w zT%JT-<{kV7nK0YV-lP0)XM4)b2#hfqNcNSwIqQOdk_r9JLVoaP8rcQhyz1R8^#dEOy*{}jwS#UUqR-Q17Bc7tgBi!6 zckm>?`IwY*jkPe$O<>ehVJmcy^7@;dclb=Yz8s~hCr8YYajOXWkTsB|HpWVkQjZJ~ZxXbM3*{Jtj7VAYPwAxl|P_aY;AENON6$@Aj&D(iYF zo0a=vms{m_Y{GfS(;fVtD64~8sO)0!BJ})f?XW~HaBKAP(ZAKjkx+H17<;FHh5Ugu zzk~3|R1LfuQrN@yXB(3^8I4_E4fef+SaR+nAyPgzVZ5K qAh(pA`ES`vTM|~ThMwE&8>hdXu$L&08e1Md`RTLKz0Ha89P$q?LuJkY literal 3666 zcmbVP-%s0C6n>wy|G}%Y@;2TPs?>*Ss6XayA#FF^YKtzPPJI4ZTDO##DqBfqUgtNQ!LFalkbI9e zN~Ewy>Mgo{;%+{51|@f3GY9qxS!!LJ6>0l7(r7tnV4sCs=-BDLbZbSh2M=y_$6fpg zL3AS}$Bo%pH7aX7N(Ah^;RbCSxb;36)Gp4lU}mbb@|+P*>nX+5;tOFqq}*}(`w&WG z1jRUmA=Kav>rVH87V}QO2{!b&MRLW9v&~PL#w2*ttdwd>)1;Ggce8ikN3P_ZzaUHd zPB%l}?!gUr&nEU}VDKrk%@DDaS(T;B;zyuJuwif=Lzdhz9BI1nikIe1L!XtC^HF}u zuhzXzhk?K&bC|<)R5YQ>6;jwC%e#KPDfqaAA*xx*Ogyl4w`{Uf64leqMMlZ*S=xRb zR$TNtr;LD*Gtcgk?JWk|`8xam)_c<2^gcZG><(lzr^L0WY^j!|8OR5H``R0>lC4*C zdmpGJr|(GDW+degNTG!!A;BU9_~A(Kis1rQG|K1PjI0~_-AGEC3%O*NbStEMitN*2 zhQ9AZKuDkN?7NL;5EE?tMccKH5DwPMGN1?D6EG5VFT`~FW!4w%rpO8b@rHT9BwP*d z-C#20M3DI(TO^@8VHt%*v7uPXdUhB3%jx#8g!>OiI~LPI8gTZUUJmO^DwZ{Gm{D0Z zO~aIRE%KN<{>ey75k;SvNJ#*Jv|yx7Nmml8q*zjT2Z{`T2G?<($2q_gan*vmP=l-{ z6fG_%ECdO7zzLCVjSLXd0Rsf1;MoBG2hy&QqFFBgxXkQ*iZZxIkm z0-jL~()vGi5kI^tH7E)o2Xf?*qKBP}Y9L0%8QQe^aiq!9sNM);sL`ZS3TB0i8+P_p z(h*)RHPDLgR+m(Ykh-SdnDZDQ=GSw;Ij(Y@#L-3`DQ|S|{2X-A12H~Y#Jo&3ZYW%;V*V1}nV`buLV!8fEI(hOFAqs! z*BcCoU8J2F#7SuhH7Gdd_UkMZZ*Qmx#CJR*WX|b z5=(#F*O_yJKnI-t`*MLl%T z+JP1+3VL9NV?RL*Je`uhyZ5zx??>>dL_rRjFmb;^l-NY`e@kE>O=CPEPGh$_$kiRF zjdft5FnWQW_JIK0X}FRg?u-(Zqe@DdQ7ly?@blet>d^!B7kq4p9Kb7C8^FT@CIb|Y zseSo5C}K#{E4sS>VB!03zd^|0hn7;sdkiS0DruMq2PbiyD?E{=VK{|D7|-zcH9sM{<2;3Dz#V@_G2(P}K3Mg^T7ZjTV>1;% zOS--bP_x>NcrbzRV&^1Xu@6(cv`3W2+A^0w1x5hZ0#L5HA_+Wa=<~^xSQcm+G4zPJ%E7%{d~oiQscY4$Z~mcSlI8D1^$dBg1^27H;oG|nix z&QlM*KEf8m7rEEjCtINEC%Dm|2t`k6Gw=nZq*I2h>fyUyMD#b_(MAtGw47egZ9OBs zvRgfJdaI=Q#?O}t-_qWY$%&UKk_uCd>t07b7yjMth(iMY57(I6MoaoKA(7>r|9pp3 MR!O!2Ul$POFVj56=>Px# diff --git a/src/main/resources/messages_zhhk.yml b/src/main/resources/messages_zhhk.yml index f92cc42617795a1c278b2355cefabae12ef43242..fcece644be9c6945b73ed5a3d646d51245240386 100644 GIT binary patch literal 6284 zcmcIoZA@EL7(Sb3laCtr$DsaL7b4UTMx6=4NtQXYIEK5WrK2pRTzboG=?aC>_QJ++ z%Yx|Ylp+q}OmrGGnf}2Tmq_?&W|ZK^4~-wmvL%ujO*Coder$2|eR_7d_jW)pOmhRh z_qOMGzn}L#CwHTg*_oFOupo=G1nZ&CBQO&AYJ@eE5 zI_5~#Dc6r48o`?Y=~YE`;oTRf-cYL~o7Coa_-0i+ebiASt#?-EEdY9gd;=fIbk|S! zkOMCjL+^BrYQx$!_dZwrm`ytA?{=5xZX_JOjqRT_ugi40oSylK&8drT30bfqnfG}g zi_oRAE_#Yuk``hlE%RzmNn}`4-FCJv$Mqi|ln9|{gxy2FiIapNc_&Iwhb>z1SIdHQ z%;iYkmnmx=)i#EHmBw68rqk~Gb9Pqhv{MdnDN*uIGVgmkYhV}rvqL+`OATy(V(g@N zDqHj`yb2qUW3aclM?(~^?|XEqd>#B_lqVz%l2(269jx!Cm~~l_(CMllSKVV$?c{su zQ4Ly)=)iY{b|OMn^zL+J1NSIzdwytnvG+kWJdoo!Mo(yz;%uJT+k z_VxJ1)-hMd%?#6{P#h0g3O}GO;ANpBstS4yl3oLOO;N#!-vDVHCw)Uy;{rd-4$wC# zih79F#i7Qb)&jmgU%f^-yhc`*Ze#$f8W`8yDm6j+f*m!A zGps|FK1H@9$xdz2%9VHv%<_0gox&@Aazx5ppZYuFJJa}*UipFtW%2|#fb)s4V0rWq z>xzLFZQg8Pas-(qW%Nh^Rn#rVwSs7_+rla`R`1em(MvLi$X8Y+hQWqfBWq?(-%ejP z;LSKauw+Orm71qS*1_}O2IN|=1-~nV3NCbd?Cfb;gRX#>fn)ZtCdx0=-gDY_hijyT zNZH_r>AS-(s8<)WT+iv^J`1y>+U68ks6029-gx4j;SI^l-oE3(5uv?acQR?8ARUUM zhS*$MFgfRO)S*>I<=$VLwEwDa2pv?iIY_?mp$M+Udh7b2vh+SCo!Ms<(zl6pl)CaoTQhWhj^oh!fErKyHe`Ev0T16Uj zl*rVT__a8CI6q0)q^jY&yaEw5cRPJ8%#io5Onn-Ip4ot{>tY+~ta12xS$xwxB1eQg zk#%5dt8-KHR5k$4LB9v~9yfSH%+3j_R!q->`D-ghafssCOKgPBzm?*PdApW4#n{Vv z&98nk1e3!qBa?G1bjqX!<^cDJ&V9|$xzP>KVQ=ly%XgSCEBD&G;L2>k;oF-zmoWQT zuK;Vgt?LF~>Agzi9VSebB4;JnL|tGZ$5)89|cswkcF5U(H`-ZL~PP${>RcylFwf?yxzGWl}R)G z7u@{Kdfc3s8Fw+=@*mQ+>u1f_1?1{^bgD=de7A{ z?fISF$fO%~@7OnB&P6rqsKqqxieVD?y(OA)q-Ir22m5G( zZeecrEW20XpHV_rS(C(f8Y1Jsir^`YJ_l&cYNS@t${*#5H19#1$?N)LB6{&0lO7mJP9_V!KRDd?BacyeDTMq3}M>TzNh!J;Te#);mAM7A;X-l#yrrgL#7C!wuOY1x|TT?bd18fHP@`MUYFCs$gsDk zi4h5zQF=m5tl(yGFLHG`eF|&q_H-&l6P0T8Oq}98Xkrk4@}=i)F&&Vnv9>?_qZ+pp zT!}6oip?yZ;ouC+%;Rg9!aci`6g@N6jxPAW&;lbi&s-}rQZ{hbqq@)Yi>|A;wQn!c-%dzuG-t1-QrE$8f_}6>}XKRQ4Wxn(NZ$odo_GY#zw#ZK&;T51_ z+EYj#PJ4s-2^=R8u*CY=-?k|wCLf&co{`FqjCW)Mms-CJ-bm~US0DIh!X}lq*LRF+ zm6@MM%8$$Y9gB13^3qp(_Gp&>?!kqK(}QZO@2JeY9~z=v)dTTO?d7>DX;!tf2PvEE UY=fubwNo?^<3Phc}ymzm1)S zFJlKV0b(Gw2^4T_13xC7+1)4pLhsD%F2=A9sLex!?VWS)+&TB$Gkb^oH6+NYUkEFq z`&{G~#l!n0pZHV>h}`E-!{Ollu`%|=-GKN7cW2}d_vJ1A!GehVOje>YA5le!;2OR6 z=jd13Tn(p=w1bXz_U)-pVeWM>F@j|KB+Um9PsJ?_MHN4PeU!wMIuT}pTn{ol7 zD)>ZR4GK}&8L@Y=rY%ovr4CBAdnbAAq(ML%X*5$i@8-0^DWIdhB$_%fVsUsFrS^LGCnSPdC57B2bLOB(|G@HTuGB?Gn?FbH|`n&&0c4-cX9@0Fk&SX%R=fnm+W;mdZ!7!)D04%9tF~mJU&4jkz zeaJn4#PzL&_3>jY3q?|eagpTj7}!HmKouy))mX)wL90eWk<5Ur4R#9OAAEj{R1$tFwd)I4AMsAwIk+OOvRdD-< z!QslgUbl@ac~q(aE{a!heH}0CX|vm?al}9=+=Sqlyu2!^s-!p{vKuYd$f9Y{72Bf8OjVko49cv)9{%O4T(o;pSyU{@N3kCLHtj z!EVW+who|cFUWrM%81Vz<&N><(AZwo>uE-O(&#)K6Euz^q6gPESj(eg9u7!5dc_U} z5P?UGIF!KvX2Wo+GNc+s98(We>fML3T!b4%C4qi050qR>mk5 zX^yhO2gOjp5z7sgW6cc!+&3Y?7nbDl@4n|45w+5(_Vy*{8eZMhDp`GJ2QSUy1?c-D z3Qx)42=3ELU7}aC>41&;ZdOkvwMJDdCP?eVo7!QO;!s-h0o8fa9$4J3KeqTVNgFB> zP|RCl|7UF@0mXnI`Tzg0jLx>CS|9r)H6jlq&!DK%rw8Pkf`O*;o~MF5v`c_JwqD@! zKe$ka<}jO)YJXqHnRC{WEtgu3jVsc4r49%h8?lrsm!-rJ&BqiTMymF13l&pztt8(} zPJy^&P8!RzxN&HXcMyM2f;TIS$67s&PG|Zb(+-RH^(qZRj$e_7jZ|n)*qhm~bdE4s zG?OBINPLY7#wHq#-W8trnz@T;E`Tmbt;?XVPWnc_Ce}Sc!xki$_$!K3B3B z9EvG=Drmc{{?}V2RLp^BG68}3U}KDU20mJ~p==wXy_cf19b3`K;q!jcc@SEYfRc~- zG_Rsl7Zjrn8L-ZB&MD}wU?aI=~*3#ixXuox9Gw$%ee1JhdXf?L}}jhr^WPC>&` zKpa+Bi&(K!T$-XQmMSmT&N4}b3~VyaS!xV#`0JXAU*4E+RtPt4=o)rie&6l z>k9{Hx6U=C8yBBDCOL?Mio4)Eski;0*WUL&WKn$)4h6PPJY_4ZO|?-HOr-e}Zsv)a z|NQ7%{?YHQ5y1+{||4U&JYGJ!T zlawB1LJUm~#~<~evn68lEQwv^2Bu^G1S7g^abaNpA(4d}EJEKj@d&{%(9E&;gY(3E z9uTSHqV}J{F{l1XI5@?tZr#RWD#=R8E*lQ7P#@0aWuA zG0wcl^)zwt48~r8J7>K%QD4|PBt~yxYg)O1(s^9j(O;Y}owA>&5tyhj2Lc>-JiI|Y zxzZH_{qPWKZeQIPJd>bXMqrDmURef)=#};Nl^_;RZyCl~X3^VBUlyaLJ2U-&6D*m6 z=@_c+qUJ8?C@VuI3v9aJ`WtP%O{=c>O{IeCIAz-naY42FHRuX1EA;I!ZvY6ya2~>B zZfDjAd+AW}`h;hYMYWCi5?8YSml- diff --git a/src/main/resources/messages_zhtw.yml b/src/main/resources/messages_zhtw.yml index 2b2341cc91deca60640e47a6bdc02c49d13d4b06..05dcdd2349f1c04a84db8c29f47c8378a7179f86 100644 GIT binary patch literal 6004 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 From 9de8c95fd05adc5f1f389552946f4f78146bd0dd Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Tue, 14 Jul 2015 11:33:46 +0200 Subject: [PATCH 3/6] Update messages_en.yml --- src/main/resources/messages_en.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/messages_en.yml b/src/main/resources/messages_en.yml index 6ff719bb..25099ef8 100644 --- a/src/main/resources/messages_en.yml +++ b/src/main/resources/messages_en.yml @@ -1,8 +1,8 @@ unknown_user: '&fThe requested user is not in the database' unsafe_spawn: '&fYour quit location was unsafe, teleporting you to world spawn' not_logged_in: '&cYou''re not logged in!' -reg_voluntarily: '&fYou can register your nickname with the command "/register password ConfirmPassword"' -usage_log: '&cUsage: /login password' +reg_voluntarily: '&fYou can register your nickname with the command "/register "' +usage_log: '&cUsage: /login ' wrong_pwd: '&cWrong password' unregistered: '&cSuccessfully unregistered!' reg_disabled: '&cRegistration is disabled' @@ -10,14 +10,14 @@ valid_session: '&cSession login' login: '&cSuccessful login!' vb_nonActiv: '&fYour account isn''t activated yet, check your emails!' user_regged: '&cYou have already registered this username' -usage_reg: '&cUsage: /register password ConfirmPassword' +usage_reg: '&cUsage: /register ' max_reg: '&fYou have exceeded the max number of registrations for your account' no_perm: '&cYou don''t have the permission to execute this command' error: '&fAn error occurred; Please contact the admin' -login_msg: '&cPlease login with "/login password"' -reg_msg: '&cPlease register with "/register password ConfirmPassword"' +login_msg: '&cPlease login with "/login "' +reg_msg: '&cPlease register with "/register "' reg_email_msg: '&cPlease register with "/register "' -usage_unreg: '&cUsage: /unregister password' +usage_unreg: '&cUsage: /unregister ' pwd_changed: '&cPassword changed!' user_unknown: '&cUsername not registered' password_error: '&fPassword doesn''t match' @@ -32,10 +32,10 @@ registered: '&cSuccessfully registered!' pass_len: '&fYour password didn''t reach the minimum length or exceeded the max length' reload: '&fConfiguration and database has been reloaded' timeout: '&fLogin timeout, please try again' -usage_changepassword: '&fUsage: /changepassword oldPassword newPassword' +usage_changepassword: '&fUsage: /changepassword ' name_len: '&cYour nickname is either too short or too long' regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' -add_email: '&cPlease add your email with: /email add yourEmail confirmEmail' +add_email: '&cPlease add your email with: /email add ' bad_database_email: '[AuthMe] This /email command is only available with MySQL and SQLite, contact an admin' recovery_email: '&cForgot your password? Please use /email recovery ' usage_captcha: '&cWe need you to type a captcha, please type: /captcha ' From b9d648f97a9715cba476e8df563583536a89daf6 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Tue, 14 Jul 2015 11:46:43 +0200 Subject: [PATCH 4/6] Incrase default security level --- src/main/resources/config.yml | 72 ++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 8b9796ce..83718ebd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,28 +1,34 @@ DataSource: - # Column for storing or checking players nickname - mySQLColumnName: username - # Table of the database - mySQLTablename: authme - # Username about Database Connection Infos - mySQLUsername: authme # Can be set to : file, sqlite, mysql backend: sqlite - # Column for storing players lastlogins - mySQLColumnLastLogin: lastlogin - # Database Name, use with converters or as SQLITE database name - mySQLDatabase: authme - # Database Port - mySQLPort: '3306' - # Column for storing players IPs - mySQLColumnIp: ip - # Database location - mySQLHost: 127.0.0.1 - # Column for storing players passwords - mySQLColumnPassword: password - # Password about Database Connection Infos - mySQLPassword: '12345' # Do we need to cache all query? caching: true + # Database location + mySQLHost: 127.0.0.1 + # Database Port + mySQLPort: '3306' + # Username about Database Connection Infos + mySQLUsername: authme + # Password about Database Connection Infos + mySQLPassword: '12345' + # Database Name, use with converters or as SQLITE database name + mySQLDatabase: authme + # Table of the database + mySQLTablename: authme + # Column of IDs to sort data + mySQLColumnId: id + # Column for storing or checking players nickname + mySQLColumnName: username + # Column for storing players passwords + mySQLColumnPassword: password + # Column for storing players emails + mySQLColumnEmail: email + # Column for Saving if a player is logged in or not + mySQLColumnLogged: isLogged + # Column for storing players IPs + mySQLColumnIp: ip + # Column for storing players lastlogins + mySQLColumnLastLogin: lastlogin # Column for SaveQuitLocation - X mySQLlastlocX: x # Column for SaveQuitLocation - Y @@ -31,12 +37,6 @@ DataSource: mySQLlastlocZ: z # Column for SaveQuitLocation - World name mySQLlastlocWorld: world - # Column for storing players emails - mySQLColumnEmail: email - # Column of IDs to sort data - mySQLColumnId: id - # Column for Saving if a player is logged in or not - mySQLColumnLogged: isLogged GroupOptions: # if you want to set up a particulary Permission Group for # users that arent registered yet. Pay attention this option @@ -87,11 +87,8 @@ settings: - /captcha # Maximum Registration per IP default: 1 maxRegPerIp: 1 - # max allowed nick length (Warning when you use - # mysql and choose a value >20 you have to - # increase the size of the nickname column in your - # mysql table) - maxNicknameLength: 20 + # Max allowed nick length + maxNicknameLength: 25 # Player that is online arent # kick out for "logged in from another # Location", this options will prevent players that would exploit @@ -129,7 +126,7 @@ settings: # position teleportUnAuthedToSpawn: false # min allowed nick length - minNicknameLength: 3 + minNicknameLength: 4 # Can unregistered players walk around? allowMovement: false # After what time players who fail to login or register @@ -176,7 +173,7 @@ settings: ForceOnlyAfterLogin: false security: # minimum Length of password - minPasswordLength: 4 + minPasswordLength: 5 # this is very important options, # every time player join the server, # if they are registered, AuthMe will switch him @@ -214,7 +211,12 @@ settings: #unsafePasswords: #- '123456' #- 'password' - unsafePasswords: [] + unsafePasswords: + - '123456' + - 'password' + - 'qwerty' + - '12345' + - '54321' registration: # enable registration on the server? enabled: true @@ -413,7 +415,7 @@ Protection: countriesBlacklist: - A1 # Do we need to enable automatic antibot system? - enableAntiBot: false + enableAntiBot: true # Max number of player allowed to login in 5 secs before enable AntiBot system automatically antiBotSensibility: 5 # Duration in minutes of the antibot automatic system From cd3dbb5a2a2ac8ae45ab985d113f77327e2f8cf7 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Tue, 14 Jul 2015 14:06:42 +0200 Subject: [PATCH 5/6] Update config.yml --- src/main/resources/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 83718ebd..2399cf1e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -88,7 +88,7 @@ settings: # Maximum Registration per IP default: 1 maxRegPerIp: 1 # Max allowed nick length - maxNicknameLength: 25 + maxNicknameLength: 16 # Player that is online arent # kick out for "logged in from another # Location", this options will prevent players that would exploit @@ -415,7 +415,7 @@ Protection: countriesBlacklist: - A1 # Do we need to enable automatic antibot system? - enableAntiBot: true + enableAntiBot: false # Max number of player allowed to login in 5 secs before enable AntiBot system automatically antiBotSensibility: 5 # Duration in minutes of the antibot automatic system From da5248c547b7040788422660db96e4d01c2eaa36 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Tue, 14 Jul 2015 14:11:26 +0200 Subject: [PATCH 6/6] Update messages_zhtw.yml --- src/main/resources/messages_zhtw.yml | Bin 6004 -> 4407 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/messages_zhtw.yml b/src/main/resources/messages_zhtw.yml index 05dcdd2349f1c04a84db8c29f47c8378a7179f86..48cf036ec0480d34f4218ef1e765939f419f5d2a 100644 GIT binary patch literal 4407 zcmb7HT~8ZV5Pgr7|8PrG+DcVEs(wg_wo2PPL@H9NR_)_zu{UHDdlz}vkh~cZY)tIn zHhjdyDj^|>ftV0z4aE?C48C`FpZXVi?vA}S=`~43K;YatGk509nYsToj?S^4Q@Z6O zbk|M|up!ejezgvQGjz`ZYsyM)h%PfPL^LQ1kGSS8nj!zPEIT zSGI!2AI-fY-^}x=>OThszPrsQcY@3WjscoJk50nD2WQV%wyP!Vkr5-VnLRuNlXoa! z>1yifd$39wBifjqNL#L+G84CyksWz+Rn{NtyMV){;~FV8$X{l?#|K}rLGSUtzg}$p z*~j`nZ@$j@)dtVb$Qv!)5lgSU>MJ-(JNk$r15~&GzSx-`2z}s$X+;kDU^$+$tr2Z> zJg%@L$3fwxzrHH3leXG18mi+meY@LU{l1tk@tI{lyCCY*6fPxErXy}T`fx&N59465 z5-jA&1`z)3L%1E)9cSE5#Wf?9vQwI6#%?Hrg?Cxh*_X}6Q(T!6#IAnFK4iR9M4H$~ z4C(Xc>&?Ro-Hgdgy@5_ldJBH@P*yF-lzHZE#3ad>uy6n!(-US~a}38Z?H+XLPF067 zVSyCh30c&hfD)iArJC~GF&-P%EZe#qbImaY1Z9Np?fB*84p-~Sp32_N6U(5vM5&?w7RhWC_18;7b8VptS zH}3iqFTKAvyv-G_l;!tVaIKILTGCOa2nOU>)!ZZ(#Ewq?y$z_ZKlTnv6zNb0*pS?K zr#L&s3~iuuL9Xbp=0bLT)hD}@%7fdJu!X{-%3qhXb;KzmiPSeJn-;sSTWXS0Tlt$a z;^CjvO%btMvq|B#o7qt#Ma-5yPY9L*flsZ87c2h39_BrogVd?&!dU3&u@7 zIhrue$Lu6K&J2EY3H2+IM&lpLfw#NV+?#3LJe;6PJ?eHDT}f6-OBg*QIw}qG>r)Ud(ga>xgj`?& z;#;#~;Xr=4HA^3c*-zNIN)K^g&|EBR`I{MxM!#C)n@eJSj?d0S>kaH(EL-ZFQ4Ew{ zQJxGI?vrGA)gpgg;MteDTL&R^>QBj9(jXimo4f@kF)E;P1gx&gG_LLnOa@6@%XZ4m^AcRh|x zK#Gk5;-nykrx?z&K^g(1Fwlo=G3vkW|7opQVzY~c(ydmOnip1y;8+5N5-_q~UWLiB#!J>rG z%78T$=(Iz&3>D}!;Bf11Bht51jKZA+4!k=nVt!io_YG`*+BG{hW{xVnP=jOrlzRq* zF1L@|_Q&|WW&ZFHo-QZ``{n8njD(}5Q|&TD=;=fPYYl3l^3Xm_QYRWmC`GFYYk9Ah zS2kf-8x1T}Aa?g3)lk9K6Vov&Cc#qEz7sMX4f`6UxFS1PVb(h5 zW43k8R4#@fAd$UGUb^ghE+nA?xTBS%W8oNn+At@HUfki=G9+?Z29hI(h(DF&nR32-vW0 zS;`zD671b_UWadRUd+fU?95}yz!n7gj3g0gy5*X~cyjA$*VYWH*NgEoj(uahLv~!I wEVs_@&hzV|>1z!<))yC=>Rvo2h z$LMLSA7aDwoShwE{dA0LSihH^Z=+Rqwuip27604VD|GY{ecRb?(y^PKankd+E@Zz+ zcmJ>N4oypnJd4tIgr(^>$Wr8sT=ct{wXiVT>TIX0Nj69}%Iq0u3){y&jMYUP{%>YK zlCPbNxX*^2o`m}O*jL>foz3e~#|W1JS`j3PqjU`UK%@1sQhQw)W!0Tkoc>>~*re(1 zL3iWYO5n?`4f$S|(}Qz;H=b!C+s18rxxHHbn;^GJAS?vW#PJBBBO4IB|LSlJKhV!@K{7qAdiZH*I`23THZ?F=f&wo z$hqoyILT2%mW|OTP5vdcTmb&?HbK6|Nq!&Yx|N+a=@0L+Q@k z5dmY~>zQJ{8v6U9H^&>-5J|+*C`F;D0b%4-JE5E;ixf+wv&zdSgE?M{3lmb_f4O6( ziSYgO)N-UD-H=8E9$f0`zU#V?K@5%%yM{<|Op8LRPhc-ND@buh6>}yq_XpTQJ21I+ z0eK|lbCOY_s6Q^#Tv~bkmDh(}g*Y;D0FNpB8Ycv+(IxV-i;(Jc#m^lI!+MV8xcvP* zJo4q89u{dmA!-bfLA9eEhAra)Zbbei)XjarNm->n+I2}t(ksdwk@uACDX>Q4T0tF| zjGp}@vnhGk$Gz2aE=bmlQM}A$71UCO)z|B|>THU<6xMP)Ytw?R*H*64FAn+41f@5v$Bsz1O<6WN3`npP8P4pGsOM-;mAZ0W9 zi#3abRn(dL1K<;5?IFuBix_7UbDKpyb2j1i%n>kSW^Hd_k z620|FnRq_bF|#ahkJzMtl$MN;C~_4XYCUrlRHvswde-yB#E;aK_OnK(op4XmXOzzN z&_^al2~h@)YW;LK#bt!fsE^T;d-F#%&NJ3yE%OsN26d)0Ca=j6ZBjHxRqr3G#T-Rv z#N1qMkFJX}`gWYsdWV9k)8YSVqJEvb%d5sZ3x!2`)rg$I^d(a~tUTfwVrTEqNqO+D zzk6Kf)Bcv8C2C1qdT@oK4f}vr$Z}>{3EY~$E>F(f@$OPDcV9g9t(Q;STn>6HP^$)W z*oAl<9#~ieBiqi*2It%ZDwCR`T$+(5j1?@95HpoI66MTcCJEeKe;$>^ne4jEj|HE^ z*R!J97+`+3vz;f>iyZr%Cw@;88cZR$$hmvrY43|ZoAhuJy(g>qyIV3GDZ~x4 zm(IlI(#pG+zRs@YKtI*w0fw$_;BuG`$^{wO;CJ?~K7ky?`ZG|)-=ATM*%es|W#|FOfBSytKavPA}u8@nI4MxlEN zT2sB&AA;Moy-`m3?$}#|N@>^EZMSQ4l2Jz`1VtW|W_F19Fj?$T<`@)Ik`($U5g&l7(o-sk(=#zO43p1r-cY+G8rqtbVT7 zty>9TzON(?9Vu>EpQ!u|`BnF=`CVFXn3_Hu`*W()TK*Qbpe{%D$)XDxkwwSnJC`vF zHsHI6ePL*=i(u-)`-i{se@i)uS2vKwz9dP=qPL;9#_3}nw_ewwu)~ixn1{Sgr*Fsh z=4E$()X0;NgsCn}I`CdIq)pSTM68oy6p)bbEHHh9