From 659db878849f06ff14d3d45bcd5eaea8ed2ca3a8 Mon Sep 17 00:00:00 2001 From: liranbg Date: Tue, 23 Sep 2014 05:57:35 +0300 Subject: [PATCH] changed translations added more detailes, help, translations and label with link in mainscreen ui --- jceGrade.pro | 4 +- jce_en.qm | Bin 6460 -> 19276 bytes jce_en.ts | 367 +++++++++++++++-------- jce_he.qm | Bin 6190 -> 11422 bytes jce_he.ts | 369 ++++++++++++++++-------- main/LoginTab/loginhandler.cpp | 2 +- main/main.cpp | 2 +- main/mainscreen.cpp | 30 +- main/mainscreen.ui | 19 +- src/jceData/Calendar/calendarDialog.cpp | 2 +- src/jceData/Calendar/calendarDialog.ui | 8 +- 11 files changed, 544 insertions(+), 259 deletions(-) diff --git a/jceGrade.pro b/jceGrade.pro index ad64892..5283ecb 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -6,8 +6,8 @@ QT += core gui network widgets -CONFIG += qt c++11 -CONFIG += console static +CONFIG += qt c++11 static +#CONFIG += console static TARGET = jceManager TEMPLATE = app diff --git a/jce_en.qm b/jce_en.qm index c62920a47825e2ebd6302d5663fb0bf909a410ed..9408f1692d003e86e4e24123d95a47884432ed05 100644 GIT binary patch literal 19276 zcmeHPeQ;dWbw85zWO-Q`Ti9TXfr|__A7jj} z_uk4{NSh8rCUl_8v>m1?&`C*?Od2|Y(sl|{no^o64buh_On~7d#H3){4r$Af=|J1* z@7(*|+YdcCrjhg4S|hLCd-t4s?m6e4&-*t0L}ATyKYi%_f4*Sd-~QUefAhw6q9xZ8 z8IKaJ`yHaOuMw^KG|~7F(U}iW*Vn&JB)&;q&vy~6exJHty&3mSGIm}~wBa}zzyB)H zIggX^v?SVg2QB^SQlid#>5Qpw6LsHB>p%EkqU0Q1diWxut{>6v%kBjJcWL|&a=`br z{#^g>H1Q?ObK%!$viy6%do5*qeuL=jDrIj5{Mmo0KR4v*`oDS-^W8;v$HvN=L}z`q9Dqv-`pSvu^A9uT&rS`;2k*JKqH# z?lVSrWBi7vj6H9G&e4~R>03efRhJpJy@PSvzi-SMe~xv2Xng)Z`iai}lyT1;-@$tR z$awH)+lexd8Gp*~nLE4xu)mXN^9S7z-}E^6@WIk0!$*m(xOwT$^xuKMZ!f*`BfxKZ zuxHZ*@UD8SXX5b>aerw~_P?(n+VV)xEpPl7bf44nt+#&y{wI2#xod)m9$dEP_1`7B zZ2hw9pLdCV<)&qK?EF4apSkRN!+>A+-DPjg;ku_Uv274|QoV^<3jA1kapIoGJ^&wA zC!T!X2fyz)E%EobKELO*@n^3C{~kT9c)>TohqF(6>H+B2w%y4qFHS&D?@p#4-H-X- zOHOQl1@QMKA3kyp^zFsuSHFPu_Ggk$PGVi+aPrBUR}rm$B>C4J9_Y9+`HwZgud4O- zUV0_wd!kpq^$gL#Z}#4HJLGrC>%Cw62H-}n?Y-wo&EHXxC7}CE z3&MDD2@vk1H03CR&oW6e$;1DG@-$6O@OKS=RmsKO0-pPL?x_(D?zyi8OjAYu@8Q!V8zgv`xTeV7O8vMlf>0axF2@s#ZUSqQFTc*qUr z&j52MV*dl_oKvV}(v?iwtC+U%{90LV?H5JI_AmFW+vVVO6@QDqJS45sv_E*w=FMCB zGgH$tkkTRP2C}n-nTN~@mR%CQBX$q(5M$Dou2~jCd9xsAth@*%2$Zhyfuv};o-aH( zBRyZb=>aAqlOCunByd_oBVb6VVIx>Nv&W%Qw5a5WQXj1(3+N49NaFx<=pZ;H)aNFA z?gPh|cYJS>_CzTA#vSLNC!B+u#6DMgo|xRT5aNrKLS`u2A_xI-vj`dW5a=I_kgv=J zs~0=$f+vRj!G&;dS`c>@7)=oG$KXFB!k_g`*FWJ5_eSci6^>a`1jV7MwW=2@yxwRN zVAvE!=CE#o-`ijhv`TAb<@;K3`T4^5cw9+smQ=){QC2tXeBl(8(uC?F^3d6d$tjV; z$Lbqh|xST9mc4{HECTIhVVoL0?Xi8(ls8yB>k=Scmb~f)yX|u(lV}TGx z!5ZF$GwPEU#XDRtaRy8Gam}`d^{S$FaA-JZ@r139k0(_nFdjXKt2E#Qb~S5Zk+#xC zWq*9Y4`SyI01NMQW_S)vN-0J$E33Fpsrd$AS@MA1t45g^!B$`Zm@>f=(ejLK2Gb%j z`v9P{m1s25K8*AzI6K39wQR6=#`G=6-Xtp8bkACz<%_B(On*?MO)>4t;?|ARzF!#} z7${q=Y3E9*lI2fVb1BOi*qxVqP1`I!vSlAsWfB; z88BY{D`pdPJl!e@NTjS94zqB9)0e^u> z!Gpe+6$OVCjw8l#%ySHDcn!Zi`w^^-@4bpoedi@LBUTkq&ClLb>tH#C5)H8*Gk#zk z#n|_N<;NJQaU93^*A(ZDsC6DSj$jO9J{-{VCZ7KY_v#}xZ(mR=3#pAb3_6)+hTxfw zK?X;fxYepx{}bvJ?{GO+aa^ArxQfH_LA=H8+!U$d>}TMw%W^POxe-THTsdnw*!pna z6{Tu<#158Sg}yn$mUD3Kc%oGb$|Q!%R{kKgRP0c5@hISpo@ZqlF<)aC$m*L{K$Cl- zVUsq@258&}i!=h2-y}*7BW)&|L9H2HQt-f=RSVE)7SL^)Z)G@0DzgcDd9dIkK+!4}u;cdI1E5V8${OCIdLR8so+ zvIt>Ll>~<1FA7bPU6|kHaQB7$9@{r0ylE-@c?{<#pM=*#g~HEgaR(dYW)^c?teumN zNJ59C)pH7NvI0goDkjG;9A(&0Y0f?BPLmxUN7ILZlXIZ@lSaj@&)Dn?^^B9i%MndD zBjX5jEq37SSb3{R;OAINyK#XzIih2i%hYMA1Xjkd9NcoK$^j~mXm;K%u65?eW8xio zGo=d)_>oY+;|`oPqNBiDPt__xvRn0}YnwCLPghLOJA@ocTT*596ky6>Wu_$T4$=`WxkoCD8*PrMCzn{j?R zpssR|>nG2=7tXDRF$?3@*)1DLzGl-kFNalk8|NRW(-}qaH>Rik8H6#@(ku*QPL%96 zWw*l!YmuIsxiZ4hC?iEws*>dag)=59qNjeT%nB`iT-@sY0!;hd|Bq>G+m-uOQK$Dw z7}s$P$gN->@_yvKXCwFNhZcnUkn1j-(ddwTJNEeeT&Z8le=%|;o-G||9NUlP8WP)@ zIo!Kk(WC1-^?Z-5W)&-7T3xjswoqJM;*ngcaFNZeR~03$Di!ggD@$>i+kD**GqlD! z&Vy;hUS+FfZ|zsxyg##-BmeESC>!fPnQW}Tr3~aFe7n3LQPffS-k_-31?iS8TW*2r zDLd}q`px)PETSS*PwFDcb0Vh;IjxCYH=H({WVBD0z*)s@s1+>=o zMQhP4ny4oXTjFL*04%US5rCm=LEPx&7|p(fD|;xrL=a1dU0JYvFAj!_S5hU8tOx8z z*(XAuBk1IaoRwv#A`6gS9E#u z(LESF$BT-_cI}w6{J5d()X<93X%1F(Z8N3Qya>FvDb$a{b0+p1Dh{Z^Fp)FLcr{ia zx<*}RCJwM01yn?U(Ns$iCB=N3fql<;^2)V)*YTzM#N z_$t~7@s^cY8-qcx*dRoJiJh`s5o1-W5L;tP0@y(WBT!OvBB1V_&LJ`7#LYHGyI^u= z0|UxRRnHbuxMJgZ5cIGy<2pV6r4`YIG3A;@nA>n^N}H;B<-Q)a`G95P%k>tMVItzv zyX;w*pn_1<*A%woK`F9T1SwExx8_fCR%u05eHGyNZcUgal-J^xbRp_hx<<}L9ob2kVwfD!c_%pc}0ru}30_MQb6Rq7|qa z>(ULEHcJiS>={Stq>8Fc+(HFo=!AvI=G8EM(7ivj{p^_I1OQn9Pb1Sv0HVSo72mU>g9e zvAhF#L99lO+5;?$y4hYiX_srLL?T)qMi0u9u?BnvtW8r&6D_4@Ul6*-tzr$pct3MQ z5ZQdL_(tH#eGYe0*y<08I1~xm4^R$)>dwO0kGMA0ORNIZSVb+xIujg#;zpBoWzCWm zH^~ZBd}!z&MIb$46Cn<)uNAC8$CrhGu}ZEdtk+iR^1y_u0ud{QzQA9=I?nSIo$(fO z1szbkFG^GEOFIx`U~x-J&<%?1h}j|l;|8P$vCH{9Mr-BLS!ct-Ac%TK%FP;Wj#;aV zm_ZkNI8x-ul0B&vdsv1ofuJHfS}QC{FHE7>#ftTKGg_7dMFDWzbIa zxJYhRDxAt4Lhr$;`ocx0xuI{trAiYF;pE#FL8D?@X~wk5sk{z2mVSCNcPp5tT0ea{ zY*j1M&7HcwE<*@waaTksY$I4lx=Q%8IZl&>}xc8`=>6~eBO+|n? z?6%mk*V8@L0S++cvy)AmZd=qxYj?-pW7X+WICZ^-vF@f@U?Oh`d`1d***S(09angm zuCS8ABC%C@Q=8NwL~mNqJZdV?&iYIvSkVp`2?3v=+l0gToWRH-sMQ4S-+=1_Fmc?2 z9m2>geHM52(?}%Tm0&RUUU%8puTk*Y$Y|Kb-*gw;5%EfBcVUtAz(296s# zzh4$n#wx^0rOoX{;r438)h3(gDaRQ%-O>VEVC}p_Ku2$lq0Z_0fP{_MONH$0_Zs&H zZ2gJy#ipT`Hf4a?LS(bg^2lT`-S|q)G=l zZ$kVM0e6qOR>4$3PZJ>tWO(c)8h5`j#tqO`#BGIK6op*5)A4-7@1qW?La{p^dctOk{5-@-xHXO~TC`}dgM(!A zwWtTqNIAs_Z`TBB^Q~ChDzqpnl$?-0x*Z2&wWrPFMd9)C$qLSka9|qCW$dNqQ=NQ5 zhSL%5UDuPDUD!b!jB@tGy>OjH*PCxT8m^z%+7KM-9G;f>gF@vayKEfrv$+AR^LjL zS~%X$piX%Kp_S!RsDL42Y}=JnSF`C;T7JSLp>4qz#e!>2gWbM^&U~y+MXxV(Uv2s%)f-1b=Jurl>U&aa>Z`S_J&!M4Rc<=Xx$=! z!x@@I6NeA*wYh!@-Mi*`JCF(;rgEXWHM_XYud}jVc_&_H@TSqn9ffMQvorq`W@jtF zZe6c3<726|*6w~Fk0(Ylv^+Q*;I%+3okCg>2halm^~On*i*)g;6RiyyoN73L zN^SVYKzMFJpRu)Jmig2*A8XXdP`H#`KSdLo>Xd4H&f!D_kFLM&H441?%tZaf@|6c{ zjxPB1H5}Hp`NdhrZB9P-s4aFY(QQ3l6g@rffL*j~9DSAr9gm#2 z8&&q-w zZ))!g`hENb1p4iE{cR5V;ITfS&o5*-syoON@XINDY@f&R8C!i|d;W2>@YJ|IEXH4P zz~}a=!5P5tJ0|!GPi)*}yrO0)7>K25%$d`()7t``8T?&Y{$%astrMN|;@-T{PS#}55u*|^DKv;jc zO^sHA;*T3jOEk5KHKw+~xG`zdhql^Q2uhpqqa-$|!Dt#1n`lsMjrz@CsAh8K+973iChjK5_AOJ&|D-k!gk~Wszv_2Sny$M9q7Mk|)V{ z@+48(Au=u)iL7_Yxa5cbMKU$j5T!4XX=;hcu}Y>dM53%|D!Z|bDCvFjZ9hb0sUY7R zYFVw+e5?odJT=F)P1-$bIgG;T9rR3u!ycqI>nlX|Qfl-61skRVXI~(4)(Y9n0M2+v znEY;nDD$*%G%kT~s&M?8i^y0lJlF}+)&|3lJ0NbqYZz;+C9-{HIFfJ@ZOStww0cS3 z8g9y0;O{oXm!^IO(?62tR;QsjXq4hykyG;<0<2<`)`6!v2o?-bzC6hZwl%ktu6=3-Zlt)|O9KasL{9Zq2LY$W7IQs<_IKOHKlv2}7j5SjRKzRnwl8r`+h?!&5&21f z+ncZN2EY}2Z{dd^l4*~{b3vT!7pCz9Sz$+YiH%4&<8aSB3t{DsmYuiInZpic!i0`J zaGY4&g7o;BsUM ziS6bZ!T$ONaW5aR`1uV>e!4=gjWmx2=H-7{Txp6p2vAh-5&OcD;?hdTU!pE3D#Y?* zwE-jmC7SvoEKOSoHVChTPu3$nx^7LqmZuS8SnKUma30j-A?zON-`d3rnV+?(fvC!g zATz{*0ZDSoD(Em3B$dFRs8Qk_R#%P#@XdhhqcBMuV$4Ont{|5={|yx(VT9C;u%)P3 z?vqDU-s;Ru3}=W2el7bdf7(~Z+ns5pnRriGSF!#&C`^4DcWoY7lF;$6)TdqN<2jvX zQ-e5KAJdOFebri#gdz7Mf&Y|O$yc__CRXz2g+$4tZzb`9ttFfl56463SQOv-NNH#c zy?8i1IwrZ`{r?OF_3i~}0FjukN*l>uh}R~KVbWq)+5imx=WVOJ(J01AmYApyQTQ>b z&&7t;2PxPu1_xM79*MHva0Km*;q3=q{9y4{{7h*%uPWQcPh{q8n))SF~17e78^6j#`fnhcX!aoSYU*`Y- diff --git a/jce_en.ts b/jce_en.ts index 87fc04c..08621ff 100644 --- a/jce_en.ts +++ b/jce_en.ts @@ -1,42 +1,43 @@ - + CalendarDialog - - Dialog - Dates + + Dates Dialog + Dialog + Dates Dialog - - <h1><b>For The Best CSV Export, Please Enter Correctly - <h1><b>For The Best CSV Export, Please Enter Correctly + + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> - + Semester Starts At: <b>Semester Starts At: - + Semester Ends At: <b>Semester Ends At: - - [ ! ] Start & End cannot be the same - [ ! ] Start & End cannot be set at the same day + + <b>Please chose your dates correctly</b> + <b>Please chose your dates correctly</b> - - - The End of the semester can NOT be equal or before semester begins. - The End of the semester can NOT be equal or before semester begins. + + + The end of the semester can NOT be equal or before the semester begin. + The end of the semester can NOT be equal or before the semester begin. - - + + Looks ok, Press OK Looks ok, Press OK @@ -146,163 +147,152 @@ Export to .CSV - + + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + + + &File &File - + Language Language - + Credits Credits - + Exit Exit - + Hebrew עברית - + English English - + OS Default OS Default - + How To How To - - Connecting - Connecting + + Ready + Ready - - Connected - Connected - - - - Disconnected - Disconnected - - - - &Login - &Login - - - - &Logout - Log&out - - - - - + + + + Error Error - - + + Invalid Dates. +Make Sure everything is correct and try again + Invalid dates. Make sure everything is correct and try again + + + + Not Connected Not Connected - + Missmatching data Missmatching Data - - CREDITS-ROOL-UP1 - + + License: + License: - - CREDITS-ROOL-UP2 - + + Powered By: + powered by: + Powered By: - - CREDITS-ROOL-UP3 - - - - - CREDITS-ROOL-UP4 - - - - - DevBy + + Developed By Developed By - + + Help Guide + Guide + Help Guide + + + Liran Liran Ben Gida - + Sagi Sagi Dayan - - HELP1 - + + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> - - HELP2 - + + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> - - HELP3 - + + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> - - HELP4 - + + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> - - HELP5 - + + <br><li>For exporting your calendar to a .CSV file:<ul><li>Do previous step and continue to next step</li><li> Click on Export to CSV</li><li>Select your dates and click OK</li><li>Once you're Done, go on your calendar and import your csv file</li></li> + <br><li>על מנת לייצא לקובץ CSV<ul><li>חזור על השלב הקודם ורק אז</li><li> לחת על ייצוא לקובץ CSV</li><li>בחר את התאריכים המתאימים ולחץ על אישור</li><li>ברגע שתסיים תוכל הודעה ולאחר מכן תוכל לייבא את הקובץ היכן שתרצה</li></li> - - HELP6 - + + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> - - + + Settings Settings - - - + + + Your settings will take effect next time you start the program Your settings will take effect next time you start the program @@ -310,17 +300,12 @@ QObject - + Exported Successfuly! Exported Successfuly! - - Error on exporting. please check your file system. - Error on exporting. Please check your file system. - - - + Dates not valid Invalid Dates @@ -360,39 +345,50 @@ Additions - + + Logout + Logout + + + + Login + Login + + + Please Check Your Username & Password Please Check Your Username & Password - - You have been blocked by JCE, please try in a couple of minutes. + + You have been <b>BLOCKED</b> by JCE, please try in a couple of minutes. + You have been blocked by JCE, please try in a couple of minutes. You have been <b>blocked</b> by JCE, please try in a couple of minutes. - + Please Check Your Internet Connection. Please Check Your Internet Connection. - + Receive Request Timeout. Receive Request Timeout. - + Send Request Timeout. Send Request Timeout. - + If this message appear without reason, please contact me at liranbg@gmail.com If this message appear without reason, please contact me at liranbg@gmail.com - + Error Error @@ -426,5 +422,150 @@ If this message appear without reason, please contact me at liranbg@gmail.comFriday Friday + + + ConnectionRefusedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + RemoteHostClosedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + HostNotFoundError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketAccessError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketTimeoutError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + NetworkError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslHandshakeFailedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslInternalError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslInvalidUserDataError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + DatagramTooLargeError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + OperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + AddressInUseError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketAddressNotAvailableError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnsupportedSocketOperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyAuthenticationRequiredError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionRefusedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnfinishedSocketOperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionClosedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionTimeoutError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyNotFoundError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyProtocolError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + TemporaryError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnknownSocketError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + Unable to open or create the file. +Exporting Failed + Unable to open or create the file. +Exporting Failed + + + + loginHandler + + + Connecting... + Connecting... + + + + Connected + Connected + + + + Disconnected + Disconnected + + + + Ready. + Ready. + diff --git a/jce_he.qm b/jce_he.qm index 7181de754de3ee9996f6f9b529d9a7dfdc630c15..036e7aca4ae0c2482c8e72c3a7dfbd0cf03e2548 100644 GIT binary patch literal 11422 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 delta 1556 zcmZuvZA?>V6h61yx3{zfYGqVZwp(B*6gwDW(}WOb0gVz|EE`crT!AYPu~*x|tXph0 zV>YwQYS!T#|KNb|XZiz&vPK{2p4Tx=^u`mjvhGkz_T#P2mo?9aR*^l;|_uO-y z^PK0L&o-Yb300hFS#;x%PrHAzFTLmBbBNfNEU(F=Q( zYI~bd-%hn5&9Qt;b?*UqL5wzbZ~*DZZP-U-Opv?rUm{ZuZ9B6Cg#Hw4(`amcBy`6Q zp@AqI33)*{RXBFlNhI2YMB1UbO22MIy@YtK zE)?teo#?5ulpFVtqQOFOV1EM~Hc0C#z6X&FhT=Np>wh%VeSIH|zcFkZPXM_5by*o?U^vIOa& z2j;=XOh{8@J}dY^V6FLwAPV)pX=z1eC|sPjdoQH5zLRdruES)f(^n5Y1aL#TKa@k1 zzBJ>&3m?KJGOiyhMC1MKU=>XP^y^eXZB$B?uuW9SrdXV0Ho+#@ENqDG@ZKADYr^Y0%tmZf$Ew6yRlYlF^61^{ZaO!JSj z&hpC+nRjMcbLMnHllcZlm+JLmS?%6dRA=!GHU}<@vakwG`cVuzcN#Hvlf~xCSe4SX zCYY=!FU|wDC4Ag=QQ&>qEBNP&FYulvm8rM1Wr9K^Jh9|}5WbSrlEPoLm+*V`w+gpl zaZ_4{q>xid8$wa~3`KH`{?#L_Vr}Erkcm8t%KVMMKUCZ1&l*jm` z<;#+GQDKN*TrTpFBF8f|7- VsY7kvp|tP=j+N5;P*x`h{{bxr$8i7v diff --git a/jce_he.ts b/jce_he.ts index d66194d..6b131b2 100644 --- a/jce_he.ts +++ b/jce_he.ts @@ -1,42 +1,43 @@ - + CalendarDialog - - Dialog + + Dates Dialog + Dialog בחירת תאריכים - - <h1><b>For The Best CSV Export, Please Enter Correctly - <h1><b>על מנת לקבל קובץ נכון, הקפד על התאריכים + + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> + <body><p><span style=" font-size:9pt; font-weight:600;">התאריכים הנל נלקחו מהאתר של המכללה. הם תואמים את סמסטר א לשנת 2015.</span></p> - + Semester Starts At: <b> הסמסטר מתחיל ב: - + Semester Ends At: <b>הסמסטר נגמר ב: - - [ ! ] Start & End cannot be the same - [!] התחלה וסוף לא יכולים להיות באותו היום + + <b>Please chose your dates correctly</b> + <b>אנא בחר את הנתונים המתאימים</b> - - - The End of the semester can NOT be equal or before semester begins. - סוף סמסטר לא יכול להיות לפני או באותו היום בו הסמסטר מתחיל. + + + The end of the semester can NOT be equal or before the semester begin. + סוף הסמסטר לא יכול להיות שווה או קודם לתחילתו. - - + + Looks ok, Press OK נראה טוב, לחץ על המשך @@ -52,7 +53,7 @@ Login - כניסה + התחבר @@ -82,7 +83,7 @@ Add - הוסף + הוספה @@ -146,163 +147,152 @@ .CSV ייצא אל קובץ - + + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + <p align="right">נוצר ע"י: <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + + + &File &קובץ - + Language שפה - + Credits קרדיט - + Exit יציאה - + Hebrew עברית - + English English - + OS Default ברירת מחדל - + How To עזרה - - Connecting - מתחבר + + Ready + מוכן - - Connected - מחובר - - - - Disconnected - מנותק - - - - &Login - &התחברות - - - - &Logout - &התנתקות - - - - - + + + + Error שגיאה - - + + Invalid Dates. +Make Sure everything is correct and try again + תאריכים לא חוקיים. אנא בדוק שהנתונים שהוזנו נכונים ונסה מחדשה + + + + Not Connected לא מחובר - + Missmatching data שגיאה בהכנסת נתונים - - CREDITS-ROOL-UP1 - + + License: + רישיון: - - CREDITS-ROOL-UP2 - + + Powered By: + powered by: + מנוע: - - CREDITS-ROOL-UP3 - + + Developed By + - - CREDITS-ROOL-UP4 - + + Help Guide + Guide + תפריט עזרה - - DevBy - פותח על ידי - - - + Liran לירן בן גידה - + Sagi שגיא דיין - - HELP1 - + + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> + <br><li>התחברות: <ul><li>הזן את שם המשתמש והסיסמה ולחץ על התחבר</li><li>בגמר ההתחברות תראה בכדור ירוק בשורת המצב. המשמעות שהינך מחובר לאתר</li></ul></li> - - HELP2 - + + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> + <br><li>קבלת גליון ציונים<ul><li>לחץ על לשונית הציונים</li><li>בחר את טווח התאריכים הרצויים ולחץ על הוספה</li></ul></li> - - HELP3 - + + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> + <br><li>שינוי ממוצע<ul><li>שנה את אחד הציונים שלך בקורס והממוצע ישתנה בהתאם.</li></ul></li> - - HELP4 - + + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> + <br><li>קבלת שעות מערכת<ul><li>לחץ על לשונית שעות מערכת</li><li>בחר את השנה והסמסטר ולחץ על הצג מערכת</li></ul></li> - - HELP5 - + + <br><li>For exporting your calendar to a .CSV file:<ul><li>Do previous step and continue to next step</li><li> Click on Export to CSV</li><li>Select your dates and click OK</li><li>Once you're Done, go on your calendar and import your csv file</li></li> + <br><li>על מנת לייצא לקובץ CSV<ul><li>בצע את השלב הקודם ואז</li><li> לחץ על ייצוא לCSV</li><li>בחר את התאריכים המתאימים ולחץ אישור</li><li>לאחר השלמת הפעולה תוכל לייבא את המערכת שעות</li></li> - - HELP6 - + + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> + <b>לעוד מידע: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> - - + + Settings הגדרות - - - + + + Your settings will take effect next time you start the program ההגדרות שלך ייכנסו לתוקפן בפעם הבאה שתפעיל את התוכנה @@ -310,17 +300,12 @@ QObject - + Exported Successfuly! הייצוא הושלם! - - Error on exporting. please check your file system. - טעות בעת ייצוא הקובץ. אנא בדוק אם הקובץ פתוח. - - - + Dates not valid תאריכים לא חוקיים @@ -360,39 +345,50 @@ תוספת - + + Logout + התנתק + + + + Login + התחבר + + + Please Check Your Username & Password אנא בדוק את שם המשתמש והסיסמה שלך - - You have been blocked by JCE, please try in a couple of minutes. - נחסמת ע"י האתר, אנא נסה מאוחר יותר. + + You have been <b>BLOCKED</b> by JCE, please try in a couple of minutes. + You have been blocked by JCE, please try in a couple of minutes. + אתה <b>נחסמת</b> על ידי האתר. אנא נסה מאוחר יותר. - + Please Check Your Internet Connection. בדוק את החיבור שלך לאינטרנט. - + Receive Request Timeout. בקשת קבלה נכשלה. - + Send Request Timeout. בקשת שליחה נכשלה. - + If this message appear without reason, please contact me at liranbg@gmail.com אם הודעה זו חוזרת על עצמה ללא סיבה. אנא פנה אל המפתח במייל liranbg@gmail.com - + Error שגיאה @@ -426,5 +422,150 @@ If this message appear without reason, please contact me at liranbg@gmail.comFriday שישי + + + ConnectionRefusedError + + + + + RemoteHostClosedError + + + + + HostNotFoundError + + + + + SocketAccessError + + + + + SocketTimeoutError + + + + + NetworkError + + + + + SslHandshakeFailedError + + + + + SslInternalError + + + + + SslInvalidUserDataError + + + + + DatagramTooLargeError + + + + + OperationError + + + + + AddressInUseError + + + + + SocketAddressNotAvailableError + + + + + UnsupportedSocketOperationError + + + + + ProxyAuthenticationRequiredError + + + + + ProxyConnectionRefusedError + + + + + UnfinishedSocketOperationError + + + + + ProxyConnectionClosedError + + + + + ProxyConnectionTimeoutError + + + + + ProxyNotFoundError + + + + + ProxyProtocolError + + + + + TemporaryError + + + + + UnknownSocketError + + + + + Unable to open or create the file. +Exporting Failed + לא ניתן ליצור את הקובץ. +היצוא נכשל + + + + loginHandler + + + Connecting... + מתחבר... + + + + Connected + מחובר + + + + Disconnected + מנותק + + + + Ready. + מוכן. + diff --git a/main/LoginTab/loginhandler.cpp b/main/LoginTab/loginhandler.cpp index 1a46f7e..50d75fa 100644 --- a/main/LoginTab/loginhandler.cpp +++ b/main/LoginTab/loginhandler.cpp @@ -70,7 +70,7 @@ bool loginHandler::makeConnection() } case jceLogin::ERROR_ON_VALIDATION_USER_BLOCKED: { - popMessage(QObject::tr("You have been blocked by JCE, please try in a couple of minutes.")); + popMessage(QObject::tr("You have been BLOCKED by JCE, please try in a couple of minutes.")); return false; } case jceLogin::ERROR_ON_OPEN_SOCKET: diff --git a/main/main.cpp b/main/main.cpp index 86349e5..ef2dd6d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) #ifdef QT_DEBUG // Incase QtCreator is in Debug mode all qDebug messages will go to terminal qDebug() << "Running a debug build"; #else // If QtCreator is on Release mode , qDebug messages will be logged in a log file. - qDebug() << "Running a release build"; +// qDebug() << "Running a release build"; qInstallMessageHandler(jce_logger::customMessageHandler); #endif diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 6962b0a..93fae86 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -251,16 +251,15 @@ void MainScreen::on_actionCredits_triggered() { qDebug() << Q_FUNC_INFO; QMessageBox::about(this, "About", - tr("Jce Manager")+ - "v1.0.0

" + "Jce Manager v1.0.0

" +tr("License:")+ "
GNU LESSER GENERAL PUBLIC LICENSE V2.1
" +"
"+ "JceManager Repository"+ "

" - +tr("powered by: ")+ - "Jce Connection

" - +tr("DevBy")+ + +tr("Powered By: ")+ + " Jce Connection

" + +tr("Developed By")+ ":" @@ -276,18 +275,15 @@ void MainScreen::on_actionHow_To_triggered() qDebug() << Q_FUNC_INFO; QMessageBox::information(this,"How To", "" - +tr("Guide")+ - "

  • " - +tr("login")+ - "

  • " - +tr("get gpa")+ - "

  • " - +tr("changing gpa")+ - "

  • " - +tr("getting calendar")+ - "

  • " - +tr("exporting")+ - "
"); + +tr("Help Guide")+ + "
    " + +tr("
  • Login:
    • Type your username and password and click Login.
    • Once you are connected, you will see a green ball in the right buttom panel.
    • ") + +tr("
  • Getting GPA sheet
    • Click on GPA Tab
    • Select your dates and click on Add
    • ") + +tr("
  • Average Changing
    • Change one of your grade and see the average in the buttom panel changing.
    • ") + +tr("
  • Getting Calendar
    • Click on Calendar Tab
    • Select your dates and click on Get Calendar
    • ") + +tr("
  • For exporting your calendar to a .CSV file:
    • Do previous step and continue to next step
    • Click on Export to CSV
    • Select your dates and click OK
    • Once you're Done, go on your calendar and import your csv file
      • ")+ + "

      " + +tr("For more information, please visit us at: Jce Manager site")); } void MainScreen::on_actionHebrew_triggered() { diff --git a/main/mainscreen.ui b/main/mainscreen.ui index 26b8404..8773bc0 100644 --- a/main/mainscreen.ui +++ b/main/mainscreen.ui @@ -61,7 +61,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r QTabWidget::Rounded - 0 + 2 false @@ -519,10 +519,10 @@ font-size: 15px; 2008 - 2015 + 2016 - 2014 + 2015 @@ -566,13 +566,13 @@ font-size: 15px; - 2012 + 2013 2020 - 2014 + 2015 @@ -585,7 +585,7 @@ font-size: 15px; 3 - 2 + 1 @@ -626,6 +626,13 @@ font-size: 15px; + + + + <p align="center">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + + + diff --git a/src/jceData/Calendar/calendarDialog.cpp b/src/jceData/Calendar/calendarDialog.cpp index 3d8eb2e..7bbeaf7 100644 --- a/src/jceData/Calendar/calendarDialog.cpp +++ b/src/jceData/Calendar/calendarDialog.cpp @@ -57,7 +57,7 @@ void CalendarDialog::on_calEnd_selectionChanged() if(ui->calStart->selectedDate() >= ui->calEnd->selectedDate()) { changeLabeStatusIcon(false); - ui->lbl_status->setText(tr("The end of the semester can NOT be equal or before semester begins.")); + ui->lbl_status->setText(tr("The end of the semester can NOT be equal or before the semester begin.")); this->isOK = false; } else diff --git a/src/jceData/Calendar/calendarDialog.ui b/src/jceData/Calendar/calendarDialog.ui index d42da7e..982512f 100644 --- a/src/jceData/Calendar/calendarDialog.ui +++ b/src/jceData/Calendar/calendarDialog.ui @@ -11,15 +11,15 @@ - Dialog + Dates Dialog - + 10 10 - 551 - 235 + 613 + 263