From 25cc682af60653184c2b1ead04125f63a604dde5 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Sat, 15 Mar 2014 19:32:23 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20206=20fdbozzo=20-=2012/03/2014=202?= =?UTF-8?q?3:52:40:=20-=20Arreglo=20bug=20mnx:=20Al=20usar=20comentarios?= =?UTF-8?q?=20multil=C3=ADnea=20en=20las=20opciones,=20se=20corrompe=20el?= =?UTF-8?q?=20MN2=20y=20el=20MNX=20regenerado=20desde=20=C3=A9l=20(Ryan=20?= =?UTF-8?q?Harris)=20-=20Arreglo=20bug=20mnx:=20Algunos=20procedimientos?= =?UTF-8?q?=20no=20se=20generan=20correctamente=20(Ryan=20Harris)=20-=20Co?= =?UTF-8?q?rrecciones=20al=20archivo=20de=20traducci=C3=B3n=20al=20Ingl?= =?UTF-8?q?=C3=A9s=20foxbin2prg=5Fen.h=20(Ryan=20Harris)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TESTS/DATOS_READONLY/menu2.mn2 | 35 +++++++--- TESTS/DATOS_READONLY/menu2.mnt | Bin 3099 -> 2573 bytes TESTS/DATOS_READONLY/menu2.mnx | Bin 2345 -> 2423 bytes foxbin2prg.prg | 121 +++++++++++++++++++++++++-------- foxbin2prg_en.h | 26 +++---- 5 files changed, 134 insertions(+), 48 deletions(-) diff --git a/TESTS/DATOS_READONLY/menu2.mn2 b/TESTS/DATOS_READONLY/menu2.mn2 index de4e8a9..83c9f55 100644 --- a/TESTS/DATOS_READONLY/menu2.mn2 +++ b/TESTS/DATOS_READONLY/menu2.mn2 @@ -2,7 +2,7 @@ * (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!! * (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! *-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.19" SourceFile="C:\DESA\foxbin2prg\TESTS\DATOS_READONLY\menu2.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) +*< FOXBIN2PRG: Version="1.19" SourceFile="menu2.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) * *5 *APPEND @@ -14,24 +14,24 @@ * DEFINE MENU _MSYSMENU BAR -DEFINE PAD _3Z80ZOKYJ OF _MSYSMENU PROMPT "Opción A con submenú" COLOR SCHEME 3 ; +DEFINE PAD _40Q0H1MMN OF _MSYSMENU PROMPT "Opción A con submenú" COLOR SCHEME 3 ; NEGOTIATE NONE, LEFT ; KEY DEL, "Pulsar " ; SKIP FOR SKIP_FOR() ; - MESSAGE "Mensaje para Opción A con submenú" && Comentario + MESSAGE "Mensaje para Opción A con submenú" && Comentariomultilínearompetodo -ON PAD _3Z80ZOKYJ OF _MSYSMENU ACTIVATE POPUP OpciónA_CS +ON PAD _40Q0H1MMN OF _MSYSMENU ACTIVATE POPUP OpciónA_CS *---------------------------------- DEFINE POPUP OpciónA_CS MARGIN RELATIVE SHADOW COLOR SCHEME 4 DEFINE BAR 1 OF OpciónA_CS PROMPT "Opción A-1" ; - PICTURE "..\..\foxunit\fxuacknowledgements.bmp" + PICTURE "..\..\foxunit\fxuacknowledgements.bmp" && Comentariomultilínearompetodo ON BAR 1 OF OpciónA_CS ACTIVATE POPUP OpciónA1 *---------------------------------- DEFINE POPUP OpciónA1 MARGIN RELATIVE SHADOW COLOR SCHEME 4 DEFINE BAR Shortcut_Menu_Title OF OpciónA1 PROMPT "OpciónA-1-Sub" ; - PICTURE "..\..\foxunit\fxuacknowledgements.bmp" + PICTURE "..\..\foxunit\fxuacknowledgements.bmp" && Comentariomultilínearompetodo ON SELECTION BAR Shortcut_Menu_Title OF OpciónA1 wait window "Ejecuta Comando o función para Opción A-1" DEFINE BAR 2 OF OpciónA_CS PROMPT "Opción A-2" @@ -65,6 +65,11 @@ ON PAD _3Z80ZOKYJ OF _MSYSMENU ACTIVATE POPUP Opci SKIP FOR NOT glEnabled_Opc_A_2_Sub_3 ; PICTRES _mfi_sysprint ; MESSAGE "Message para Opción A-2-Sub.3 (Tipo Bar#)" && Comentarios para Opción A-2-Sub.3 + + DEFINE BAR 3 OF OpciónA_CS PROMPT "Opción A-3" ; + SKIP FOR valor de skip() ; + MESSAGE "un mensaje de texto" && Y este esel nuevo comandodentro de un PROC! + ON SELECTION BAR 3 OF OpciónA_CS ON ERROR **** ON SELECTION POPUP OpciónA_CS *-- PROCEDURE Le cambié el nombre! DEFINE PAD opc_b OF _MSYSMENU PROMPT "Opción B con comando" COLOR SCHEME 3 ; @@ -73,8 +78,8 @@ DEFINE PAD opc_b OF _MSYSMENU PROMPT "Opci MESSAGE "Mensaje para Opción B con Command" && Comentario de la Opción b ON SELECTION PAD opc_b OF _MSYSMENU WAIT WINDOW "Opción B" -ON SELECTION POPUP ALL *- Menu bar procedure -ON SELECTION MENU _MSYSMENU *-- Menu Procedure +ON SELECTION POPUP ALL DO ALL_FB2P +ON SELECTION MENU _MSYSMENU DO SELECTION_MENU__MSYSMENU_FB2P * @@ -86,6 +91,20 @@ PROCEDURE Menu1_Opci *ENDPROC ENDPROC && Menu1_Opción_A_2_Sub_SNIPPET +PROCEDURE ALL_FB2P + *- Menu bar procedure + multilínea + rompetodo + +ENDPROC && ALL_FB2P + +PROCEDURE SELECTION_MENU__MSYSMENU_FB2P + *-- Menu Procedure + multilínea + rompetodo + +ENDPROC && SELECTION_MENU__MSYSMENU_FB2P + * diff --git a/TESTS/DATOS_READONLY/menu2.mnt b/TESTS/DATOS_READONLY/menu2.mnt index 038126205fbb28f2b3a34af0010fc5c45ed071be..7c0ea054fa6553cf1e395f3f275ab6f20ec56cae 100644 GIT binary patch literal 2573 zcmeHI-*4Mg6b@n_W??ZgK$>{iX)4gx%~6t8W16~3Y3f2mV`p}%YEmWZI=(G;b9_D9 zcWwV<9`?i=PaHev+BhAB@d{BACFh>=ogd%%t~(vW>~uOG;phL?e{%vQ_j_BG1yi0V zm}PRoBb9N}SgN=X@wv8J9Rnk!~_Q}#MXEyWPv3+pt*>J>R!Iq);6?hDZT!tCn zXvf0H8hlvN?|Qvce4oinm5Ac>>{7AC>qK6}JUZuP)p;*mriA$!Rj6~^^?#9Bu~0>T z!&AXr6fq}PlU%KV<*Sg4KU^?Tz=cR6c>!Jf6~|BpI30!-kZ`7wYV0ivtbrc5Qg!wc>+d zg&mB7VSw0y?@VShdu|$A4e#Y}*Bwpcb|qKQ2xJ3;Z0DeiYgFf+?$Rn#S-Q>V|B8!M zYeU`1v$kr=X6jCc)IZW&@(Wj$>h@7Bn=q_r@#%Q(9X+!3){vfB#%~>W4(G9*un@Ph zorB_@HwtU(S2ulQEq_7t4%vG*(!4{^NFK^X)r}d!_Ep@Eo;>A!!uh_s8AZ}C_83y0 zNl0as2?inq_C~!U?^}lxN2~kRi{r_h?A>-XrB}PTx&kwp9!>(hT4&zG(c$a6yiKr= z+OTUIzfCESz0DebMV&_g?SD6LrZa9doaOH&O*@*w@=OHzRi0)dDJWf|+uF@_!1g@X zgDrfK+t*!{0P<4Z>=B28Ulvkt?-y@bEHglJ{#vB$;3HuPoPV4-q$6)|1q?}!FiQM hXxG)i_X)Oo5^<=6qiuJu3r8Q_YldGo6W33?@DEe%AyEJT literal 3099 zcmeH}-)qxQ6vsRKfh!iqrh@o#nxgE7Eo(PaWE0vhgW#Ihreg@haFgE7%ruGlLAO8I z2cLZN$$Ro+Np7+V`ns@^o14!)=iKi-=PZ><jw<{z!L~mm5Oq~>T1{{jI=cCY>_A*;ktZ3;5UjftPjr*;_{6n&j^OV!~SG^vLo_qqh|za zaq*UN2)vMo6Sy!%i)buQaicf8%=jvI5FOTGTHX2bO+t>vW*DXjT!)>g$2v*_Iwc*0 z^Myga&-aIXluOOyxuS)YWt&0Z@Sn0e%DzrMdziJtg)aD{-Oo}8w3a6Ae!NkZfUKDW zT*}6UqwZasyVE!C=x)|{G)5P%!hcDIl_unCaHwm8V^3X!fZ+o99{emW4rkE9{bNb4 z-|{|`TFCDL@%#}LBF|b2U3@x~CfUjC7y(|%JsybaVw{~$$7tcNz>>Pic}vY^N9dxS z)`eGE7)$M-g_=5_8LD^fIj&*(S^I2^z)oIjt|{)tva?calxZHh7#vF~`^FfJC7IV8 zf#mz47gntvb@?O|1R^DS$yEN1K=}PYA?!c}41tYe3raZzo~KH}l!AHlg`lyQ2$X+6 nL?Op*M_|}37g~5=v&M(!$}R++opq%NoJsQ0@C<}l>7MWhpi{gW diff --git a/TESTS/DATOS_READONLY/menu2.mnx b/TESTS/DATOS_READONLY/menu2.mnx index be3596eb2c843ae452e54898638a4dab2f348648..2382761d5e0eab08fb876a0a4519195e81bdb809 100644 GIT binary patch literal 2423 zcmeH}ziSjh6vx;6Fi}vkP&5_}qM(H^vwPm9F|gUpC70~X9=CVGHAege0a2TPc7irG z7FNN|#!mbLRBWyM0r>|k>_iYr8SwjNHn+2rHTVZO@Mh=Uci(5;ym@yVKRkZqXb=QT z6B=`MjEx6DHox2-b|ndVAEvSDE2Jmcg4OZ*E?vjUh>+AIrU@^;+sjn9Z=C8tjh(9$f2mD_s2GBOzBEhXekY^m)zk(4{&}(_iw@L_b^0*xNy;Aa9ZdfDAdc$04Bg+K zdh-7W0>&+8s zdSw8rg>V)Xw5ZkkjNoqtak~PtwDah^2(}1AZZ1s>;S)_KH~t77cZlb37?7p8TAM}L z{Tpk)@5ZZ1Ugp*)bECK4Im8lFN8>I{d_o*b$@vy7P&a<2QfFjN_!3E8s_UYC!IB^oGgd}PqBunOt9PrD|CoUGaEa(MNMcW$FL2U zM+@J==hAH5f+?HA2|UZREX_^MqeY}SG<1kANIOyDS_Qe|HcxcOYV`09zuBCS6c z4m77j=(T46ynwx`fNFDdX}jvyn*9R8cNmTB8XBJtf;m_U^G@2h2OphOY|w%gx9}Pt zKEO6%f2-RsXeG_`TQrUTBTn5wyA01V>^AHP%%{D9?>+1*3^eyQB>Vy2h&J;Fy6o34 literal 2345 zcmeHI+iuf95M4@n08xqirBE?~0^+LJO_K-#!gV%HTCW}Aq!0w^1Mq-^5HCFN-TVOO ztey4RwfF*#G?Upmv$H$v*-dBT{MH4f)ObCGu4C=AQrX_Yd^y!5(o;}t^$_xLHY|9A zpWxHTSQ3;u1GV0mKb>V}I=4=9wuO%~W1@7(0JG7;8=dFTzFopxY~hhVE(=Jnf@cjr z$m`)^h79H!i01xsJzq?V1nDOD=6uT+3C*pR`EjD7w48sZWxnMXQ)Vy%)m-01vqO?V zybaY{|4=ViM{MqcZ_WpwM0+{`WgfNg`Qc$4~SLn)Enkl(+CfG5?rR`A-IBp&|wt~hmnNGCST_0l?8GX*+h1P5%}%*Y48Ccc#(xhr4%p!b;u36 zMf_~RP56SIOB+h(HatFpEsTU7t7tf2Z`se!-~RlFj^o@Vk*+Yp?TwGa3PPh&964Zb zem34oB^{&{8aTJkUAjCJA#{l6EzFSwWi}qYJ2$ttUjG3C??E1xbA`W^;>e-eo6T13 zZ5tu3Qa(c~2#rc{}xl>0=jL82_%cTUHw8zgj9C*q(V(W_*g@;5n4g zVHFLBYHv1MRVgD-X|Mkh2DkhQ@`6r?r_>IHd=Pi(cHh)y3)!r!v`D+^-Z$_P5kzQI ziX(?cHZEkdm6rk?61&*K2!;%yZ50g%bjb0}@9&*2y}?(u840Z5bqGBp2%k?ru>$cF zM-G_jXFG9j{Q;kPKD5LPA~Y(c_-| 0 tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) *tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS ENDIF - RETURN + RETURN (ln_AT_Cmt > 0) ENDPROC @@ -10305,9 +10305,11 @@ DEFINE CLASS CL_CUS_BASE AS CUSTOM + [] ; + [] ; + [] ; + + [] ; + [] ; + [] + l_Debug = .F. @@ -10339,6 +10341,27 @@ DEFINE CLASS CL_CUS_BASE AS CUSTOM ENDPROC + PROCEDURE get_SeparatedLineAndComment + *--------------------------------------------------------------------------------------------------- + * PARÁMETROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT) + * tcLine (@! IN/OUT) Línea a separar del comentario + * tcComment (@? OUT) Comentario + *--------------------------------------------------------------------------------------------------- + LPARAMETERS tcLine, tcComment + LOCAL ln_AT_Cmt + tcComment = '' + ln_AT_Cmt = AT( '&'+'&', tcLine) + + IF ln_AT_Cmt > 0 + tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) + *tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS + ENDIF + + RETURN (ln_AT_Cmt > 0) + ENDPROC + + ENDDEFINE @@ -10355,6 +10378,7 @@ DEFINE CLASS CL_COL_BASE AS COLLECTION _MEMBERDATA = [] ; + [] ; + [] ; + + [] ; + [] ; + [] ; + [] @@ -10390,6 +10414,27 @@ DEFINE CLASS CL_COL_BASE AS COLLECTION ENDPROC + PROCEDURE get_SeparatedLineAndComment + *--------------------------------------------------------------------------------------------------- + * PARÁMETROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT) + * tcLine (@! IN/OUT) Línea a separar del comentario + * tcComment (@? OUT) Comentario + *--------------------------------------------------------------------------------------------------- + LPARAMETERS tcLine, tcComment + LOCAL ln_AT_Cmt + tcComment = '' + ln_AT_Cmt = AT( '&'+'&', tcLine) + + IF ln_AT_Cmt > 0 + tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) + *tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS + ENDIF + + RETURN (ln_AT_Cmt > 0) + ENDPROC + + PROCEDURE toText *--------------------------------------------------------------------------------------------------- * PARÁMETROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT) @@ -16672,9 +16717,14 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE lcExpr = loReg.PROCEDURE THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. ) - IF EMPTY(lcProcName) + IF EMPTY(lcProcCode) + *-- Comando lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' ' + lcExpr + CR_LF ELSE + *-- Procedure + IF EMPTY(lcProcName) + lcProcName = CHRTRAN( ALLTRIM( IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) ), ' ', '_' ) + '_FB2P' + ENDIF lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' DO ' + lcProcName + CR_LF tcEndProcedures = tcEndProcedures + STRTRAN( lcProcCode, '<>', lcProcName ) + CR_LF ENDIF @@ -16876,17 +16926,15 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ' COLOR ' ) ), '"', '' ) *-- ANALISIS DEL "DEFINE PAD" - IF ';' $ tcLine + DO CASE + CASE ';' $ tcLine FOR I = I + 1 TO tnCodeLines .set_Line( @tcLine, @taCodeLines, I ) IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe - lnPos = AT( '&'+'&', tcLine ) - IF lnPos > 0 - *-- Busco si tiene comentario - loReg.COMMENT = SUBSTR( tcLine, lnPos + 3 ) - tcLine = LEFT( tcLine, lnPos - 1 ) - lnPos = 0 + *-- Busco si tiene comentario + IF .get_SeparatedLineAndComment( @tcLine, @lcComment ) + loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '', CHR(13) ), '', CHR(10) ) ENDIF ENDIF @@ -16926,7 +16974,12 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE EXIT ENDIF ENDFOR - ENDIF && ';' $ tcLine + + CASE .set_Line( @tcLine, @taCodeLines, I ) AND .get_SeparatedLineAndComment( @tcLine, @lcComment ) + *-- Es un Bar de una sola línea y con comentarios + loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '', CHR(13) ), '', CHR(10) ) + + ENDCASE * Estructuras ejemplo a analizar: @@ -17063,17 +17116,15 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ';', 1, 2 ) ), '"', '' ) *-- ANALISIS DEL "DEFINE BAR" - IF ';' $ tcLine + DO CASE + CASE ';' $ tcLine FOR I = I + 1 TO tnCodeLines .set_Line( @tcLine, @taCodeLines, I ) IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe - lnPos = AT( '&'+'&', tcLine ) - IF lnPos > 0 - *-- Busco si tiene comentario - loReg.COMMENT = SUBSTR( tcLine, lnPos + 3 ) - tcLine = LEFT( tcLine, lnPos - 1 ) - lnPos = 0 + *-- Busco si tiene comentario + IF .get_SeparatedLineAndComment( @tcLine, @lcComment ) + loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '', CHR(13) ), '', CHR(10) ) ENDIF ENDIF @@ -17113,7 +17164,12 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE EXIT ENDIF ENDFOR - ENDIF && ';' $ tcLine + + CASE .set_Line( @tcLine, @taCodeLines, I ) AND .get_SeparatedLineAndComment( @tcLine, @lcComment ) + *-- Es un Bar de una sola línea y con comentarios + loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '', CHR(13) ), '', CHR(10) ) + + ENDCASE IF LEFT(lcBarName,1) == '_' *-- Es un BAR del Sistema, así que no tiene ON BAR ni nada más. @@ -17240,12 +17296,23 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE lcExpr = loReg.PROCEDURE .AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. ) - IF EMPTY(lcProcName) - lcProcName = CHRTRAN( ALLTRIM( STREXTRACT( lcText, 'DEFINE ', 'PROMPT ' ) ), ' ', '_' ) + '_FB2P' - ENDIF + IF EMPTY(lcProcCode) + *-- Comando + IF EMPTY(lcExpr) + lcText = STRTRAN( lcText, 'DO <>', '' ) + ELSE + lcText = STRTRAN( lcText, 'DO <>', lcExpr ) + ENDIF + ELSE - lcText = STRTRAN( lcText, '<>', lcProcName ) - tcEndProcedures = tcEndProcedures + STRTRAN( lcProcCode, '<>', lcProcName ) + CR_LF + *-- Procedure + IF EMPTY(lcProcName) + lcProcName = CHRTRAN( ALLTRIM( STREXTRACT( lcText, 'DEFINE ', 'PROMPT ' ) ), ' ', '_' ) + '_FB2P' + ENDIF + lcProcCode = STRTRAN( lcProcCode, '<>', lcProcName ) + lcText = STRTRAN( lcText, '<>', lcProcName ) + tcEndProcedures = tcEndProcedures + lcProcCode + CR_LF + ENDIF ENDIF @@ -17319,7 +17386,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE ENDIF IF NOT EMPTY(toReg.COMMENT) - lcText = lcText + ' &' + '& ' + toReg.COMMENT + lcText = lcText + ' &' + '& ' + STRTRAN( STRTRAN( toReg.COMMENT, CHR(13), '' ), CHR(10), '' ) ENDIF *-- ON BAR @@ -17412,7 +17479,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE ENDIF IF NOT EMPTY(toReg.COMMENT) - lcText = lcText + ' &' + '& ' + toReg.COMMENT + lcText = lcText + ' &' + '& ' + STRTRAN( STRTRAN( toReg.COMMENT, CHR(13), '' ), CHR(10), '' ) ENDIF lcText = lcText + CR_LF diff --git a/foxbin2prg_en.h b/foxbin2prg_en.h index 2eff952..41b68ee 100644 --- a/foxbin2prg_en.h +++ b/foxbin2prg_en.h @@ -2,38 +2,38 @@ *-- ENGLISH TRANSLATION => RENAME OR COPY TO [foxbin2prg.h] TO USE, AND RECOMPILE FOXBIN2PRG.PRG - Feel free to change or adapt the strings. *-- NOTE: MUST USE DOUBLE QUOTES, OR SYNTAX ERRORS HAPPEN WHEN COMPILING. STRANGE :( *------------------------------------------------------------------------------------------------------------------------------------------- -#DEFINE C_ASTERISK_EXT_NOT_ALLOWED_LOC "* and ? extensions are not allowed because is dangerous (binaries can be overwriten with xx2 empty files)" +#DEFINE C_ASTERISK_EXT_NOT_ALLOWED_LOC "* and ? extensions are not allowed because it's dangerous (binaries can be overwritten with xx2 empty files)" #DEFINE C_BACKLINK_CANT_UPDATE_BL_LOC "Could not update backlink" #DEFINE C_BACKLINK_OF_TABLE_LOC "of table" #DEFINE C_BACKUP_OF_LOC "Doing Backup of: " -#DEFINE C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC "Can not generate file [<>] because it is ReadOnly" +#DEFINE C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC "Cannot generate file [<>] because it is ReadOnly" #DEFINE C_CONFIGFILE_LOC "Using configuration file:" #DEFINE C_CONVERTER_UNLOAD_LOC "Converter unload" #DEFINE C_CONVERTING_FILE_LOC "Converting file" -#DEFINE C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC "Data Error: Cant't parse because unpairing double-quotes on line <>" +#DEFINE C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC "Data Error: Can't parse because of unpaired double-quotes on line <>" #DEFINE C_DUPLICATED_FILE_LOC "Duplicated file" -#DEFINE C_ENDDEFINE_MARKER_NOT_FOUND_LOC "No se ha encontrado el marcador de fin [ENDDEFINE] de la línea <> para el identificador [<>]" -#DEFINE C_END_MARKER_NOT_FOUND_LOC "Can not found end marker [<>] that closes start marker [<>] on line <>" -#DEFINE C_FIELD_NOT_FOUND_ON_FILE_STRUCTURE_LOC "Field [<>] not found on structure of file <>" +#DEFINE C_ENDDEFINE_MARKER_NOT_FOUND_LOC "Cannot find end marker [ENDDEFINE] of line <> for ID [<>]" +#DEFINE C_END_MARKER_NOT_FOUND_LOC "Cannot find end marker [<>] that closes start marker [<>] on line <>" +#DEFINE C_FIELD_NOT_FOUND_ON_FILE_STRUCTURE_LOC "Field [<>] not found in structure of file <>" #DEFINE C_FILE_DOESNT_EXIST_LOC 'File does not exist:' #DEFINE C_FILE_NAME_IS_NOT_SUPPORTED_LOC "File [<<.c_InputFile>>] is not supported" #DEFINE C_FILE_NOT_FOUND_LOC "File not found" #DEFINE C_EXTENSION_RECONFIGURATION_LOC "Extension Reconfiguration:" #DEFINE C_FOXBIN2PRG_ERROR_CAPTION_LOC "FOXBIN2PRG: ERROR!!" #DEFINE C_FOXBIN2PRG_INFO_SINTAX_LOC "FOXBIN2PRG: SYNTAX INFO" -#DEFINE C_FOXBIN2PRG_INFO_SINTAX_EXAMPLE_LOC "FOXBIN2PRG [,cType ,cTextName ,cGenText ,cNoMostrarErrores ,cDebug, cDontShowProgress, cOriginalFileName, cRecompile, cNoTimestamps]" + CR_LF + CR_LF ; - + "Example to generate TXT of all VCX of 'c:\desa\clases', without showing error window and generating LOG file: " + CR_LF ; - + " FOXBIN2PRG 'c:\desa\clases\*.vcx' '0' '0' '0' '1' '1'" + CR_LF + CR_LF ; - + "Example to generate TXT of all VCX of 'c:\desa\clases', without showing error window and without LOG file: " + CR_LF ; - + " FOXBIN2PRG 'c:\desa\clases\*.vc2' '0' '0' '0' '1' '0'" +#DEFINE C_FOXBIN2PRG_INFO_SINTAX_EXAMPLE_LOC "FOXBIN2PRG [,cType ,cTextName ,cGenText ,cDontShowErrors ,cDebug, cDontShowProgress, cOriginalFileName, cRecompile, cNoTimestamps]" + CR_LF + CR_LF ; + + "Example of generating TXT from all VCX in 'c:\development\classes', without showing error window and generating LOG file: " + CR_LF ; + + " FOXBIN2PRG 'c:\development\classes\*.vcx' '0' '0' '0' '1' '1'" + CR_LF + CR_LF ; + + "Example of generating TXT from all VCX is 'c:\development\classes', without showing error window and without LOG file: " + CR_LF ; + + " FOXBIN2PRG 'c:\development\classes\*.vc2' '0' '0' '0' '1' '0'" #DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG is only for Visual FoxPro 9.0!" #DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNING!" -#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<>] is NOT VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU <>" +#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU <>" #DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Object [<>] does not contain oReg object (level <>)" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Names capitalization program [<>] found" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Names capitalization program [<>] not found" #DEFINE C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC "Operation not recognized. Only SETNAME and GETNAME allowed." -#DEFINE C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC "Optimization: Output file [<>] is not overwriten because it is the same as the genereted." +#DEFINE C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC "Optimization: Output file [<>] was not overwritten because it is the same as was generated." #DEFINE C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC "Procedure not closed. Last line of code must be ENDPROC. [<>]" #DEFINE C_PROCESSING_LOC "Processing file" #DEFINE C_PROCESS_PROGRESS_LOC "Process Progress:"