fixed: I've forgotten to add: menu_view_lang_chinese item in the chinese language

changed: version of the program: 0.8.5 now



git-svn-id: svn://ttmath.org/publicrep/ttcalc/trunk@167 e52654a7-88a9-db11-a3e9-0013d4bc506e

CHANGELOG

@@ -1,3 +1,14 @@
+Version 0.8.5 (2009.06.18):
+    * added:   new language: Chinese
+               translation made by: Juis <zsyfly at gmail dot com>
+    * 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
+               and the result was sometimes very big (even greater than x)
+    * changed: factorial() function is much faster now
+
+
 Version 0.8.4 (2009.05.08):
     * added:   new language: Danish
                translation made by: Rune Bisgaard Vammen <runebisgaard at gmail dot com>
@@ -41,7 +52,7 @@ Version 0.8.3 (2009.04.06):
     * removed: 'cut off last non valid digits' on 'rounding' option
                on 'display' tab
 
-Changes from TTMath 0.8.3 relating to TTCalc:
+    Changes from TTMath 0.8.3 relating to TTCalc:
     * fixed:   Big::Add incorrectly rounded 'this' when both exponents were equal
                it caused that sometimes when adding a zero the result has changed
                this had impact among other things on FromString() method

README

@@ -17,7 +17,7 @@ display values with the base (radix) from two to sixteen.
 Author:            Tomasz Sowa
 Contact:           t.sowa@ttmath.org
 Licence:           BSD (open source)
-Interface:         English, Polish, Spanish, Danish
+Interface:         English, Polish, Spanish, Danish, Chinese
 Project page:      http://ttcalc.sourceforge.net/
-Bignum library:    TTMath http://ttmath.org/
+Bignum library:    TTMath http://www.ttmath.org/
 Operating systems: Microsoft Windows 9x/Me/NT/2000/XP/Vista

help/index.html

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" href="styles.css" type="text/css">
 	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
 		<param name="Keyword" value="TTCalc">
+		<param name="Keyword" value="TTMath">
 		<param name="Keyword" value="author">
 		<param name="Keyword" value="contact">
 		<param name="Keyword" value="licence">
@@ -43,9 +44,9 @@ display values with the base (radix) from two to sixteen.
 <tr><td>Author:</td><td>Tomasz Sowa</td></tr>
 <tr><td>Contact:</td><td>t.sowa@ttmath.org</td></tr>
 <tr><td>Licence:</td><td>BSD (open source)</td></tr>
-<tr><td>Interface:</td><td>English, Polish, Spanish, Danish</td></tr>
+<tr><td>Interface:</td><td>English, Polish, Spanish, Danish, Chinese</td></tr>
 <tr><td>Project page:</td><td><a href="http://ttcalc.sourceforge.net/">http://ttcalc.sourceforge.net/</a></td></tr>
-<tr><td>Bignum library:</td><td>TTMath <a href="http://ttmath.org/">http://ttmath.org/</a></td></tr>
+<tr><td>Bignum library:</td><td>TTMath <a href="http://ttmath.org/">http://www.ttmath.org/</a></td></tr>
 <tr><td>Operating systems:</td><td>Microsoft Windows 9x/Me/NT/2000/XP/Vista</td></tr>
 </table>
 

setup/innosetup.iss

@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=TTCalc
-AppVerName=TTCalc 0.8.4
+AppVerName=TTCalc 0.8.5
-AppVersion=0.8.4
+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)

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
@@ -35,7 +37,6 @@ setup: $(setupdep)
 
 clean:
 	rm -f *.o
-	rm -f *.s
 	rm -f $(name)
-	rm -f $(helpname)
+	rm -f ../help/$(helpname)
-	rm -f $(setupname)
+	rm -f ../setup/$(setupname)

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						\
+helpdep = ../help/accuracy.html					\
-	../help/logarithm_exponential.html  						\
+../help/arithmetic_functions.html				\
-	../help/trigonometric_functions.html  						\
+../help/bitwise_functions.html					\
-	../help/inverse_trigonometric_functions.html  				\
+../help/conversions_deg_rad_grad.html			\
-	../help/hyperbolic_functions.html  							\
+../help/help.hhp								\
-	../help/inverse_hyperbolic_functions.html  					\
+../help/hyperbolic_functions.html				\
-	../help/conversions_deg_rad_grad.html  						\
+../help/index.hhk								\
-	../help/rounding_functions.html  							\
+../help/index.html								\
-	../help/other_functions.html  								\
+../help/inverse_hyperbolic_functions.html		\
-	../help/operators_priority.html  							\
+../help/inverse_trigonometric_functions.html	\
-	../help/bitwise_functions.html								\
+../help/logarithm_exponential.html				\
-	../help/index.html											\
+../help/logical_functions.html					\
-	../help/userfunctions.html									\
+../help/operators_priority.html					\
-	../help/logical_functions.html								\
+../help/other_functions.html					\
-	../help/accuracy.html  										\
+../help/rounding_functions.html					\
-	../help/tips.html											\
+../help/styles.css								\
-	../help/values_and_std_operators.html						\
+../help/tips.html								\
-	../help/styles.css											\
+../help/toc.hhc									\
-	../help/index.hhk               							\
+../help/trigonometric_functions.html			\
-	../help/toc.hhc 											\
+../help/userfunctions.html						\
-	../help/help.hhp
+../help/values_and_std_operators.html
+
 
 setupdep = ttcalc help ../setup/innosetup.iss ../setup/COPYRIGHT ../COPYRIGHT ../CHANGELOG ../README

src/Makefileportable

@@ -13,3 +13,9 @@ ttcalc: $(o)
 	
 resource.o: resource.rc
 	windres -DTTCALC_PORTABLE resource.rc resource.o
+
+clean:
+	rm -f *.o
+	rm -f $(name)
+	rm -f ../help/$(helpname)
+

src/bigtypes.h

@@ -39,6 +39,8 @@
 #define bigtypesheader
 
 #include "compileconfig.h"
+
+//#define TTMATH_RELEASE
 #include <ttmath/ttmath.h>
 
 

src/compileconfig.h

@@ -55,7 +55,7 @@
 */
 #define TTCALC_MAJOR_VER		0
 #define TTCALC_MINOR_VER		8
-#define TTCALC_REVISION_VER		4
+#define TTCALC_REVISION_VER		5
 #define TTCALC_PRERELEASE_VER	0
 
 
@@ -68,6 +68,8 @@
 #pragma warning (disable : 4800)
 #endif
 
+#ifndef _WIN32_IE
 #define _WIN32_IE	0x0501
+#endif
 
 #endif

src/languages.cpp

@@ -211,6 +211,36 @@ void Languages::InitErrorMessagesTab()
 	InsertErrorPair(ttmath::err_too_big_factorial,"Et for stort argument for factorial() funktionen");
 
 
+/*
+	Chinese messages relating to ttmath library
+*/
+	error_messages_tab.push_back( std::map<ttmath::ErrorCode, std::string>() );
+
+	InsertErrorPair(ttmath::err_ok,"ȷ<EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_nothing_has_read,"");
+	InsertErrorPair(ttmath::err_unknown_character,"δ֪<EFBFBD>ַ<EFBFBD>");
+	InsertErrorPair(ttmath::err_unexpected_final_bracket,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_stack_not_clear,"δ֪<EFBFBD>ַ<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_unknown_variable,"δ֪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_division_by_zero,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_interrupt,"<EFBFBD><EFBFBD><EFBFBD>㱻<EFBFBD>ж<EFBFBD>");
+	InsertErrorPair(ttmath::err_overflow,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_unknown_function,"δ֪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_unknown_operator,"δ֪<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_unexpected_semicolon_operator,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķֺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_improper_amount_of_arguments,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_improper_argument,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_unexpected_end,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĩ<EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_internal_error,"<EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+
+	InsertErrorPair(ttmath::err_incorrect_name,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_incorrect_value,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ");
+	InsertErrorPair(ttmath::err_variable_exists,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_variable_loop,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_functions_loop,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD>");
+	InsertErrorPair(ttmath::err_must_be_only_one_value,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>з<EFBFBD><EFBFBD><EFBFBD>ֵ");
+	InsertErrorPair(ttmath::err_still_calculating,"<EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><EFBFBD><EFBFBD>...");
+	InsertErrorPair(ttmath::err_too_big_factorial,"<EFBFBD>׳˺<EFBFBD><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><EFBFBD>");
 }
 
 
@@ -346,6 +376,7 @@ void Languages::InitGuiMessagesTab()
 	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_close_program,	"&Close");
 	InsertGuiPair(menu_edit_undo,			"&Undo");
 	InsertGuiPair(menu_edit_paste,			"&Paste");
@@ -477,6 +508,7 @@ void Languages::InitGuiMessagesTab()
 	InsertGuiPair(menu_view_lang_polish,	"&Polski");
 	InsertGuiPair(menu_view_lang_spanish,	"&Hiszpa<70>ski");
 	InsertGuiPair(menu_view_lang_danish,	"&Du<44>ski");
+	InsertGuiPair(menu_view_lang_chinese,	"&Chi<68>ski");
 	InsertGuiPair(menu_view_close_program,	"&Zamknij");
 	InsertGuiPair(menu_edit_undo,			"&Cofnij");
 	InsertGuiPair(menu_edit_paste,			"&Wklej");
@@ -612,6 +644,7 @@ void Languages::InitGuiMessagesTab()
 	InsertGuiPair(menu_view_lang_polish,	"&Polaco");
 	InsertGuiPair(menu_view_lang_spanish,	"&Espa<70>ol");
 	InsertGuiPair(menu_view_lang_danish,	"&Dan<61>s"); // 'Dan<61>s' is a correct translation for 'Danish'?
+	InsertGuiPair(menu_view_lang_chinese,	"&Chino"); // 'Chino' is a correct translation for 'Chinese'?
 	InsertGuiPair(menu_view_close_program,	"&Close");
 	InsertGuiPair(menu_edit_undo,			"&Deshacer");
 	InsertGuiPair(menu_edit_paste,			"&Pegar");
@@ -743,6 +776,7 @@ void Languages::InitGuiMessagesTab()
 	InsertGuiPair(menu_view_lang_polish,	"&Polsk");
 	InsertGuiPair(menu_view_lang_spanish,	"&Spansk");
 	InsertGuiPair(menu_view_lang_danish,	"&Dansk");
+	InsertGuiPair(menu_view_lang_chinese,	"&Kinesisk"); // 'Kinesisk' is a correct translation for 'Chinese'?
 	InsertGuiPair(menu_view_close_program,	"&Afslut");
 	InsertGuiPair(menu_edit_undo,			"&Fortryd");
 	InsertGuiPair(menu_edit_paste,			"&S<>t ind");
@@ -788,6 +822,133 @@ void Languages::InitGuiMessagesTab()
 	InsertGuiPair(cant_open_project_page,   "Projekt siden kunne ikke <20>bnes");
 
 
+
+/*
+	Chinese gui messages
+*/
+	gui_messages_tab.push_back( std::map<GuiMsg, std::string>() );
+
+	InsertGuiPair(button_ok,"ȷ<EFBFBD><EFBFBD>");
+	InsertGuiPair(button_cancel,"ȡ<EFBFBD><EFBFBD>");
+	InsertGuiPair(message_box_caption,"TTCalc");
+
+	InsertGuiPair(dialog_box_add_variable_caption,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>±<EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_edit_variable_caption,"<EFBFBD>༭<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_add_variable_incorrect_name,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_add_variable_incorrect_value,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD>ֵ");
+	InsertGuiPair(dialog_box_add_variable_variable_exists,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_edit_variable_unknown_variable,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>д˱<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_delete_variable_confirm,"<EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD>Ҫɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_variable_not_all_deleted,"һЩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_add_function_caption,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>º<EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_edit_function_caption,"<EFBFBD>༭<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_add_function_function_exists,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_edit_function_unknown_function,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>д˺<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_delete_function_confirm,"<EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD>Ҫɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_function_not_all_deleted,"һЩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(dialog_box_add_function_incorrect_name,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+
+	InsertGuiPair(list_variables_header_1,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(list_variables_header_2,"ֵ");
+	InsertGuiPair(list_functions_header_1,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(list_functions_header_2,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(list_functions_header_3,"ֵ");
+
+	InsertGuiPair(button_add,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(button_edit,"<EFBFBD>༭");
+	InsertGuiPair(button_delete,"ɾ<EFBFBD><EFBFBD>");
+	InsertGuiPair(button_clear,"C");
+	InsertGuiPair(tab_standard,"<EFBFBD><EFBFBD>׼");
+	InsertGuiPair(tab_variables,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(tab_functions,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(tab_precision,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(tab_display,"<EFBFBD><EFBFBD>ʾ");
+	InsertGuiPair(tab_convert,"ת<EFBFBD><EFBFBD>");
+
+	InsertGuiPair(radio_precision_1,"С - 96 bits β<><CEB2>, 32 bits ָ<><D6B8>");
+	InsertGuiPair(radio_precision_2,"<EFBFBD><EFBFBD> - 288 bits β<><CEB2>, 64 bits ָ<><D6B8>");
+	InsertGuiPair(radio_precision_3,"<EFBFBD><EFBFBD> - 864 bits β<><CEB2>, 128 bits for ָ<><D6B8>");
+
+
+	InsertGuiPair(precision_1_info,"(+/-)6.9 e+646457021, 26λ<36><CEBB>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>(ʮ<><CAAE><EFBFBD><EFBFBD>)");
+	InsertGuiPair(precision_2_info,"(+/-)3.4e+2776511644261678652, 85λ<35><CEBB>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>");
+	InsertGuiPair(precision_3_info,"(+/-)6.7e+51217599719369681875006054625051616609, 258λ<38><CEBB>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>");
+
+	InsertGuiPair(overflow_during_printing,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+
+	InsertGuiPair(combo_rounding_none,"<EFBFBD><EFBFBD>");
+	InsertGuiPair(combo_rounding_integer,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(combo_rounding_to_number,"ת<EFBFBD><EFBFBD>");
+	InsertGuiPair(combo_rounding_after_comma,"λ<EFBFBD><EFBFBD>");
+	InsertGuiPair(check_remove_zeroes,"ȥ<EFBFBD><EFBFBD>β<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+
+	InsertGuiPair(display_input,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(display_output,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(display_rounding,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(display_always_scientific,"һֱ");
+	InsertGuiPair(display_not_always_scientific,"<EFBFBD><EFBFBD>ָ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:");
+	InsertGuiPair(display_group_scientific,	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(display_decimal_point,	"С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(display_deg_rad_grad,		"sin/cos asin/acos");
+	InsertGuiPair(convert_type,				"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(convert_input,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(convert_output,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(convert_dynamic_output,	"<EFBFBD>Զ<EFBFBD>");
+
+	InsertGuiPair(menu_view,				"&<26>鿴");
+	InsertGuiPair(menu_edit,				"&<26>༭");
+	InsertGuiPair(menu_help,				"&<26><><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_language,			"&<26><><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_view_new_window,		"&<26>´<EFBFBD><C2B4><EFBFBD>");
+	InsertGuiPair(menu_view_normal_view,	"&<26><>ͨ<EFBFBD><CDA8>ͼ");
+	InsertGuiPair(menu_view_compact_view,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ");
+	InsertGuiPair(menu_view_always_on_top,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ");
+	InsertGuiPair(menu_view_lang_english,	"&Ӣ<><D3A2>");
+	InsertGuiPair(menu_view_lang_polish,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_view_lang_spanish,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_view_lang_danish,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_view_lang_chinese,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_view_close_program,	"&<26>ر<EFBFBD>");
+	InsertGuiPair(menu_edit_undo,			"&ȡ<><C8A1>");
+	InsertGuiPair(menu_edit_paste,			"&ճ<><D5B3>");
+	InsertGuiPair(menu_edit_copy_result,	"&<26><><EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD>");
+	InsertGuiPair(menu_help_help,			"&<26><><EFBFBD><EFBFBD>");
+	InsertGuiPair(menu_help_project_page,	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ");
+	InsertGuiPair(menu_help_about,			"&<26><><EFBFBD><EFBFBD>");
+	InsertGuiPair(cant_init_calculations,	"<EFBFBD><EFBFBD><EFBFBD>ܳ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>");
+	InsertGuiPair(message_box_error_caption,"TTCalc");
+	InsertGuiPair(cant_create_thread,		"<EFBFBD><EFBFBD><EFBFBD>ܴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(cant_create_main_window,	"<EFBFBD><EFBFBD><EFBFBD>ܴ<EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>ó<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(cant_init_common_controls,"<EFBFBD><EFBFBD><EFBFBD>ܳ<EFBFBD>ʼ<EFBFBD><EFBFBD>ͨ<EFBFBD>ÿؼ<EFBFBD>(InitCommonControlsEx)");
+	InsertGuiPair(about_text,
+		"Mathematical calculator TTCalc %d.%d.%d%s%s\r\n"
+		"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Tomasz Sowa\r\n"
+		"<EFBFBD><EFBFBD>ϵ: t.sowa@ttmath.org\r\n"
+		"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: BSD (<28><>Դ<EFBFBD><D4B4>Ŀ)\r\n"
+		"<EFBFBD><EFBFBD>ҳ: http://ttcalc.sourceforge.net\r\n"
+		"Bignum library: TTMath %d.%d.%d%s\r\n"
+		"Programming language: C++\r\n"
+		"Compiler: %s\r\n"
+		"%s"	// for upx
+		"\r\n"
+		"TTCalc uses the TTMath bignum library"
+		" which can be found at http://sourceforge.net/projects/ttmath\r\n"
+		"\r\n"
+#ifdef TTCALC_PORTABLE
+		"This is the portable version of the program TTCalc. In this version "
+		"you can calculate only with one kind of precision (96 bits for the "
+		"mantissa and 32 bits for the exponent) it's about +/-6.9e+646457021.\r\n"
+		"\r\n"
+#endif
+		"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κδ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⡢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><EFBFBD><EFBFBD>뷨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뿪<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҽ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD>ӭ<EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD>" 
+		);
+	InsertGuiPair(about_text_portable_version, " portable version");
+	InsertGuiPair(about_text_exe_packer,	"EXE Packer: UPX 3.03\r\n");
+	InsertGuiPair(about_box_title,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(about_box_button_close,	"<EFBFBD>ر<EFBFBD>");
+	InsertGuiPair(unknown_error,			"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ֪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+	InsertGuiPair(cant_find_help,			"û<EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>");
+	InsertGuiPair(cant_open_project_page,   "<EFBFBD><EFBFBD><EFBFBD>ܴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ");
 }
 
 

src/languages.h

@@ -119,6 +119,7 @@ public:
 		menu_view_lang_polish,
 		menu_view_lang_spanish,
 		menu_view_lang_danish,
+		menu_view_lang_chinese,
 		menu_view_close_program,
 		menu_edit_undo,
 		menu_edit_paste,
@@ -147,7 +148,7 @@ public:
 	// (after conversion to 'int' we pass it into the std::vector)
 	enum Country
 	{
-		en = 0, pl, sp, da
+		en = 0, pl, sp, da, chn
 	};
 
 

src/mainwindow.cpp

@@ -406,6 +406,7 @@ HMENU menu = GetMenu(hWnd);
 	SetMenuLanguageItem(menu, IDM_LANGUAGE_POLISH,	Languages::menu_view_lang_polish);
 	SetMenuLanguageItem(menu, IDM_LANGUAGE_SPANISH,	Languages::menu_view_lang_spanish);
 	SetMenuLanguageItem(menu, IDM_LANGUAGE_DANISH,	Languages::menu_view_lang_danish);
+	SetMenuLanguageItem(menu, IDM_LANGUAGE_CHINESE,	Languages::menu_view_lang_chinese);
 	SetMenuLanguageItem(menu, IDM_CLOSE_PROGRAM,	Languages::menu_view_close_program);
 	SetMenuLanguageItem(menu, IDM_EDIT_UNDO,		Languages::menu_edit_undo);
 	SetMenuLanguageItem(menu, IDM_EDIT_PASTE,		Languages::menu_edit_paste);
@@ -768,6 +769,7 @@ void WmInitMenuPopUpView(HMENU menu)
 	CheckMenuItem(menu, IDM_LANGUAGE_POLISH,  MF_BYCOMMAND|MF_UNCHECKED);
 	CheckMenuItem(menu, IDM_LANGUAGE_SPANISH, MF_BYCOMMAND|MF_UNCHECKED);
 	CheckMenuItem(menu, IDM_LANGUAGE_DANISH,  MF_BYCOMMAND|MF_UNCHECKED);
+	CheckMenuItem(menu, IDM_LANGUAGE_CHINESE, MF_BYCOMMAND|MF_UNCHECKED);
 
 	Languages::Country lang = GetPrgRes()->GetLanguages()->GetCurrentLanguage();
 
@@ -782,6 +784,9 @@ void WmInitMenuPopUpView(HMENU menu)
 	else
 	if( lang == Languages::da )
 		CheckMenuItem(menu, IDM_LANGUAGE_DANISH,  MF_BYCOMMAND|MF_CHECKED);
+	else
+	if( lang == Languages::chn )
+		CheckMenuItem(menu, IDM_LANGUAGE_CHINESE, MF_BYCOMMAND|MF_CHECKED);
 }
 
 
@@ -1055,6 +1060,16 @@ BOOL WmCommand_LanguageDanish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 return true;
 }
 
+BOOL WmCommand_LanguageChinese(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	GetPrgRes()->GetLanguages()->SetCurrentLanguage(Languages::chn);
+
+	SetMenuLanguage(hWnd);
+	SetOutputEditLanguage(hWnd);
+	TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) );
+
+return true;
+}
 
 
 
@@ -1126,6 +1141,7 @@ void CreateCommandMessagesTable(Messages & cmessages)
 	cmessages.Associate(IDM_LANGUAGE_POLISH, WmCommand_LanguagePolish);
 	cmessages.Associate(IDM_LANGUAGE_SPANISH, WmCommand_LanguageSpanish);
 	cmessages.Associate(IDM_LANGUAGE_DANISH, WmCommand_LanguageDanish);
+	cmessages.Associate(IDM_LANGUAGE_CHINESE, WmCommand_LanguageChinese);
 	cmessages.Associate(IDM_HELP_HELP, WmHelp);
 	cmessages.Associate(IDM_HELP_PROJECT_PAGE, WmProjectPage);
 }

src/parsermanager.cpp

@@ -57,19 +57,19 @@ ParserManager::ParserManager() : buffer_len(2048)
 
 ParserManager::ParserManager(const ParserManager & p) : buffer_len(p.buffer_len)
 {
-	buffer = 0;
+	buffer            = 0;
-	base_input = p.base_input;
+	base_input        = p.base_input;
-	base_output = p.base_output;
+	base_output       = p.base_output;
 	always_scientific = p.always_scientific;
-	when_scientific = p.when_scientific;
+	when_scientific   = p.when_scientific;
-	rounding = p.rounding;
+	rounding          = p.rounding;
-	remove_zeroes = p.remove_zeroes;
+	remove_zeroes     = p.remove_zeroes;
 	last_variables_id = p.last_variables_id;
 	last_functions_id = p.last_functions_id;
 }
 
 
-ParserManager & ParserManager::operator=(const ParserManager & p)
+ParserManager & ParserManager::operator=(const ParserManager &)
 {
 	buffer = 0;
 

src/parsermanager.h

@@ -44,9 +44,7 @@
 */
 
 #include "resource.h"
-#include <ttmath/ttmath.h>
 #include "programresources.h"
-
 #include <windows.h>
 
 

src/programresources.cpp

@@ -803,6 +803,9 @@ std::string ini_value[20];
 	SetDisplayRounding(			atoi(ini_value[11].c_str()) );
 	SetRemovingZeroes(			bool(atoi(ini_value[15].c_str())) );
 
+	if( ini_value[13] == "4" )
+		languages.SetCurrentLanguage(Languages::chn);
+	else
 	if( ini_value[13] == "3" )
 		languages.SetCurrentLanguage(Languages::da);
 	else

src/resource.h

@@ -196,6 +196,7 @@
 #define IDM_LANGUAGE_POLISH				40011
 #define IDM_LANGUAGE_SPANISH			40012
 #define IDM_LANGUAGE_DANISH				40013
+#define IDM_LANGUAGE_CHINESE			40014
 #define IDM_CLOSE_PROGRAM				40020
 #define IDM_EDIT_UNDO					40030
 #define IDM_EDIT_PASTE					40031

src/resource.rc

@@ -1,7 +1,8 @@
 #define APSTUDIO_READONLY_SYMBOLS
-#include "afxres.h"
+//#include "afxres.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
+#include "windows.h"
 
 LANGUAGE LANG_POLISH, 1
 104 ICON "..\\res\\icon02.ico"
@@ -29,6 +30,7 @@ BEGIN
       MENUITEM "&Polish", 40011
       MENUITEM "&Spanish", 40012
       MENUITEM "&Danish", 40013
+      MENUITEM "&Chinese", 40014
     END
     MENUITEM SEPARATOR
     MENUITEM "&Close", 40020

src/threadcontroller.h

@@ -243,7 +243,7 @@ NewStopCalculating stop_calculating;
 		we make the copy-constructor private so that nobody will be able
 		to make a copy of the one object of this class
 	*/
-	ThreadController(const ThreadController & c)
+	ThreadController(const ThreadController &)
 	{
 	}
 };