Mercurial > public > mk2
changeset 446:92304826000d
localisation part2 from Sergei
| author | heinrichsweikamp |
|---|---|
| date | Sat, 13 Aug 2011 09:45:53 +0200 |
| parents | 6e57b5bb98ce |
| children | b63a90a87fe2 |
| files | code_part1/OSTC_code_asm_part1/aa_font28_idx_rus.inc code_part1/OSTC_code_asm_part1/aa_font28_rus.inc code_part1/OSTC_code_asm_part1/aa_fonts.asm code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/spanish_text.asm |
| diffstat | 9 files changed, 386 insertions(+), 132 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/aa_font28_idx_rus.inc Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/aa_font28_idx_rus.inc Sat Aug 13 09:45:53 2011 +0200 @@ -1,5 +1,5 @@ ;========================================================================== -; Font index exported by fontconv.php 1.00 2011-08-04 03:58:46 rvs $ +; Font index exported by fontconv.php 1.00 2011-08-13 04:05:47 rvs $ ;========================================================================== aa_font28_chars EQU .151 aa_font28_firstChar EQU ' '
--- a/code_part1/OSTC_code_asm_part1/aa_font28_rus.inc Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/aa_font28_rus.inc Sat Aug 13 09:45:53 2011 +0200 @@ -1,5 +1,5 @@ ;========================================================================== -; Font data exported by fontconv.php 1.00 2011-08-04 03:58:46 rvs $ +; Font data exported by fontconv.php 1.00 2011-08-13 04:05:47 rvs $ ;========================================================================== aa_font28_height EQU .24 aa_font28_width EQU .14 @@ -568,7 +568,7 @@ DB 0x85, 0x01, 0x84, 0x01, 0x86, 0x01, 0x85, 0x01 DB 0x84, 0x01, 0x86, 0x01, 0x85, 0x01, 0x84, 0x01 DB 0x86, 0x01, 0x85, 0x01, 0x84, 0x01, 0x86, 0x01 - DB 0x85, 0x01, 0x85, 0x01, 0x84, 0x02, 0x85, 0x01 + DB 0x85, 0x01, 0x84, 0x02, 0x84, 0x02, 0x85, 0x01 DB 0x85, 0x08, 0x8F, 0x06, 0x9E ; Г 81 DB 0xC8, 0x11, 0x85, 0x11, 0x85, 0x01, 0x95, 0x01 @@ -809,9 +809,9 @@ DB 0x95, 0x01, 0x95, 0x01, 0x95, 0x0C, 0x8A, 0x0C DB 0xB4 ; м A6 - DB 0x85, 0x0C, 0x8A, 0x0C, 0x8B, 0x01, 0x96, 0x01 - DB 0x96, 0x01, 0x96, 0x01, 0x96, 0x01, 0x94, 0x01 - DB 0x94, 0x01, 0x94, 0x01, 0x94, 0x01, 0x94, 0x0C + DB 0x85, 0x0C, 0x8A, 0x0C, 0x8B, 0x03, 0x95, 0x03 + DB 0x95, 0x03, 0x95, 0x03, 0x95, 0x02, 0x92, 0x03 + DB 0x91, 0x03, 0x91, 0x03, 0x91, 0x03, 0x92, 0x0C DB 0x8A, 0x0C, 0x9C ; н A7 DB 0xB5, 0x0C, 0x8A, 0x0C, 0x8F, 0x01, 0x95, 0x01
--- a/code_part1/OSTC_code_asm_part1/aa_fonts.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/aa_fonts.asm Sat Aug 13 09:45:53 2011 +0200 @@ -145,6 +145,7 @@ endif ;---- MEDIUM font description and data --------------------------------------- +#ifndef RUSSIAN aa_font48_block: DB 0x27, 0x3B ; ' char DB '"', 0x3C @@ -159,6 +160,22 @@ #include "aa_font48_idx.inc" #include "aa_font48.inc" aa_font48_end: +#else +aa_font48_block: + DB 0x27, 0x3B + DB 0x22, 0x3C + DB 0xEC, 0x3D + DB 0x20, 0x3E + DB 0 ; End of translation table + DB aa_font48_firstChar ; To be substracted + DB aa_font48_chars ; Max value + DB 0x3E-aa_font48_firstChar + DB aa_font48_height + 0x80 +; +#include "aa_font48_idx_rus.inc" ; SHOULD FOLLOW ! +#include "aa_font48_rus.inc" +aa_font48_end: +#endif ; Make sure this is coherent... if aa_font48_nbbits != 3 error MEDIUM fount should be encoded with 3bits anti-aliasing...
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sat Aug 13 09:45:53 2011 +0200 @@ -20,6 +20,7 @@ ; 2007/10/13 : Initial version by Matthias Heinrichs, info@heinrichsweikamp.com ; 2008/05/24 : MW. ; 2011/02/02 : Jean-Do Gascuel : split into different files for multi-lingual support +; 2011/08/12 : Sergei V. Rozinov: Complete translation patch ; ; known bugs: ; ToDo: @@ -56,47 +57,68 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= -; Define's section -; Definition "translation" ; English original +; Define's section +; Definition translation ; English original #IFNDEF TXT_DEFINED #DEFINE TXT_DEFINED -#DEFINE TXT_GAS_C 'G' ; 'G' -#DEFINE TXT_METER_C 'm' ; 'm' -#DEFINE TXT_METER5 "m " ; "m " -#DEFINE TXT_METER3 "m " ; "m " -#DEFINE TXT_METER2 "m " ; "m " -#DEFINE TXT_METER1 "m" ; "m" -#DEFINE TXT_MBAR7 " mbar " ; " mbar " -#DEFINE TXT_MBAR5 "mbar " ; "mbar " -#DEFINE TXT_BAR4 "bar " ; "bar " -#DEFINE TXT_ALT5 "Alt: " ; "Alt: " -#DEFINE TXT_KGL4 "kg/l" ; "kg/l" -#DEFINE TXT_VOLT1 "V" ; "V" -#DEFINE TXT_STEP5 "Step:" ; "Step:" -#DEFINE TXT_CF2 "CF" ; "CF" -#DEFINE TXT_O2_4 "O2: " ; "O2: " -#DEFINE TXT_O2_3 "O2 " ; "O2 " -#DEFINE TXT_AIR4 "AIR " ; "AIR " -#DEFINE TXT_ERR4 "ERR " ; "ERR " -#DEFINE TXT_HE4 "He: " ; "He: " -#DEFINE TXT_NX3 "NX " ; "NX " -#DEFINE TXT_TX3 "TX " ; "TX " -#DEFINE TXT_IN4 " in " ; " in " -#DEFINE TXT_G1_3 "G1:" ; "G1:" -#DEFINE TXT_G2_3 "G2:" ; "G2:" -#DEFINE TXT_G3_3 "G3:" ; "G3:" -#DEFINE TXT_G4_3 "G4:" ; "G4:" -#DEFINE TXT_G5_3 "G5:" ; "G5:" -#DEFINE TXT_G6_3 "G6:" ; "G6:" -#DEFINE TXT_1ST4 "1st:" ; "1st:" -#DEFINE TXT_CNS4 "CNS:" ; "CNS:" -#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" -#DEFINE TXT_AVR4 "Avr:" ; "Avr:" -#DEFINE TXT_GF3 "GF:" ; "GF:" -#DEFINE TXT_SAT4 "Sat:" ; "Sat:" - -#ENDIF +#DEFINE TXT_GAS_C 'G' ; 'G' +#DEFINE TXT_GAS1 "G" ; "G" +#DEFINE TXT_METER_C 'm' ; 'm' +#DEFINE TXT_METER5 "m " ; "m " +#DEFINE TXT_METER3 "m " ; "m " +#DEFINE TXT_METER2 "m " ; "m " +#DEFINE TXT_METER1 "m" ; "m" +#DEFINE TXT_MBAR7 " mbar " ; " mbar " +#DEFINE TXT_MBAR5 "mbar " ; "mbar " +#DEFINE TXT_BAR4 "bar " ; "bar " +#DEFINE TXT_BAR3 "bar" ; "bar" +#DEFINE TXT_ALT5 "Alt: " ; "Alt: " +#DEFINE TXT_KGL4 "kg/l" ; "kg/l" +#DEFINE TXT_VOLT2 "V " ; "V " +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_CF2 "CF" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " in " ; " in " +#DEFINE TXT_G1_3 "G1:" ; "G1:" +#DEFINE TXT_G2_3 "G2:" ; "G2:" +#DEFINE TXT_G3_3 "G3:" ; "G3:" +#DEFINE TXT_G4_3 "G4:" ; "G4:" +#DEFINE TXT_G5_3 "G5:" ; "G5:" +#DEFINE TXT_G6_3 "G6:" ; "G6:" +#DEFINE TXT_1ST4 "1st:" ; "1st:" +#DEFINE TXT_CNS4 "CNS:" ; "CNS:" +#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Avr:" ; "Avr:" +#DEFINE TXT_GF3 "GF:" ; "GF:" +#DEFINE TXT_SAT4 "Sat:" ; "Sat:" +#DEFINE TXT_0MIN5 "0min " ; "0min " +#DEFINE TXT_MIN4 "min " ; "min " +#DEFINE TXT_BSAT5 "BSat:" ; "BSat:" +#DEFINE TXT_BDES5 "BDes:" ; "BDes:" +#DEFINE TXT_LAST5 "Last:" ; "Last:" +#DEFINE TXT_GFLO6 "GF_lo:" ; "GF_lo:" +#DEFINE TXT_GFHI6 "GF_hi:" ; "GF_hi:" +#DEFINE TXT_PPO2_5 "ppO2:" ; "ppO2:" +#DEFINE TXT_OC_O1 "O" ; "O" +#DEFINE TXT_OC_C1 "C" ; "C" +#DEFINE TXT_CC_C1_1 "C" ; "C" +#DEFINE TXT_CC_C2_1 "C" ; "C" +#DEFINE TXT_GF_G1 "G" ; "G" +#DEFINE TXT_GF_F1 "F" ; "F" +#DEFINE TXT_SP2 "SP" ; "SP" +#DEFINE TXT_DIL4 "Dil:" ; "Dil:" +#DEFINE TXT_N2_2 "N2" ; "N2" +#DEFINE TXT_HE2 "He" ; "He" + +#ENDIF ;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Building MD2 Hash" ;001 Building MD2 Hash
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sat Aug 13 09:45:53 2011 +0200 @@ -57,6 +57,69 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= +; Define's section +; Definition translation ; English original +#IFNDEF TXT_DEFINED +#DEFINE TXT_DEFINED + +#DEFINE TXT_GAS_C 'G' ; 'G' +#DEFINE TXT_GAS1 "G" ; "G" +#DEFINE TXT_METER_C 'm' ; 'm' +#DEFINE TXT_METER5 "m " ; "m " +#DEFINE TXT_METER3 "m " ; "m " +#DEFINE TXT_METER2 "m " ; "m " +#DEFINE TXT_METER1 "m" ; "m" +#DEFINE TXT_MBAR7 " mbar " ; " mbar " +#DEFINE TXT_MBAR5 "mbar " ; "mbar " +#DEFINE TXT_BAR4 "bar " ; "bar " +#DEFINE TXT_BAR3 "bar" ; "bar" +#DEFINE TXT_ALT5 "Alt: " ; "Alt: " +#DEFINE TXT_KGL4 "kg/l" ; "kg/l" +#DEFINE TXT_VOLT2 "V " ; "V " +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_CF2 "CF" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " in " ; " in " +#DEFINE TXT_G1_3 "G1:" ; "G1:" +#DEFINE TXT_G2_3 "G2:" ; "G2:" +#DEFINE TXT_G3_3 "G3:" ; "G3:" +#DEFINE TXT_G4_3 "G4:" ; "G4:" +#DEFINE TXT_G5_3 "G5:" ; "G5:" +#DEFINE TXT_G6_3 "G6:" ; "G6:" +#DEFINE TXT_1ST4 "1st:" ; "1st:" +#DEFINE TXT_CNS4 "CNS:" ; "CNS:" +#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Avr:" ; "Avr:" +#DEFINE TXT_GF3 "GF:" ; "GF:" +#DEFINE TXT_SAT4 "Sat:" ; "Sat:" +#DEFINE TXT_0MIN5 "0min " ; "0min " +#DEFINE TXT_MIN4 "min " ; "min " +#DEFINE TXT_BSAT5 "BSat:" ; "BSat:" +#DEFINE TXT_BDES5 "BDes:" ; "BDes:" +#DEFINE TXT_LAST5 "Last:" ; "Last:" +#DEFINE TXT_GFLO6 "GF_lo:" ; "GF_lo:" +#DEFINE TXT_GFHI6 "GF_hi:" ; "GF_hi:" +#DEFINE TXT_PPO2_5 "ppO2:" ; "ppO2:" +#DEFINE TXT_OC_O1 "O" ; "O" +#DEFINE TXT_OC_C1 "C" ; "C" +#DEFINE TXT_CC_C1_1 "C" ; "C" +#DEFINE TXT_CC_C2_1 "C" ; "C" +#DEFINE TXT_GF_G1 "G" ; "G" +#DEFINE TXT_GF_F1 "F" ; "F" +#DEFINE TXT_SP2 "SP" ; "SP" +#DEFINE TXT_DIL4 "Dil:" ; "Dil:" +#DEFINE TXT_N2_2 "N2" ; "N2" +#DEFINE TXT_HE2 "He" ; "He" + +#ENDIF +;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Calcul du hash MD2" ;001 Building MD2 Hash TCODE .0, .25, "Attendez SVP..." ;002 Please Wait...
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sat Aug 13 09:45:53 2011 +0200 @@ -57,6 +57,69 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= +; Define's section +; Definition translation ; English original +#IFNDEF TXT_DEFINED +#DEFINE TXT_DEFINED + +#DEFINE TXT_GAS_C 'G' ; 'G' +#DEFINE TXT_GAS1 "G" ; "G" +#DEFINE TXT_METER_C 'm' ; 'm' +#DEFINE TXT_METER5 "m " ; "m " +#DEFINE TXT_METER3 "m " ; "m " +#DEFINE TXT_METER2 "m " ; "m " +#DEFINE TXT_METER1 "m" ; "m" +#DEFINE TXT_MBAR7 " mbar " ; " mbar " +#DEFINE TXT_MBAR5 "mbar " ; "mbar " +#DEFINE TXT_BAR4 "bar " ; "bar " +#DEFINE TXT_BAR3 "bar" ; "bar" +#DEFINE TXT_ALT5 "Alt: " ; "Alt: " +#DEFINE TXT_KGL4 "kg/l" ; "kg/l" +#DEFINE TXT_VOLT2 "V " ; "V " +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_CF2 "CF" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " in " ; " in " +#DEFINE TXT_G1_3 "G1:" ; "G1:" +#DEFINE TXT_G2_3 "G2:" ; "G2:" +#DEFINE TXT_G3_3 "G3:" ; "G3:" +#DEFINE TXT_G4_3 "G4:" ; "G4:" +#DEFINE TXT_G5_3 "G5:" ; "G5:" +#DEFINE TXT_G6_3 "G6:" ; "G6:" +#DEFINE TXT_1ST4 "1st:" ; "1st:" +#DEFINE TXT_CNS4 "CNS:" ; "CNS:" +#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Avr:" ; "Avr:" +#DEFINE TXT_GF3 "GF:" ; "GF:" +#DEFINE TXT_SAT4 "Sat:" ; "Sat:" +#DEFINE TXT_0MIN5 "0min " ; "0min " +#DEFINE TXT_MIN4 "min " ; "min " +#DEFINE TXT_BSAT5 "BSat:" ; "BSat:" +#DEFINE TXT_BDES5 "BDes:" ; "BDes:" +#DEFINE TXT_LAST5 "Last:" ; "Last:" +#DEFINE TXT_GFLO6 "GF_lo:" ; "GF_lo:" +#DEFINE TXT_GFHI6 "GF_hi:" ; "GF_hi:" +#DEFINE TXT_PPO2_5 "ppO2:" ; "ppO2:" +#DEFINE TXT_OC_O1 "O" ; "O" +#DEFINE TXT_OC_C1 "C" ; "C" +#DEFINE TXT_CC_C1_1 "C" ; "C" +#DEFINE TXT_CC_C2_1 "C" ; "C" +#DEFINE TXT_GF_G1 "G" ; "G" +#DEFINE TXT_GF_F1 "F" ; "F" +#DEFINE TXT_SP2 "SP" ; "SP" +#DEFINE TXT_DIL4 "Dil:" ; "Dil:" +#DEFINE TXT_N2_2 "N2" ; "N2" +#DEFINE TXT_HE2 "He" ; "He" + +#ENDIF +;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Erstelle MD2 Hash" ;001 Building MD2 Hash TCODE .0, .25, "Bitte warten..." ;002 Please Wait...
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sat Aug 13 09:45:53 2011 +0200 @@ -470,7 +470,7 @@ lfsr FSR2,letter movff char_O_first_deco_depth,lo ; Ceiling in m output_99 - PUTC 'm' + PUTC TXT_METER_C movff char_O_first_deco_time,lo ; length of first stop in m output_99 STRCAT_PRINT "'" @@ -508,7 +508,7 @@ WIN_FONT FT_SMALL PLED_color_code warn_gf ; Color-code Output - STRCPY "GF:" + STRCPY TXT_GF3 movff char_O_gradient_factor,lo ; gradient factor output_8 STRCAT_PRINT "% " @@ -539,7 +539,7 @@ PLED_simulator_data_1: bsf leftbind output_8 - STRCAT "0min " + STRCAT TXT_0MIN5 PLED_simulator_data_2: call word_processor @@ -552,7 +552,7 @@ movff sim_btm_time,lo bsf leftbind output_8 - STRCAT_PRINT "min " + STRCAT_PRINT TXT_MIN4 ;---- Updates depth line ------------------------------------------------- WIN_TOP .125 @@ -562,7 +562,7 @@ movff sim_btm_depth,lo bsf leftbind output_8 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER3 bcf leftbind return @@ -726,7 +726,7 @@ WIN_FONT FT_SMALL WIN_INVERT .0 ; Init new Wordprocessor call PLED_standard_color - STRCPY "BSat:" + STRCPY TXT_BSAT5 GETCUSTOM8 d'11' movwf lo @@ -735,7 +735,7 @@ STRCAT_PRINT "%" WIN_TOP .50 - STRCPY "BDes:" + STRCPY TXT_BDES5 GETCUSTOM8 d'12' movwf lo @@ -745,12 +745,12 @@ PLED_show_cf11_cf12_cf29_2: WIN_TOP .75 - STRCPY "Last:" + STRCPY TXT_LAST5 GETCUSTOM8 d'29' movwf lo bsf leftbind output_8 - STRCAT_PRINT "m" + STRCAT_PRINT TXT_METER1 bcf leftbind return @@ -764,7 +764,7 @@ GETCUSTOM8 d'32' ; GF_lo movwf lo - STRCPY "GF_lo:" + STRCPY TXT_GFLO6 bsf leftbind output_8 STRCAT_PRINT "%" @@ -772,7 +772,7 @@ WIN_TOP .50 GETCUSTOM8 d'33' ; GF_hi movwf lo - STRCPY "GF_hi:" + STRCPY TXT_GFHI6 bsf leftbind output_8 STRCAT_PRINT "%" @@ -1066,7 +1066,7 @@ WIN_LEFT .0 WIN_FONT FT_SMALL PLED_color_code warn_ppo2 ; Color-code output (ppO2 stored in xC) - STRCPY "ppO2:" + STRCPY TXT_PPO2_5 ; Check very high ppO2 manually tstfsz xC+2 ; char_I_O2_ratio * p_amb/10 > 65536, ppO2>6,55bar? @@ -1214,10 +1214,10 @@ ;ZH-L16 WIN_TOP .125 - STRCPY_PRINT "O" + STRCPY_PRINT TXT_OC_O1 WIN_TOP .150 - STRCPY_PRINT "C" + STRCPY_PRINT TXT_OC_C1 return show_decotype_surface2: @@ -1235,10 +1235,14 @@ WIN_TOP .125 call PLED_standard_color - STRCPY_PRINT "C" + STRCPY_PRINT TXT_CC_C1_1 WIN_TOP .150 +#IF TXT_CC_C1_1 == TXT_CC_C2_1 call word_processor ; Twice the same string. +#ELSE + STRCPY_PRINT TXT_CC_C2_1 +#ENDIF return show_decotype_surface4: @@ -1255,10 +1259,10 @@ bra show_decotype_surface6 ; Multi-GF OC WIN_TOP .125 - STRCPY_PRINT "G" + STRCPY_PRINT TXT_GF_G1 WIN_TOP .150 - STRCPY_PRINT "F" + STRCPY_PRINT TXT_GF_F1 return ;----------------------------------------------------------------------------- @@ -1327,7 +1331,7 @@ movlw d'4' addwf wait_temp,F ; Increase eeprom address for gas list - STRCPY "G" + STRCPY TXT_GAS1 movff hi,lo ; copy gas number output_8 ; display gas number STRCAT ": " @@ -1386,7 +1390,7 @@ WIN_LEFT .90 movff waitms_temp,win_top ; Set Row - STRCPY "SP" + STRCPY TXT_SP2 movff apnoe_mins,lo ; copy gas number output_8 ; display gas number STRCAT ": " @@ -1416,7 +1420,7 @@ WIN_LEFT .90 WIN_TOP .100 - STRCPY "Dil:" + STRCPY TXT_DIL4 output_8 ; O2 Ratio PUTC '/' movff hi,lo @@ -1452,7 +1456,7 @@ output_16dp d'3' ; outputs into Postinc2! bcf leftbind - STRCAT_PRINT "bar" + STRCAT_PRINT TXT_BAR3 bra PLED_active_gas_surfmode_exit PLED_active_gas_surfmode2: @@ -1841,7 +1845,7 @@ bsf leftbind output_16 bcf leftbind - STRCAT_PRINT "mbar " + STRCAT_PRINT TXT_MBAR5 call PLED_standard_color ; Reset color return @@ -1884,7 +1888,7 @@ bsf leftbind output_16dp d'2' ; e.g. 3.45V bcf leftbind - STRCAT_PRINT "V " + STRCAT_PRINT TXT_VOLT2 return update_batt_voltage2: @@ -2298,7 +2302,7 @@ bsf ignore_digit5 ; do not display 1cm depth output_16dp d'3' bcf leftbind - STRCAT_PRINT "m" + STRCAT_PRINT TXT_METER1 return PLED_stopwatch_show_gauge: @@ -2347,7 +2351,7 @@ bsf ignore_digit5 ; do not display 1cm depth output_16dp d'3' bcf leftbind - STRCAT_PRINT "m" + STRCAT_PRINT TXT_METER1 WIN_FONT FT_SMALL ; Reset... return @@ -2370,7 +2374,7 @@ bsf ignore_digit5 ; do not display 1cm depth bcf leftbind output_16dp d'3' - STRCAT_PRINT "m" + STRCAT_PRINT TXT_METER1 return ;============================================================================= @@ -2463,7 +2467,7 @@ WIN_FONT FT_SMALL call PLED_standard_color - STRCPY "G6:" + STRCPY TXT_G6_3 read_int_eeprom d'24' ; Get Gas6 %O2 movff EEDATA,lo bcf leftbind @@ -2518,7 +2522,7 @@ lfsr FSR2,letter bsf leftbind output_8 ; outputs into Postinc2! - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER2 ;---- Print duration ------------------------------------------------- WIN_LEFT .140 @@ -2780,7 +2784,7 @@ WIN_LEFT .100 movff waitms_temp,win_top ; Set Row - STRCPY "G" + STRCPY TXT_GAS1 movff hi,lo ; copy gas number output_8 ; display gas number PUTC ':' @@ -2842,7 +2846,7 @@ movff waitms_temp,win_top ; Set Row WIN_LEFT .100 - STRCPY "SP" + STRCPY TXT_SP2 movff decoplan_index,lo ; copy gas number output_8 ; display gas number PUTC ':' @@ -3033,13 +3037,13 @@ btfsc divemode movlw .169+7 ; divemode movff WREG,win_top - STRCPY_PRINT "N2" + STRCPY_PRINT TXT_N2_2 movlw .120-.30 ; surfmode: 30pix above bottom border btfsc divemode movlw .239-.30 ; divemode movff WREG,win_top - STRCPY_PRINT "He" + STRCPY_PRINT TXT_HE2 ;---- Draw scale and O2[16]% --------------------------------------------- btfsc divemode @@ -3249,14 +3253,14 @@ movff char_O_EAD,lo bsf leftbind output_8 ; Print EAD w/o leading space. - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER2 WIN_TOP .216 lfsr FSR2,letter movff char_O_END,lo output_8 ; Print END w/o leading space. bcf leftbind - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER2 ; Show ppO2[Flush] iff in CCR mode & not in Bailout: btfsc is_bailout ; In bailout mode? @@ -3268,7 +3272,7 @@ WIN_LEFT .95 WIN_TOP .168 call PLED_divemask_color ; Set Color for Divemode mask - STRCPY_PRINT "ppO2:" ; ppO2 of diluent + STRCPY_PRINT TXT_PPO2_5 ; ppO2 of diluent movff char_O_flush_ppO2,WREG ; copy to WREG mullw .100 @@ -3362,11 +3366,11 @@ movlw d'16' cpfslt wait_temp bra PLED_show_leading_tissue_he - STRCAT "N2" + STRCAT TXT_N2_2 bra PLED_show_leading_tissue2 PLED_show_leading_tissue_he: - STRCAT "He" + STRCAT TXT_HE2 PLED_show_leading_tissue2: WIN_LEFT .95 @@ -3417,7 +3421,7 @@ WIN_FONT FT_SMALL PLED_color_code warn_cns ; Color-code CNS output - STRCPY "CNS:" + STRCPY TXT_CNS4 movff char_O_CNS_fraction,lo bsf leftbind output_8 @@ -3442,7 +3446,7 @@ WIN_INVERT .0 ; Init new Wordprocessor PLED_color_code warn_cns ; Color-code CNS output - STRCPY "CNS:" + STRCPY TXT_CNS4 movff char_O_CNS_fraction,lo bsf leftbind output_8 @@ -3522,7 +3526,7 @@ movlw d'4' addwf wait_temp,F ; Increase eeprom address for gas list - STRCPY "G" + STRCPY TXT_GAS1 movff hi,lo ; copy gas number output_8 ; display gas number PUTC ':' @@ -3542,7 +3546,7 @@ movff EEDATA,lo ; Change depth in m movff lo,divemins ; Store for grey-out output_99 ; outputs into Postinc2! - PUTC 'm' + PUTC TXT_METER_C ; Check if gas is first gas ? read_int_eeprom d'33' ; First gas (1-5)? @@ -3612,7 +3616,7 @@ WIN_LEFT .0 movff waitms_temp,win_top ; Set Row - STRCPY "SP" + STRCPY TXT_SP2 movff decoplan_index,lo ; copy gas number output_8 ; display gas number STRCAT ": " @@ -3647,7 +3651,7 @@ WIN_LEFT .0 WIN_TOP .110 - STRCPY "Dil:" + STRCPY TXT_DIL4 output_8 ; O2 Ratio STRCAT "/" movff hi,lo
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Sat Aug 13 09:45:53 2011 +0200 @@ -23,6 +23,7 @@ ; 2011/07/25 : Sergei V. Rozinov: Russian translation. ; 2011/07/28 : Sergei V. Rozinov: Corrected. ; 2011/08/04 : Sergei V. Rozinov: Adapted for firmware 1.95+ +; 2011/08/12 : Sergei V. Rozinov: Complete translation patch ; ; known bugs: ; ToDo: @@ -60,44 +61,65 @@ ; ;============================================================================= ; Define's section -; Definition "translation" ; English original +; Definition translation ; English original #IFNDEF TXT_DEFINED #DEFINE TXT_DEFINED - ; 'G' -#DEFINE TXT_GAS_C 'Г' ; 'm' -#DEFINE TXT_METER_C 'м' ; "m " -#DEFINE TXT_METER5 "м " ; "m " -#DEFINE TXT_METER3 "м " ; "m " -#DEFINE TXT_METER2 "м " ; "m" -#DEFINE TXT_METER1 "м" ; " mbar " -#DEFINE TXT_MBAR7 " мбар " ; "mbar " -#DEFINE TXT_MBAR5 "мбар " ; "bar " -#DEFINE TXT_BAR4 "бар " ; "Alt: " -#DEFINE TXT_ALT5 "Альт " ; "kg/l" -#DEFINE TXT_KGL4 "кг/л" ; "V" -#DEFINE TXT_VOLT1 "V" ; "Step:" -#DEFINE TXT_STEP5 "Шаг: " ; "CF" -#DEFINE TXT_CF2 "ДП" ; "O2: " -#DEFINE TXT_O2_4 "O2: " ; "O2 " -#DEFINE TXT_O2_3 "O2 " ; "AIR " -#DEFINE TXT_AIR4 "AIR " ; "ERR " -#DEFINE TXT_ERR4 "ERR " ; "He: " -#DEFINE TXT_HE4 "He: " ; "NX " -#DEFINE TXT_NX3 "NX " ; "TX " -#DEFINE TXT_TX3 "TX " ; " in " -#DEFINE TXT_IN4 " на " ; "G1:" -#DEFINE TXT_G1_3 "Г1:" ; "G2:" -#DEFINE TXT_G2_3 "Г2:" ; "G3:" -#DEFINE TXT_G3_3 "Г3:" ; "G4:" -#DEFINE TXT_G4_3 "Г4:" ; "G5:" -#DEFINE TXT_G5_3 "Г5:" ; "G6:" -#DEFINE TXT_G6_3 "Г6:" ; "1st:" -#DEFINE TXT_1ST4 "Нач:" ; "CNS:" -#DEFINE TXT_CNS4 "ЦНС:" ; "CNS > 250%" -#DEFINE TXT_CNSGR10 "ЦНС > 250%" ; "Avr:" -#DEFINE TXT_AVR4 "Срд:" ; "GF:" -#DEFINE TXT_GF3 "ГФ:" ; "Sat:" -#DEFINE TXT_SAT4 "Сат:" + +#DEFINE TXT_GAS_C 'Г' ; 'G' +#DEFINE TXT_GAS1 "Г" ; "G" +#DEFINE TXT_METER_C 'м' ; 'm' +#DEFINE TXT_METER5 "м " ; "m " +#DEFINE TXT_METER3 "м " ; "m " +#DEFINE TXT_METER2 "м " ; "m " +#DEFINE TXT_METER1 "м" ; "m" +#DEFINE TXT_MBAR7 " мбар " ; " mbar " +#DEFINE TXT_MBAR5 "мбар " ; "mbar " +#DEFINE TXT_BAR4 "бар " ; "bar " +#DEFINE TXT_BAR3 "бар" ; "bar" +#DEFINE TXT_ALT5 "Альт " ; "Alt: " +#DEFINE TXT_KGL4 "кг/л" ; "kg/l" +#DEFINE TXT_VOLT2 "V " ; "V " +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Шаг: " ; "Step:" +#DEFINE TXT_CF2 "ДП" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " на " ; " in " +#DEFINE TXT_G1_3 "Г1:" ; "G1:" +#DEFINE TXT_G2_3 "Г2:" ; "G2:" +#DEFINE TXT_G3_3 "Г3:" ; "G3:" +#DEFINE TXT_G4_3 "Г4:" ; "G4:" +#DEFINE TXT_G5_3 "Г5:" ; "G5:" +#DEFINE TXT_G6_3 "Г6:" ; "G6:" +#DEFINE TXT_1ST4 "Нач:" ; "1st:" +#DEFINE TXT_CNS4 "ЦНС:" ; "CNS:" +#DEFINE TXT_CNSGR10 "ЦНС > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Срд:" ; "Avr:" +#DEFINE TXT_GF3 "ГФ:" ; "GF:" +#DEFINE TXT_SAT4 "Сат:" ; "Sat:" +#DEFINE TXT_0MIN5 "0мин " ; "0min " +#DEFINE TXT_MIN4 "мин " ; "min " +#DEFINE TXT_BSAT5 "КСат:" ; "BSat:" +#DEFINE TXT_BDES5 "КДес:" ; "BDes:" +#DEFINE TXT_LAST5 "Стоп:" ; "Last:" +#DEFINE TXT_GFLO6 "ГФниж:" ; "GF_lo:" +#DEFINE TXT_GFHI6 "ГФврх:" ; "GF_hi:" +#DEFINE TXT_PPO2_5 "ppO2:" ; "ppO2:" +#DEFINE TXT_OC_O1 "O" ; "O" +#DEFINE TXT_OC_C1 "C" ; "C" +#DEFINE TXT_CC_C1_1 "C" ; "C" +#DEFINE TXT_CC_C2_1 "C" ; "C" +#DEFINE TXT_GF_G1 "G" ; "G" +#DEFINE TXT_GF_F1 "F" ; "F" +#DEFINE TXT_SP2 "СП" ; "SP" +#DEFINE TXT_DIL4 "Дил:" ; "Dil:" +#DEFINE TXT_N2_2 "N2" ; "N2" +#DEFINE TXT_HE2 "He" ; "He" #ENDIF ;============================================================================= @@ -169,7 +191,7 @@ TCODE .40, .35, "ЦНС показать[%]" ;063 CNSshow dive[%] TCODE .40, .35, "Номер в журнале" ;064 Logbook offset TCODE .40, .35, "Крайняя деко[м]" ;065 Last Deco at[m] - TCODE .40, .35, "Конец Apnoe [ч]" ;066 End Apnoe [h] + TCODE .40, .35, "Конец Апноэ [ч]" ;066 End Apnoe [h] TCODE .40, .35, "Показ напр.бат." ;067 Show Batt.Volts ; End of function descriptor I ; @@ -210,8 +232,8 @@ TCODE .20, .35, "Доп. Параметры I" ;099 Custom FunctionsI TCODE .20, .125, "Алгоритм:" ;100 Decotype: TCODE .85, .125, "ZH-L16 OC" ;101 ZH-L16 OC - TCODE .85, .125, "Gauge " ;102 Gauge - TCODE .85, .125, "Gauge" ;103 Gauge + TCODE .85, .125, "Таймер " ;102 Gauge + TCODE .85, .125, "Таймер" ;103 Gauge TCODE .85, .125, "ZH-L16 CC" ;104 ZH-L16 CC TCODE .0, .0, "Активный Газ? " ;105 Active Gas? TCODE .10, .2, "Настройка газов" ;106 Gas Setup - Gaslist @@ -220,11 +242,11 @@ TCODE .20, .155, "Умолчание:" ;109 Default: TCODE .20, .65, "Сетпоинты CCR" ;110 CCR SetPoint Menu TCODE .20, .2, "Меню сетпоинтов CCR" ;111 CCR SetPoint Menu - TCODE .0, .0, "SP#" ;112 SP# + TCODE .0, .0, "СП#" ;112 SP# TCODE .20, .95, "Состояние батареи" ;113 Battery Info TCODE .17, .2, "Информация батареи" ;114 Battery Information TCODE .0, .9, "Циклов:" ;115 Cycles: - TCODE .85, .125, "Apnoe" ;116 Apnoe + TCODE .85, .125, "Апноэ" ;116 Apnoe TCODE .0, .18, "Посл. зарядка:" ;117 Last Complete: TCODE .0, .27, "Минимум Vбат:" ;118 Lowest Vbatt: TCODE .0, .36, "Минимум дата:" ;119 Lowest at: @@ -246,7 +268,7 @@ TCODE .10, .50, "Сообщите об ошибке, " ;135 and report the Debug TCODE .10, .75, "отправьте отчет ниже!" ;136 Information below! TCODE .100, .75, "На запас" ;137 Bailout - TCODE .85, .125, "Apnoe " ;138 Apnoe + TCODE .85, .125, "Апноэ " ;138 Apnoe TCODE .112, .120, "В воде" ;139 Descent TCODE .105, .60, "Наверху" ;140 Surface TCODE .65, .2, "Откл?" ;141 Quit? @@ -301,7 +323,7 @@ TCODE .20, .2, "Доп. Параметры II" ;186 Custom Functions II TCODE .20, .95, "Показать лицензию" ;187 Show License TCODE .0, .2, "Результаты:" ;188 Sim. Results: - TCODE .90, .25, "Поверхн." ;189 Surface + TCODE .90, .25, "Надводный" ;189 Surface TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Дил." ;192 Dil. (Rebreather diluent) @@ -314,7 +336,7 @@ TCODE .0, .185, "в меню настройки. " ;198 in Gassetup menu. TCODE .0, .215, "Уточн. ДП11 & ДП12!" ;199 Check CF11 & CF12 ! ; Gaugemode description - TCODE .0, .35, "Алгоритм: Gauge " ;200 Decotype: Gauge + TCODE .0, .35, "Алгоритм: Таймер " ;200 Decotype: Gauge TCODE .0, .65, "Время под водой в " ;201 Divetime will be in TCODE .0, .95, "виде Минуты:Секунды" ;202 Minutes:Seconds. TCODE .0, .125, "OSTC2 не вычисляет " ;203 OSTC2 will not @@ -330,7 +352,7 @@ TCODE .0, .185, "CCR. Доступно до 5 " ;212 Setup menu. 5 bail- TCODE .0, .215, "запасных смесей. " ;213 outs are available. ; Apnoemode description - TCODE .0, .35, "Алгоритм: Apnoe " ;214 Decotype: Apnoe + TCODE .0, .35, "Алгоритм: Апноэ " ;214 Decotype: Apnoe TCODE .0, .65, "OSTC2 показывает " ;215 OSTC2 will display TCODE .0, .95, "каждое погружение " ;216 each descent separ- TCODE .0, .125, "отдельно в Мин:Сек." ;217 ately in Min:Sec.
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Thu Aug 11 20:01:55 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat Aug 13 09:45:53 2011 +0200 @@ -56,6 +56,69 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= +; Define's section +; Definition translation ; English original +#IFNDEF TXT_DEFINED +#DEFINE TXT_DEFINED + +#DEFINE TXT_GAS_C 'G' ; 'G' +#DEFINE TXT_GAS1 "G" ; "G" +#DEFINE TXT_METER_C 'm' ; 'm' +#DEFINE TXT_METER5 "m " ; "m " +#DEFINE TXT_METER3 "m " ; "m " +#DEFINE TXT_METER2 "m " ; "m " +#DEFINE TXT_METER1 "m" ; "m" +#DEFINE TXT_MBAR7 " mbar " ; " mbar " +#DEFINE TXT_MBAR5 "mbar " ; "mbar " +#DEFINE TXT_BAR4 "bar " ; "bar " +#DEFINE TXT_BAR3 "bar" ; "bar" +#DEFINE TXT_ALT5 "Alt: " ; "Alt: " +#DEFINE TXT_KGL4 "kg/l" ; "kg/l" +#DEFINE TXT_VOLT2 "V " ; "V " +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_CF2 "CF" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " in " ; " in " +#DEFINE TXT_G1_3 "G1:" ; "G1:" +#DEFINE TXT_G2_3 "G2:" ; "G2:" +#DEFINE TXT_G3_3 "G3:" ; "G3:" +#DEFINE TXT_G4_3 "G4:" ; "G4:" +#DEFINE TXT_G5_3 "G5:" ; "G5:" +#DEFINE TXT_G6_3 "G6:" ; "G6:" +#DEFINE TXT_1ST4 "1st:" ; "1st:" +#DEFINE TXT_CNS4 "CNS:" ; "CNS:" +#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Avr:" ; "Avr:" +#DEFINE TXT_GF3 "GF:" ; "GF:" +#DEFINE TXT_SAT4 "Sat:" ; "Sat:" +#DEFINE TXT_0MIN5 "0min " ; "0min " +#DEFINE TXT_MIN4 "min " ; "min " +#DEFINE TXT_BSAT5 "BSat:" ; "BSat:" +#DEFINE TXT_BDES5 "BDes:" ; "BDes:" +#DEFINE TXT_LAST5 "Last:" ; "Last:" +#DEFINE TXT_GFLO6 "GF_lo:" ; "GF_lo:" +#DEFINE TXT_GFHI6 "GF_hi:" ; "GF_hi:" +#DEFINE TXT_PPO2_5 "ppO2:" ; "ppO2:" +#DEFINE TXT_OC_O1 "O" ; "O" +#DEFINE TXT_OC_C1 "C" ; "C" +#DEFINE TXT_CC_C1_1 "C" ; "C" +#DEFINE TXT_CC_C2_1 "C" ; "C" +#DEFINE TXT_GF_G1 "G" ; "G" +#DEFINE TXT_GF_F1 "F" ; "F" +#DEFINE TXT_SP2 "SP" ; "SP" +#DEFINE TXT_DIL4 "Dil:" ; "Dil:" +#DEFINE TXT_N2_2 "N2" ; "N2" +#DEFINE TXT_HE2 "He" ; "He" + +#ENDIF +;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Creando Resumen MD2" ;001 Building MD2 Hash TCODE .0, .25, "Espere por favor..." ;002 Please Wait...