diff --git a/CHANGELOG b/CHANGELOG index 7d5297d..36ffada 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ -Version 0.8.5 prerelease (2009.06.11): +Version 0.8.5 prerelease (2009.06.14): * added: new language: Chinese - translation made by: ... - * changed: version of the TTMath library: 0.8.5 (prerelease) now + translation made by: Juis + * changed: version of the TTMath library: 0.8.5 now Changes from TTMath 0.8.5 relating to TTCalc: * fixed: Big::Mod(x) didn't correctly return a carry diff --git a/setup/innosetup.iss b/setup/innosetup.iss index ae48847..f6500fa 100644 --- a/setup/innosetup.iss +++ b/setup/innosetup.iss @@ -3,8 +3,8 @@ [Setup] AppName=TTCalc -AppVerName=TTCalc 0.8.4 -AppVersion=0.8.4 +AppVerName=TTCalc 0.8.5 +AppVersion=0.8.5 AppPublisher=Tomasz Sowa AppPublisherURL=http://ttcalc.sourceforge.net AppSupportURL=http://ttcalc.sourceforge.net @@ -26,6 +26,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "chinese"; MessagesFile: "compiler:Languages\ChineseSimp-12-5.1.11.isl" [InstallDelete] ; prior to 0.8.3 we were using mingwm10.dll (now it is not needed and will be deleted if exists) diff --git a/src/Makefile b/src/Makefile index 1c86754..a5947b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -8,7 +8,6 @@ helpname = ttcalc.chm # the name of the setup is also set in the Inno Setup config file setupname = ttcalc-setup.exe - @@ -17,9 +16,11 @@ all: ttcalc include Makefile.dep + ttcalc: $(o) $(CC) -o $(name) $(CFLAGS) $(o) -lcomctl32 + resource.o: resource.rc #windres -DTTCALC_CONVERT resource.rc resource.o windres resource.rc resource.o @@ -27,7 +28,8 @@ resource.o: resource.rc help: $(helpdep) Makefile.help.sh - + + setup: $(setupdep) iscc ../setup/innosetup.iss diff --git a/src/Makefile.dep b/src/Makefile.dep index 7da4c07..5eb12b8 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -19,26 +19,27 @@ winmain.o: winmain.cpp compileconfig.h winmain.h programresources.h iniparser. $(CC) -c $(CFLAGS) $< -helpdep = ../help/arithmetic_functions.html \ - ../help/logarithm_exponential.html \ - ../help/trigonometric_functions.html \ - ../help/inverse_trigonometric_functions.html \ - ../help/hyperbolic_functions.html \ - ../help/inverse_hyperbolic_functions.html \ - ../help/conversions_deg_rad_grad.html \ - ../help/rounding_functions.html \ - ../help/other_functions.html \ - ../help/operators_priority.html \ - ../help/bitwise_functions.html \ - ../help/index.html \ - ../help/userfunctions.html \ - ../help/logical_functions.html \ - ../help/accuracy.html \ - ../help/tips.html \ - ../help/values_and_std_operators.html \ - ../help/styles.css \ - ../help/index.hhk \ - ../help/toc.hhc \ - ../help/help.hhp +helpdep = ../help/accuracy.html \ +../help/arithmetic_functions.html \ +../help/bitwise_functions.html \ +../help/conversions_deg_rad_grad.html \ +../help/help.hhp \ +../help/hyperbolic_functions.html \ +../help/index.hhk \ +../help/index.html \ +../help/inverse_hyperbolic_functions.html \ +../help/inverse_trigonometric_functions.html \ +../help/logarithm_exponential.html \ +../help/logical_functions.html \ +../help/operators_priority.html \ +../help/other_functions.html \ +../help/rounding_functions.html \ +../help/styles.css \ +../help/tips.html \ +../help/toc.hhc \ +../help/trigonometric_functions.html \ +../help/userfunctions.html \ +../help/values_and_std_operators.html + setupdep = ttcalc help ../setup/innosetup.iss ../setup/COPYRIGHT ../COPYRIGHT ../CHANGELOG ../README diff --git a/src/languages.cpp b/src/languages.cpp index fe329d4..e1d8eef 100644 --- a/src/languages.cpp +++ b/src/languages.cpp @@ -219,7 +219,7 @@ void Languages::InitErrorMessagesTab() InsertErrorPair(ttmath::err_ok,"确定"); InsertErrorPair(ttmath::err_nothing_has_read,""); InsertErrorPair(ttmath::err_unknown_character,"未知字符"); - InsertErrorPair(ttmath::err_unexpected_final_bracket,"意外多余的括弧"); // + InsertErrorPair(ttmath::err_unexpected_final_bracket,"意外多余的括弧"); InsertErrorPair(ttmath::err_stack_not_clear,"未知字符没有清空"); InsertErrorPair(ttmath::err_unknown_variable,"未知变量"); InsertErrorPair(ttmath::err_division_by_zero,"除数不能为零"); @@ -874,7 +874,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(precision_2_info,"(+/-)3.4e+2776511644261678652, 85位有效数字"); InsertGuiPair(precision_3_info,"(+/-)6.7e+51217599719369681875006054625051616609, 258位有效数字"); - InsertGuiPair(overflow_during_printing,"打印时数据溢出"); + InsertGuiPair(overflow_during_printing,"输出时数据溢出"); InsertGuiPair(combo_rounding_none,"无"); InsertGuiPair(combo_rounding_integer,"整数"); @@ -887,7 +887,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_rounding, "四舍五入"); InsertGuiPair(display_always_scientific,"一直"); InsertGuiPair(display_not_always_scientific,"当指数大于:"); - InsertGuiPair(display_group_scientific, "按科学计数法打印结果"); + InsertGuiPair(display_group_scientific, "按科学计数法输出结果"); InsertGuiPair(display_decimal_point, "小数点"); InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); InsertGuiPair(convert_type, "类型"); @@ -903,11 +903,10 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_normal_view, "&普通视图"); InsertGuiPair(menu_view_compact_view, "&迷你视图"); InsertGuiPair(menu_view_always_on_top, "&总在最前"); - InsertGuiPair(menu_view_lang_english, "&English"); - InsertGuiPair(menu_view_lang_polish, "&Polish"); - InsertGuiPair(menu_view_lang_spanish, "&Spanish"); - InsertGuiPair(menu_view_lang_danish, "&Danish"); - InsertGuiPair(menu_view_lang_chinese, "&Chinese"); + InsertGuiPair(menu_view_lang_english, "&英语"); + InsertGuiPair(menu_view_lang_polish, "&波兰语"); + InsertGuiPair(menu_view_lang_spanish, "&西班牙语"); + InsertGuiPair(menu_view_lang_danish, "&丹麦语"); InsertGuiPair(menu_view_close_program, "&关闭"); InsertGuiPair(menu_edit_undo, "&取消"); InsertGuiPair(menu_edit_paste, "&粘贴"); @@ -922,10 +921,10 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_init_common_controls,"不能初始化通用控件(InitCommonControlsEx)"); InsertGuiPair(about_text, "Mathematical calculator TTCalc %d.%d.%d%s%s\r\n" - "Author: Tomasz Sowa\r\n" - "Contact: t.sowa@ttmath.org\r\n" - "Licence: BSD (open source)\r\n" - "Project page: http://ttcalc.sourceforge.net\r\n" + "开发人: Tomasz Sowa\r\n" + "联系: t.sowa@ttmath.org\r\n" + "许可: BSD (开源项目)\r\n" + "主页: http://ttcalc.sourceforge.net\r\n" "Bignum library: TTMath %d.%d.%d%s\r\n" "Programming language: C++\r\n" "Compiler: %s\r\n" @@ -940,9 +939,7 @@ void Languages::InitGuiMessagesTab() "mantissa and 32 bits for the exponent) it's about +/-6.9e+646457021.\r\n" "\r\n" #endif - "If you have any questions, advices or interesting ideas about" - " this program or if you want to join to this project as" - " a developer or a programmer feel free to contant with the author." + "如果你有任何此软件的问题、建议和有趣的想法，或者你想帮助一起加入开发软件的话，我将随时热情的欢迎你们！" ); InsertGuiPair(about_text_portable_version, " portable version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n");