29 Dec
2008
29 Dec
'08
3:53 a.m.
Author: dgorbachev
Date: Sun Dec 28 21:53:13 2008
New Revision: 38438
URL: http://svn.reactos.org/svn/reactos?rev=38438&view=rev
Log:
Add Slovak koruna to Calculator, update Korean file.
Patch by Mario Kacmar, with some modifications.
Bug #3867.
Modified:
trunk/reactos/base/applications/calc/convert.c
trunk/reactos/base/applications/calc/lang/bg-BG.rc
trunk/reactos/base/applications/calc/lang/cs-CZ.rc
trunk/reactos/base/applications/calc/lang/de-DE.rc
trunk/reactos/base/applications/calc/lang/en-US.rc
trunk/reactos/base/applications/calc/lang/es-ES.rc
trunk/reactos/base/applications/calc/lang/it-IT.rc
trunk/reactos/base/applications/calc/lang/ko-KR.rc
trunk/reactos/base/applications/calc/lang/nl-NL.rc
trunk/reactos/base/applications/calc/lang/no-NO.rc
trunk/reactos/base/applications/calc/lang/pl-PL.rc
trunk/reactos/base/applications/calc/lang/ru-RU.rc
trunk/reactos/base/applications/calc/lang/sk-SK.rc
trunk/reactos/base/applications/calc/lang/th-TH.rc
trunk/reactos/base/applications/calc/lang/uk-UA.rc
trunk/reactos/base/applications/calc/resource.h
Modified: trunk/reactos/base/applications/calc/convert.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con…
==============================================================================
--- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Sun Dec 28 21:53:13 2008
@@ -142,6 +142,7 @@
DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC, "$/40,3399",
"$*40,3399")
DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA, "$/0.42930",
"$*0.42930")
DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO, "$/200,482",
"$*200,482")
+ DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA, "$/30,126",
"$*30,126")
DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR, "$/239,640",
"$*239,640")
DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA, "$/166,386",
"$*166,386")
DECLARE_CONV_END
Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -522,6 +522,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,6 +1,6 @@
/* FILE: base/applications/calc/lang/cs-CZ.rc
* TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED: 2008-07-27
+ * UPDATED: 2008-12-29
*/
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -523,6 +523,7 @@
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"
IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakouský ilink"
IDS_CURRENCY_GREEK_DRACHMA "Øecká drachma"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský tolar"
IDS_CURRENCY_SPANISH_PESETA "panìlská peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -521,6 +521,7 @@
IDS_CURRENCY_DUTCH_GUILDER "Niederländische Guilder"
IDS_CURRENCY_AUSTRIAN_SCHILLING "Österreichische Schilling"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slowakische Krone"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenische Tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanische Peseta"
IDS_CURRENCY_CYPRIOT_POUND "Zypriotische Pfund"
Modified: trunk/reactos/base/applications/calc/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -517,6 +517,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,5 +1,5 @@
/*
- *Spanish Language resource file
+ * Spanish Language resource file
* Traducido por: Javier Remacha 2008
*/
@@ -527,6 +527,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Luxemburgués"
IDS_CURRENCY_MALTESE_LIRA "Lira Maltesa"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugués"
+ IDS_CURRENCY_SLOVAK_KORUNA "Corona Eslovaca"
IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Esloveno"
IDS_CURRENCY_SPANISH_PESETA "Peseta Española"
END
Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -517,6 +517,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese"
IDS_CURRENCY_MALTESE_LIRA "Lira maltese"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese"
+ IDS_CURRENCY_SLOVAK_KORUNA "Corona slovacca"
IDS_CURRENCY_SLOVENIAN_TOLAR "Tallero sloveno"
IDS_CURRENCY_SPANISH_PESETA "Peseta spagnola"
END
Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,11 +1,13 @@
/*
- *Korean translation by manatails007(www.manatails007.org) Seungju Kim
+ * Korean translation by manatails007 (www.manatails007.org) Seungju Kim
*/
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS °è»ê±â"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -151,7 +153,7 @@
42,10
CONTROL
"Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
24,42,10
- CONTROL
"Grads",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
+ CONTROL
"Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
236,24,44,10
PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER |
BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -165,7 +167,7 @@
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS °è»ê±â"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -231,13 +233,91 @@
DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
END
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS °è»ê±â Á¤º¸"
+MENU IDR_MENU_STANDARD
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17
+ COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP | CBS_SORT
+ LTEXT "Category:",IDC_STATIC,4,20,56,8
+ COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP | CBS_SORT
+ LTEXT "Convert from:",IDC_STATIC,4,49,56,8
+ COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP | CBS_SORT
+ LTEXT "Convert to:",IDC_STATIC,4,76,56,8
+ CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
+ CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
+ CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW |
+ BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
+ 40,17
+ RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
+ WS_EX_CLIENTEDGE
+ CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
+ CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
+ CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
+ CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
+ CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
+ CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
+ CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
+ CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
+ CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
+ CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
+ CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
+ CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
+ CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
+ CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
+ CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
+ CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
+ CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
+ CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
+ CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
+ CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
+ CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
+ WS_EX_CLIENTEDGE
+ CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
+ CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
+ CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
+ CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW |
BS_CENTER |
+ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
+ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
+END
+
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS °è»ê±â Á¤º¸"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,105,148,52,16
- CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE |
+ CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP |
SS_CENTERIMAGE |
SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48
LTEXT "ReactOS °è»ê±â",IDC_STATIC,120,12,132,8,
SS_CENTERIMAGE
@@ -251,7 +331,7 @@
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistics box"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -265,7 +345,6 @@
SS_SUNKEN
END
-
// Menus
IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE
@@ -365,3 +444,260 @@
IDS_QUICKHELP "ºü¸¥ µµ¿ò¸»"
END
+// types of conversion
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CONV_AREA "Area"
+ IDS_CONV_CONSUMPTION "Consumption (engines)"
+ IDS_CONV_CURRENCY "Currencies"
+ IDS_CONV_ENERGY "Energy"
+ IDS_CONV_LENGTH "Lenghts"
+ IDS_CONV_POWER "Power"
+ IDS_CONV_PRESSURE "Pressure"
+ IDS_CONV_TEMPERATURE "Temperature"
+ IDS_CONV_VELOCITY "Velocity"
+ IDS_CONV_VOLUME "Volume"
+ IDS_CONV_WEIGHT "Weights"
+END
+
+// TYPES OF AREAS
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_AREA_ACRES "Acres"
+ IDS_AREA_ACRES_BRAZIL "Acres (Brazil)"
+ IDS_AREA_ACRES_FRANCE "Acres (France)"
+ IDS_AREA_ACRES_SCOTS "Acres (Scots)"
+ IDS_AREA_ACRES_US "Acres (US)"
+ IDS_AREA_ARES "Ares"
+ IDS_AREA_CHOU "Chou"
+ IDS_AREA_DANBO "Danbo"
+ IDS_AREA_HECTARES "Hectares"
+ IDS_AREA_JEONGBO "Jeongbo"
+ IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)"
+ IDS_AREA_MU "Mu"
+ IDS_AREA_PING "Ping"
+ IDS_AREA_PYEONG "Pyeong"
+ IDS_AREA_PYEONGBANGJA "Pyeongbangja"
+ IDS_AREA_RAI "Rai"
+ IDS_AREA_SE "Se"
+ IDS_AREA_SQUARE_CENTIMETERS "Square centimeters"
+ IDS_AREA_SQUARE_CHR "Square chr"
+ IDS_AREA_SQUARE_FATHOMS "Square fathoms"
+ IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+ IDS_AREA_SQUARE_FEET "Square feet"
+ IDS_AREA_SQUARE_INCHES "Square inches"
+ IDS_AREA_SQUARE_KILOMETERS "Square kilometers"
+ IDS_AREA_SQUARE_LAR "Square lar"
+ IDS_AREA_SQUARE_METER "Square meter"
+ IDS_AREA_SQUARE_MILES "Square miles"
+ IDS_AREA_SQUARE_MILLIMETERS "Square millimeters"
+ IDS_AREA_SQUARE_SHAKU "Square shaku"
+ IDS_AREA_SQUARE_TSUEN "Square tsuen"
+ IDS_AREA_SQUARE_VA "Square va"
+ IDS_AREA_SQUARE_YARD "Square yard"
+ IDS_AREA_TAN "Tan"
+ IDS_AREA_TSUBO "Tsubo"
+END
+
+// TYPES OF COMSUMPTIONS
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CONSUMPTION_KM_PER_L "Kilometer/liter"
+ IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers"
+ IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
+ IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
+END
+
+// TYPES OF CURRENCIES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+ IDS_CURRENCY_BELGIAN_FRANC "Belgian franc"
+ IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound"
+ IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
+ IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+ IDS_CURRENCY_EURO "Euro"
+ IDS_CURRENCY_FINNISH_MARKKA "Finnish markka"
+ IDS_CURRENCY_FRENCH_FRANC "French franc"
+ IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma"
+ IDS_CURRENCY_IRISH_POUND "Irish pound"
+ IDS_CURRENCY_ITALIAN_LIRA "Italian lira"
+ IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
+ IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
+ IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
+ IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
+ IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
+END
+
+// TYPES OF ENERGIES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_ENERGY_15_C_CALORIES "15 ^C calories"
+ IDS_ENERGY_ERGS "Ergs"
+ IDS_ENERGY_IT_CALORIES "International Table calories"
+ IDS_ENERGY_JOULES "Joules"
+ IDS_ENERGY_KILOJOULES "Kilojoules"
+ IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours"
+ IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories"
+ IDS_ENERGY_TH_CALORIES "Thermochemical calorie"
+END
+
+// TYPES OF LENGTHS
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_LENGTH_ANGSTROMS "Angstroms"
+ IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units"
+ IDS_LENGTH_BARLEYCORNS "Barleycorns"
+ IDS_LENGTH_CENTIMETERS "Centimeters"
+ IDS_LENGTH_CHAINS_UK "Chains (UK)"
+ IDS_LENGTH_CHI "Chi"
+ IDS_LENGTH_CHOU "Chou"
+ IDS_LENGTH_CHR "Chr"
+ IDS_LENGTH_CUN "Cun"
+ IDS_LENGTH_FATHOMS "Fathoms"
+ IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)"
+ IDS_LENGTH_FEET "Feet"
+ IDS_LENGTH_FURLONGS "Furlongs"
+ IDS_LENGTH_GAN "Gan"
+ IDS_LENGTH_HANDS "Hands"
+ IDS_LENGTH_HUNH "Hunh"
+ IDS_LENGTH_INCHES "Inches"
+ IDS_LENGTH_JA "Ja"
+ IDS_LENGTH_JEONG "Jeong"
+ IDS_LENGTH_KABIET "Kabiet"
+ IDS_LENGTH_KEN "Ken"
+ IDS_LENGTH_KEUB "Keub"
+ IDS_LENGTH_KILOMETERS "Kilometers"
+ IDS_LENGTH_LAR "Lar"
+ IDS_LENGTH_LIGHT_YEARS "Light years"
+ IDS_LENGTH_LINKS_UK "Links (UK)"
+ IDS_LENGTH_METERS "Meters"
+ IDS_LENGTH_MILES "Miles"
+ IDS_LENGTH_MILLIMETERS "Millimeters"
+ IDS_LENGTH_NAUTICAL_MILES "Nautical miles"
+ IDS_LENGTH_NIEU "Nieu"
+ IDS_LENGTH_PARSECS "Parsecs"
+ IDS_LENGTH_PICAS "Picas"
+ IDS_LENGTH_RI_JAPAN "Ri (Japan)"
+ IDS_LENGTH_RI_KOREA "Ri (Korea)"
+ IDS_LENGTH_SAWK "Sawk"
+ IDS_LENGTH_SEN "Sen"
+ IDS_LENGTH_SHAKU "Shaku"
+ IDS_LENGTH_SPAN "Span"
+ IDS_LENGTH_SUN "Sun"
+ IDS_LENGTH_TSUEN "Tsuen"
+ IDS_LENGTH_VA "Va"
+ IDS_LENGTH_YARDS "Yards"
+ IDS_LENGTH_YOTE "Yote"
+ IDS_LENGTH_ZHANG "Zhang"
+END
+
+// TYPES OF POWERS
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_POWER_HORSEPOWER "Horsepower"
+ IDS_POWER_KILOWATTS "Kilowatts"
+ IDS_POWER_MEGAWATTS "Megawatts"
+ IDS_POWER_WATTS "Watts"
+END
+
+// TYPE OF PRESSURES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_PRESSURE_ATMOSPHERES "Atmospheres"
+ IDS_PRESSURE_BARS "Bars"
+ IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury"
+ IDS_PRESSURE_PASCALS "Pascals"
+ IDS_PRESSURE_PSI "Pounds-force per square inch"
+END
+
+// TYPES OF TEMPERATURES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_TEMPERATURE_CELSIUS "Celsius"
+ IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit"
+ IDS_TEMPERATURE_KELVIN "Kelvin"
+ IDS_TEMPERATURE_RANKINE "Rankine"
+END
+
+// TYPES OF VELOCITIES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_VELOCITY_FEET_HOUR "Feet/hour"
+ IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour"
+ IDS_VELOCITY_KNOTS "Knots"
+ IDS_VELOCITY_MACH "Mach"
+ IDS_VELOCITY_METERS_SECOND "Meters/second"
+ IDS_VELOCITY_MILES_HOUR "Miles/hour"
+END
+
+// TYPES OF VOLUMES
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_VOLUME_BARRELS_UK "Barrels (UK)"
+ IDS_VOLUME_BARRELS_OIL "Barrels oil"
+ IDS_VOLUME_BUN "Bun"
+ IDS_VOLUME_BUSHELS_UK "Bushels (UK)"
+ IDS_VOLUME_BUSHELS_US "Bushels (US)"
+ IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters"
+ IDS_VOLUME_CUBIC_FEET "Cubic feet"
+ IDS_VOLUME_CUBIC_INCHES "Cubic inches"
+ IDS_VOLUME_CUBIC_METERS "Cubic meters"
+ IDS_VOLUME_CUBIC_YARDS "Cubic yards"
+ IDS_VOLUME_DOE "Doe"
+ IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)"
+ IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)"
+ IDS_VOLUME_GALLONS_UK "Gallons (UK)"
+ IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)"
+ IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)"
+ IDS_VOLUME_GOU "Gou"
+ IDS_VOLUME_HOP "Hop"
+ IDS_VOLUME_ICCE "Icce"
+ IDS_VOLUME_KWIAN "Kwian"
+ IDS_VOLUME_LITERS "Liters"
+ IDS_VOLUME_MAL "Mal"
+ IDS_VOLUME_MILLILITERS "Milliliters"
+ IDS_VOLUME_PINTS_UK "Pints (UK)"
+ IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)"
+ IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)"
+ IDS_VOLUME_QUARTS_UK "Quarts (UK)"
+ IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)"
+ IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)"
+ IDS_VOLUME_SEKI "Seki"
+ IDS_VOLUME_SYOU "Syou"
+ IDS_VOLUME_TANANLOUNG "Tananloung"
+ IDS_VOLUME_TANG "Tang"
+ IDS_VOLUME_TO "To"
+END
+
+// TYPES OF WEIGHTS
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_WEIGHT_BAHT "Baht"
+ IDS_WEIGHT_CARATS "Carats"
+ IDS_WEIGHT_CHUNG "Chung"
+ IDS_WEIGHT_DON "Don"
+ IDS_WEIGHT_GEUN "Geun"
+ IDS_WEIGHT_GRAMS "Grams"
+ IDS_WEIGHT_GWAN "Gwan"
+ IDS_WEIGHT_HARB "Harb"
+ IDS_WEIGHT_JIN_CHINA "Jin (China)"
+ IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)"
+ IDS_WEIGHT_KAN "Kan"
+ IDS_WEIGHT_KILOGRAMS "Kilograms"
+ IDS_WEIGHT_KIN "Kin"
+ IDS_WEIGHT_LIANG_CHINA "Liang (China)"
+ IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
+ IDS_WEIGHT_MONME "Monme"
+ IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois"
+ IDS_WEIGHT_OUNCES_TROY "Ounces, troy"
+ IDS_WEIGHT_POUNDS "Pounds"
+ IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)"
+ IDS_WEIGHT_SALOUNG "Saloung"
+ IDS_WEIGHT_STONES "Stones"
+ IDS_WEIGHT_TAMLUNG "Tamlung"
+ IDS_WEIGHT_TONNES "Tonnes"
+ IDS_WEIGHT_TONS_UK "Tons (UK)"
+ IDS_WEIGHT_TONS_US "Tons (US)"
+END
Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,4 +1,3 @@
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
// Dialog
@@ -523,6 +522,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -518,6 +518,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -529,6 +529,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank"
IDS_CURRENCY_MALTESE_LIRA "Maltañskie liry"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "S³owacka korona"
IDS_CURRENCY_SLOVENIAN_TOLAR "S³oveñski tolar"
IDS_CURRENCY_SPANISH_PESETA "Hiszpañska peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -522,6 +522,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Ëþêñåìáóðãñêèé ôðàíê"
IDS_CURRENCY_MALTESE_LIRA "Ìàëüòèéñêàÿ ëèðà"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Ïîðòóãàëüñêîå ýñêóäî"
+ IDS_CURRENCY_SLOVAK_KORUNA "Ñëîâàöêàÿ êðîíà"
IDS_CURRENCY_SLOVENIAN_TOLAR "Ñëîâåíñêèé òîëàð"
IDS_CURRENCY_SPANISH_PESETA "Èñïàíñêàÿ ïåñåòà"
END
Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,6 +1,6 @@
/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk)
* DATE OF TR.: 30-01-2008
- * LAST CHANGE: 30-08-2008
+ * LAST CHANGE: 29-12-2008
* ---------------------------------------
* TODO:
* 1. treba usporiada jednotky pod¾a abecedy
@@ -350,7 +350,6 @@
SS_SUNKEN
END
-
// Menus
IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE
@@ -531,6 +530,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar"
IDS_CURRENCY_SPANISH_PESETA "panielska peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -1,6 +1,6 @@
/*
* ReactOS Calc (Thai resource file)
- * Last modified: 2008-12-18
+ * Last modified: 2008-12-29
*/
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
@@ -522,6 +522,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Sun Dec 28 21:53:13
2008
@@ -530,6 +530,7 @@
IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+ IDS_CURRENCY_SLOVAK_KORUNA "Ñëîâàöüêà êðîíà"
IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
END
Modified: trunk/reactos/base/applications/calc/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res…
==============================================================================
--- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Sun Dec 28 21:53:13 2008
@@ -173,8 +173,9 @@
#define IDS_CURRENCY_LUXEMBOURG_FRANC 2311
#define IDS_CURRENCY_MALTESE_LIRA 2312
#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2313
-#define IDS_CURRENCY_SLOVENIAN_TOLAR 2314
-#define IDS_CURRENCY_SPANISH_PESETA 2315
+#define IDS_CURRENCY_SLOVAK_KORUNA 2314
+#define IDS_CURRENCY_SLOVENIAN_TOLAR 2315
+#define IDS_CURRENCY_SPANISH_PESETA 2316
/* TYPES OF ENERGIES */
#define IDS_ENERGY_15_C_CALORIES 2400