From 7c62d9eae0fa2671a2f63fde47c0850a9904a3e8 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 30 Jan 2011 15:00:07 +0000 Subject: [PATCH] added: a new language: German translation made by: Moritz Beleites git-svn-id: svn://ttmath.org/publicrep/ttcalc/trunk@334 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/Makefile | 2 +- src/Makefileportable | 2 +- src/compileconfig.h | 6 +- src/languages.cpp | 271 ++++++++++++++++++++++++++++++++++++++- src/languages.h | 5 +- src/mainwindow.cpp | 19 ++- src/programresources.cpp | 31 ++--- src/programresources.h | 2 +- src/resource.h | 3 +- src/resource.rc | 1 + 10 files changed, 306 insertions(+), 36 deletions(-) diff --git a/src/Makefile b/src/Makefile index d715572..3513690 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ CC = g++ #CFLAGS = -Wall -pedantic -s -O2 -mwindows -I../../ttmath -DTTCALC_CONVERT -CFLAGS = -Wall -pedantic -s -O2 -mwindows -I../../ttmath +CFLAGS = -Wall -pedantic -s -O2 -mwindows -I../../ttmath -DTTMATH_DONT_USE_WCHAR name = ttcalc.exe # the name of the help is also set in the html help workshop project file diff --git a/src/Makefileportable b/src/Makefileportable index 8d03f7b..67ffc53 100644 --- a/src/Makefileportable +++ b/src/Makefileportable @@ -1,5 +1,5 @@ CC = g++ -CFLAGS = -Wall -pedantic -s -Os -fno-default-inline -mwindows -I../../ttmath -DTTCALC_PORTABLE +CFLAGS = -Wall -pedantic -s -Os -fno-default-inline -mwindows -I../../ttmath -DTTCALC_PORTABLE -DTTMATH_DONT_USE_WCHAR name = ttcalcp.exe compressor = upx diff --git a/src/compileconfig.h b/src/compileconfig.h index a4b50f0..64f6665 100644 --- a/src/compileconfig.h +++ b/src/compileconfig.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2010, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,8 +55,8 @@ */ #define TTCALC_MAJOR_VER 0 #define TTCALC_MINOR_VER 9 -#define TTCALC_REVISION_VER 2 -#define TTCALC_PRERELEASE_VER 0 +#define TTCALC_REVISION_VER 3 +#define TTCALC_PRERELEASE_VER 1 diff --git a/src/languages.cpp b/src/languages.cpp index 428b98e..24fc7d3 100644 --- a/src/languages.cpp +++ b/src/languages.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2010, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -336,6 +336,39 @@ void Languages::InitErrorMessagesTab() InsertErrorPair(ttmath::err_must_be_only_one_value,"Le variabili o le funzioni devono dare come risultato un solo valore"); InsertErrorPair(ttmath::err_still_calculating,"Calcolo..."); InsertErrorPair(ttmath::err_percent_from,"Operatore percentuale non correttamente utilizzato"); + + +/* + german messages relating to ttmath library +*/ + error_messages_tab.push_back( std::map() ); + + InsertErrorPair(ttmath::err_ok,"ok"); + InsertErrorPair(ttmath::err_nothing_has_read,""); + InsertErrorPair(ttmath::err_unknown_character,"Unbekanntes Zeichen"); + InsertErrorPair(ttmath::err_unexpected_final_bracket,"Unerwartete schließende Klammer"); + InsertErrorPair(ttmath::err_stack_not_clear,"Unbekanntes Zeichen ist übrig"); + InsertErrorPair(ttmath::err_unknown_variable,"Unbekannte Variable"); + InsertErrorPair(ttmath::err_division_by_zero,"Division durch Null"); + InsertErrorPair(ttmath::err_interrupt,"Berechnung unterbrochen"); + InsertErrorPair(ttmath::err_overflow,"Überlauf"); + InsertErrorPair(ttmath::err_unknown_function,"Unbekannte Funktion"); + InsertErrorPair(ttmath::err_unknown_operator,"Unbekannter Operator"); + InsertErrorPair(ttmath::err_unexpected_semicolon_operator,"Unerwarteter Semikolon-Operator"); + InsertErrorPair(ttmath::err_improper_amount_of_arguments,"Falsche Parameteranzahl"); + InsertErrorPair(ttmath::err_improper_argument,"Unpassender Parameter"); + InsertErrorPair(ttmath::err_unexpected_end,"Unerwartetes Ende"); + InsertErrorPair(ttmath::err_internal_error,"Interner Fehler"); + + InsertErrorPair(ttmath::err_incorrect_name,"Ungültiger Name einer Variablen oder Funktion"); + InsertErrorPair(ttmath::err_incorrect_value,"Ungültiger Wert einer Variablen oder Funktion"); + InsertErrorPair(ttmath::err_variable_exists,"Diese Variable existiert bereits"); + InsertErrorPair(ttmath::err_variable_loop,"Rekursion zwischen Variablen gefunden"); + InsertErrorPair(ttmath::err_functions_loop,"Rekursion zwischen Funktionen gefunden"); + InsertErrorPair(ttmath::err_must_be_only_one_value,"Variablen und Funktionen dürfen nur einen Rückgabewert haben"); + InsertErrorPair(ttmath::err_still_calculating,"Berechnung läuft..."); + InsertErrorPair(ttmath::err_percent_from,"Falsch angewandter Prozent-Operator"); + } @@ -495,6 +528,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&Russian"); InsertGuiPair(menu_view_lang_swedish, "S&wedish"); InsertGuiPair(menu_view_lang_italian, "&Italian"); + InsertGuiPair(menu_view_lang_german, "&German"); InsertGuiPair(menu_view_close_program, "&Close"); InsertGuiPair(menu_edit_undo, "&Undo \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); @@ -554,6 +588,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "German Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " portable version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -699,6 +735,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&Rosyjski"); InsertGuiPair(menu_view_lang_swedish, "&Szwedzki"); InsertGuiPair(menu_view_lang_italian, "&W³oski"); + InsertGuiPair(menu_view_lang_german, "&Niemiecki"); InsertGuiPair(menu_view_close_program, "&Zamknij"); InsertGuiPair(menu_edit_undo, "&Cofnij \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "Wy&tnij \tCtrl+X"); @@ -757,6 +794,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "W³oski Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "Niemiecki Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " wersja portable"); InsertGuiPair(about_text_exe_packer, "Paker exe: UPX 3.04\r\n"); @@ -905,6 +944,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&Ruso"); InsertGuiPair(menu_view_lang_swedish, "&Sueco"); InsertGuiPair(menu_view_lang_italian, "I&talian"); + InsertGuiPair(menu_view_lang_german, "&Alemán"); // is it a good translation? InsertGuiPair(menu_view_close_program, "&Close"); InsertGuiPair(menu_edit_undo, "&Deshacer \tCtrl+Z"); @@ -965,6 +1005,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "Alemán Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " versión portatil"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -1113,6 +1155,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&Russisk"); InsertGuiPair(menu_view_lang_swedish, "S&vensk"); InsertGuiPair(menu_view_lang_italian, "&Italian"); + InsertGuiPair(menu_view_lang_german, "&Tysk"); // is it a good translation? InsertGuiPair(menu_view_close_program, "Afslu&t"); InsertGuiPair(menu_edit_undo, "&Fortryd \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "Kli&p \tCtrl+X"); @@ -1171,6 +1214,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "Tysk Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " transportabel version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -1318,6 +1363,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&¶íÓï"); InsertGuiPair(menu_view_lang_swedish, "&ÈðµäÓï"); InsertGuiPair(menu_view_lang_italian, "&Italian"); + InsertGuiPair(menu_view_lang_german, "&German"); // to translate InsertGuiPair(menu_view_close_program, "&¹Ø±Õ"); InsertGuiPair(menu_edit_undo, "&È¡Ïû \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "&¼ôÇÐ \tCtrl+X"); @@ -1377,6 +1423,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "German Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " portable version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -1525,7 +1573,8 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_chinese, "&Êèòàéñêèé"); InsertGuiPair(menu_view_lang_russian, "&Ðóññêèé"); InsertGuiPair(menu_view_lang_swedish, "&Øâåäñêèé"); - InsertGuiPair(menu_view_lang_italian, "&Italian"); + InsertGuiPair(menu_view_lang_italian, "&Italian"); // to translate + InsertGuiPair(menu_view_lang_german, "&German"); // to translate InsertGuiPair(menu_view_close_program, "&Çàêðûòü"); InsertGuiPair(menu_edit_undo, "&Îòìåíèòü äåéñòâèå \tCtrl+Z"); @@ -1587,6 +1636,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "German Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " ïåðåíîñíàÿ âåðñèÿ"); InsertGuiPair(about_text_exe_packer, "óïàêîâùèê EXE: UPX 3.04\r\n"); @@ -1737,6 +1788,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_russian, "&Ryska"); InsertGuiPair(menu_view_lang_swedish, "S&venska"); InsertGuiPair(menu_view_lang_italian, "&Italian"); + InsertGuiPair(menu_view_lang_german, "&Tyska"); // is it a good translation? InsertGuiPair(menu_view_close_program, "A&vsluta"); InsertGuiPair(menu_edit_undo, "&Ångra \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); @@ -1795,6 +1847,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "Tyska Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " transportabel version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -1940,8 +1994,9 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_danish, "&Danese"); InsertGuiPair(menu_view_lang_chinese, "&Cinese"); InsertGuiPair(menu_view_lang_russian, "&Russo"); - InsertGuiPair(menu_view_lang_swedish, "&Svedese"); + InsertGuiPair(menu_view_lang_swedish, "S&vedese"); InsertGuiPair(menu_view_lang_italian, "I&taliano"); + InsertGuiPair(menu_view_lang_german, "&Tedesco"); // is it a good translation? InsertGuiPair(menu_view_close_program, "&Esci"); InsertGuiPair(menu_edit_undo, "&Annulla \tCtrl+Z"); InsertGuiPair(menu_edit_cut, "&Taglia \tCtrl+X"); @@ -2001,6 +2056,8 @@ void Languages::InitGuiMessagesTab() " lars.gafvert@gmail.com\r\n" "Italian Damiano Monaco\r\n" " dmonax@gmail.com\r\n" + "Tedesco Moritz Beleites\r\n" + " morbel@gmx.net\r\n" ); InsertGuiPair(about_text_portable_version, " versione portabile"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); @@ -2046,5 +2103,213 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cannot_save_file, "Non posso salvare in tale file"); InsertGuiPair(file_too_long, "Il file e troppo lungo"); InsertGuiPair(other_error, "Si e verificato un problema con questa operazione"); // for other kinds of errors + + + +/* + german gui messages +*/ + gui_messages_tab.push_back( std::map() ); + + InsertGuiPair(button_ok,"Ok"); + InsertGuiPair(button_cancel,"Abbrechen"); + InsertGuiPair(message_box_caption,"TTCalc"); + + InsertGuiPair(dialog_box_add_variable_caption,"Variable hinzufügen"); + InsertGuiPair(dialog_box_edit_variable_caption,"Variable bearbeiten"); + InsertGuiPair(dialog_box_add_variable_incorrect_name,"Ungültiger Variablenname"); + InsertGuiPair(dialog_box_add_variable_incorrect_value,"Ungültiger Wert der Variablen"); + InsertGuiPair(dialog_box_add_variable_variable_exists,"Diese Variable existiert bereits"); + InsertGuiPair(dialog_box_edit_variable_unknown_variable,"Variable unbekannt - vermutlich interner Fehler!"); + InsertGuiPair(dialog_box_delete_variable_confirm,"Diese Variablen löschen?"); + InsertGuiPair(dialog_box_variable_not_all_deleted,"Variablen konnten nicht alle gelöscht werden - vermutlich interner Fehler!"); + InsertGuiPair(dialog_box_add_function_caption,"Funktion hinzufügen"); + InsertGuiPair(dialog_box_edit_function_caption,"Funktion bearbeiten"); + InsertGuiPair(dialog_box_add_function_function_exists,"Diese Funktion existiert bereits"); + InsertGuiPair(dialog_box_edit_function_unknown_function,"Funktion unbekannt - vermutlich interner Fehler!"); + InsertGuiPair(dialog_box_delete_function_confirm,"Diese Funktionen löschen?"); + InsertGuiPair(dialog_box_function_not_all_deleted,"Funktionen konnten nicht alle gelöscht werden - vermutlich interner Fehler!"); + InsertGuiPair(dialog_box_add_function_incorrect_name,"Ungültiger Funktionsname"); + + InsertGuiPair(list_variables_header_1,"Name"); + InsertGuiPair(list_variables_header_2,"Wert"); + InsertGuiPair(list_functions_header_1,"Name"); + InsertGuiPair(list_functions_header_2,"Param."); + InsertGuiPair(list_functions_header_3,"Wert"); + + InsertGuiPair(button_add,"Hinzufügen"); + InsertGuiPair(button_edit,"Bearbeiten"); + InsertGuiPair(button_delete,"Löschen"); + InsertGuiPair(button_clear,"C"); + InsertGuiPair(tab_standard,"Standard"); + InsertGuiPair(tab_variables,"Variablen"); + InsertGuiPair(tab_functions,"Funktionen"); + InsertGuiPair(tab_precision,"Genauigkeit"); + InsertGuiPair(tab_display,"Anzeige"); + InsertGuiPair(tab_convert,"Konvertieren"); + + InsertGuiPair(radio_precision_1,"Klein - 96 bit für Mantisse, 32 bit für Exponenten"); + InsertGuiPair(radio_precision_2,"Mittel - 512 bit für Mantisse, 64 bit für Exponenten"); + InsertGuiPair(radio_precision_3,"Groß - 1024 bit für Mantisse, 128 bit für Exponenten"); + + InsertGuiPair(precision_1_info,"(+/-)6.97...e+646457021, 26 gültige Dezimalstellen"); + InsertGuiPair(precision_2_info,"(+/-)9.25...e+2776511644261678719, 152 gültige Dezimalstellen"); + InsertGuiPair(precision_3_info,"(+/-)9.80...*10^(10^37), 306 gültige Dezimalstellen"); + + InsertGuiPair(overflow_during_printing,"Überlauf während der Ausgabe"); + + InsertGuiPair(combo_rounding_none,"keine"); + InsertGuiPair(combo_rounding_integer,"auf Ganzzahl"); + InsertGuiPair(combo_rounding_to_number,"auf"); + InsertGuiPair(combo_rounding_after_comma,"Stelle(n)"); + InsertGuiPair(check_remove_zeroes,"Nur signifikante Nachkommastellen"); + + InsertGuiPair(display_input, "Eingabebasis"); + InsertGuiPair(display_output, "Ergebnisbasis"); + InsertGuiPair(display_rounding, "Rundung"); + InsertGuiPair(display_always_scientific,"Immer"); + InsertGuiPair(display_not_always_scientific,"Wenn der Exponent größer ist als:"); + InsertGuiPair(display_group_scientific, "Ergebnis in wissenschaftlicher Schreibweise"); + InsertGuiPair(display_deg_rad_grad, "Winkelmaß"); + InsertGuiPair(display_grouping, "Gruppierung"); // e.g. 1`000`000 + InsertGuiPair(display_grouping_none, "keine"); + InsertGuiPair(display_grouping_space, "Leerzeichen"); + InsertGuiPair(display_input_decimal_point, "Dezimaltrennz. Eingabe"); // Decimal point in formula + InsertGuiPair(display_input_decimal_point_item1, " . oder ,"); + InsertGuiPair(display_output_decimal_point, "Dezimaltrennz. Ergebnis"); // Decimal point in result + InsertGuiPair(display_param_sep, "Parameter getrennt durch"); + InsertGuiPair(display_param_sep_item2, " ; oder ."); + InsertGuiPair(display_param_sep_item3, " ; oder ,"); + + InsertGuiPair(convert_type, "Typ"); + InsertGuiPair(convert_input, "Eingabe"); + InsertGuiPair(convert_output, "Ergebnis"); + InsertGuiPair(convert_dynamic_output, "Auto präfix"); + + InsertGuiPair(menu_view, "&Ansicht"); + InsertGuiPair(menu_edit, "&Bearbeiten"); + InsertGuiPair(menu_help, "&Hilfe"); + InsertGuiPair(menu_language, "&Sprache"); + InsertGuiPair(menu_view_new_window, "&Neues Fenster"); + InsertGuiPair(menu_view_normal_view, "No&rmale Ansicht"); + InsertGuiPair(menu_view_compact_view, "&Kompakte Ansicht"); + InsertGuiPair(menu_view_pad, "&Notizblock"); + InsertGuiPair(menu_view_always_on_top, "Immer im &Vordergrund"); + InsertGuiPair(menu_view_lang_english, "&Englisch"); + InsertGuiPair(menu_view_lang_polish, "&Polnisch"); + InsertGuiPair(menu_view_lang_spanish, "&Spanisch"); + InsertGuiPair(menu_view_lang_danish, "&Dänisch"); + InsertGuiPair(menu_view_lang_chinese, "&Chinesisch"); + InsertGuiPair(menu_view_lang_russian, "&Russisch"); + InsertGuiPair(menu_view_lang_swedish, "Sch&wedisch"); + InsertGuiPair(menu_view_lang_italian, "&Italienisch"); + InsertGuiPair(menu_view_lang_german, "De&utsch"); + InsertGuiPair(menu_view_close_program, "&Beenden"); + InsertGuiPair(menu_edit_undo, "&Rückgängig \tStrg+Z"); + InsertGuiPair(menu_edit_cut, "&Ausschneiden \tStrg+X"); + InsertGuiPair(menu_edit_copy, "&Kopieren \tStrg+C"); + InsertGuiPair(menu_edit_paste, "&Einfügen"); // cutting, copying, pasting the the edit which has a focus + InsertGuiPair(menu_edit_del, "&Löschen \tEntf"); + InsertGuiPair(menu_edit_paste_formula, "&Formel einfügen \tStrg+V"); // pasting directly to input edit + InsertGuiPair(menu_edit_copy_result, "E&rgebnis kopieren \tStrg+R"); + InsertGuiPair(menu_edit_copy_both, "&Beides kopieren \tStrg+B"); // copying in this way: "input edit = output edit" + InsertGuiPair(menu_edit_select_all, "Alles a&uswählen \tEsc"); + InsertGuiPair(menu_edit_bracket, "Eingabe eink&lammern \tStrg+0"); // inserting brackets: (...) + InsertGuiPair(menu_edit_swap, "&Vertauschen \tStrg+W"); // swapping input edit for output edit + InsertGuiPair(menu_help_help, "&Hilfe"); + InsertGuiPair(menu_help_project_page, "&Projektseite aufrufen"); + InsertGuiPair(menu_help_check_update, "Nach &Updates suchen..."); + InsertGuiPair(menu_help_about, "&Über TTCalc"); + InsertGuiPair(menu_update_available, "&Neue Version ist verfügbar"); + // this will be a new main menu item (one after 'help') visible only if there is an update + + InsertGuiPair(cant_init_calculations, "Konnte Modul für die Berechnungen nicht initialisieren"); + InsertGuiPair(message_box_error_caption,"TTCalc"); + InsertGuiPair(cant_create_thread, "Konnte zweiten Thread für die Berechung nicht erzeugen"); + InsertGuiPair(cant_create_pad, "Konnte Fenster für Notizblock nicht erzeugen"); + InsertGuiPair(cant_create_main_window, "Konnte das Hauptfenster nicht erzeugen"); + InsertGuiPair(cant_init_common_controls,"Konnte die \"common controls\" nicht initialisieren (InitCommonControlsEx)"); + InsertGuiPair(about_text, + "Mathematischer Taschenrechner TTCalc %d.%d.%d%s%s\r\n\r\n" + "Autor: Tomasz Sowa\r\n" + "Kontakt: t.sowa@ttmath.org\r\n" + "Lizenz: BSD (open source)\r\n" + "Projektseite: http://ttcalc.sourceforge.net\r\n" + "Bignum library: TTMath %d.%d.%d%s (%s)\r\n" + "Bignum Typ: binary floating point numbers\r\n" + "Programmiersprache: C++\r\n" + "Compiler: %s\r\n" + "%s" // for upx + "\r\n" + "TTCalc verwendet das TTMath bignum library," + " welches auf http://www.ttmath.org verfügbar ist.\r\n" + "\r\n" +#ifdef TTCALC_PORTABLE + "Dies ist die portable Version des Programms TTCalc. In dieser Version " + "kann nur mit einer einzigen Präzision gerechnet werden (96 bit für die " + "Mantisse und 32 bit für den Exponenten) ungefähr +/-6.9e+646457021.\r\n" + "\r\n" +#endif + "Übersetzungen:\r\n" + "Spanisch Alejandro S. Valdezate\r\n" + " alesanval@gmail.com\r\n" + "Dänisch Rune Bisgaard Vammen\r\n" + " runebisgaard@gmail.com\r\n" + "Chinesisch Juis\r\n" + " zsyfly@gmail.com\r\n" + "Russisch Vladimir Gladilovich\r\n" + " vdgladilovich@gmail.com\r\n" + "Schwedisch Lars 'Bafvert' Gafvert\r\n" + " lars.gafvert@gmail.com\r\n" + "Italienisch Damiano Monaco\r\n" + " dmonax@gmail.com\r\n" + "Deutsch Moritz Beleites\r\n" + " morbel@gmx.net\r\n" + ); + InsertGuiPair(about_text_portable_version, " portable Version"); + InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.04\r\n"); + InsertGuiPair(about_box_title, "Über TTCalc"); + InsertGuiPair(about_box_button_close, "Schließen"); + InsertGuiPair(unknown_error, "Ein unbekannter Fehler ist aufgetreten"); + InsertGuiPair(cant_find_help, "Hilfe-Dateien können nicht gefunden werden"); + InsertGuiPair(cant_open_project_page, "Projektseite kann nicht geöffnet werden"); + InsertGuiPair(update_title, "Nach neuer Version suchen"); + InsertGuiPair(update_button_next, "Weiter"); + InsertGuiPair(update_button_finish, "Ende"); + InsertGuiPair(update_button_cancel, "Abbrechen"); + InsertGuiPair(update_check_at_startup, "Beim Start des Programms immer nach Update suchen"); + InsertGuiPair(update_check_for_info, "\"Weiter\", um die Update-Suche zu starten..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d ist verfügbar \"Weiter\", um den Download zu starten..."); + InsertGuiPair(update_no_new_version1, "Es ist keine neuere Version verfügbar."); + InsertGuiPair(update_no_new_version2, "Die neueste Version ist bereits installiert."); + InsertGuiPair(update_download_from, "Download läuft..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "Eine neue Setup-Datei wurde heruntergeladen."); + InsertGuiPair(update_downloaded_info2, "\"Ende\", um TTCalc zu beenden und die neue version zu installieren."); +#else + InsertGuiPair(update_downloaded_info1, "Eine neue Version wurde heruntergeladen."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "Problem beim Download - bitte später erneut versuchen."); + + InsertGuiPair(pad_title, "Notizblock"); + InsertGuiPair(pad_menu_file, "&Datei"); + InsertGuiPair(pad_menu_edit, "&Bearbeiten"); + InsertGuiPair(pad_menu_file_new, "&Neu"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "Ö&ffnen..."); + InsertGuiPair(pad_menu_file_saveas, "Speichern &als..."); + InsertGuiPair(pad_menu_file_close, "&Beenden"); + InsertGuiPair(pad_menu_edit_undo, "&Rückgängig \tStrg+Z"); + InsertGuiPair(pad_menu_edit_cut, "&Ausschneiden \tStrg+X"); + InsertGuiPair(pad_menu_edit_copy, "&Kopieren \tStrg+C"); + InsertGuiPair(pad_menu_edit_paste, "&Einfügen \tStrg+V"); + InsertGuiPair(pad_menu_edit_del, "&Löschen \tEntf"); + InsertGuiPair(pad_menu_edit_select_all, "Alles a&uswählen \tStrg+A"); + + InsertGuiPair(cannot_open_file, "Datei kann nicht geöffnet werden"); + InsertGuiPair(cannot_save_file, "Datei kann nicht gespeichert werden"); + InsertGuiPair(file_too_long, "Datei ist zu lang"); + InsertGuiPair(other_error, "Unbekannter Fehler aufgetreten"); // for other kinds of errors + } diff --git a/src/languages.h b/src/languages.h index 5f19604..61c38c7 100644 --- a/src/languages.h +++ b/src/languages.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2010, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -132,6 +132,7 @@ public: menu_view_lang_russian, menu_view_lang_swedish, menu_view_lang_italian, + menu_view_lang_german, menu_view_close_program, menu_edit_undo, menu_edit_cut, @@ -201,7 +202,7 @@ public: // (after conversion to 'int' we pass it into the std::vector) enum Country { - en = 0, pl, sp, da, chn, ru, swe, it + en = 0, pl, sp, da, chn, ru, swe, it, ger }; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 56b992c..d4a97cc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2010, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -408,6 +408,7 @@ HMENU menu = GetMenu(hWnd); SetMenuLanguageItem(menu, IDM_LANGUAGE_RUSSIAN, Languages::menu_view_lang_russian); SetMenuLanguageItem(menu, IDM_LANGUAGE_SWEDISH, Languages::menu_view_lang_swedish); SetMenuLanguageItem(menu, IDM_LANGUAGE_ITALIAN, Languages::menu_view_lang_italian); + SetMenuLanguageItem(menu, IDM_LANGUAGE_GERMAN, Languages::menu_view_lang_german); SetMenuLanguageItem(menu, IDM_CLOSE_PROGRAM, Languages::menu_view_close_program); SetMenuLanguageItem(menu, IDM_EDIT_UNDO, Languages::menu_edit_undo); SetMenuLanguageItem(menu, IDM_EDIT_CUT, Languages::menu_edit_cut); @@ -819,6 +820,9 @@ void WmInitMenuPopUpView(HMENU menu) else if( lang == Languages::it ) CheckMenuItem(menu, IDM_LANGUAGE_ITALIAN, MF_BYCOMMAND|MF_CHECKED); + else + if( lang == Languages::ger ) + CheckMenuItem(menu, IDM_LANGUAGE_GERMAN, MF_BYCOMMAND|MF_CHECKED); } @@ -1352,6 +1356,18 @@ return true; } +BOOL WmCommand_LanguageGerman(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + GetPrgRes()->GetLanguages()->SetCurrentLanguage(Languages::ger); + + SetMenuLanguage(hWnd); + SetOutputEditLanguage(hWnd); + TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); + +return true; +} + BOOL WmHelp(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { SHELLEXECUTEINFO exec; @@ -1456,6 +1472,7 @@ void CreateCommandMessagesTable(Messages & cmessages) cmessages.Associate(IDM_LANGUAGE_RUSSIAN, WmCommand_LanguageRussian); cmessages.Associate(IDM_LANGUAGE_SWEDISH, WmCommand_LanguageSwedish); cmessages.Associate(IDM_LANGUAGE_ITALIAN, WmCommand_LanguageItalian); + cmessages.Associate(IDM_LANGUAGE_GERMAN, WmCommand_LanguageGerman); cmessages.Associate(IDM_HELP_HELP, WmHelp); cmessages.Associate(IDM_HELP_PROJECT_PAGE, WmProjectPage); } diff --git a/src/programresources.cpp b/src/programresources.cpp index 86888f7..05be365 100644 --- a/src/programresources.cpp +++ b/src/programresources.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2009, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1149,28 +1149,13 @@ std::string ini_value[30]; if( !ini_value[15].empty() ) SetRemovingZeroes( bool(atoi(ini_value[15].c_str())) ); - if( ini_value[13] == "7" ) - languages.SetCurrentLanguage(Languages::it); - else - if( ini_value[13] == "6" ) - languages.SetCurrentLanguage(Languages::swe); - else - if( ini_value[13] == "5" ) - languages.SetCurrentLanguage(Languages::ru); - else - if( ini_value[13] == "4" ) - languages.SetCurrentLanguage(Languages::chn); - else - if( ini_value[13] == "3" ) - languages.SetCurrentLanguage(Languages::da); - else - if( ini_value[13] == "2" ) - languages.SetCurrentLanguage(Languages::sp); - else - if( ini_value[13] == "1" ) - languages.SetCurrentLanguage(Languages::pl); - else - languages.SetCurrentLanguage(Languages::en); + + int lang_int = atoi(ini_value[13].c_str()); + + if( lang_int < 0 || lang_int > 8 ) + lang_int = 0; + + languages.SetCurrentLanguage((Languages::Country)lang_int); SetDecimalPoint( atoi(ini_value[14].c_str()) ); SetDegRadGrad( atoi(ini_value[16].c_str()) ); diff --git a/src/programresources.h b/src/programresources.h index 9bf1390..79f7651 100644 --- a/src/programresources.h +++ b/src/programresources.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2009, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/resource.h b/src/resource.h index 9998841..2623fa0 100644 --- a/src/resource.h +++ b/src/resource.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2010, Tomasz Sowa + * Copyright (c) 2006-2011, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -223,6 +223,7 @@ #define IDM_LANGUAGE_RUSSIAN 40015 #define IDM_LANGUAGE_SWEDISH 40016 #define IDM_LANGUAGE_ITALIAN 40017 +#define IDM_LANGUAGE_GERMAN 40018 #define IDM_CLOSE_PROGRAM 40020 #define IDM_EDIT_UNDO 40030 diff --git a/src/resource.rc b/src/resource.rc index aa5db3a..5de1564 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -35,6 +35,7 @@ BEGIN MENUITEM "Russian", IDM_LANGUAGE_RUSSIAN MENUITEM "Swedish", IDM_LANGUAGE_SWEDISH MENUITEM "Italian", IDM_LANGUAGE_ITALIAN + MENUITEM "German", IDM_LANGUAGE_GERMAN END MENUITEM SEPARATOR MENUITEM "Close", IDM_CLOSE_PROGRAM