Author: dgorbachev Date: Mon Jan 26 16:27:19 2009 New Revision: 39119
URL: http://svn.reactos.org/svn/reactos?rev=39119&view=rev Log: Calculator update by Radek Liska (with some changes). Bug #4064.
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/conv... ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -7,6 +7,7 @@
The base units for all categories are:
+ ANGLE..........degrees AREA...........square meters CONSUMPTION....kilometers per liter CURRENCY.......Euro @@ -15,9 +16,10 @@ POWER..........Watt PRESSURE.......Pascal TEMPERATURE....kelvin + TIME...........seconds VELOCITY.......meters per second VOLUME.........liter - WEIGHT.........kilogram + WEIGHT.........gram
The '$' character is used as "what you read into the display". */ @@ -40,6 +42,17 @@
#define DECLARE_CONV_END \ { 0, NULL, NULL }, + +/* + 1 gradian = 0.9 deg + 1 radian = 57.29577951308233 deg +*/ +static const conv_t conv_ANGLE[] = { + DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") + DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, RADIANS, "$*180/P", "$*P/180") + DECLARE_CONV_END +};
/* 1 acre ................ = 4840 square yd = 4046,8564224 mq @@ -131,6 +144,7 @@ DECLARE_CONV_UNIT(CURRENCY, AUSTRIAN_SCHILLING, "$/13,7603", "$*13,7603") DECLARE_CONV_UNIT(CURRENCY, BELGIAN_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, CYPRIOT_POUND, "$/0,585274","$*0,585274") + DECLARE_CONV_UNIT(CURRENCY, CZECH_KORUNA, "$/27,9766", "$*27,9766") DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK, "$/1,9558", "$*1,9558") DECLARE_CONV_UNIT(CURRENCY, DUTCH_GUILDER, "$/2,20371", "$*2,20371") DECLARE_CONV_UNIT(CURRENCY, EURO, "$", "$") @@ -149,9 +163,13 @@ };
/* - 1 15^C ..... = 4.1855 J + 1 cal15 .... = 4.1855 J + 1 BTU ...... = 1055.056 J 1 ERG ...... = 0.0000001 J + 1 EV ....... = 0.000000000000000000160217653 J + 1 Foot-Pound = 1.3558179483314004 J 1 IT calorie = 4.1868 J + 1 KCa ...... = 4186.8 J 1 KJ ....... = 1000 J 1 KWh ...... = 3600 J 1 IUNS ..... = 4.182 J @@ -159,8 +177,12 @@ */ static const conv_t conv_ENERGY[] = { DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES, "$*4.1855", "$/4.1855") + DECLARE_CONV_UNIT(ENERGY, BTUS, "$*1055.056", "$/1055.056") DECLARE_CONV_UNIT(ENERGY, ERGS, "$*.0000001", "$/.0000001") + DECLARE_CONV_UNIT(ENERGY, EVS, "$*.000000000000000000160217653", "$/.000000000000000000160217653") + DECLARE_CONV_UNIT(ENERGY, FOOT_POUNDS, "$*1.3558179483314004", "$/1.3558179483314004") DECLARE_CONV_UNIT(ENERGY, IT_CALORIES, "$*4.1868", "$/4.1868") + DECLARE_CONV_UNIT(ENERGY, IT_KILOCALORIES, "$*4186.8", "$/4186.8") DECLARE_CONV_UNIT(ENERGY, JOULES, "$", "$") DECLARE_CONV_UNIT(ENERGY, KILOJOULES, "$*1000", "$/1000") DECLARE_CONV_UNIT(ENERGY, KILOWATT_HOURS, "$*3600", "$/3600") @@ -171,7 +193,7 @@
/* 1 angstrom ....... = 0.0000000001 m - 1 astronomila unit = 149598000000 m + 1 astronomical unit= 149598000000 m 1 barleycorn ..... = 1/3 inch = 0.9144/108 m 1 cm ............. = 1/100 m 1 chain uk ....... = 22 yards = 22*0.9144 m @@ -195,6 +217,7 @@ 1 lar ............ = 1 light year ..... = 9460730472580800 m 1 link uk ........ = 0.01 chains = 0.22*0.9144 m + 1 micron ......... = 0.000001 m 1 mile ........... = 1760 yards = 1609.344 m 1 millimeter ..... = 1/1000 m 1 nautical mile .. = 1852 m @@ -203,6 +226,7 @@ 1 pica ........... = yard/216 = 0.9144/216 m 1 ri japan ....... = 1 ri korea ....... = + 1 rod ............ = 5.0292 m 1 sawk ........... = 1 sen ............ = 1 shaku .......... = 10/33 m @@ -216,7 +240,7 @@ */ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$*0.0000000001", "$/0.0000000001") - DECLARE_CONV_UNIT(LENGTH, ASTRONOMILA_UNITS, "$*149598000000", "$/149598000000") + DECLARE_CONV_UNIT(LENGTH, ASTRONOMICAL_UNITS, "$*149598000000", "$/149598000000") DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS, "$*0.9144/108", "$/0.9144*108") DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100") DECLARE_CONV_UNIT(LENGTH, CHAINS_UK, "$*20.1168", "$/20.1168") @@ -242,12 +266,14 @@ DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS, "$*9460730472580800", "$/9460730472580800") DECLARE_CONV_UNIT(LENGTH, LINKS_UK, "$*0.201168", "$/0.201168") DECLARE_CONV_UNIT(LENGTH, METERS, "$", "$") + DECLARE_CONV_UNIT(LENGTH, MICRONS, "$*0.000001", "$/0.000001") DECLARE_CONV_UNIT(LENGTH, MILES, "$*1609.344", "$/1609.344") DECLARE_CONV_UNIT(LENGTH, MILLIMETERS, "$/1000", "$*1000") DECLARE_CONV_UNIT(LENGTH, NAUTICAL_MILES, "$*1852", "$/1852") // DECLARE_CONV_UNIT(LENGTH, NIEU, "$", "$") DECLARE_CONV_UNIT(LENGTH, PARSECS, "$*30856800000000000", "$/30856800000000000") DECLARE_CONV_UNIT(LENGTH, PICAS, "$*0.9144/216", "$/0.9144*216") + DECLARE_CONV_UNIT(LENGTH, RODS, "$*5.0292", "$/5.0292") // DECLARE_CONV_UNIT(LENGTH, RI_JAPAN, "$", "$") // DECLARE_CONV_UNIT(LENGTH, RI_KOREA, "$", "$") // DECLARE_CONV_UNIT(LENGTH, SAWK, "$", "$") @@ -264,30 +290,58 @@ };
/* + 1 BTU/min = 17.5842642 W + 1 Foot-pound/minute = 0.02259696580552333 W 1 hp = 745.69987158227022 W 1 KW = 1000 W 1 MW = 1000000 W */ static const conv_t conv_POWER[] = { - DECLARE_CONV_UNIT(POWER, HORSEPOWER, "$*745.69987158227022", "$/745.69987158227022") - DECLARE_CONV_UNIT(POWER, KILOWATTS, "$*1000", "$/1000") - DECLARE_CONV_UNIT(POWER, MEGAWATTS, "$*1000000", "$/1000000") - DECLARE_CONV_UNIT(POWER, WATTS, "$", "$") + DECLARE_CONV_UNIT(POWER, BTUS_PER_MINUTE, "$*17.5842642", "$/17.5842642") + DECLARE_CONV_UNIT(POWER, FPS_PER_MINUTE, "$*0.02259696580552333", "$/0.02259696580552333") + DECLARE_CONV_UNIT(POWER, HORSEPOWER, "$*745.69987158227022", "$/745.69987158227022") + DECLARE_CONV_UNIT(POWER, KILOWATTS, "$*1000", "$/1000") + DECLARE_CONV_UNIT(POWER, MEGAWATTS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(POWER, WATTS, "$", "$") DECLARE_CONV_END };
/* 1 ATM = 101325 Pa 1 BAR = 100000 Pa + 1 hPa = 100 Pa + 1 kPa = 1000 Pa 1 mm HG = 133.322 Pa 1 psi = 6894.757 Pa */ static const conv_t conv_PRESSURE[] = { DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES, "$*101325", "$/101325") DECLARE_CONV_UNIT(PRESSURE, BARS, "$*100000", "$/100000") + DECLARE_CONV_UNIT(PRESSURE, HECTOPASCALS, "$*100", "$/100") + DECLARE_CONV_UNIT(PRESSURE, KILOPASCALS, "$*1000", "$/1000") DECLARE_CONV_UNIT(PRESSURE, MM_OF_MERCURY, "$*133.322", "$/133.322") DECLARE_CONV_UNIT(PRESSURE, PASCALS, "$", "$") DECLARE_CONV_UNIT(PRESSURE, PSI, "$*6894.757", "$/6894.757") + DECLARE_CONV_END +}; + +/* + 1 day ....... = 86400 s + 1 hour ...... = 3600 s + 1 microsecond = 0.000001 s + 1 millisecond = 0.001 s + 1 minute .... = 60 s + 1 week ...... = 669600 s +*/ +static const conv_t conv_TIME[] = { + DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") + DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400") + DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600") + DECLARE_CONV_UNIT(TIME, MILISECONDS, "$*0.001", "$/0.001") + DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001") + DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$") + DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800") + DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952") DECLARE_CONV_END };
@@ -305,14 +359,18 @@ };
/* - 1 f/h = 0.3048 m/s + 1 cm/s = 0.01 m/s + 1 f/h = 0.0000846666667 m/s + 1 f/s = 0.3048 m/s 1 Km/h = 10/36 m/s -> 0.27778 m/s 1 knot = 18.52/36 m/s -> 0.51444444 m/s 1 mach = 340.3 m/s 1 mph = 0.44704 m/s */ static const conv_t conv_VELOCITY[] = { - DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR, "$*.3048", "$/.3048") + DECLARE_CONV_UNIT(VELOCITY, CMS_SECOND, "$*.01", "$/.01") + DECLARE_CONV_UNIT(VELOCITY, FEET_SECOND, "$*.3048", "$/.3048") + DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR, "$*.0000846666667", "$/.0000846666667") DECLARE_CONV_UNIT(VELOCITY, KILOMETERS_HOUR, "$*10/36", "$*36/10") DECLARE_CONV_UNIT(VELOCITY, KNOTS, "$*18.52/36", "$*36/18.52") DECLARE_CONV_UNIT(VELOCITY, MACH, "$*340.3", "$/340.3") @@ -418,8 +476,8 @@ 1 stone ........... = 6350.29318 g 1 tamlung ......... = 1 ton ............. = 1000000 g - 1 ton uk .......... = 1016046.9088 g - 1 ton us .......... = 907184.74 g + 1 ton uk .......... = 1016046.9088 g // long ton + 1 ton us .......... = 907184.74 g // short ton */ static const conv_t conv_WEIGHT[] = { DECLARE_CONV_UNIT(WEIGHT, BAHT, "$*12.244", "$/12.244") @@ -452,6 +510,7 @@ };
static const conv_category_t conv_table[] = { + DECLARE_CONV_CAT(ANGLE) DECLARE_CONV_CAT(AREA) DECLARE_CONV_CAT(CONSUMPTION) DECLARE_CONV_CAT(CURRENCY) @@ -459,6 +518,7 @@ DECLARE_CONV_CAT(LENGTH) DECLARE_CONV_CAT(POWER) DECLARE_CONV_CAT(PRESSURE) + DECLARE_CONV_CAT(TIME) DECLARE_CONV_CAT(TEMPERATURE) DECLARE_CONV_CAT(VELOCITY) DECLARE_CONV_CAT(VOLUME)
Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Øñòí",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Äñòí",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Îñì",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Äâîè÷",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Øñòí",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Äñòí",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Îñì",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Äâîè÷",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Îáð",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -341,38 +337,37 @@ SS_SUNKEN END
- // Menus
IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Îáèêíîâåí", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "Îáèêíîâåí", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR MENUITEM "Ãðàäóñè\tF2", IDM_VIEW_DEG, CHECKED MENUITEM "Ðàäèàíè\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Ãðàäîâå\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ãðàäîâå\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END
@@ -380,32 +375,32 @@ BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR MENUITEM "×äóìà\tF12", IDM_VIEW_QWORD, CHECKED MENUITEM "Ääóìà\tF2", IDM_VIEW_DWORD, CHECKED MENUITEM "Äóìà\tF3", IDM_VIEW_WORD, CHECKED MENUITEM "Áàéò\tF4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END
@@ -413,22 +408,22 @@ BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END
@@ -444,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Úãúë" IDS_CONV_AREA "Ïëîù" IDS_CONV_CONSUMPTION "Ïîòðåáëåíèå (äâèãàòåëè)" IDS_CONV_CURRENCY "Ïàðè÷íè åäèíèöè" @@ -452,9 +448,18 @@ IDS_CONV_POWER "Ìîùíîñò" IDS_CONV_PRESSURE "Íàëÿãàíå" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "Âðåìå" IDS_CONV_VELOCITY "Ñêîðîñò" IDS_CONV_VOLUME "Îáåì" IDS_CONV_WEIGHT "Òåãëî" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Ãðàäóñè" + IDS_ANGLE_GRADIANS "Ãðàäè" + IDS_ANGLE_RADIANS "Ðàäèàíè" END
// TYPES OF AREAS @@ -511,9 +516,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "×åøêà êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "Åâðî" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -530,12 +536,16 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C êàëîðèè" + IDS_ENERGY_15_C_CALORIES "15-ãðàäóñíè êàëîðèè" + IDS_ENERGY_BTUS "Áðèòàíñêè òåðìàëíè åäèíèöè" IDS_ENERGY_ERGS "Åðãîâå" + IDS_ENERGY_EVS "Åëåêòðîíâîëòè" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "Ìåæäóíàðîäíè òàáëè÷íè êàëîðèè" + IDS_ENERGY_IT_KILOCALORIES "Ìåæäóíàðîäíè òàáëè÷íè êèëîêàëîðèè" IDS_ENERGY_JOULES "Äæàóëè" IDS_ENERGY_KILOJOULES "Êèëîäæàóëè" - IDS_ENERGY_KILOWATT_HOURS "Êèëîâàò/ ÷àñîâå" + IDS_ENERGY_KILOWATT_HOURS "Êèëîâàò÷àñîâå" IDS_ENERGY_NUTRITION_CALORIES "Õðàíèòåëíè êàëîðèè" IDS_ENERGY_TH_CALORIES "Òîïëèííè êàëîðèè" END @@ -544,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Àíãñòðüîìè" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Àñòðîíîìè÷åñêà åäèíèöà" IDS_LENGTH_BARLEYCORNS "Å÷åìè÷åíè çúðíà" IDS_LENGTH_CENTIMETERS "Ñàíòèìåòðè" IDS_LENGTH_CHAINS_UK "Âåðèãè (ÎÊ)" @@ -570,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "Ñâåòëèííè ãîäèíè" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Ìåòðè" + IDS_LENGTH_MICRONS "Ìèêðîìåòðè" IDS_LENGTH_MILES "Ìèëè" IDS_LENGTH_MILLIMETERS "Ìèëèìåòðè" IDS_LENGTH_NAUTICAL_MILES "Ìîðñêè ìèëè" @@ -578,6 +589,7 @@ IDS_LENGTH_PICAS "Äâàíàäåñåòêè (ïèêè)" IDS_LENGTH_RI_JAPAN "Ri (ÿïîíñêè)" IDS_LENGTH_RI_KOREA "Ri (êîðåéñêè)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -593,6 +605,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Êîíñêè ñèëè" IDS_POWER_KILOWATTS "Êèëîâàòîâå" IDS_POWER_MEGAWATTS "Ìåãàâàòîâå" @@ -604,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Àòìîñôåðè" IDS_PRESSURE_BARS "Áàðîâå" + IDS_PRESSURE_HECTOPASCALS "Õåêòîïàñêàëè" + IDS_PRESSURE_KILOPASCALS "Êèëîïàñêàëè" IDS_PRESSURE_MM_OF_MERCURY "Ìèëèìåòðè æèâà÷åí ñòúëá" IDS_PRESSURE_PASCALS "Ïàñêàëè" IDS_PRESSURE_PSI "Ïàóíäîâå íà êâàäðàòåí öîë" @@ -618,10 +634,25 @@ IDS_TEMPERATURE_RANKINE "Ðàíêèí" END
+// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Äíè" + IDS_TIME_HOURS "×àñè" + IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè" + IDS_TIME_MILISECONDS "Ìèëèñåêóíäè" + IDS_TIME_MINUTES "Ìèíóòè" + IDS_TIME_SECONDS "Ñåêóíäè" + IDS_TIME_WEEKS "Ñåäìèöè" + IDS_TIME_YEARS "Ãîäèíè" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Ñàíòèìåòðè/÷àñ" IDS_VELOCITY_FEET_HOUR "Ñòúïêè/÷àñ" + IDS_VELOCITY_FEET_SECOND "Ñòúïêè/ñåêóíäà" IDS_VELOCITY_KILOMETERS_HOUR "Êèëîìåòðè/÷àñ" IDS_VELOCITY_KNOTS "Âúçëè" IDS_VELOCITY_MACH "Ìàõîâå"
Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -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-12-29 + * UPDATED: 2009-01-25 */
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -444,6 +444,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_TIME "Èas" IDS_CONV_LENGTH "Délka" IDS_CONV_ENERGY "Energie" IDS_CONV_WEIGHT "Hmotnost" @@ -451,10 +452,19 @@ IDS_CONV_VOLUME "Objem" IDS_CONV_AREA "Plocha" IDS_CONV_VELOCITY "Rychlost" - IDS_CONV_CONSUMPTION "Spotøeba (motory)" + IDS_CONV_CONSUMPTION "Spotøeba" IDS_CONV_TEMPERATURE "Teplota" IDS_CONV_PRESSURE "Tlak" + IDS_CONV_ANGLE "Úhel" IDS_CONV_POWER "Výkon" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_GRADIANS "Grady" + IDS_ANGLE_RADIANS "Radiány" + IDS_ANGLE_DEGREES "Stupnì" END
// TYPES OF AREAS @@ -510,6 +520,7 @@ BEGIN
IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" + IDS_CURRENCY_CZECH_KORUNA "Èeská koruna" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finská marka" IDS_CURRENCY_FRENCH_FRANC "Francouzský frank" @@ -531,12 +542,16 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C kalorie" + IDS_ENERGY_15_C_CALORIES "15 °C kalorie" + IDS_ENERGY_BTUS "Britské termální jednotky" + IDS_ENERGY_EVS "Elektronvolty" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_ERGS "Ergy" IDS_ENERGY_JOULES "Jouly" IDS_ENERGY_KILOJOULES "Kilojouly" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hodiny" IDS_ENERGY_IT_CALORIES "Mezinárodní kalorie" + IDS_ENERGY_IT_KILOCALORIES "Mezinárodní kilokalorie" IDS_ENERGY_NUTRITION_CALORIES "Nutrièní kalorie" IDS_ENERGY_TH_CALORIES "Termochemické kalorie" END @@ -545,7 +560,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angströmy" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomické jednotky" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomické jednotky" IDS_LENGTH_BARLEYCORNS "Barleycorny" IDS_LENGTH_CENTIMETERS "Centimetry" IDS_LENGTH_CHAINS_UK "Chains (Gunter's chains) (UK)" @@ -568,6 +583,7 @@ IDS_LENGTH_LAR "Lar" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Metry" + IDS_LENGTH_MICRONS "Mikrony" IDS_LENGTH_MILES "Míle" IDS_LENGTH_MILLIMETERS "Milimetry" IDS_LENGTH_NAUTICAL_MILES "Námoøní míle" @@ -577,6 +593,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -594,6 +611,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "Britské termální jednotky za minutu" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds za minutu" IDS_POWER_HORSEPOWER "Koòské síly" IDS_POWER_KILOWATTS "Kilowatty" IDS_POWER_MEGAWATTS "Megawatty" @@ -605,6 +624,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosféry" IDS_PRESSURE_BARS "Bary" + IDS_PRESSURE_HECTOPASCALS "Hektopascaly" + IDS_PRESSURE_KILOPASCALS "Kilopascaly" IDS_PRESSURE_PSI "Libry na ètvercový palec" IDS_PRESSURE_MM_OF_MERCURY "Milimetry rtuového sloupce" IDS_PRESSURE_PASCALS "Pascaly" @@ -619,14 +640,29 @@ IDS_TEMPERATURE_RANKINE "Rankina" END
+// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Dny" + IDS_TIME_HOURS "Hodiny" + IDS_TIME_MICROSECONDS "Mikrosekundy" + IDS_TIME_MILISECONDS "Milisekundy" + IDS_TIME_MINUTES "Minuty" + IDS_TIME_SECONDS "Sekundy" + IDS_TIME_YEARS "Roky" + IDS_TIME_WEEKS "Týdny" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/hodinu" + IDS_VELOCITY_CMS_SECOND "Centimetry za hodinu" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometry za hodinu" IDS_VELOCITY_MACH "Machy" - IDS_VELOCITY_METERS_SECOND "Metry/sekundu" - IDS_VELOCITY_MILES_HOUR "Míle/hodinu" - IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" + IDS_VELOCITY_METERS_SECOND "Metry za sekundu" + IDS_VELOCITY_MILES_HOUR "Míle za hodinu" + IDS_VELOCITY_FEET_HOUR "Stopy za hodinu" + IDS_VELOCITY_FEET_SECOND "Stopy za sekundu" IDS_VELOCITY_KNOTS "Uzly" END
Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -540,7 +540,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angströms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomische Einheiten" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomische Einheiten" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou"
Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -439,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Angle" IDS_CONV_AREA "Area" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -447,9 +448,18 @@ IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_TIME "Time" IDS_CONV_VELOCITY "Velocity" IDS_CONV_VOLUME "Volume" IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "Radians" END
// TYPES OF AREAS @@ -506,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" IDS_CURRENCY_EURO "Euro" @@ -525,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" @@ -539,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -565,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "Light years" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MICRONS "Microns" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -573,6 +589,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -588,6 +605,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" IDS_POWER_MEGAWATTS "Megawatts" @@ -599,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "Hectopascals" + IDS_PRESSURE_KILOPASCALS "Kilopascals" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" IDS_PRESSURE_PSI "Pounds-force per square inch" @@ -613,10 +634,25 @@ IDS_TEMPERATURE_RANKINE "Rankine" END
+// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Days" + IDS_TIME_HOURS "Hours" + IDS_TIME_MICROSECONDS "Microseconds" + IDS_TIME_MILISECONDS "Miliseconds" + IDS_TIME_MINUTES "Minutes" + IDS_TIME_SECONDS "Seconds" + IDS_TIME_WEEKS "Weeks" + IDS_TIME_YEARS "Years" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach"
Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -549,7 +549,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centímetros" IDS_LENGTH_CHAINS_UK "Cadenas (UK)"
Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -539,7 +539,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstrom" - IDS_LENGTH_ASTRONOMILA_UNITS "Unità astronomiche" + IDS_LENGTH_ASTRONOMICAL_UNITS "Unità astronomiche" IDS_LENGTH_BARLEYCORNS "Barleycorn" IDS_LENGTH_CENTIMETERS "Centimetri" IDS_LENGTH_CHAINS_UK "Catene (GB)"
Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -543,7 +543,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)"
Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -544,7 +544,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)"
Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -540,7 +540,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)"
Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -551,7 +551,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angsztremów" - IDS_LENGTH_ASTRONOMILA_UNITS "Jednostek Astronomicznych" + IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostek Astronomicznych" IDS_LENGTH_BARLEYCORNS "Palców" IDS_LENGTH_CENTIMETERS "Centimetrów" IDS_LENGTH_CHAINS_UK "Chains (UK)"
Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -341,7 +337,6 @@ SS_SUNKEN END
- // Menus
IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -436,7 +431,7 @@
STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - ñâîáîäíîå ïðîãðàììíîå îáåñïåöåíèå, ðàñïðîñòðàíÿþùååñÿ ïî ëèöåíçèè GNU GPL.\r\n\r\nÂû ìîæåòå ïîëó÷èòü êîïèþ ëèöåíçèè GNU GPL çäåñü:\r\nhttp://www.gnu.org/licenses/gpl.html%5Cr%5Cn%5Cr%5Cn%C3%8F%C3%AE%C3%AB%C3%B3... ïåðåâåäåííóþ íà âàø ÿçûê êîïèþ ëèöåíçèè GNU GPL ìîæíî çäåñü:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - ñâîáîäíîå ïðîãðàììíîå îáåñïåöåíèå, ðàñïðîñòðàíÿþùååñÿ ïî ëèöåíçèè GNU GPL.\r\n\r\nÂû ìîæåòå ïîëó÷èòü êîïèþ ëèöåíçèè GNU GPL çäåñü:\r\nhttp://www.gnu.org/licenses/gpl.html%5Cr%5Cn%5Cr%5Cn%C3%8E%C3%A7%C3%AD%C3%A0... c ïåðåâîäîì ëèöåíçèè GNU GPL ìîæíî çäåñü:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Îøèáêà" IDS_QUICKHELP "Áûñòðàÿ ñïðàâêà" END @@ -444,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Óãîë" IDS_CONV_AREA "Ïëîùàäü" IDS_CONV_CONSUMPTION "Ðàñõîä òîïëèâà (äâèãàòåëè)" IDS_CONV_CURRENCY "Âàëþòà" @@ -452,9 +448,18 @@ IDS_CONV_POWER "Ìîùíîñòü" IDS_CONV_PRESSURE "Äàâëåíèå" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "Âðåìÿ" IDS_CONV_VELOCITY "Ñêîðîñòü" IDS_CONV_VOLUME "Îáúåì" IDS_CONV_WEIGHT "Âåñ" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "ãðàäóñ" + IDS_ANGLE_GRADIANS "ãðàä" + IDS_ANGLE_RADIANS "ðàäèàí" END
// TYPES OF AREAS @@ -511,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Àâñòðàëèéñêèé øèëëèíã" IDS_CURRENCY_BELGIAN_FRANC "Áåëüãèéñêèé ôðàíê" IDS_CURRENCY_CYPRIOT_POUND "Êèïðèîòñêèé ôóíò" + IDS_CURRENCY_CZECH_KORUNA "×åøñêàÿ êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Íåìåöêàÿ ìàðêà" IDS_CURRENCY_DUTCH_GUILDER "Ãîëëàíäñêèé ãóëüäåí" IDS_CURRENCY_EURO "Åâðî" @@ -530,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "êàëîðèÿ ïàòíàäöàòèãðàäóñíàÿ" + IDS_ENERGY_15_C_CALORIES "êàëîðèÿ ïÿòíàäöàòèãðàäóñíàÿ" + IDS_ENERGY_BTUS "áðèòàíñêàÿ òåïëîâàÿ åäèíèöà" IDS_ENERGY_ERGS "ýðã" + IDS_ENERGY_EVS "ýëåêòðîíâîëüò" + IDS_ENERGY_FOOT_POUNDS "ôóòîôóíò" IDS_ENERGY_IT_CALORIES "êàëîðèÿ ìåæäóíàðîäíàÿ" + IDS_ENERGY_IT_KILOCALORIES "êèëîêàëîðèÿ ìåæäóíàðîäíàÿ" IDS_ENERGY_JOULES "äæîóëü" IDS_ENERGY_KILOJOULES "êèëîäæîóëü" IDS_ENERGY_KILOWATT_HOURS "êèëîâàòò-÷àñ" @@ -544,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "àíãñòðåì" - IDS_LENGTH_ASTRONOMILA_UNITS "àñòðîíîìè÷åñêàÿ åäåíèöà" + IDS_LENGTH_ASTRONOMICAL_UNITS "àñòðîíîìè÷åñêàÿ åäåíèöà" IDS_LENGTH_BARLEYCORNS "áàðëåéêîðí" IDS_LENGTH_CENTIMETERS "ñàíòèìåòð" IDS_LENGTH_CHAINS_UK "÷åéí (áðèòàíñêèé)" @@ -570,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "ñâåòîâîé ãîä" IDS_LENGTH_LINKS_UK "ëèíê (áðèòàíñêèé)" IDS_LENGTH_METERS "ìåòð" + IDS_LENGTH_MICRONS "ìèêðîìåòð" IDS_LENGTH_MILES "ìèëÿ" IDS_LENGTH_MILLIMETERS "ìèëëèìåòð" IDS_LENGTH_NAUTICAL_MILES "ìîðñêàÿ ìèëÿ" @@ -578,6 +589,7 @@ IDS_LENGTH_PICAS "ïèêà" IDS_LENGTH_RI_JAPAN "ðè (ÿïîíñêàÿ)" IDS_LENGTH_RI_KOREA "ðè (êîðåéñêàÿ)" + IDS_LENGTH_RODS "ðîä" IDS_LENGTH_SAWK "ñîóê" IDS_LENGTH_SEN "ñåí" IDS_LENGTH_SHAKU "øàêó" @@ -593,7 +605,9 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "ëîøàäèííàÿ ñèëà" + IDS_POWER_BTUS_PER_MINUTE "áðèòàíñêàÿ òåïëîâàÿ åäèíèöà â ìèíóòó" + IDS_POWER_FPS_PER_MINUTE "ôóòîôóíò â ìèíóòó" + IDS_POWER_HORSEPOWER "ëîøàäèíàÿ ñèëà" IDS_POWER_KILOWATTS "êèëîâàòò" IDS_POWER_MEGAWATTS "ìåãàâàòò" IDS_POWER_WATTS "âàòò" @@ -604,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "àòìîñôåðà (ôèçè÷åñêàÿ)" IDS_PRESSURE_BARS "áàð" + IDS_PRESSURE_HECTOPASCALS "ãåêòîïàñêàëü" + IDS_PRESSURE_KILOPASCALS "êèëîïàñêàëü" IDS_PRESSURE_MM_OF_MERCURY "ìèëëèìåòð ðòóòíîãî ñòîëáà" IDS_PRESSURE_PASCALS "ïàñêàëü" IDS_PRESSURE_PSI "ôóíò íà êâàäðàòíûé äþéì" @@ -618,15 +634,30 @@ IDS_TEMPERATURE_RANKINE "ãðàäóñ (ïî øêàëå Rankine)" END
+// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "äåíü" + IDS_TIME_HOURS "÷àñ" + IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà" + IDS_TIME_MILISECONDS "ìèëëèñåêóíäà" + IDS_TIME_MINUTES "ìèíóòà" + IDS_TIME_SECONDS "ñåêóíäà" + IDS_TIME_WEEKS "íåäåëÿ" + IDS_TIME_YEARS "ãîä" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "ñàíòèìåòð â ÷àñ" IDS_VELOCITY_FEET_HOUR "ôóò â ÷àñ" - IDS_VELOCITY_KILOMETERS_HOUR "êèëîìåòð/÷àñ" + IDS_VELOCITY_FEET_SECOND "ôóò â ñåêóíäó" + IDS_VELOCITY_KILOMETERS_HOUR "êèëîìåòð â ÷àñ" IDS_VELOCITY_KNOTS "óçåë" IDS_VELOCITY_MACH "ìàõ" IDS_VELOCITY_METERS_SECOND "ìåòð â ñåêóíäó" - IDS_VELOCITY_MILES_HOUR "ìèëü â ÷àñ" + IDS_VELOCITY_MILES_HOUR "ìèëÿ â ÷àñ" END
// TYPES OF VOLUMES @@ -646,8 +677,8 @@ IDS_VOLUME_FLUID_OUNCES_UK "æèäêàÿ óíöèÿ (áðèòàíñêàÿ)" IDS_VOLUME_FLUID_OUNCES_US "æèäêàÿ óíöèÿ (ÑØÀ)" IDS_VOLUME_GALLONS_UK "ãàëëîí (áðèòàíñêèé)" - IDS_VOLUME_GALLONS_DRY_US "ãàëëîí (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_GALLONS_LIQUID_US "ãàëëîí (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_GALLONS_DRY_US "ãàëëîí (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_GALLONS_LIQUID_US "ãàëëîí (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_GOU "ãîó" IDS_VOLUME_HOP "õîï" IDS_VOLUME_ICCE "èêêý" @@ -656,11 +687,11 @@ IDS_VOLUME_MAL "ìàëü" IDS_VOLUME_MILLILITERS "ìèëëèëèòð" IDS_VOLUME_PINTS_UK "ïèíòà (áðèòàíñêàÿ)" - IDS_VOLUME_PINTS_DRY_US "ïèíòà (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_PINTS_LIQUID_US "ïèíòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_PINTS_DRY_US "ïèíòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_PINTS_LIQUID_US "ïèíòà (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_QUARTS_UK "êâàðòà (áðèòàíñêàÿ)" - IDS_VOLUME_QUARTS_DRY_US "êâàðòà (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_QUARTS_LIQUID_US "êâàðòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_QUARTS_DRY_US "êâàðòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_QUARTS_LIQUID_US "êâàðòà (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_SEKI "ñýêè" IDS_VOLUME_SYOU "ñ¸" IDS_VOLUME_TANANLOUNG "òàíàíëóíã" @@ -687,7 +718,7 @@ IDS_WEIGHT_LIANG_CHINA "ëèàíã (êèòàéñêèé)" IDS_WEIGHT_LIANG_TAIWAN "ëèàíã (òàéâàíü)" IDS_WEIGHT_MONME "ìîíì" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíöèÿ (àìåðèêàíñêàÿ)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíöèÿ (òîðãîâàÿ)" IDS_WEIGHT_OUNCES_TROY "óíöèÿ (òðîéñêàÿ)" IDS_WEIGHT_POUNDS "ôóíò" IDS_WEIGHT_QUINTAL_METRIC "êâèíòàë (ìåòðè÷åñêèé)" @@ -695,6 +726,6 @@ IDS_WEIGHT_STONES "ñòîóí" IDS_WEIGHT_TAMLUNG "òàìëóíã" IDS_WEIGHT_TONNES "òîííà" - IDS_WEIGHT_TONS_UK "òîííà (UK)" - IDS_WEIGHT_TONS_US "òîííà (US)" -END + IDS_WEIGHT_TONS_UK "òîííà (áðèòàíñêàÿ)" + IDS_WEIGHT_TONS_US "òîííà (ÑØÀ)" +END
Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -548,7 +548,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimetre" IDS_LENGTH_CHAINS_UK "Chains (UK)"
Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -1,6 +1,6 @@ /* * ReactOS Calc (Thai resource file) - * Last modified: 2008-12-29 + * Last modified: 2009-01-27 */
LANGUAGE LANG_THAI, SUBLANG_DEFAULT @@ -444,6 +444,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "ÁØÁ" IDS_CONV_AREA "¾×é¹·Õè" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -452,9 +453,18 @@ IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_TIME "àÇÅÒ" IDS_CONV_VELOCITY "Velocity" IDS_CONV_VOLUME "Volume" IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "ͧÈÒ" + IDS_ANGLE_GRADIANS "à¡Ãà´Õ¹" + IDS_ANGLE_RADIANS "àÃà´Õ¹" END
// TYPES OF AREAS @@ -511,9 +521,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "ÂÙâÃ" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -530,9 +541,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 ^0C á¤ÅÍÃÕ" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" @@ -544,7 +559,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -570,6 +585,7 @@ IDS_LENGTH_LIGHT_YEARS "Light years" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MICRONS "Microns" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -578,6 +594,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -593,6 +610,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" IDS_POWER_MEGAWATTS "Megawatts" @@ -604,6 +623,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "Hectopascals" + IDS_PRESSURE_KILOPASCALS "Kilopascals" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" IDS_PRESSURE_PSI "Pounds-force per square inch" @@ -618,10 +639,25 @@ IDS_TEMPERATURE_RANKINE "Rankine" END
+// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Days" + IDS_TIME_HOURS "Hours" + IDS_TIME_MICROSECONDS "Microseconds" + IDS_TIME_MILISECONDS "Miliseconds" + IDS_TIME_MINUTES "Minutes" + IDS_TIME_SECONDS "Seconds" + IDS_TIME_WEEKS "Weeks" + IDS_TIME_YEARS "Years" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach"
Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lang... ============================================================================== --- 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] Mon Jan 26 16:27:19 2009 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Calculator * LICENSE: GPL - See COPYING in the top level directory - * FILE: rosapps/roscalc/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for roscalc + * FILE: base/applications/calc/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Calc * TRANSLATOR: Artem Reznikov */
@@ -17,14 +17,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -249,10 +245,10 @@ LTEXT "Êàòåãîð³ÿ:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Âèõ³äíà âåëè÷èíà (""ç""):",IDC_STATIC,4,49,56,8 + LTEXT "Âèõ³äíà âåëè÷èíà ("ç"):",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "ʳíöåâà âåëè÷èíà (""â""):",IDC_STATIC,4,76,56,8 + LTEXT "ʳíöåâà âåëè÷èíà ("â"):",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 | @@ -349,7 +345,6 @@ SS_SUNKEN END
- // Menus
IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -452,6 +447,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Êóò" IDS_CONV_AREA "Ïëîùà" IDS_CONV_CONSUMPTION "Âèòðàòà ïàëèâà (äâèãóíè)" IDS_CONV_CURRENCY "Âàëþòà" @@ -460,9 +456,18 @@ IDS_CONV_POWER "Ïîòóæí³ñòü" IDS_CONV_PRESSURE "Òèñê" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "×àñ" IDS_CONV_VELOCITY "Øâèäê³ñòü" IDS_CONV_VOLUME "Îá'ºì" IDS_CONV_WEIGHT "Âàãà" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "ãðàäóñ" + IDS_ANGLE_GRADIANS "ãðàä" + IDS_ANGLE_RADIANS "ðàä³àí" END
// TYPES OF AREAS @@ -493,7 +498,7 @@ 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_METER "êâàäðàòíèé ìåòð" IDS_AREA_SQUARE_MILES "Square miles" IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" IDS_AREA_SQUARE_SHAKU "Square shaku" @@ -519,9 +524,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "×åñüêà êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "ªâðî" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -538,21 +544,25 @@ // 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_15_C_CALORIES "êàëîð³ÿ 15-ãðàäóñíà" + IDS_ENERGY_BTUS "áðèòàíñüêà òåïëîâà îäèíèöÿ" + IDS_ENERGY_ERGS "åðã" + IDS_ENERGY_EVS "åëåêòðîíâîëüò" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_IT_CALORIES "êàëîð³ÿ ì³æíàðîäíà" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "äæîóëü" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_TH_CALORIES "êàëîð³ÿ òåðìîõ³ì³÷íà" END
// TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ANGSTROMS "àíãñòðåì" + IDS_LENGTH_ASTRONOMICAL_UNITS "àñòðîíîì³÷íà îäèíèöÿ" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -575,17 +585,19 @@ IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KILOMETERS "Kilometers" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "ñâ³òëîâèé ð³ê" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" + IDS_LENGTH_METERS "ìåòð" + IDS_LENGTH_MICRONS "ì³êðîìåòð" + IDS_LENGTH_MILES "ìèëÿ" + IDS_LENGTH_MILLIMETERS "ì³ë³ìåòð" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PARSECS "ïàðñåê" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -601,10 +613,12 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_BTUS_PER_MINUTE "áðèòàíñüêà òåïëîâà îäèíèöÿ çà õâèëèíó" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_HORSEPOWER "ê³íñüêà ñèëà" + IDS_POWER_KILOWATTS "ê³ëîâàò" + IDS_POWER_MEGAWATTS "ìåãàâàò" + IDS_POWER_WATTS "âàò" END
// TYPE OF PRESSURES @@ -612,25 +626,42 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "ãåêòîïàñêàëü" + IDS_PRESSURE_KILOPASCALS "ê³ëîïàñêàëü" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_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" + IDS_TEMPERATURE_CELSIUS "ãðàäóñ (çà øêàëîþ Öåëüñ³ÿ)" + IDS_TEMPERATURE_FAHRENHEIT "ãðàäóñ (çà øêàëîþ Ôàðåíãåéòà)" + IDS_TEMPERATURE_KELVIN "ãðàäóñ (çà øêàëîþ Êåëüâ³íà)" + IDS_TEMPERATURE_RANKINE "ãðàäóñ (çà øêàëîþ Ðàíê³íà)" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "äîáà" + IDS_TIME_HOURS "ãîäèíà" + IDS_TIME_MICROSECONDS "ì³êðîñåêóíäà" + IDS_TIME_MILISECONDS "ì³ë³ñåêóíäà" + IDS_TIME_MINUTES "õâèëèíà" + IDS_TIME_SECONDS "ñåêóíäà" + IDS_TIME_WEEKS "òèæäåíü" + IDS_TIME_YEARS "ð³ê" END
// TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" + IDS_VELOCITY_KILOMETERS_HOUR "ê³ëîìåòð çà ãîäèíó" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" IDS_VELOCITY_METERS_SECOND "Meters/second" @@ -695,9 +726,9 @@ 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_OUNCES_AVOIRDUPOIS "óíö³ÿ òîðãîâåëüíà" + IDS_WEIGHT_OUNCES_TROY "óíö³ÿ òðîéñüêà" + IDS_WEIGHT_POUNDS "ôóíò" IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Stones"
Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/reso... ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -104,226 +104,256 @@ #define IDC_BUTTON_RSH 1093
/* TYPES OF CONVERSIONS */ -#define IDS_CONV_AREA 2000 -#define IDS_CONV_CONSUMPTION 2001 -#define IDS_CONV_CURRENCY 2002 -#define IDS_CONV_ENERGY 2003 -#define IDS_CONV_LENGTH 2004 -#define IDS_CONV_POWER 2005 -#define IDS_CONV_PRESSURE 2006 -#define IDS_CONV_TEMPERATURE 2007 -#define IDS_CONV_VELOCITY 2008 -#define IDS_CONV_VOLUME 2009 -#define IDS_CONV_WEIGHT 2010 +#define IDS_CONV_ANGLE 2000 +#define IDS_CONV_AREA 2001 +#define IDS_CONV_CONSUMPTION 2002 +#define IDS_CONV_CURRENCY 2003 +#define IDS_CONV_ENERGY 2004 +#define IDS_CONV_LENGTH 2005 +#define IDS_CONV_POWER 2006 +#define IDS_CONV_PRESSURE 2007 +#define IDS_CONV_TEMPERATURE 2008 +#define IDS_CONV_TIME 2009 +#define IDS_CONV_VELOCITY 2010 +#define IDS_CONV_VOLUME 2011 +#define IDS_CONV_WEIGHT 2012 + +/* TYPES OF ANGLES */ +#define IDS_ANGLE_DEGREES 2100 +#define IDS_ANGLE_GRADIANS 2101 +#define IDS_ANGLE_RADIANS 2102
/* TYPES OF AREAS */ -#define IDS_AREA_ACRES 2100 -#define IDS_AREA_ACRES_BRAZIL 2101 -#define IDS_AREA_ACRES_FRANCE 2102 -#define IDS_AREA_ACRES_SCOTS 2103 -#define IDS_AREA_ACRES_US 2104 -#define IDS_AREA_ARES 2105 -#define IDS_AREA_CHOU 2106 -#define IDS_AREA_DANBO 2107 -#define IDS_AREA_HECTARES 2108 -#define IDS_AREA_JEONGBO 2109 -#define IDS_AREA_MORGEN_HUNGARY 2110 -#define IDS_AREA_MU 2111 -#define IDS_AREA_PING 2112 -#define IDS_AREA_PYEONG 2113 -#define IDS_AREA_PYEONGBANGJA 2114 -#define IDS_AREA_RAI 2115 -#define IDS_AREA_SE 2116 -#define IDS_AREA_SQUARE_CENTIMETERS 2117 -#define IDS_AREA_SQUARE_CHR 2118 -#define IDS_AREA_SQUARE_FATHOMS 2119 -#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2120 -#define IDS_AREA_SQUARE_FEET 2121 -#define IDS_AREA_SQUARE_INCHES 2122 -#define IDS_AREA_SQUARE_KILOMETERS 2123 -#define IDS_AREA_SQUARE_LAR 2124 -#define IDS_AREA_SQUARE_METER 2125 -#define IDS_AREA_SQUARE_MILES 2126 -#define IDS_AREA_SQUARE_MILLIMETERS 2127 -#define IDS_AREA_SQUARE_SHAKU 2128 -#define IDS_AREA_SQUARE_TSUEN 2129 -#define IDS_AREA_SQUARE_VA 2130 -#define IDS_AREA_SQUARE_YARD 2131 -#define IDS_AREA_TAN 2132 -#define IDS_AREA_TSUBO 2133 +#define IDS_AREA_ACRES 2200 +#define IDS_AREA_ACRES_BRAZIL 2201 +#define IDS_AREA_ACRES_FRANCE 2202 +#define IDS_AREA_ACRES_SCOTS 2203 +#define IDS_AREA_ACRES_US 2204 +#define IDS_AREA_ARES 2205 +#define IDS_AREA_CHOU 2206 +#define IDS_AREA_DANBO 2207 +#define IDS_AREA_HECTARES 2208 +#define IDS_AREA_JEONGBO 2209 +#define IDS_AREA_MORGEN_HUNGARY 2210 +#define IDS_AREA_MU 2211 +#define IDS_AREA_PING 2212 +#define IDS_AREA_PYEONG 2213 +#define IDS_AREA_PYEONGBANGJA 2214 +#define IDS_AREA_RAI 2215 +#define IDS_AREA_SE 2216 +#define IDS_AREA_SQUARE_CENTIMETERS 2217 +#define IDS_AREA_SQUARE_CHR 2218 +#define IDS_AREA_SQUARE_FATHOMS 2219 +#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2220 +#define IDS_AREA_SQUARE_FEET 2221 +#define IDS_AREA_SQUARE_INCHES 2222 +#define IDS_AREA_SQUARE_KILOMETERS 2223 +#define IDS_AREA_SQUARE_LAR 2224 +#define IDS_AREA_SQUARE_METER 2225 +#define IDS_AREA_SQUARE_MILES 2226 +#define IDS_AREA_SQUARE_MILLIMETERS 2227 +#define IDS_AREA_SQUARE_SHAKU 2228 +#define IDS_AREA_SQUARE_TSUEN 2229 +#define IDS_AREA_SQUARE_VA 2230 +#define IDS_AREA_SQUARE_YARD 2231 +#define IDS_AREA_TAN 2232 +#define IDS_AREA_TSUBO 2233
/* TYPES OF COMSUMPTIONS */ -#define IDS_CONSUMPTION_KM_PER_L 2200 -#define IDS_CONSUMPTION_L_PER_100_KM 2201 -#define IDS_CONSUMPTION_MILES_GALLON_UK 2202 -#define IDS_CONSUMPTION_MILES_GALLON_US 2203 +#define IDS_CONSUMPTION_KM_PER_L 2300 +#define IDS_CONSUMPTION_L_PER_100_KM 2301 +#define IDS_CONSUMPTION_MILES_GALLON_UK 2302 +#define IDS_CONSUMPTION_MILES_GALLON_US 2303
/* TYPES OF CURRENCIES */ -#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2300 -#define IDS_CURRENCY_BELGIAN_FRANC 2301 -#define IDS_CURRENCY_CYPRIOT_POUND 2302 -#define IDS_CURRENCY_DEUTSCHE_MARK 2303 -#define IDS_CURRENCY_DUTCH_GUILDER 2304 -#define IDS_CURRENCY_EURO 2305 -#define IDS_CURRENCY_FINNISH_MARKKA 2306 -#define IDS_CURRENCY_FRENCH_FRANC 2307 -#define IDS_CURRENCY_GREEK_DRACHMA 2308 -#define IDS_CURRENCY_IRISH_POUND 2309 -#define IDS_CURRENCY_ITALIAN_LIRA 2310 -#define IDS_CURRENCY_LUXEMBOURG_FRANC 2311 -#define IDS_CURRENCY_MALTESE_LIRA 2312 -#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2313 -#define IDS_CURRENCY_SLOVAK_KORUNA 2314 -#define IDS_CURRENCY_SLOVENIAN_TOLAR 2315 -#define IDS_CURRENCY_SPANISH_PESETA 2316 +#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2400 +#define IDS_CURRENCY_BELGIAN_FRANC 2401 +#define IDS_CURRENCY_CYPRIOT_POUND 2402 +#define IDS_CURRENCY_CZECH_KORUNA 2403 +#define IDS_CURRENCY_DEUTSCHE_MARK 2404 +#define IDS_CURRENCY_DUTCH_GUILDER 2405 +#define IDS_CURRENCY_EURO 2406 +#define IDS_CURRENCY_FINNISH_MARKKA 2407 +#define IDS_CURRENCY_FRENCH_FRANC 2408 +#define IDS_CURRENCY_GREEK_DRACHMA 2409 +#define IDS_CURRENCY_IRISH_POUND 2410 +#define IDS_CURRENCY_ITALIAN_LIRA 2411 +#define IDS_CURRENCY_LUXEMBOURG_FRANC 2412 +#define IDS_CURRENCY_MALTESE_LIRA 2413 +#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2414 +#define IDS_CURRENCY_SLOVAK_KORUNA 2415 +#define IDS_CURRENCY_SLOVENIAN_TOLAR 2416 +#define IDS_CURRENCY_SPANISH_PESETA 2417
/* TYPES OF ENERGIES */ -#define IDS_ENERGY_15_C_CALORIES 2400 -#define IDS_ENERGY_ERGS 2401 -#define IDS_ENERGY_IT_CALORIES 2402 -#define IDS_ENERGY_JOULES 2403 -#define IDS_ENERGY_KILOJOULES 2404 -#define IDS_ENERGY_KILOWATT_HOURS 2405 -#define IDS_ENERGY_NUTRITION_CALORIES 2406 -#define IDS_ENERGY_TH_CALORIES 2407 +#define IDS_ENERGY_15_C_CALORIES 2500 +#define IDS_ENERGY_BTUS 2501 +#define IDS_ENERGY_ERGS 2502 +#define IDS_ENERGY_EVS 2503 +#define IDS_ENERGY_FOOT_POUNDS 2504 +#define IDS_ENERGY_IT_CALORIES 2505 +#define IDS_ENERGY_IT_KILOCALORIES 2506 +#define IDS_ENERGY_JOULES 2507 +#define IDS_ENERGY_KILOJOULES 2508 +#define IDS_ENERGY_KILOWATT_HOURS 2509 +#define IDS_ENERGY_NUTRITION_CALORIES 2510 +#define IDS_ENERGY_TH_CALORIES 2511
/* TYPES OF LENGTHS */ -#define IDS_LENGTH_ANGSTROMS 2500 -#define IDS_LENGTH_ASTRONOMILA_UNITS 2501 -#define IDS_LENGTH_BARLEYCORNS 2502 -#define IDS_LENGTH_CENTIMETERS 2503 -#define IDS_LENGTH_CHAINS_UK 2504 -#define IDS_LENGTH_CHI 2505 -#define IDS_LENGTH_CHOU 2506 -#define IDS_LENGTH_CHR 2507 -#define IDS_LENGTH_CUN 2508 -#define IDS_LENGTH_FATHOMS 2509 -#define IDS_LENGTH_FATHOMS_HUNGARY 2510 -#define IDS_LENGTH_FEET 2511 -#define IDS_LENGTH_FURLONGS 2512 -#define IDS_LENGTH_GAN 2513 -#define IDS_LENGTH_HANDS 2514 -#define IDS_LENGTH_HUNH 2515 -#define IDS_LENGTH_INCHES 2516 -#define IDS_LENGTH_JA 2517 -#define IDS_LENGTH_JEONG 2518 -#define IDS_LENGTH_KABIET 2519 -#define IDS_LENGTH_KEN 2520 -#define IDS_LENGTH_KEUB 2521 -#define IDS_LENGTH_KILOMETERS 2522 -#define IDS_LENGTH_LAR 2523 -#define IDS_LENGTH_LIGHT_YEARS 2524 -#define IDS_LENGTH_LINKS_UK 2525 -#define IDS_LENGTH_METERS 2526 -#define IDS_LENGTH_MILES 2527 -#define IDS_LENGTH_MILLIMETERS 2528 -#define IDS_LENGTH_NAUTICAL_MILES 2529 -#define IDS_LENGTH_NIEU 2530 -#define IDS_LENGTH_PARSECS 2531 -#define IDS_LENGTH_PICAS 2532 -#define IDS_LENGTH_RI_JAPAN 2533 -#define IDS_LENGTH_RI_KOREA 2534 -#define IDS_LENGTH_SAWK 2535 -#define IDS_LENGTH_SEN 2536 -#define IDS_LENGTH_SHAKU 2537 -#define IDS_LENGTH_SPAN 2538 -#define IDS_LENGTH_SUN 2539 -#define IDS_LENGTH_TSUEN 2540 -#define IDS_LENGTH_VA 2541 -#define IDS_LENGTH_YARDS 2542 -#define IDS_LENGTH_YOTE 2543 -#define IDS_LENGTH_ZHANG 2544 +#define IDS_LENGTH_ANGSTROMS 2600 +#define IDS_LENGTH_ASTRONOMICAL_UNITS 2601 +#define IDS_LENGTH_BARLEYCORNS 2602 +#define IDS_LENGTH_CENTIMETERS 2603 +#define IDS_LENGTH_CHAINS_UK 2604 +#define IDS_LENGTH_CHI 2605 +#define IDS_LENGTH_CHOU 2606 +#define IDS_LENGTH_CHR 2607 +#define IDS_LENGTH_CUN 2608 +#define IDS_LENGTH_FATHOMS 2609 +#define IDS_LENGTH_FATHOMS_HUNGARY 2610 +#define IDS_LENGTH_FEET 2611 +#define IDS_LENGTH_FURLONGS 2612 +#define IDS_LENGTH_GAN 2613 +#define IDS_LENGTH_HANDS 2614 +#define IDS_LENGTH_HUNH 2615 +#define IDS_LENGTH_INCHES 2616 +#define IDS_LENGTH_JA 2617 +#define IDS_LENGTH_JEONG 2618 +#define IDS_LENGTH_KABIET 2619 +#define IDS_LENGTH_KEN 2620 +#define IDS_LENGTH_KEUB 2621 +#define IDS_LENGTH_KILOMETERS 2622 +#define IDS_LENGTH_LAR 2623 +#define IDS_LENGTH_LIGHT_YEARS 2624 +#define IDS_LENGTH_LINKS_UK 2625 +#define IDS_LENGTH_METERS 2626 +#define IDS_LENGTH_MICRONS 2627 +#define IDS_LENGTH_MILES 2628 +#define IDS_LENGTH_MILLIMETERS 2629 +#define IDS_LENGTH_NAUTICAL_MILES 2630 +#define IDS_LENGTH_NIEU 2631 +#define IDS_LENGTH_PARSECS 2632 +#define IDS_LENGTH_PICAS 2633 +#define IDS_LENGTH_RODS 2634 +#define IDS_LENGTH_RI_JAPAN 2635 +#define IDS_LENGTH_RI_KOREA 2636 +#define IDS_LENGTH_SAWK 2637 +#define IDS_LENGTH_SEN 2638 +#define IDS_LENGTH_SHAKU 2639 +#define IDS_LENGTH_SPAN 2640 +#define IDS_LENGTH_SUN 2641 +#define IDS_LENGTH_TSUEN 2642 +#define IDS_LENGTH_VA 2643 +#define IDS_LENGTH_YARDS 2644 +#define IDS_LENGTH_YOTE 2645 +#define IDS_LENGTH_ZHANG 2646
/* TYPES OF POWERS */ -#define IDS_POWER_HORSEPOWER 2600 -#define IDS_POWER_KILOWATTS 2601 -#define IDS_POWER_MEGAWATTS 2602 -#define IDS_POWER_WATTS 2603 +#define IDS_POWER_BTUS_PER_MINUTE 2700 +#define IDS_POWER_FPS_PER_MINUTE 2701 +#define IDS_POWER_HORSEPOWER 2702 +#define IDS_POWER_KILOWATTS 2703 +#define IDS_POWER_MEGAWATTS 2704 +#define IDS_POWER_WATTS 2705
/* TYPE OF PRESSURES */ -#define IDS_PRESSURE_ATMOSPHERES 2701 -#define IDS_PRESSURE_BARS 2702 -#define IDS_PRESSURE_MM_OF_MERCURY 2703 -#define IDS_PRESSURE_PASCALS 2704 -#define IDS_PRESSURE_PSI 2705 +#define IDS_PRESSURE_ATMOSPHERES 2800 +#define IDS_PRESSURE_BARS 2801 +#define IDS_PRESSURE_HECTOPASCALS 2802 +#define IDS_PRESSURE_KILOPASCALS 2803 +#define IDS_PRESSURE_MM_OF_MERCURY 2804 +#define IDS_PRESSURE_PASCALS 2805 +#define IDS_PRESSURE_PSI 2806
/* TYPES OF TEMPERATURES */ -#define IDS_TEMPERATURE_CELSIUS 2800 -#define IDS_TEMPERATURE_FAHRENHEIT 2801 -#define IDS_TEMPERATURE_KELVIN 2802 -#define IDS_TEMPERATURE_RANKINE 2803 +#define IDS_TEMPERATURE_CELSIUS 2900 +#define IDS_TEMPERATURE_FAHRENHEIT 2901 +#define IDS_TEMPERATURE_KELVIN 2902 +#define IDS_TEMPERATURE_RANKINE 2903 + +/* TYPE OF TIME */ +#define IDS_TIME_DAYS 3001 +#define IDS_TIME_HOURS 3002 +#define IDS_TIME_MICROSECONDS 3003 +#define IDS_TIME_MILISECONDS 3004 +#define IDS_TIME_MINUTES 3005 +#define IDS_TIME_SECONDS 3006 +#define IDS_TIME_WEEKS 3007 +#define IDS_TIME_YEARS 3008
/* TYPES OF VELOCITIES */ -#define IDS_VELOCITY_FEET_HOUR 2900 -#define IDS_VELOCITY_KILOMETERS_HOUR 2901 -#define IDS_VELOCITY_KNOTS 2902 -#define IDS_VELOCITY_MACH 2903 -#define IDS_VELOCITY_METERS_SECOND 2904 -#define IDS_VELOCITY_MILES_HOUR 2905 +#define IDS_VELOCITY_CMS_SECOND 3100 +#define IDS_VELOCITY_FEET_SECOND 3101 +#define IDS_VELOCITY_FEET_HOUR 3102 +#define IDS_VELOCITY_KILOMETERS_HOUR 3103 +#define IDS_VELOCITY_KNOTS 3104 +#define IDS_VELOCITY_MACH 3105 +#define IDS_VELOCITY_METERS_SECOND 3106 +#define IDS_VELOCITY_MILES_HOUR 3107
/* TYPES OF VOLUMES */ -#define IDS_VOLUME_BARRELS_UK 3000 -#define IDS_VOLUME_BARRELS_OIL 3001 -#define IDS_VOLUME_BUN 3002 -#define IDS_VOLUME_BUSHELS_UK 3003 -#define IDS_VOLUME_BUSHELS_US 3004 -#define IDS_VOLUME_CUBIC_CENTIMETERS 3005 -#define IDS_VOLUME_CUBIC_FEET 3006 -#define IDS_VOLUME_CUBIC_INCHES 3007 -#define IDS_VOLUME_CUBIC_METERS 3008 -#define IDS_VOLUME_CUBIC_YARDS 3009 -#define IDS_VOLUME_DOE 3010 -#define IDS_VOLUME_FLUID_OUNCES_UK 3011 -#define IDS_VOLUME_FLUID_OUNCES_US 3012 -#define IDS_VOLUME_GALLONS_UK 3013 -#define IDS_VOLUME_GALLONS_DRY_US 3014 -#define IDS_VOLUME_GALLONS_LIQUID_US 3015 -#define IDS_VOLUME_GOU 3016 -#define IDS_VOLUME_HOP 3017 -#define IDS_VOLUME_ICCE 3018 -#define IDS_VOLUME_KWIAN 3019 -#define IDS_VOLUME_LITERS 3020 -#define IDS_VOLUME_MAL 3021 -#define IDS_VOLUME_MILLILITERS 3022 -#define IDS_VOLUME_PINTS_UK 3023 -#define IDS_VOLUME_PINTS_DRY_US 3024 -#define IDS_VOLUME_PINTS_LIQUID_US 3025 -#define IDS_VOLUME_QUARTS_UK 3026 -#define IDS_VOLUME_QUARTS_DRY_US 3027 -#define IDS_VOLUME_QUARTS_LIQUID_US 3028 -#define IDS_VOLUME_SEKI 3029 -#define IDS_VOLUME_SYOU 3030 -#define IDS_VOLUME_TANANLOUNG 3031 -#define IDS_VOLUME_TANG 3032 -#define IDS_VOLUME_TO 3033 +#define IDS_VOLUME_BARRELS_UK 3200 +#define IDS_VOLUME_BARRELS_OIL 3201 +#define IDS_VOLUME_BUN 3202 +#define IDS_VOLUME_BUSHELS_UK 3203 +#define IDS_VOLUME_BUSHELS_US 3204 +#define IDS_VOLUME_CUBIC_CENTIMETERS 3205 +#define IDS_VOLUME_CUBIC_FEET 3206 +#define IDS_VOLUME_CUBIC_INCHES 3207 +#define IDS_VOLUME_CUBIC_METERS 3208 +#define IDS_VOLUME_CUBIC_YARDS 3209 +#define IDS_VOLUME_DOE 3210 +#define IDS_VOLUME_FLUID_OUNCES_UK 3211 +#define IDS_VOLUME_FLUID_OUNCES_US 3212 +#define IDS_VOLUME_GALLONS_UK 3213 +#define IDS_VOLUME_GALLONS_DRY_US 3214 +#define IDS_VOLUME_GALLONS_LIQUID_US 3215 +#define IDS_VOLUME_GOU 3216 +#define IDS_VOLUME_HOP 3217 +#define IDS_VOLUME_ICCE 3218 +#define IDS_VOLUME_KWIAN 3219 +#define IDS_VOLUME_LITERS 3220 +#define IDS_VOLUME_MAL 3221 +#define IDS_VOLUME_MILLILITERS 3222 +#define IDS_VOLUME_PINTS_UK 3223 +#define IDS_VOLUME_PINTS_DRY_US 3224 +#define IDS_VOLUME_PINTS_LIQUID_US 3225 +#define IDS_VOLUME_QUARTS_UK 3226 +#define IDS_VOLUME_QUARTS_DRY_US 3227 +#define IDS_VOLUME_QUARTS_LIQUID_US 3228 +#define IDS_VOLUME_SEKI 3229 +#define IDS_VOLUME_SYOU 3230 +#define IDS_VOLUME_TANANLOUNG 3231 +#define IDS_VOLUME_TANG 3232 +#define IDS_VOLUME_TO 3233
/* TYPES OF WEIGHTS */ -#define IDS_WEIGHT_BAHT 3100 -#define IDS_WEIGHT_CARATS 3101 -#define IDS_WEIGHT_CHUNG 3102 -#define IDS_WEIGHT_DON 3103 -#define IDS_WEIGHT_GEUN 3104 -#define IDS_WEIGHT_GRAMS 3105 -#define IDS_WEIGHT_GWAN 3106 -#define IDS_WEIGHT_HARB 3107 -#define IDS_WEIGHT_JIN_CHINA 3108 -#define IDS_WEIGHT_JIN_TAIWAN 3109 -#define IDS_WEIGHT_KAN 3110 -#define IDS_WEIGHT_KILOGRAMS 3111 -#define IDS_WEIGHT_KIN 3112 -#define IDS_WEIGHT_LIANG_CHINA 3113 -#define IDS_WEIGHT_LIANG_TAIWAN 3114 -#define IDS_WEIGHT_MONME 3115 -#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3116 -#define IDS_WEIGHT_OUNCES_TROY 3117 -#define IDS_WEIGHT_POUNDS 3118 -#define IDS_WEIGHT_QUINTAL_METRIC 3119 -#define IDS_WEIGHT_SALOUNG 3120 -#define IDS_WEIGHT_STONES 3121 -#define IDS_WEIGHT_TAMLUNG 3122 -#define IDS_WEIGHT_TONNES 3123 -#define IDS_WEIGHT_TONS_UK 3124 -#define IDS_WEIGHT_TONS_US 3125 +#define IDS_WEIGHT_BAHT 3300 +#define IDS_WEIGHT_CARATS 3301 +#define IDS_WEIGHT_CHUNG 3302 +#define IDS_WEIGHT_DON 3303 +#define IDS_WEIGHT_GEUN 3304 +#define IDS_WEIGHT_GRAMS 3305 +#define IDS_WEIGHT_GWAN 3306 +#define IDS_WEIGHT_HARB 3307 +#define IDS_WEIGHT_JIN_CHINA 3308 +#define IDS_WEIGHT_JIN_TAIWAN 3309 +#define IDS_WEIGHT_KAN 3310 +#define IDS_WEIGHT_KILOGRAMS 3311 +#define IDS_WEIGHT_KIN 3312 +#define IDS_WEIGHT_LIANG_CHINA 3313 +#define IDS_WEIGHT_LIANG_TAIWAN 3314 +#define IDS_WEIGHT_MONME 3315 +#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3316 +#define IDS_WEIGHT_OUNCES_TROY 3317 +#define IDS_WEIGHT_POUNDS 3318 +#define IDS_WEIGHT_QUINTAL_METRIC 3319 +#define IDS_WEIGHT_SALOUNG 3320 +#define IDS_WEIGHT_STONES 3321 +#define IDS_WEIGHT_TAMLUNG 3322 +#define IDS_WEIGHT_TONNES 3323 +#define IDS_WEIGHT_TONS_UK 3324 +#define IDS_WEIGHT_TONS_US 3325
/* MENU */ #define IDM_EDIT_COPY 40002
-
dgorbachev＠svn.reactos.org