Index: base/applications/calc/about.c =================================================================== --- base/applications/calc/about.c (revision 54057) +++ base/applications/calc/about.c (working copy) @@ -1,6 +1,6 @@ #include "calc.h" -#define MAX_LICENSE_SIZE 1000 // it's enought! +#define MAX_LICENSE_SIZE 1000 // it's enough! INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { Index: base/applications/calc/convert.c =================================================================== --- base/applications/calc/convert.c (revision 54057) +++ base/applications/calc/convert.c (working copy) @@ -1,4 +1,4 @@ -#include "calc.h" +#include "calc.h" /* The conversion is made by converting the "from" unit @@ -7,19 +7,19 @@ The base units for all categories are: - ANGLE..........degrees - AREA...........square meters - CONSUMPTION....kilometers per liter + ANGLE..........Degrees + AREA...........Square meters + CONSUMPTION....Kilometers per liter CURRENCY.......Euro - ENERGY.........joule - LENGTHS........meters + ENERGY.........Joule + LENGTHS........Meters POWER..........Watt PRESSURE.......Pascal - TEMPERATURE....kelvin - TIME...........seconds - VELOCITY.......meters per second - VOLUME.........liter - WEIGHT.........gram + TEMPERATURE....Kelvin + TIME...........Seconds + VELOCITY.......Meters per second + VOLUME.........Liter + WEIGHT.........Gram The '$' character is used as "what you read into the display". */ @@ -44,86 +44,181 @@ { 0, NULL, NULL }, /* - 1 gradian = 0.9 deg - 1 radian = 57.29577951308233 deg + 1 arcminute ....... = 0.0166 deg + 1 arcsecond ....... = 0.000277 deg + 1 centesimal minute = 0.009 deg + 1 centesimal second = 0.00009 deg + 1 gon ............. = 0.9 deg + 1 gradian ......... = 0.9 deg + 1 mil ............. = 0.0562 deg + 1 milliarcsecond .. = 0.0000002777778 deg + 1 milligon ........ = 0.0009 deg + 1 milliradian ..... = 0.0572 deg + 1 octant .......... = 45 deg + 1 point ........... = 11.25 deg + 1 quadrant ........ = 90 deg + 1 radian .......... = 57.29577951308233 deg + 1 sextant ......... = 60 deg + 1 sign ............ = 30 deg + 1 streck .......... = 0.0571 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, "$/P*180", "$*P/180") + DECLARE_CONV_UNIT(ANGLE, ARCMINUTES, "$*0.0166", "$/0.0166") + DECLARE_CONV_UNIT(ANGLE, ARCSECONDS, "$*0.000277", "$/0.000277") + DECLARE_CONV_UNIT(ANGLE, CENTESIMAL_MINUTES, "$*0.009", "$/0.009") + DECLARE_CONV_UNIT(ANGLE, CENTESIMAL_SECONDS, "$*0.00009", "$/0.00009") + DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") + DECLARE_CONV_UNIT(ANGLE, GONS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, MILS, "$*0.0562", "$/0.0562") + DECLARE_CONV_UNIT(ANGLE, MILLIARCSECONDS, "$*0.0000002777778", "$/0.0000002777778") + DECLARE_CONV_UNIT(ANGLE, MILLIGONS, "$*0.0009", "$/0.0009") + DECLARE_CONV_UNIT(ANGLE, MILLIRADIANS, "$*0.0572", "$/0.0572") + DECLARE_CONV_UNIT(ANGLE, OCTANTS, "$*45", "$/45") + DECLARE_CONV_UNIT(ANGLE, POINTS, "$*11.25", "$/11.25") + DECLARE_CONV_UNIT(ANGLE, QUADRANTS, "$*90", "$/90") + DECLARE_CONV_UNIT(ANGLE, RADIANS, "$/P*180", "$*P/180") + DECLARE_CONV_UNIT(ANGLE, SEXTANTS, "$*60", "$/60") + DECLARE_CONV_UNIT(ANGLE, SIGNS, "$*30", "$/30") + DECLARE_CONV_UNIT(ANGLE, STRECKS, "$*0.0571", "$/0.0571") DECLARE_CONV_END }; /* 1 acre ................ = 4840 square yd = 4046,8564224 mq - 1 acre brazil ......... = - 1 acre france ......... = + 1 acre brazil ......... = 4046.856 mq + 1 acre france ......... = 5200 mq 1 acre scots .......... = 5000 mq 1 acre us ............. = 4840*(36/39.37)^2 m = 6272640/1549.9969 m 1 are ................. = 100 mq + 1 barn ................ = 0.0000000000000000000000000001 mq + 1 barony .............. = 16187430 mq + 1 board ............... = 0.00774 mq + 1 cho (Japan) ......... = 9917.355 mq 1 chou ................ = 108000*(10/33)^2 mq - 1 danbo ............... = + 1 circular inch ....... = 0.000506 mq + 1 circular mil ........ = 0.0000000005067075 mq + 1 cord ................ = 1.486 mq + 1 cotka ............... = 100 mq + 1 danbo ............... = 991.74 mq + 1 dunam ............... = 1000 mq + 1 feddan (Egyptian) ... = 4200.833 mq 1 ha .................. = 10000 mq - 1 jeongbo ............. = - 1 morgen hungary ...... = + 1 hide ................ = 485622.771 mq + 1 jeongbo ............. = 9917.4 mq + 1 joch ................ = 5755 mq + 1 kcmil ............... = 0.0000005067075 mq + 1 mål (Norwegian)...... = 1000 mq + 1 manzana ............. = 6988.96 mq + 1 marla (Pakistan)..... = 25.293 mq + 1 morgen (Africa) ..... = 8566.961 mq + 1 morgen (Austria) .... = 5755 mq + 1 morgen (Dutch) ...... = 8498.398 mq + 1 morgen (Hungary) .... = 5754.641 mq + 1 morgen (Prussia) .... = 2553.22 mq + 1 morgen (Scandinavia). = 2549.52 mq 1 mu .................. = 2000/3 mq - 1 ping ................ = - 1 pyeong .............. = - 1 pyeongbangja ........ = + 1 perch (Japan) ....... = 25.293 mq + 1 ping ................ = 3.306 mq + 1 pole (Japan) ........ = 25.293 mq + 1 pyeong .............. = 3.306 mq + 1 pyeongbangja ........ = 0.0918 mq 1 rai ................. = 1600 mq + 1 rood ................ = 1011.714 mq 1 se .................. = 1080*(10/33)^2 mq + 1 sitio ............... = 17564480 mq + 1 soendre (Bhutan) .... = 202.343 mq + 1 sotka (Russia) ...... = 100 mq 1 square cm ........... = 0.0001 mq - 1 square chr .......... = + 1 square chr .......... = 0.0918 mq 1 square fathom ....... = 1.8288^2 = 3.34450944 mq 1 square fathom hungary = 1.8964838^2 = 3.59665080366244 mq 1 square ft ........... = 0,09290304 mq 1 square in ........... = 0,00064516 mq 1 square km ........... = 1000000 mq - 1 square lar .......... = + 1 square lar .......... = 0.836 mq + 1 square legua (Spain). = 17564480 mq + 1 square link ......... = 0.0404 mq + 1 square mil .......... = 0.00000000064516 mq 1 square mile ......... = 1609.344^2 = 2589988.110336 mq 1 square mm ........... = 0,000001 mq 1 square shaku ........ = (10/33)^2 mq - 1 square tsuen ........ = - 1 square va ........... = + 1 square tsuen ........ = 0.000918 mq + 1 square va ........... = 4 mq 1 square yard ......... = 0,83612736 mq + 1 stang (Welsh)........ = 2709.053 mq + 1 stremma ............. = 1000 mq + 1 talang wah (Thailand) = 4 mq 1 tan ................. = 10800*(10/33)^2 mq 1 tsubo ............... = 36*(10/33)^2 mq */ static const conv_t conv_AREA[] = { - DECLARE_CONV_UNIT(AREA, ACRES, "$*4046,8564224", "$/4046,8564224") -// DECLARE_CONV_UNIT(AREA, ACRES_BRAZIL, "$", "$") -// DECLARE_CONV_UNIT(AREA, ACRES_FRANCE, "$", "$") - DECLARE_CONV_UNIT(AREA, ACRES_US, "$*627264/154.99969", "$/627264*154.99969") - DECLARE_CONV_UNIT(AREA, ACRES_SCOTS, "$*5000", "$/5000") - DECLARE_CONV_UNIT(AREA, ARES, "$*100", "$/100") - DECLARE_CONV_UNIT(AREA, CHOU, "$*10800000/1089", "$*1089/10800000") -// DECLARE_CONV_UNIT(AREA, DANBO, "$", "$") - DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000") -// DECLARE_CONV_UNIT(AREA, JEONGBO, "$", "$") -// DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY, "$", "$") - DECLARE_CONV_UNIT(AREA, MU, "$*(2000/3)", "$/(2000/3)") -// DECLARE_CONV_UNIT(AREA, PING, "$", "$") -// DECLARE_CONV_UNIT(AREA, PYEONG, "$", "$") -// DECLARE_CONV_UNIT(AREA, PYEONGBANGJA, "$", "$") - DECLARE_CONV_UNIT(AREA, RAI, "$*1600", "$/1600") - DECLARE_CONV_UNIT(AREA, SE, "$*108000/1089", "$*1089/108000") - DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS, "$*0,0001", "$/0,0001") -// DECLARE_CONV_UNIT(AREA, SQUARE_CHR, "$", "$") - DECLARE_CONV_UNIT(AREA, SQUARE_FATHOMS, "$*3.34450944", "$/3.34450944") - DECLARE_CONV_UNIT(AREA, SQUARE_FATHOMS_HUNGARY, "$*3.59665080366244", "$/3.59665080366244") - DECLARE_CONV_UNIT(AREA, SQUARE_FEET, "$*0,09290304", "$/0,09290304") - DECLARE_CONV_UNIT(AREA, SQUARE_INCHES, "$*0,00064516", "$/0.00064516") - DECLARE_CONV_UNIT(AREA, SQUARE_KILOMETERS, "$*1000000", "$/1000000") -// DECLARE_CONV_UNIT(AREA, SQUARE_LAR, "$", "$") - DECLARE_CONV_UNIT(AREA, SQUARE_METER, "$", "$") - DECLARE_CONV_UNIT(AREA, SQUARE_MILES, "$*2589988.110336", "$/2589988.110336") - DECLARE_CONV_UNIT(AREA, SQUARE_MILLIMETERS, "$*1000000", "$/1000000") - DECLARE_CONV_UNIT(AREA, SQUARE_SHAKU, "$*100/1089", "$/1089*100") -// DECLARE_CONV_UNIT(AREA, SQUARE_TSUEN, "$", "$") -// DECLARE_CONV_UNIT(AREA, SQUARE_VA, "$", "$") - DECLARE_CONV_UNIT(AREA, SQUARE_YARD, "$*0,83612736", "$/0,83612736") - DECLARE_CONV_UNIT(AREA, TAN, "$*1080000/1089", "$*1089/1080000") - DECLARE_CONV_UNIT(AREA, TSUBO, "$*1188/1089", "$*1089/1188") + DECLARE_CONV_UNIT(AREA, ACRES, "$*4046,8564224", "$/4046,8564224") + DECLARE_CONV_UNIT(AREA, ACRES_BRAZIL, "$*4046.856", "$/4046.856") + DECLARE_CONV_UNIT(AREA, ACRES_FRANCE, "$*5200", "$/5200") + DECLARE_CONV_UNIT(AREA, ACRES_US, "$*627264/154.99969", "$/627264*154.99969") + DECLARE_CONV_UNIT(AREA, ACRES_SCOTS, "$*5000", "$/5000") + DECLARE_CONV_UNIT(AREA, ARES, "$*100", "$/100") + DECLARE_CONV_UNIT(AREA, BARNS, "$*0.0000000000000000000000000001", "$/0.0000000000000000000000000001") + DECLARE_CONV_UNIT(AREA, BARONY, "$*16187430", "$/16187430") + DECLARE_CONV_UNIT(AREA, BOARDS, "$*0.00774", "$/0.00774") + DECLARE_CONV_UNIT(AREA, CHO, "$*9917.335", "$/9917.335") + DECLARE_CONV_UNIT(AREA, CHOU, "$*10800000/1089", "$/1089/10800000") + DECLARE_CONV_UNIT(AREA, CIRCULAR_INCHES, "$*0.000506", "$/0.000506") + DECLARE_CONV_UNIT(AREA, CIRCULAR_MILS, "$*0.0000000005067075", "$/0.0000000005067075") + DECLARE_CONV_UNIT(AREA, CORDS, "$*1.486", "$/1.486") + DECLARE_CONV_UNIT(AREA, COTKA, "$*100", "$/100") + DECLARE_CONV_UNIT(AREA, DANBO, "$*991.74", "$/991.74") + DECLARE_CONV_UNIT(AREA, DUNAM, "$*1000", "$/1000") + DECLARE_CONV_UNIT(AREA, FEDDAN, "$*4200.833", "$/4200.833") + DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000") + DECLARE_CONV_UNIT(AREA, JEONGBO, "$*9917.4", "$/9917.4") + DECLARE_CONV_UNIT(AREA, JOCH, "$*5755", "$/5755") + DECLARE_CONV_UNIT(AREA, KCMILS, "$*0.0000005067075", "$/0.0000005067075") + DECLARE_CONV_UNIT(AREA, MAL, "$*1000", "$/1000") + DECLARE_CONV_UNIT(AREA, MANZANA, "$*6988.96", "$/6988.96") + DECLARE_CONV_UNIT(AREA, MARLA, "$*25.293", "$/25.293") + DECLARE_CONV_UNIT(AREA, MORGEN_AFRICA, "$*8566.961", "$/8566.961") + DECLARE_CONV_UNIT(AREA, MORGEN_AUSTRIA, "$*5755", "$/5755") + DECLARE_CONV_UNIT(AREA, MORGEN_DUTCH, "$*8498.398", "$/8498.398") + DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY, "$*5754.641", "$/5754.641") + DECLARE_CONV_UNIT(AREA, MORGEN_PRUSSIA, "$*2553.22", "$/2553.22") + DECLARE_CONV_UNIT(AREA, MORGEN_SCANDINAVIA, "$*2549.52", "$/2549.52") + DECLARE_CONV_UNIT(AREA, MU, "$*(2000/3)", "$/(2000/3)") + DECLARE_CONV_UNIT(AREA, PERCH, "$*25.293", "$/25.293") + DECLARE_CONV_UNIT(AREA, PING, "$*3.306", "$/3.306") + DECLARE_CONV_UNIT(AREA, POLE, "$*25.293", "$/25.293") + DECLARE_CONV_UNIT(AREA, PYEONG, "$*3.306", "$/3.306") + DECLARE_CONV_UNIT(AREA, PYEONGBANGJA, "$*0.0918", "$/0.0918") + DECLARE_CONV_UNIT(AREA, RAI, "$*1600", "$/1600") + DECLARE_CONV_UNIT(AREA, ROOD, "$*1011.714", "$/1011.714") + DECLARE_CONV_UNIT(AREA, SE, "$*108000/1089", "$*1089/108000") + DECLARE_CONV_UNIT(AREA, SITIO, "$*17564480", "$/17564480") + DECLARE_CONV_UNIT(AREA, SOENDRE, "$*202.343", "$/202.343") + DECLARE_CONV_UNIT(AREA, SOTKA, "$*100", "$/100") + DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS, "$*0,0001", "$/0,0001") + DECLARE_CONV_UNIT(AREA, SQUARE_CHR, "$*0.0918", "$/0.0918") + DECLARE_CONV_UNIT(AREA, SQUARE_FATHOMS, "$*3.34450944", "$/3.34450944") + DECLARE_CONV_UNIT(AREA, SQUARE_FATHOMS_HUNGARY, "$*3.59665080366244", "$/3.59665080366244") + DECLARE_CONV_UNIT(AREA, SQUARE_FEET, "$*0,09290304", "$/0,09290304") + DECLARE_CONV_UNIT(AREA, SQUARE_INCHES, "$*0,00064516", "$/0.00064516") + DECLARE_CONV_UNIT(AREA, SQUARE_KILOMETERS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(AREA, SQUARE_LAR, "$*0.836", "$/0.836") + DECLARE_CONV_UNIT(AREA, SQUARE_LEGUA, "$*17564480", "$/17564480") + DECLARE_CONV_UNIT(AREA, SQUARE_LINKS, "$*0.0404", "$/0.0404") + DECLARE_CONV_UNIT(AREA, SQUARE_METERS, "$", "$") + DECLARE_CONV_UNIT(AREA, SQUARE_MILS, "$*0.00000000064516", "$/0.00000000064516") + DECLARE_CONV_UNIT(AREA, SQUARE_MILES, "$*2589988.110336", "$/2589988.110336") + DECLARE_CONV_UNIT(AREA, SQUARE_MILLIMETERS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(AREA, SQUARE_SHAKU, "$*100/1089", "$/1089*100") + DECLARE_CONV_UNIT(AREA, SQUARE_TSUEN, "$*0.000918", "$/0.000918") + DECLARE_CONV_UNIT(AREA, SQUARE_VA, "$*4", "$/4") + DECLARE_CONV_UNIT(AREA, SQUARE_YARD, "$*0,83612736", "$/0,83612736") + DECLARE_CONV_UNIT(AREA, STANG, "$*2709.053", "$/2709.053") + DECLARE_CONV_UNIT(AREA, STREMMA, "$*1000", "$/1000") + DECLARE_CONV_UNIT(AREA, TALANG_WAH, "$*4", "$/4") + DECLARE_CONV_UNIT(AREA, TAN, "$*1080000/1089", "$*1089/1080000") + DECLARE_CONV_UNIT(AREA, TSUBO, "$*1188/1089", "$*1089/1188") DECLARE_CONV_END }; @@ -163,17 +258,35 @@ }; /* - 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 - 1 calth .... = 4.184 J + 1 Atomic unit of energy.... = 0.000000000000000004359744 J + 1 Attajoule ............... = 0.000000000000000001 J + 1 Cal15 ................... = 4.1855 J + 1 Dyna-centimeter ......... = 0.0000001 J + 1 BTU ..................... = 1055.056 J + 1 Calth ................... = 4.184 J + 1 Celsius unit ............ = 1899.101 J + 1 ERG ..................... = 0.0000001 J + 1 EV ...................... = 0.000000000000000000160217653 J + 1 Foot-Pound .............. = 1.3558179483314004 J + 1 Gigajoule ............... = 1000000000 J + 1 Gigawatt-hour ........... = 3600000000000 J + 1 Hartree ................. = 0.000000000000000004359744 J + 1 IT calorie .............. = 4.1868 J + 1 IUNS .................... = 4.182 J + 1 KCa ..................... = 4186.8 J + 1 Kiloelectronvolt (keV) .. = 0.0000000000000001602176 J + 1 KJ ...................... = 1000 J + 1 KWh ..................... = 3600 J + 1 Megaelectronvolt (meV) .. = 0.0000000000001602177 J + 1 Megajoule ............... = 1000000 J + 1 Megalerg ................ = 0.1 J + 1 Megaton ................. = 4184000000000000 J + 1 Microjoule .............. = 0.000001 J + 1 Millijoule .............. = 0.001 J + 1 Nanojoule ............... = 0.000000001 J + 1 Quad .................... = 1055056000000000000 J + 1 Rydberg ................. = 0.000000000000000002179872 J + 1 Thermie ................. = 4186800 J */ static const conv_t conv_ENERGY[] = { DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES, "$*4.1855", "$/4.1855") @@ -199,45 +312,45 @@ 1 chain uk ....... = 22 yards = 22*0.9144 m 1 chi ............ = 1/3 m 1 chou ........... = 3600/33 m - 1 chr ............ = + 1 chr ............ = 0.303 m 1 cun ............ = 1/10 chi = 1/30 m 1 fathom ......... = 2 yard = 2*0.9144 m 1 fathom ungary .. = 1.8964838 m (fixed) 1 feet ........... = 12 inch = 0.9144/3 m 1 furlong ........ = 10 chains = 220*0.9144 m - 1 gan ............ = + 1 gan ............ = 1.818 m 1 hand ........... = 4 inches = 0.9144/9 m - 1 hunh ........... = + 1 hunh ........... = 0.00260 m 1 inch ........... = yard/36 = 0.9144/36 m - 1 ja ............. = - 1 jeong .......... = - 1 kabiet ......... = + 1 ja ............. = 0.303 m + 1 jeong .......... = 109.091 m + 1 kabiet ......... = 0.00520 m 1 ken ............ = 60/33 m - 1 keub ........... = + 1 keub ........... = 0.250 m 1 km ............. = 1000 m - 1 lar ............ = + 1 lar ............ = 0.914 m 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 - 1 nieu ........... = + 1 nieu ........... = 0.0208 m 1 parsec ......... = 30856800000000000 m 1 pica ........... = yard/216 = 0.9144/216 m - 1 ri japan ....... = - 1 ri korea ....... = + 1 ri japan ....... = 3927.273 m + 1 ri korea ....... = 392.727 m 1 rod ............ = 5.0292 m - 1 sawk ........... = - 1 sen ............ = + 1 sawk ........... = 0.5 m + 1 sen ............ = 40 m 1 shaku .......... = 10/33 m 1 span ........... = 9 inches = 0.9144/4 m 1 sun ............ = 1/33 m - 1 tsuen .......... = - 1 va ............. = + 1 tsuen .......... = 0.0303 m + 1 va ............. = 2 m 1 yard ........... = 0.9144 m - 1 yote ........... = - 1 zhang .......... = + 1 yote ........... = 16000 m + 1 zhang .......... = 3.333 m */ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$*0.0000000001", "$/0.0000000001") @@ -247,23 +360,23 @@ DECLARE_CONV_UNIT(LENGTH, CHAINS_UK, "$*20.1168", "$/20.1168") DECLARE_CONV_UNIT(LENGTH, CHI, "$/3", "$*3") DECLARE_CONV_UNIT(LENGTH, CHOU, "$*3600/33", "$*33/3600") -// DECLARE_CONV_UNIT(LENGTH, CHR, "$", "$") + DECLARE_CONV_UNIT(LENGTH, CHR, "$*0.303", "$/0.303") DECLARE_CONV_UNIT(LENGTH, CUN, "$/30", "$*30") DECLARE_CONV_UNIT(LENGTH, FATHOMS, "$*1.8288", "$/1.8288") DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY, "$*1.8964838", "$/1.8964838") DECLARE_CONV_UNIT(LENGTH, FEET, "$*0.3048", "$/0.3048") DECLARE_CONV_UNIT(LENGTH, FURLONGS, "$*201.168", "$/201.168") -// DECLARE_CONV_UNIT(LENGTH, GAN, "$", "$") + DECLARE_CONV_UNIT(LENGTH, GAN, "$*1.818", "$/1.818") DECLARE_CONV_UNIT(LENGTH, HANDS, "$*0,1016", "$/0,1016") -// DECLARE_CONV_UNIT(LENGTH, HUNH, "$", "$") + DECLARE_CONV_UNIT(LENGTH, HUNH, "$*0.00260", "$/0.00260") DECLARE_CONV_UNIT(LENGTH, INCHES, "$*0.0254", "$/0.0254") -// DECLARE_CONV_UNIT(LENGTH, JA, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, JEONG, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, KABIET, "$", "$") + DECLARE_CONV_UNIT(LENGTH, JA, "$*0.303", "$/0.303") + DECLARE_CONV_UNIT(LENGTH, JEONG, "$*109.091", "$/109.091") + DECLARE_CONV_UNIT(LENGTH, KABIET, "$*0.00520", "$/0.00520") DECLARE_CONV_UNIT(LENGTH, KEN, "$*60/33", "$*33/60") -// DECLARE_CONV_UNIT(LENGTH, KEUB, "$", "$") + DECLARE_CONV_UNIT(LENGTH, KEUB, "$*0.250", "$/0.250") DECLARE_CONV_UNIT(LENGTH, KILOMETERS, "$*1000", "$/1000") -// DECLARE_CONV_UNIT(LENGTH, LAR, "$", "$") + DECLARE_CONV_UNIT(LENGTH, LAR, "$*0.914", "$/0.914") DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS, "$*9460730472580800", "$/9460730472580800") DECLARE_CONV_UNIT(LENGTH, LINKS_UK, "$*0.201168", "$/0.201168") DECLARE_CONV_UNIT(LENGTH, METERS, "$", "$") @@ -271,31 +384,37 @@ 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, NIEU, "$*0.0208", "$/0.0208") 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, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, SEN, "$", "$") + DECLARE_CONV_UNIT(LENGTH, RI_JAPAN, "$*3927.273", "$/3927.273") + DECLARE_CONV_UNIT(LENGTH, RI_KOREA, "$*392.727", "$/392.727") + DECLARE_CONV_UNIT(LENGTH, SAWK, "$*0.5", "$/0.5") + DECLARE_CONV_UNIT(LENGTH, SEN, "$*40", "$/40") DECLARE_CONV_UNIT(LENGTH, SHAKU, "$*10/33", "$*33/10") DECLARE_CONV_UNIT(LENGTH, SPAN, "$*0.9144/4", "$*4/0.9144") - DECLARE_CONV_UNIT(LENGTH, SUN, "$*1/33", "$*33") -// DECLARE_CONV_UNIT(LENGTH, TSUEN, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, VA, "$", "$") + DECLARE_CONV_UNIT(LENGTH, SUN, "$*1/33", "$*33") + DECLARE_CONV_UNIT(LENGTH, TSUEN, "$*0.0303", "$/0.0303") + DECLARE_CONV_UNIT(LENGTH, VA, "$*2", "$/2") DECLARE_CONV_UNIT(LENGTH, YARDS, "$*0.9144", "$/0.9144") -// DECLARE_CONV_UNIT(LENGTH, YOTE, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, ZHANG, "$", "$") + DECLARE_CONV_UNIT(LENGTH, YOTE, "$*16000", "$/16000") + DECLARE_CONV_UNIT(LENGTH, ZHANG, "$*3.333", "$/3.333") DECLARE_CONV_END }; /* - 1 BTU/min = 17.5842642 W + 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 + 1 Gigawatt ........ = 1000000000 W + 1 hp .............. = 745.69987158227022 W + 1 KW .............. = 1000 W + 1 Lusec ........... = 0.000133 W + 1 Manpower ........ = 74.57 W + 1 Millihorsepower . = 0.745 W + 1 Milliwatt ....... = 0.001 W + 1 MW .............. = 1000000 W + 1 Poncelet ........ = 980.665 W */ static const conv_t conv_POWER[] = { DECLARE_CONV_UNIT(POWER, BTUS_PER_MINUTE, "$*17.5842642", "$/17.5842642") @@ -308,12 +427,20 @@ }; /* - 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 + 1 ATM ................ = 101325 Pa + 1 BAR ................ = 100000 Pa + 1 barye ................ = 0.1 Pa + 1 hPa ................ = 100 Pa + 1 kPa ................ = 1000 Pa + 1 megapascal ........... = 1000000 Pa + 1 microbar ............. = 0.1 Pa + 1 millibar ............. = 100 Pa + 1 millipascal .......... = 0.001 Pa + 1 mm HG ................ = 133.322 Pa + 1 mm H2O ............... = 9.806 Pa + 1 pièze ................ = 1000 Pa + 1 psi ................ = 6894.757 Pa + 1 torr ................. = 133.322 Pa */ static const conv_t conv_PRESSURE[] = { DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES, "$*101325", "$/101325") @@ -327,13 +454,43 @@ }; /* - 1 day ....... = 86400 s - 1 hour ...... = 3600 s - 1 microsecond = 0.000001 s - 1 millisecond = 0.001 s - 1 nanosecond. = 0.000000001 s - 1 minute .... = 60 s - 1 week ...... = 669600 s + 1 atom ................. = 0.159 s + 1 callippic cycle ...... = 2398377000 s + 1 century (Calendar) ... = 3153600000 s + 1 century (Gregorian) .. = 3155695000 s + 1 century (Julian) ..... = 3155760000 s + 1 day .................. = 86400 s + 1 decade ............... = 315360000 s + 1 enneadecaeteris ...... = 599616000 s + 1 fortnight ............ = 1209600 s + 1 hipparchic cycle ..... = 9593424000 s + 1 hour ................. = 3600 s + 1 jiffy ................ = 0.0166 s + 1 jiffy (alternate) .... = 0.01 s + 1 leap year ............ = 31622400 s + 1 lustre (lustrum) ..... = 157680000 s + 1 megayear ............. = 31536000000000 s + 1 metonic cycle ........ = 599616000 s + 1 microsecond .......... = 0.000001 s + 1 millenium (Calendar) . = 31536000000 s + 1 millenium (Gregorian). = 31556950000 s + 1 millenium (Julian) ... = 31557600000 s + 1 millisecond .......... = 0.001 s + 1 minute ............... = 60 s + 1 minutum .............. = 360 s + 1 molad (Hebrew) ....... = 2551443 s + 1 moment ............... = 90 s + 1 nanosecond ........... = 0.000000001 s + 1 octaeteris ........... = 252288000 s + 1 ounce ................ = 7.5 s + 1 shake ................ = 0.00000001 s + 1 sidereal day ......... = 86164.091 s + 1 sigma ................ = 0.000001 s + 1 sol (Mars) ........... = 88775 s + 1 sothic cycle ......... = 46074100000 s + 1 stunde (Germany) ..... = 3600 s + 1 svedberg ............. = 0.0000000000001 s + 1 week ................. = 669600 s */ static const conv_t conv_TIME[] = { DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") @@ -385,7 +542,7 @@ /* 1 barrel uk ...... = 163.65924 l 1 barrel oil ..... = 158.987295 l - 1 bun ............ = + 1 bun ............ = 1000 l 1 bushel uk ...... = 36.36872 l 1 bushel us ...... = 35.23907017 l 1 cubic cm ...... = 0.001 l @@ -393,17 +550,17 @@ 1 cubic inch ..... = 0.016387064 l 1 cubic meter .... = 1000 l 1 cubic yard ..... = 764.554857 l - 1 doe ............ = + 1 doe ............ = 1.803 l 1 fluid ounce uk = 0.0284130625 l 1 fluid ounce us = 0.0295735295625 l 1 gallon uk ...... = 4.54609 l 1 gallon dry us .. = 4.40488377086 l 1 gallon liquid us = 3.785411784 l 1 gou ............ = 0.1809 l - 1 hop ............ = - 1 icce ........... = - 1 kwian .......... = - 1 mal ............ = + 1 hop ............ = 0.180 l + 1 icce ........... = 0.848 l + 1 kwian .......... = 2000 l + 1 mal ............ = 18.03 l 1 milliliter ..... = 0.001 l 1 pint uk ........ = 0.56826125 l 1 pint dry us .... = 0.5506104713575 l @@ -411,16 +568,16 @@ 1 quart uk ....... = 1.1365225 l 1 quart dry us ... = 1.101220942715 l 1 quart liquid us = 0.946352946 l - 1 seki ........... = - 1 syou ........... = - 1 tananloung ..... = - 1 tang ........... = - 1 to ............. = 18040 l + 1 seki ........... = 180.39 l + 1 syou ........... = 1.804 l + 1 tananloung ..... = 1 l + 1 tang ........... = 20 l + 1 to ............. = 18.040 l */ static const conv_t conv_VOLUME[] = { DECLARE_CONV_UNIT(VOLUME, BARRELS_UK, "$*163.65924", "$/163.65924") DECLARE_CONV_UNIT(VOLUME, BARRELS_OIL, "$*158.987295", "$/158.987295") -// DECLARE_CONV_UNIT(VOLUME, BUN, "$", "$") + DECLARE_CONV_UNIT(VOLUME, BUN, "$*1000", "$/1000") DECLARE_CONV_UNIT(VOLUME, BUSHELS_UK, "$*36.36872", "$/36.36872") DECLARE_CONV_UNIT(VOLUME, BUSHELS_US, "$*35.23907017", "$/35.23907017") DECLARE_CONV_UNIT(VOLUME, CUBIC_CENTIMETERS, "$*0.001", "$/0.001") @@ -428,18 +585,18 @@ DECLARE_CONV_UNIT(VOLUME, CUBIC_INCHES, "$*0.016387064", "$/0.016387064") DECLARE_CONV_UNIT(VOLUME, CUBIC_METERS, "$*1000", "$/1000") DECLARE_CONV_UNIT(VOLUME, CUBIC_YARDS, "$*764.554857", "$/764.554857") -// DECLARE_CONV_UNIT(VOLUME, DOE, "$", "$") + DECLARE_CONV_UNIT(VOLUME, DOE, "$*1.803", "$/1.803") DECLARE_CONV_UNIT(VOLUME, FLUID_OUNCES_UK, "$*0.0284130625", "$/0.0284130625") DECLARE_CONV_UNIT(VOLUME, FLUID_OUNCES_US, "$*0.0295735295625", "$/0.0295735295625") DECLARE_CONV_UNIT(VOLUME, GALLONS_UK, "$*4.54609", "$/4.54609") DECLARE_CONV_UNIT(VOLUME, GALLONS_DRY_US, "$*4.40488377086", "$/4.40488377086") DECLARE_CONV_UNIT(VOLUME, GALLONS_LIQUID_US, "$*3.785411784", "$/3.785411784") DECLARE_CONV_UNIT(VOLUME, GOU, "$*0.1809", "$/0.1809") -// DECLARE_CONV_UNIT(VOLUME, HOP, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, ICCE, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, KWIAN, "$", "$") + DECLARE_CONV_UNIT(VOLUME, HOP, "$*0.180", "$/0.180") + DECLARE_CONV_UNIT(VOLUME, ICCE, "$*0.848", "$/0.848") + DECLARE_CONV_UNIT(VOLUME, KWIAN, "$*2000", "$/2000") DECLARE_CONV_UNIT(VOLUME, LITERS, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, MAL, "$", "$") + DECLARE_CONV_UNIT(VOLUME, MAL, "$*18.03", "$/18.03") DECLARE_CONV_UNIT(VOLUME, MILLILITERS, "$*0.001", "$/0.001") DECLARE_CONV_UNIT(VOLUME, PINTS_UK, "$*0.56826125", "$/0.56826125") DECLARE_CONV_UNIT(VOLUME, PINTS_DRY_US, "$*0.5506104713575", "$/0.5506104713575") @@ -447,68 +604,204 @@ DECLARE_CONV_UNIT(VOLUME, QUARTS_UK, "$*1.1365225", "$/1.1365225") DECLARE_CONV_UNIT(VOLUME, QUARTS_DRY_US, "$*1.101220942715", "$/1.101220942715") DECLARE_CONV_UNIT(VOLUME, QUARTS_LIQUID_US, "$*0.946352946", "$/0.946352946") -// DECLARE_CONV_UNIT(VOLUME, SEKI, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, SYOU, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, TANANLOUNG, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, TANG, "$", "$") - DECLARE_CONV_UNIT(VOLUME, TO, "$*18040", "$/18040") + DECLARE_CONV_UNIT(VOLUME, SEKI, "$*180.39", "$/180.39") + DECLARE_CONV_UNIT(VOLUME, SYOU, "$*1.804", "$/1.804") + DECLARE_CONV_UNIT(VOLUME, TANANLOUNG, "$*1", "$/1") + DECLARE_CONV_UNIT(VOLUME, TANG, "$*20", "$/20") + DECLARE_CONV_UNIT(VOLUME, TO, "$*18.040", "$/18.040") DECLARE_CONV_END }; /* 1 baht ............ = 12.244 g - 1 carat ........... = 0.2 g - 1 chung ........... = - 1 don ............. = - 1 geun ............ = - 1 gwan ............ = - 1 harb ............ = - 1 jin china ....... = - 1 jin taiwan ...... = + 1 barge ........... = 20411660 g + 1 berkovets(Russia) = 163806.872 g + 1 carat ........... = 0.205 g + 1 carat (Metric)... = 0.2 g + 1 catty (China) ... = 500 g + 1 catty (Malaysia). = 604.79 g + 1 catty (Thailand). = 600 g + 1 centner ......... = 50000 g + 1 chin (China) .... = 500 g + 1 chung ........... = 1200 g + 1 clove ........... = 3628.739 g + 1 crith ........... = 0.0899 g + 1 dalton .......... = 0.000000000000000000000001660902 g + 1 decigram ........ = 0.1 g + 1 dekagram ........ = 10 g + 1 dolia (Russia) .. = 0.0444 g + 1 don ............. = 3.75 g + 1 funt (Russia) ... = 409.517 g + 1 gamma ........... = 0.000001 g + 1 geepound ........ = 14593.903 g + 1 geun ............ = 600 g + 1 gigagram ........ = 1000000000 g + 1 gin (China) ..... = 500 g + 1 gongjin (China) . = 1000 g + 1 grain ........... = 0.0647 g + 1 gwan ............ = 3750 g + 1 harb ............ = 60000 g + 1 hectogram ....... = 100 g + 1 jin china ....... = 500 g + 1 jin taiwan ...... = 600 g 1 Kan ............. = 3750 g - 1 Kilograms ....... = 1000 g + 1 Kilogram ....... = 1000 g 1 Kin ............. = 600 g - 1 Liang China ..... = - 1 Liang Taiwan .... = + 1 Kip ............. = 453592.37 g + 1 Liang China ..... = 50 g + 1 Liang Taiwan .... = 37.5 g + 1 libra (Spain) ... = 459.04 g + 1 livre (France) .. = 500 g + 1 lot ............. = 15.625 g + 1 lot (Russia) .... = 12.797 g + 1 mace (China) .... = 5 g + 1 mahnd (Arab) .... = 925 g + 1 marc (France) ... = 229.52 g + 1 marco (Spain) ... = 229.52 g + 1 mark (UK) ....... = 248.828 g + 1 masha ........... = 0.971 g + 1 maund ........... = 37324.172 g + 1 megadalton ...... = 0.0000000000000000016605402 g + 1 megagram ........ = 1000000 g + 1 megatonne ....... = 1000000000000 g + 1 microgram ....... = 0.000001 g + 1 milligram ....... = 0.001 g + 1 millier (UK) .... = 1000000 g + 1 mina (Hebrew) ... = 499 g + 1 mite ............ = 0.00323 g + 1 mite (Metric) ... = 0.05 g + 1 momme (Japan) ... = 3.75 g 1 monme ........... = 3.75 g + 1 mug ............. = 175126.835 g + 1 nanogram ........ = 0.000000001 g + 1 onza (Spain) .... = 28.69 g 1 ounce avoirdupois = 28.349523125 g 1 ounce troy ...... = 31.1034768 g + 1 picogram ........ = 0.000000000001 g + 1 point (mass) .... = 0.002 g + 1 pood (Russia) ... = 16380.687 g 1 pound ........... = 453.59237 g + 1 pound (metric) .. = 500 g + 1 qian (China) .... = 5 g + 1 quarter (long)... = 254011.727 g + 1 quarter (UK) .... = 12700.586 g 1 quintal metric .. = 100000 g - 1 saloung ......... = + 1 saloung ......... = 3.75 g + 1 scruple ......... = 1.296 g + 1 seer ............ = 933.104 g + 1 sheet............ = 0.647 g + 1 sheqel (Hebrew).. = 8.317 g + 1 slinch .......... = 175126.835 g + 1 slug (metric) ... = 9806.65 g + 1 snail ........... = 175126.835 g 1 stone ........... = 6350.29318 g 1 tamlung ......... = + 1 tael (China) .... = 50 g + 1 tael (Japan) .... = 37.506 g + 1 teragram ........ = 1000000000000 g + 1 tola ............ = 11.664 1 ton ............. = 1000000 g 1 ton uk .......... = 1016046.9088 g // long ton 1 ton us .......... = 907184.74 g // short ton + 1 tonneau (France) = 1000000 g + 1 unze ............ = 31.25 g + 1 wey ............. = 114305.277 g + 1 zentner ......... = 50000 + 1 zolotnik (Russia) = 4.266 g */ static const conv_t conv_WEIGHT[] = { - DECLARE_CONV_UNIT(WEIGHT, BAHT, "$*12.244", "$/12.244") - DECLARE_CONV_UNIT(WEIGHT, CARATS, "$*0.2", "$/0.2") -// DECLARE_CONV_UNIT(WEIGHT, CHUNG, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, DON, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, GEUN, "$", "$") - DECLARE_CONV_UNIT(WEIGHT, GRAMS, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, GWAN, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, HARB, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN, "$", "$") - DECLARE_CONV_UNIT(WEIGHT, KAN, "$*3750", "$/3750") - DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS, "$*1000", "$/1000") - DECLARE_CONV_UNIT(WEIGHT, KIN, "$*600", "$/600") -// DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN, "$", "$") - DECLARE_CONV_UNIT(WEIGHT, MONME, "$*3.75", "$/3.75") - DECLARE_CONV_UNIT(WEIGHT, OUNCES_AVOIRDUPOIS, "$*28.349523125", "$/28.349523125") - DECLARE_CONV_UNIT(WEIGHT, OUNCES_TROY, "$*31.1034768", "$/31.1034768") - DECLARE_CONV_UNIT(WEIGHT, POUNDS, "$*453.59237", "$/453.59237") - DECLARE_CONV_UNIT(WEIGHT, QUINTAL_METRIC, "$*100000", "$/100000") -// DECLARE_CONV_UNIT(WEIGHT, SALOUNG, "$", "$") - DECLARE_CONV_UNIT(WEIGHT, STONES, "$*6350.29318", "$/6350.29318") -// DECLARE_CONV_UNIT(WEIGHT, TAMLUNG, "$", "$") - DECLARE_CONV_UNIT(WEIGHT, TONNES, "$*1000000", "$/1000000") - DECLARE_CONV_UNIT(WEIGHT, TONS_UK, "$*1016046.9088", "$/1016046.9088") - DECLARE_CONV_UNIT(WEIGHT, TONS_US, "$*907184.74", "$/907184.74") + DECLARE_CONV_UNIT(WEIGHT, BAHT, "$*12.244", "$/12.244") + DECLARE_CONV_UNIT(WEIGHT, BARGES, "$*20411660", "$/20411660") + DECLARE_CONV_UNIT(WEIGHT, BERKOVETS, "$*163806.872", "$/163806.872") + DECLARE_CONV_UNIT(WEIGHT, CARATS, "$*0.2", "$/0.2") + DECLARE_CONV_UNIT(WEIGHT, CATTY_CHINA, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, CATTY_MALAYSIA, "$*604.79", "$/604.79") + DECLARE_CONV_UNIT(WEIGHT, CATTY_THAILAND, "$*600", "$/600") + DECLARE_CONV_UNIT(WEIGHT, CENTNER, "$*50000", "$/50000") + DECLARE_CONV_UNIT(WEIGHT, CHIN, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, CHUNG, "$*1200", "$/1200") + DECLARE_CONV_UNIT(WEIGHT, CLOVES, "$*3628.739", "$/3628.739") + DECLARE_CONV_UNIT(WEIGHT, CRITHS, "$*0.0899", "$/0.0899") + DECLARE_CONV_UNIT(WEIGHT, DALTONS, "$*0.000000000000000000000001660902", "$/0.000000000000000000000001660902") + DECLARE_CONV_UNIT(WEIGHT, DECIGRAMS, "$*0.1", "$/0.1") + DECLARE_CONV_UNIT(WEIGHT, DEKAGRAMS, "$*10", "$/10") + DECLARE_CONV_UNIT(WEIGHT, DOLIA, "$*0.0444", "$/0.0444") + DECLARE_CONV_UNIT(WEIGHT, DON, "$*3.75", "$/3.75") + DECLARE_CONV_UNIT(WEIGHT, FUNT, "$*409.517", "$/409.517") + DECLARE_CONV_UNIT(WEIGHT, GAMMA, "$*0.000001", "$/0.000001") + DECLARE_CONV_UNIT(WEIGHT, GEEPOUNDS, "$*14593.903", "$/14593.903") + DECLARE_CONV_UNIT(WEIGHT, GEUN, "$*600", "$/600") + DECLARE_CONV_UNIT(WEIGHT, GIGAGRAMS, "$*1000000000", "$/1000000000") + DECLARE_CONV_UNIT(WEIGHT, GIN, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, GONGJIN, "$*1000", "$/1000") + DECLARE_CONV_UNIT(WEIGHT, GRAINS, "$*0.0647", "$/0.0647") + DECLARE_CONV_UNIT(WEIGHT, GRAMS, "$", "$") + DECLARE_CONV_UNIT(WEIGHT, GWAN, "$*3750", "$/3750") + DECLARE_CONV_UNIT(WEIGHT, HARB, "$*60000", "$/60000") + DECLARE_CONV_UNIT(WEIGHT, HECTOGRAMS, "$*100", "$/100") + DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN, "$*600", "$/600") + DECLARE_CONV_UNIT(WEIGHT, KAN, "$*3750", "$/3750") + DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS, "$*1000", "$/1000") + DECLARE_CONV_UNIT(WEIGHT, KIN, "$*600", "$/600") + DECLARE_CONV_UNIT(WEIGHT, KIP, "$*453592.37", "$/453592.37") + DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA, "$*50", "$/50") + DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN, "$*37.5", "$/37.5") + DECLARE_CONV_UNIT(WEIGHT, LIBRA, "$*459.04", "$/459.04") + DECLARE_CONV_UNIT(WEIGHT, LIVRES, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, LOTS, "$*15.625", "$/15.625") + DECLARE_CONV_UNIT(WEIGHT, LOT_RUSSIA, "$*12.797", "$/12.797") + DECLARE_CONV_UNIT(WEIGHT, MACE, "$*5", "$/5") + DECLARE_CONV_UNIT(WEIGHT, MAHND, "$*925", "$/925") + DECLARE_CONV_UNIT(WEIGHT, MARCS, "$*229.52", "$/229.52") + DECLARE_CONV_UNIT(WEIGHT, MARCO, "$*229.52", "$/229.52") + DECLARE_CONV_UNIT(WEIGHT, MARKS, "$*248.828", "$/248.828") + DECLARE_CONV_UNIT(WEIGHT, MASHA, "$*0.971", "$/0.971") + DECLARE_CONV_UNIT(WEIGHT, MAUND, "$*37324.172", "$/37324.172") + DECLARE_CONV_UNIT(WEIGHT, MEGADALTONS, "$*0.0000000000000000016605402", "$/0.0000000000000000016605402") + DECLARE_CONV_UNIT(WEIGHT, MEGAGRAMS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(WEIGHT, MEGATONNES, "$*1000000000000", "$/1000000000000") + DECLARE_CONV_UNIT(WEIGHT, MICROGRAMS, "$*0.000001", "$/0.000001") + DECLARE_CONV_UNIT(WEIGHT, MILLIGRAMS, "$*0.001", "$/0.001") + DECLARE_CONV_UNIT(WEIGHT, MILLIERS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(WEIGHT, MINA, "$*499", "$/499") + DECLARE_CONV_UNIT(WEIGHT, MONME, "$*3.75", "$/3.75") + DECLARE_CONV_UNIT(WEIGHT, MUGS, "$*175126.835", "$/175126.835") + DECLARE_CONV_UNIT(WEIGHT, NANOGRAMS, "$*0.000000001", "$/0.000000001") + DECLARE_CONV_UNIT(WEIGHT, ONZA, "$*28.69", "$/28.69") + DECLARE_CONV_UNIT(WEIGHT, OUNCES_AVOIRDUPOIS, "$*28.349523125", "$/28.349523125") + DECLARE_CONV_UNIT(WEIGHT, OUNCES_TROY, "$*31.1034768", "$/31.1034768") + DECLARE_CONV_UNIT(WEIGHT, PICOGRAMS, "$*0.000000000001", "$/0.000000000001") + DECLARE_CONV_UNIT(WEIGHT, POINTS, "$*0.002", "$/0.002") + DECLARE_CONV_UNIT(WEIGHT, POOD, "$*16380.687", "$/16380.687") + DECLARE_CONV_UNIT(WEIGHT, POUNDS, "$*453.59237", "$/453.59237") + DECLARE_CONV_UNIT(WEIGHT, POUNDS_METRIC, "$*500", "$/500") + DECLARE_CONV_UNIT(WEIGHT, QIAN, "$*5", "$/5") + DECLARE_CONV_UNIT(WEIGHT, QUARTERS_LONG, "$*254011.727", "$/254011.727") + DECLARE_CONV_UNIT(WEIGHT, QUARTERS_UK, "$*12700.586", "$/12700.586") + DECLARE_CONV_UNIT(WEIGHT, QUINTAL_METRIC, "$*100000", "$/100000") + DECLARE_CONV_UNIT(WEIGHT, SALOUNG, "$*3.75", "$/3.75") + DECLARE_CONV_UNIT(WEIGHT, SCRUPLES, "$*1.296", "$/1.296") + DECLARE_CONV_UNIT(WEIGHT, SEERS, "$*933.104", "$/933.104") + DECLARE_CONV_UNIT(WEIGHT, SHEETS, "$*0.647", "$/0.647") + DECLARE_CONV_UNIT(WEIGHT, SHEQEL, "$*8.317", "$/8.317") + DECLARE_CONV_UNIT(WEIGHT, SLINCHES, "$*175126.835", "$/175126.835") + DECLARE_CONV_UNIT(WEIGHT, SLUGS_METRIC, "$*9806.65", "$/9806.65") + DECLARE_CONV_UNIT(WEIGHT, SNAILS, "$*175126.835", "$/175126.835") + DECLARE_CONV_UNIT(WEIGHT, STONES, "$*6350.29318", "$/6350.29318") +// DECLARE_CONV_UNIT(WEIGHT, TAMLUNG, "$", "$") + DECLARE_CONV_UNIT(WEIGHT, TAEL_CHINA, "$*50", "$/50") + DECLARE_CONV_UNIT(WEIGHT, TAEL_JAPAN, "$*37.506", "$/37.506") + DECLARE_CONV_UNIT(WEIGHT, TERAGRAMS, "$*1000000000000", "$/1000000000000") + DECLARE_CONV_UNIT(WEIGHT, TOLA, "$*11.664", "$/11.664") + DECLARE_CONV_UNIT(WEIGHT, TONNES, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(WEIGHT, TONS_UK, "$*1016046.9088", "$/1016046.9088") + DECLARE_CONV_UNIT(WEIGHT, TONS_US, "$*907184.74", "$/907184.74") + DECLARE_CONV_UNIT(WEIGHT, TONNEAU, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(WEIGHT, UNZE, "$*31.25", "$/31.25") + DECLARE_CONV_UNIT(WEIGHT, WEYS, "$*114305.277", "$/114305.277") + DECLARE_CONV_UNIT(WEIGHT, ZENTNERS, "$*50000", "$/50000") + DECLARE_CONV_UNIT(WEIGHT, ZOLOTNIK, "$*4.266", "$/4.266") DECLARE_CONV_END }; Index: base/applications/calc/lang/bg-BG.rc =================================================================== --- base/applications/calc/lang/bg-BG.rc (revision 54057) +++ base/applications/calc/lang/bg-BG.rc (working copy) @@ -458,9 +458,24 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_DEGREES "Градуси" - IDS_ANGLE_GRADIANS "Гради" - IDS_ANGLE_RADIANS "Радиани" + IDS_ANGLE_ARCMINUTES "Arcminutes" + IDS_ANGLE_ARCSECONDS "Arcseconds" + IDS_ANGLE_CENTESIMAL_MINUTES "Centesimal Minutes" + IDS_ANGLE_CENTESIMAL_SECONDS "Centesimal Seconds" + IDS_ANGLE_DEGREES "Градуси" + IDS_ANGLE_GONS "Gons" + IDS_ANGLE_GRADIANS "Гради" + IDS_ANGLE_MILS "Mils" + IDS_ANGLE_MILLIARCSECONDS "Milliarcseconds" + IDS_ANGLE_MILLIGONS "Milligons" + IDS_ANGLE_MILLIRADIANS "Milliradians" + IDS_ANGLE_OCTANTS "Octants" + IDS_ANGLE_POINTS "Points" + IDS_ANGLE_QUADRANTS "Quadrants" + IDS_ANGLE_RADIANS "Радиани" + IDS_ANGLE_SEXTANTS "Sextants" + IDS_ANGLE_SIGNS "Signs" + IDS_ANGLE_STRECKS "Strecks" END // TYPES OF AREAS @@ -472,17 +487,43 @@ IDS_AREA_ACRES_SCOTS "Акри (Шотландски)" IDS_AREA_ACRES_US "Акри (САЩ)" IDS_AREA_ARES "Арове" + IDS_AREA_BARNS "Barns" + IDS_AREA_BARONY "Baronys" + IDS_AREA_BOARDS "Boards" + IDS_AREA_CHO "Cho" IDS_AREA_CHOU "Chou" + IDS_AREA_CIRCULAR_INCHES "Circular Inches" + IDS_AREA_CIRCULAR_MILS "Circular Mils" + IDS_AREA_CORDS "Cords" + IDS_AREA_COTKA "Cotka" IDS_AREA_DANBO "Danbo" + IDS_AREA_DUNAM "Dunam" + IDS_AREA_FEDDAN "Feddan" IDS_AREA_HECTARES "Хектари" IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_JOCH "Joch" + IDS_AREA_KCMILS "Kcmils" + IDS_AREA_MAL "Mål" + IDS_AREA_MANZANA "Manzana" + IDS_AREA_MARLA "Marla" + IDS_AREA_MORGEN_AFRICA "Morgen (Africa)" + IDS_AREA_MORGEN_AUSTRIA "Morgen (Austria)" + IDS_AREA_MORGEN_DUTCH "Morgen (Dutch)" IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_PRUSSIA "Morgen (Prussia)" + IDS_AREA_MORGEN_SCANDINAVIA "Morgen (Scandinavia)" IDS_AREA_MU "Mu" + IDS_AREA_PERCH "Perch" IDS_AREA_PING "Ping" + IDS_AREA_POLE "Pole" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" + IDS_AREA_ROOD "Rood" IDS_AREA_SE "Se" + IDS_AREA_SITIO "Sitio" + IDS_AREA_SOENDRE "Soendre" + IDS_AREA_SOTKA "Sotka" IDS_AREA_SQUARE_CENTIMETERS "Квадратни сантиметри" IDS_AREA_SQUARE_CHR "Квадратни chr" IDS_AREA_SQUARE_FATHOMS "Квадратни фадоми" @@ -491,13 +532,19 @@ IDS_AREA_SQUARE_INCHES "Квадратни цолове" IDS_AREA_SQUARE_KILOMETERS "Квадратни километри" IDS_AREA_SQUARE_LAR "Квадратни lar" + IDS_AREA_SQUARE_LEGUA "Square legua" + IDS_AREA_SQUARE_LINKS "Square links" IDS_AREA_SQUARE_METER "Квадратни метри" + IDS_AREA_SQUARE_MILS "Square mils" IDS_AREA_SQUARE_MILES "Квадратни мили" IDS_AREA_SQUARE_MILLIMETERS "Квадратни милиметри" IDS_AREA_SQUARE_SHAKU "Квадратни shaku" IDS_AREA_SQUARE_TSUEN "Квадратни tsuen" IDS_AREA_SQUARE_VA "Квадратни va" IDS_AREA_SQUARE_YARD "Квадратни ярдове" + IDS_AREA_STANG "Stang" + IDS_AREA_STREMMA "Stremma" + IDS_AREA_TALANG_WAH "Talang Wah" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -537,18 +584,31 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - 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_NUTRITION_CALORIES "Хранителни калории" - IDS_ENERGY_TH_CALORIES "Топлинни калории" + IDS_ENERGY_15_C_CALORIES "15-градусни калории" + IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY "Atomic Units of Energy" + IDS_ENERGY_ATTAJOULES "Attajoules" + IDS_ENERGY_DYNA_CENTIMETERS "Dyna-Centimeters" + IDS_ENERGY_ERGS "Ергове" + IDS_ENERGY_EVS "Електронволти" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_GIGAJOULES "Gigajoules" + IDS_ENERGY_GIGAWATT_HOURS "Gigawatt hours" + IDS_ENERGY_HARTREES "Hartrees" + IDS_ENERGY_IT_CALORIES "Международни таблични калории" + IDS_ENERGY_JOULES "Джаули" + IDS_ENERGY_KILOELECTRONVOLTS "Kiloelectronvolts" + IDS_ENERGY_KILOJOULES "Килоджаули" + IDS_ENERGY_KILOWATT_HOURS "Киловатчасове" + IDS_ENERGY_MEGAELECTRONVOLTS "Megaelectronvolts" + IDS_ENERGY_MEGAJOULES "Megajoules" + IDS_ENERGY_MEGALERGS "Megalergs" + IDS_ENERGY_MEGATONS "Megatons" + IDS_ENERGY_MICROJOULES "Microjoules" + IDS_ENERGY_MILLIJOULES "Millijoules" + IDS_ENERGY_NUTRITION_CALORIES "Хранителни калории" + IDS_ENERGY_QUADS "Quads" + IDS_ENERGY_RYDBERGS "Rydbergs" + IDS_ENERGY_TH_CALORIES "Топлинни калории" END // TYPES OF LENGTHS @@ -608,9 +668,15 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_GIGAWATTS "Gigawatts" IDS_POWER_HORSEPOWER "Конски сили" IDS_POWER_KILOWATTS "Киловатове" + IDS_POWER_LUSECS "Lusecs" + IDS_POWER_MANPOWER "Manpower" IDS_POWER_MEGAWATTS "Мегаватове" + IDS_POWER_MILLIHORSEPOWER "Millihorsepower" + IDS_POWER_MILLIWATTS "Milliwatts" + IDS_POWER_PONCELETS "Poncelets" IDS_POWER_WATTS "Ватове" END @@ -619,11 +685,18 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Атмосфери" IDS_PRESSURE_BARS "Барове" + IDS_PRESSURE_BARYE "Barye" IDS_PRESSURE_HECTOPASCALS "Хектопаскали" IDS_PRESSURE_KILOPASCALS "Килопаскали" + IDS_PRESSURE_MICROBARS "Microbars" + IDS_PRESSURE_MILLIBARS "Millibars" + IDS_PRESSURE_MM_OF_WATER "Millimeters of water" IDS_PRESSURE_MM_OF_MERCURY "Милиметри живачен стълб" + IDS_PRESSURE_MILLIPASCALS "Millipascals" IDS_PRESSURE_PASCALS "Паскали" + IDS_PRESSURE_PIEZE "Pièze" IDS_PRESSURE_PSI "Паундове на квадратен цол" + IDS_PRESSURE_TORR "Torr" END // TYPES OF TEMPERATURES @@ -638,15 +711,44 @@ // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "Дни" - IDS_TIME_HOURS "Часи" - IDS_TIME_NANOSECONDS "Nanoseconds" - IDS_TIME_MICROSECONDS "Микросекунди" - IDS_TIME_MILLISECONDS "Милисекунди" - IDS_TIME_MINUTES "Минути" - IDS_TIME_SECONDS "Секунди" - IDS_TIME_WEEKS "Седмици" - IDS_TIME_YEARS "Години" + IDS_TIME_ATOMS "Atoms" + IDS_TIME_CALLIPPIC_CYCLE "Callippic cycles" + IDS_TIME_CENTURIES_CALENDAR "Centuries (Calendar)" + IDS_TIME_CENTURIES_GREGORIAN "Centuries (Gregorian)" + IDS_TIME_CENTURIES_JULIAN "Centuries (Julian)" + IDS_TIME_DAYS "Дни" + IDS_TIME_DECADES "Decades" + IDS_TIME_ENNEADECATERIS "Enneadecateris" + IDS_TIME_FORTNIGHTS "Fortnights" + IDS_TIME_HIPPARCHIC_CYCLE "Hipparchic cycle" + IDS_TIME_HOURS "Часи" + IDS_TIME_JIFFIES "Jiffies" + IDS_TIME_JIFFIES_ALTERNATIVE "Jiffies (Alternative)" + IDS_TIME_LEAP_YEARS "Leap years" + IDS_TIME_LUSTRES "Lustres" + IDS_TIME_METONIC_CYCLES "Metonic cycles" + IDS_TIME_MICROSECONDS "Микросекунди" + IDS_TIME_MILLENIUMS_CALENDAR "Milleniums (Calendar)" + IDS_TIME_MILLENIUMS_GREGORIAN "Milleniums (Gregorian)" + IDS_TIME_MILLENIUMS_JULIAN "Milleniums (Julian)" + IDS_TIME_MILLISECONDS "Милисекунди" + IDS_TIME_MINUTES "Минути" + IDS_TIME_MINUTUM "Minutum" + IDS_TIME_MOLAD "Molad" + IDS_TIME_MOMENTS "Moments" + IDS_TIME_NANOSECONDS "Nanoseconds" + IDS_TIME_OCTAETERIS "Octaeteris" + IDS_TIME_OUNCES "Ounces" + IDS_TIME_SECONDS "Секунди" + IDS_TIME_SHAKES "Shakes" + IDS_TIME_SIDEREAL_DAYS "Sidereal days" + IDS_TIME_SIGMAS "Sigmas" + IDS_TIME_SOLS_MARS "Sol (Mars)" + IDS_TIME_SOTHIC_CYCLES "Sothic cycles" + IDS_TIME_STUNDE "Stunde" + IDS_TIME_SVEDBERG "Svedberg" + IDS_TIME_WEEKS "Седмици" + IDS_TIME_YEARS "Години" END // TYPES OF VELOCITIES @@ -705,29 +807,94 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_BARGES "Barges" + IDS_WEIGHT_BERKOVETS "Berkovets" IDS_WEIGHT_CARATS "Карати" + IDS_WEIGHT_CATTY_CHINA "Catty (China)" + IDS_WEIGHT_CATTY_MALAYSIA "Catty (Malaysia)" + IDS_WEIGHT_CATTY_THAILAND "Catty (Thailand)" + IDS_WEIGHT_CENTNER "Centner" + IDS_WEIGHT_CHIN "Chin" IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_CLOVES "Cloves" + IDS_WEIGHT_CRITHS "Criths" + IDS_WEIGHT_DALTONS "Daltons" + IDS_WEIGHT_DECIGRAMS "Decigrams" + IDS_WEIGHT_DEKAGRAMS "Dekagrams" + IDS_WEIGHT_DOLIA "Dolia" IDS_WEIGHT_DON "Don" + IDS_WEIGHT_FUNT "Funt" + IDS_WEIGHT_GAMMA "Gamma" + IDS_WEIGHT_GEEPOUNDS "Geepounds" IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GIGAGRAMS "Gigagrams" + IDS_WEIGHT_GIN "Gin" + IDS_WEIGHT_GONGJIN "Gongjin" + IDS_WEIGHT_GRAINS "Grains" IDS_WEIGHT_GRAMS "Grams" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_HECTOGRAMS "Hectograms" IDS_WEIGHT_JIN_CHINA "Джинове (Китай)" IDS_WEIGHT_JIN_TAIWAN "Джинове (Тайван)" IDS_WEIGHT_KAN "Kan" IDS_WEIGHT_KILOGRAMS "Килограми" IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_KIP "Kip" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIBRA "Libra" + IDS_WEIGHT_LIVRES "Livres" + IDS_WEIGHT_LOTS "Lots" + IDS_WEIGHT_LOT_RUSSIA "Lot (Russia)" + IDS_WEIGHT_MACE "Mace" + IDS_WEIGHT_MAHND "Mahnd" + IDS_WEIGHT_MARCS "Marcs" + IDS_WEIGHT_MARCO "Marco" + IDS_WEIGHT_MARKS "Marks" + IDS_WEIGHT_MASHA "Masha" + IDS_WEIGHT_MAUND "Maund" + IDS_WEIGHT_MEGADALTONS "Megadaltons" + IDS_WEIGHT_MEGAGRAMS "Megagrams" + IDS_WEIGHT_MEGATONNES "Megatonnes" + IDS_WEIGHT_MICROGRAMS "Micrograms" + IDS_WEIGHT_MILLIGRAMS "Milligrams" + IDS_WEIGHT_MILLIERS "Milliers" + IDS_WEIGHT_MINA "Mina" IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_MUGS "Mugs" + IDS_WEIGHT_NANOGRAMS "Nanograms" + IDS_WEIGHT_ONZA "Onza" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Унции, avoirdupois" IDS_WEIGHT_OUNCES_TROY "Унции, трой" - IDS_WEIGHT_POUNDS "Фунтове" + IDS_WEIGHT_PICOGRAMS "Picograms" + IDS_WEIGHT_POINTS "Points" + IDS_WEIGHT_POOD "Pood" + IDS_WEIGHT_POUNDS "Фунтове (Imperial)" + IDS_WEIGHT_POUNDS_METRIC "Pounds (Metric)" + IDS_WEIGHT_QIAN "Qian" + IDS_WEIGHT_QUARTERS_LONG "Quarters (long)" + IDS_WEIGHT_QUARTERS_UK "Quarters (UK)" IDS_WEIGHT_QUINTAL_METRIC "Центнери (метрични)" IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_SCRUPLES "Scruples" + IDS_WEIGHT_SEERS "Seers" + IDS_WEIGHT_SHEETS "Sheets" + IDS_WEIGHT_SHEQEL "Sheqel" + IDS_WEIGHT_SLINCHES "Slinches" + IDS_WEIGHT_SLUGS_METRIC "Slugs" IDS_WEIGHT_STONES "Камъни" IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TAEL_CHINA "Tael (China)" + IDS_WEIGHT_TAEL_JAPAN "Tael (Japan)" + IDS_WEIGHT_TERAGRAMS "Teragrams" + IDS_WEIGHT_TOLA "Tola" IDS_WEIGHT_TONNES "Тонове" IDS_WEIGHT_TONS_UK "Тонове (ОК)" IDS_WEIGHT_TONS_US "Тонове (САЩ)" + IDS_WEIGHT_TONNEAU "Tonneau" + IDS_WEIGHT_UNZE "Unze" + IDS_WEIGHT_WEYS "Weys" + IDS_WEIGHT_ZENTNERS "Zentners" + IDS_WEIGHT_ZOLOTNIK "Zolotnik" END Index: base/applications/calc/lang/cs-CZ.rc =================================================================== --- base/applications/calc/lang/cs-CZ.rc (revision 54057) +++ base/applications/calc/lang/cs-CZ.rc (working copy) @@ -462,9 +462,24 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_GRADIANS "Grady" - IDS_ANGLE_RADIANS "Radiány" - IDS_ANGLE_DEGREES "Stupně" + IDS_ANGLE_ARCMINUTES "Arcminutes" + IDS_ANGLE_ARCSECONDS "Arcseconds" + IDS_ANGLE_CENTESIMAL_MINUTES "Centesimal Minutes" + IDS_ANGLE_CENTESIMAL_SECONDS "Centesimal Seconds" + IDS_ANGLE_GONS "Gons" + IDS_ANGLE_GRADIANS "Grady" + IDS_ANGLE_MILS "Mils" + IDS_ANGLE_MILLIARCSECONDS "Milliarcseconds" + IDS_ANGLE_MILLIGONS "Milligons" + IDS_ANGLE_MILLIRADIANS "Milliradians" + IDS_ANGLE_OCTANTS "Octants" + IDS_ANGLE_POINTS "Points" + IDS_ANGLE_QUADRANTS "Quadrants" + IDS_ANGLE_RADIANS "Radiány" + IDS_ANGLE_DEGREES "Stupně" + IDS_ANGLE_SEXTANTS "Sextants" + IDS_ANGLE_SIGNS "Signs" + IDS_ANGLE_STRECKS "Strecks" END // TYPES OF AREAS @@ -476,7 +491,15 @@ IDS_AREA_ACRES_SCOTS "Akry (Skotsko)" IDS_AREA_ACRES_US "Akry (USA)" IDS_AREA_ARES "Ary" + IDS_AREA_BARNS "Barns" + IDS_AREA_BARONY "Baronys" + IDS_AREA_BOARDS "Boards" + IDS_AREA_CHO "Cho" IDS_AREA_CHOU "Chou" + IDS_AREA_CIRCULAR_INCHES "Circular Inches" + IDS_AREA_CIRCULAR_MILS "Circular Mils" + IDS_AREA_CORDS "Cords" + IDS_AREA_COTKA "Cotka" IDS_AREA_SQUARE_CENTIMETERS "Čtvereční centimetry" IDS_AREA_SQUARE_CHR "Čtvereční chr" IDS_AREA_SQUARE_FATHOMS "Čtvereční fathomy" @@ -493,15 +516,39 @@ IDS_AREA_SQUARE_VA "Čtvereční va" IDS_AREA_SQUARE_YARD "Čtvereční yardy" IDS_AREA_DANBO "Danbo" + IDS_AREA_DUNAM "Dunam" + IDS_AREA_FEDDAN "Feddan" IDS_AREA_HECTARES "Hektary" IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_JOCH "Joch" + IDS_AREA_KCMILS "Kcmils" + IDS_AREA_MAL "Mål" + IDS_AREA_MANZANA "Manzana" + IDS_AREA_MARLA "Marla" + IDS_AREA_MORGEN_AFRICA "Morgen (Africa)" + IDS_AREA_MORGEN_AUSTRIA "Morgen (Austria)" + IDS_AREA_MORGEN_DUTCH "Morgen (Dutch)" IDS_AREA_MORGEN_HUNGARY "Morgen (Maďarsko)" + IDS_AREA_MORGEN_PRUSSIA "Morgen (Prussia)" + IDS_AREA_MORGEN_SCANDINAVIA "Morgen (Scandinavia)" IDS_AREA_MU "Mu" + IDS_AREA_PERCH "Perch" IDS_AREA_PING "Ping" + IDS_AREA_POLE "Pole" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" + IDS_AREA_ROOD "Rood" IDS_AREA_SE "Se" + IDS_AREA_SITIO "Sitio" + IDS_AREA_SOENDRE "Soendre" + IDS_AREA_SOTKA "Sotka" + IDS_AREA_SQUARE_LEGUA "Square legua" + IDS_AREA_SQUARE_LINKS "Square links" + IDS_AREA_SQUARE_MILS "Square mils" + IDS_AREA_STANG "Stang" + IDS_AREA_STREMMA "Stremma" + IDS_AREA_TALANG_WAH "Talang Wah" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -541,18 +588,35 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - 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" + IDS_ENERGY_15_C_CALORIES "15 °C kalorie" + IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY "Atomic Units of Energy" + IDS_ENERGY_ATTAJOULES "Attajoules" + IDS_ENERGY_BTUS "Britské termální jednotky" + IDS_ENERGY_DYNA_CENTIMETERS "Dyna-Centimeters" + IDS_ENERGY_ERGS "Ergy" + IDS_ENERGY_EVS "Elektronvolty" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_GIGAJOULES "Gigajoules" + IDS_ENERGY_GIGAWATT_HOURS "Gigawatt hours" + IDS_ENERGY_HARTREES "Hartrees" + IDS_ENERGY_JOULES "Jouly" + IDS_ENERGY_KILOELECTRONVOLTS "Kiloelectronvolts" + 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_MEGAELECTRONVOLTS "Megaelectronvolts" + IDS_ENERGY_MEGAJOULES "Megajoules" + IDS_ENERGY_MEGALERGS "Megalergs" + IDS_ENERGY_MEGATONS "Megatons" + IDS_ENERGY_MICROJOULES "Microjoules" + IDS_ENERGY_MILLIJOULES "Millijoules" + IDS_ENERGY_NANOJOULES "Nanojoules" + IDS_ENERGY_NUTRITION_CALORIES "Nutriční kalorie" + IDS_ENERGY_QUADS "Quads" + IDS_ENERGY_RYDBERGS "Rydbergs" + IDS_ENERGY_THERMIES "Thermies" + IDS_ENERGY_TH_CALORIES "Termochemické kalorie" END // TYPES OF LENGTHS @@ -612,9 +676,15 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "Britské termální jednotky za minutu" IDS_POWER_FPS_PER_MINUTE "Foot-Pounds za minutu" + IDS_POWER_GIGAWATTS "Gigawatts" IDS_POWER_HORSEPOWER "Koňské síly" IDS_POWER_KILOWATTS "Kilowatty" + IDS_POWER_LUSECS "Lusecs" + IDS_POWER_MANPOWER "Manpower" IDS_POWER_MEGAWATTS "Megawatty" + IDS_POWER_MILLIHORSEPOWER "Millihorsepower" + IDS_POWER_MILLIWATTS "Milliwatts" + IDS_POWER_PONCELETS "Poncelets" IDS_POWER_WATTS "Watty" END @@ -623,11 +693,19 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosféry" IDS_PRESSURE_BARS "Bary" + IDS_PRESSURE_BARYE "Barye" IDS_PRESSURE_HECTOPASCALS "Hektopascaly" IDS_PRESSURE_KILOPASCALS "Kilopascaly" + IDS_PRESSURE_MEGAPASCALS "Megapascals" + IDS_PRESSURE_MICROBARS "Microbars" + IDS_PRESSURE_MILLIBARS "Millibars" + IDS_PRESSURE_MILLIPASCALS "Millipascals" + IDS_PRESSURE_MM_OF_WATER "Millimeters of water" + IDS_PRESSURE_PIEZE "Pièze" IDS_PRESSURE_PSI "Libry na čtvercový palec" IDS_PRESSURE_MM_OF_MERCURY "Milimetry rtuťového sloupce" IDS_PRESSURE_PASCALS "Pascaly" + IDS_PRESSURE_TORR "Torr" END // TYPES OF TEMPERATURES @@ -642,15 +720,44 @@ // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "Dny" - IDS_TIME_HOURS "Hodiny" - IDS_TIME_NANOSECONDS "Nanosekundy" - IDS_TIME_MICROSECONDS "Mikrosekundy" - IDS_TIME_MILLISECONDS "Milisekundy" - IDS_TIME_MINUTES "Minuty" - IDS_TIME_SECONDS "Sekundy" - IDS_TIME_YEARS "Roky" - IDS_TIME_WEEKS "Týdny" + IDS_TIME_ATOMS "Atoms" + IDS_TIME_CALLIPPIC_CYCLE "Callippic cycles" + IDS_TIME_CENTURIES_CALENDAR "Centuries (Calendar)" + IDS_TIME_CENTURIES_GREGORIAN "Centuries (Gregorian)" + IDS_TIME_CENTURIES_JULIAN "Centuries (Julian)" + IDS_TIME_DAYS "Dny" + IDS_TIME_DECADES "Decades" + IDS_TIME_ENNEADECATERIS "Enneadecateris" + IDS_TIME_FORTNIGHTS "Fortnights" + IDS_TIME_HIPPARCHIC_CYCLE "Hipparchic cycle" + IDS_TIME_HOURS "Hodiny" + IDS_TIME_JIFFIES "Jiffies" + IDS_TIME_JIFFIES_ALTERNATIVE "Jiffies (Alternative)" + IDS_TIME_LEAP_YEARS "Leap years" + IDS_TIME_LUSTRES "Lustres" + IDS_TIME_METONIC_CYCLES "Metonic cycles" + IDS_TIME_MICROSECONDS "Mikrosekundy" + IDS_TIME_MILLENIUMS_CALENDAR "Milleniums (Calendar)" + IDS_TIME_MILLENIUMS_GREGORIAN "Milleniums (Gregorian)" + IDS_TIME_MILLENIUMS_JULIAN "Milleniums (Julian)" + IDS_TIME_MILLISECONDS "Milisekundy" + IDS_TIME_MINUTES "Minuty" + IDS_TIME_MINUTUM "Minutum" + IDS_TIME_MOLAD "Molad" + IDS_TIME_MOMENTS "Moments" + IDS_TIME_NANOSECONDS "Nanosekundy" + IDS_TIME_OCTAETERIS "Octaeteris" + IDS_TIME_OUNCES "Ounces" + IDS_TIME_SECONDS "Sekundy" + IDS_TIME_SHAKES "Shakes" + IDS_TIME_SIDEREAL_DAYS "Sidereal days" + IDS_TIME_SIGMAS "Sigmas" + IDS_TIME_SOLS_MARS "Sol (Mars)" + IDS_TIME_SOTHIC_CYCLES "Sothic cycles" + IDS_TIME_STUNDE "Stunde" + IDS_TIME_SVEDBERG "Svedberg" + IDS_TIME_YEARS "Roky" + IDS_TIME_WEEKS "Týdny" END // TYPES OF VELOCITIES @@ -709,29 +816,94 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_BARGES "Barges" + IDS_WEIGHT_BERKOVETS "Berkovets" IDS_WEIGHT_QUINTAL_METRIC "Centy (metrické)" + IDS_WEIGHT_CATTY_CHINA "Catty (China)" + IDS_WEIGHT_CATTY_MALAYSIA "Catty (Malaysia)" + IDS_WEIGHT_CATTY_THAILAND "Catty (Thailand)" + IDS_WEIGHT_CENTNER "Centner" + IDS_WEIGHT_CHIN "Chin" IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_CLOVES "Cloves" + IDS_WEIGHT_CRITHS "Criths" + IDS_WEIGHT_DALTONS "Daltons" + IDS_WEIGHT_DECIGRAMS "Decigrams" + IDS_WEIGHT_DEKAGRAMS "Dekagrams" + IDS_WEIGHT_DOLIA "Dolia" IDS_WEIGHT_DON "Don" + IDS_WEIGHT_FUNT "Funt" + IDS_WEIGHT_GAMMA "Gamma" + IDS_WEIGHT_GEEPOUNDS "Geepounds" IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GIGAGRAMS "Gigagrams" + IDS_WEIGHT_GIN "Gin" + IDS_WEIGHT_GONGJIN "Gongjin" + IDS_WEIGHT_GRAINS "Grains" IDS_WEIGHT_GRAMS "Gramy" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_HECTOGRAMS "Hectograms" IDS_WEIGHT_JIN_CHINA "Jin (Čína)" IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_KAN "Kan" IDS_WEIGHT_CARATS "Karáty" IDS_WEIGHT_KILOGRAMS "Kilogramy" IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_KIP "Kip" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" - IDS_WEIGHT_POUNDS "Libry" + IDS_WEIGHT_LIBRA "Libra" + IDS_WEIGHT_LIVRES "Livres" + IDS_WEIGHT_LOTS "Lots" + IDS_WEIGHT_LOT_RUSSIA "Lot (Russia)" + IDS_WEIGHT_MACE "Mace" + IDS_WEIGHT_MAHND "Mahnd" + IDS_WEIGHT_MARCS "Marcs" + IDS_WEIGHT_MARCO "Marco" + IDS_WEIGHT_MARKS "Marks" + IDS_WEIGHT_MASHA "Masha" + IDS_WEIGHT_MAUND "Maund" + IDS_WEIGHT_MEGADALTONS "Megadaltons" + IDS_WEIGHT_MEGAGRAMS "Megagrams" + IDS_WEIGHT_MEGATONNES "Megatonnes" + IDS_WEIGHT_MICROGRAMS "Micrograms" + IDS_WEIGHT_MILLIGRAMS "Milligrams" + IDS_WEIGHT_MILLIERS "Milliers" + IDS_WEIGHT_MINA "Mina" + IDS_WEIGHT_POUNDS "Libry (Imperial)" + IDS_WEIGHT_POUNDS_METRIC "Libry (Metric)" IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_MUGS "Mugs" + IDS_WEIGHT_NANOGRAMS "Nanograms" + IDS_WEIGHT_ONZA "Onza" + IDS_WEIGHT_PICOGRAMS "Picograms" + IDS_WEIGHT_POINTS "Points" + IDS_WEIGHT_POOD "Pood" + IDS_WEIGHT_QIAN "Qian" + IDS_WEIGHT_QUARTERS_LONG "Quarters (long)" + IDS_WEIGHT_QUARTERS_UK "Quarters (UK)" IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_SCRUPLES "Scruples" + IDS_WEIGHT_SEERS "Seers" + IDS_WEIGHT_SHEETS "Sheets" + IDS_WEIGHT_SHEQEL "Sheqel" + IDS_WEIGHT_SLINCHES "Slinches" + IDS_WEIGHT_SLUGS_METRIC "Slugs" IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAEL_CHINA "Tael (China)" + IDS_WEIGHT_TAEL_JAPAN "Tael (Japan)" + IDS_WEIGHT_TERAGRAMS "Teragrams" + IDS_WEIGHT_TOLA "Tola" IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNEAU "Tonneau" IDS_WEIGHT_TONNES "Tuny (metrické)" IDS_WEIGHT_TONS_UK "Tuny (UK)" IDS_WEIGHT_TONS_US "Tuny (USA)" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce (angloamerické)" IDS_WEIGHT_OUNCES_TROY "Unce (trojské/lékárenské)" + IDS_WEIGHT_UNZE "Unze" + IDS_WEIGHT_WEYS "Weys" + IDS_WEIGHT_ZENTNERS "Zentners" + IDS_WEIGHT_ZOLOTNIK "Zolotnik" END Index: base/applications/calc/lang/de-DE.rc =================================================================== --- base/applications/calc/lang/de-DE.rc (revision 54057) +++ base/applications/calc/lang/de-DE.rc (working copy) @@ -457,9 +457,24 @@ // WINKELTYPEN STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_GRADIANS "Gon" - IDS_ANGLE_DEGREES "Grad" - IDS_ANGLE_RADIANS "Radiant" + IDS_ANGLE_ARCMINUTES "Arcminutes" + IDS_ANGLE_ARCSECONDS "Arcseconds" + IDS_ANGLE_CENTESIMAL_MINUTES "Centesimal Minutes" + IDS_ANGLE_CENTESIMAL_SECONDS "Centesimal Seconds" + IDS_ANGLE_GONS "Gons" + IDS_ANGLE_GRADIANS "Gon" + IDS_ANGLE_DEGREES "Grad" + IDS_ANGLE_MILS "Mils" + IDS_ANGLE_MILLIARCSECONDS "Milliarcseconds" + IDS_ANGLE_MILLIGONS "Milligons" + IDS_ANGLE_MILLIRADIANS "Milliradians" + IDS_ANGLE_OCTANTS "Octants" + IDS_ANGLE_POINTS "Points" + IDS_ANGLE_QUADRANTS "Quadrants" + IDS_ANGLE_RADIANS "Radiant" + IDS_ANGLE_SEXTANTS "Sextants" + IDS_ANGLE_SIGNS "Signs" + IDS_ANGLE_STRECKS "Strecks" END // FLÄCHENTYPEN @@ -471,25 +486,54 @@ IDS_AREA_ACRES_SCOTS "Acre (Schottland)" IDS_AREA_ACRES_US "Acre (USA)" IDS_AREA_ARES "Ar" + IDS_AREA_BARNS "Barns" + IDS_AREA_BARONY "Baronys" + IDS_AREA_BOARDS "Boards" + IDS_AREA_CHO "Cho" IDS_AREA_CHOU "Chou" + IDS_AREA_CIRCULAR_INCHES "Circular Inches" + IDS_AREA_CIRCULAR_MILS "Circular Mils" + IDS_AREA_CORDS "Cords" + IDS_AREA_COTKA "Cotka" IDS_AREA_DANBO "Danbo" + IDS_AREA_DUNAM "Dunam" + IDS_AREA_FEDDAN "Feddan" IDS_AREA_HECTARES "Hektar" IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_JOCH "Joch" + IDS_AREA_KCMILS "Kcmils" + IDS_AREA_MAL "Mål" + IDS_AREA_MANZANA "Manzana" + IDS_AREA_MARLA "Marla" + IDS_AREA_MORGEN_AFRICA "Morgen (Africa)" + IDS_AREA_MORGEN_AUSTRIA "Morgen (Austria)" + IDS_AREA_MORGEN_DUTCH "Morgen (Dutch)" IDS_AREA_MORGEN_HUNGARY "Morgen (Ungarn)" + IDS_AREA_MORGEN_PRUSSIA "Morgen (Prussia)" + IDS_AREA_MORGEN_SCANDINAVIA "Morgen (Scandinavia)" IDS_AREA_MU "Mu" + IDS_AREA_PERCH "Perch" IDS_AREA_PING "Ping" + IDS_AREA_POLE "Pole" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" + IDS_AREA_ROOD "Rood" IDS_AREA_SE "Se" + IDS_AREA_SITIO "Sitio" + IDS_AREA_SOENDRE "Soendre" + IDS_AREA_SOTKA "Sotka" IDS_AREA_SQUARE_CHR "Quadratchr" IDS_AREA_SQUARE_FATHOMS "Quadratfathom" IDS_AREA_SQUARE_FATHOMS_HUNGARY "Quadratfathom (Ungarn)" IDS_AREA_SQUARE_FEET "Quadratfuß" IDS_AREA_SQUARE_KILOMETERS "Quadratkilometer" IDS_AREA_SQUARE_LAR "Quadratlar" + IDS_AREA_SQUARE_LEGUA "Square legua" + IDS_AREA_SQUARE_LINKS "Square links" IDS_AREA_SQUARE_METER "Quadratmeter" IDS_AREA_SQUARE_MILES "Quadratmeilen" + IDS_AREA_SQUARE_MILS "Square mils" IDS_AREA_SQUARE_MILLIMETERS "Quadratmillimeter" IDS_AREA_SQUARE_SHAKU "Quadratshaku" IDS_AREA_SQUARE_TSUEN "Quadrattsuen" @@ -497,6 +541,9 @@ IDS_AREA_SQUARE_YARD "Quadratyard" IDS_AREA_SQUARE_CENTIMETERS "Quadratzentimeter" IDS_AREA_SQUARE_INCHES "Quadratzoll" + IDS_AREA_STANG "Stang" + IDS_AREA_STREMMA "Stremma" + IDS_AREA_TALANG_WAH "Talang Wah" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -536,18 +583,35 @@ // ENERGIETYPEN STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 °C Kalorien" - IDS_ENERGY_BTUS "British thermal unit" - IDS_ENERGY_EVS "Elektronenvolt" - IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_NUTRITION_CALORIES "Ernährung Kalorien" - IDS_ENERGY_FOOT_POUNDS "Foot-Pound" - IDS_ENERGY_IT_CALORIES "International Kalorien" - IDS_ENERGY_IT_KILOCALORIES "International Kilokalorien" - IDS_ENERGY_JOULES "Joules" - IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowattstunden" - IDS_ENERGY_TH_CALORIES "Thermochemische Kalorie" + IDS_ENERGY_15_C_CALORIES "15 °C Kalorien" + IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY "Atomic Units of Energy" + IDS_ENERGY_ATTAJOULES "Attajoules" + IDS_ENERGY_BTUS "British thermal unit" + IDS_ENERGY_DYNA_CENTIMETERS "Dyna-Centimeters" + IDS_ENERGY_EVS "Elektronenvolt" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_NUTRITION_CALORIES "Ernährung Kalorien" + IDS_ENERGY_FOOT_POUNDS "Foot-Pound" + IDS_ENERGY_GIGAJOULES "Gigajoules" + IDS_ENERGY_GIGAWATT_HOURS "Gigawatt hours" + IDS_ENERGY_HARTREES "Hartrees" + IDS_ENERGY_IT_CALORIES "International Kalorien" + IDS_ENERGY_IT_KILOCALORIES "International Kilokalorien" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOELECTRONVOLTS "Kiloelectronvolts" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowattstunden" + IDS_ENERGY_MEGAELECTRONVOLTS "Megaelectronvolts" + IDS_ENERGY_MEGAJOULES "Megajoules" + IDS_ENERGY_MEGALERGS "Megalergs" + IDS_ENERGY_MEGATONS "Megatons" + IDS_ENERGY_MICROJOULES "Microjoules" + IDS_ENERGY_MILLIJOULES "Millijoules" + IDS_ENERGY_NANOJOULES "Nanojoules" + IDS_ENERGY_QUADS "Quads" + IDS_ENERGY_RYDBERGS "Rydbergs" + IDS_ENERGY_THERMIES "Thermies" + IDS_ENERGY_TH_CALORIES "Thermochemische Kalorie" END // LÄNGENTYPEN @@ -607,8 +671,14 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "BTU pro Minute" IDS_POWER_FPS_PER_MINUTE "Foot-Pound pro Minute" + IDS_POWER_GIGAWATTS "Gigawatts" IDS_POWER_KILOWATTS "Kilowatt" + IDS_POWER_LUSECS "Lusecs" + IDS_POWER_MANPOWER "Manpower" IDS_POWER_MEGAWATTS "Megawatt" + IDS_POWER_MILLIHORSEPOWER "Millihorsepower" + IDS_POWER_MILLIWATTS "Milliwatts" + IDS_POWER_PONCELETS "Poncelets" IDS_POWER_HORSEPOWER "Pferdestärken" IDS_POWER_WATTS "Watt" END @@ -618,11 +688,19 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosphären" IDS_PRESSURE_BARS "Bar" + IDS_PRESSURE_BARYE "Barye" IDS_PRESSURE_HECTOPASCALS "Hektopascal" IDS_PRESSURE_KILOPASCALS "Kilopascal" + IDS_PRESSURE_MEGAPASCALS "Megapascals" + IDS_PRESSURE_MICROBARS "Microbars" + IDS_PRESSURE_MILLIBARS "Millibars" + IDS_PRESSURE_MILLIPASCALS "Millipascals" + IDS_PRESSURE_MM_OF_WATER "Millimeters of water" IDS_PRESSURE_MM_OF_MERCURY "Millimeter auf dem Quecksilber" IDS_PRESSURE_PASCALS "Pascal" + IDS_PRESSURE_PIEZE "Pièze" IDS_PRESSURE_PSI "Pfunddruck pro Quadratzoll" + IDS_PRESSURE_TORR "Torr" END // TEMPERATURTYPEN @@ -637,15 +715,44 @@ // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "Tagen" - IDS_TIME_HOURS "Stunden" - IDS_TIME_NANOSECONDS "Nanosekunden" - IDS_TIME_MICROSECONDS "Mikrosekunden" - IDS_TIME_MILLISECONDS "Millisekunden" - IDS_TIME_MINUTES "Minuten" - IDS_TIME_SECONDS "Sekunden" - IDS_TIME_WEEKS "Wochen" - IDS_TIME_YEARS "Jahren" + IDS_TIME_ATOMS "Atoms" + IDS_TIME_CALLIPPIC_CYCLE "Callippic cycles" + IDS_TIME_CENTURIES_CALENDAR "Centuries (Calendar)" + IDS_TIME_CENTURIES_GREGORIAN "Centuries (Gregorian)" + IDS_TIME_CENTURIES_JULIAN "Centuries (Julian)" + IDS_TIME_DAYS "Tagen" + IDS_TIME_DECADES "Decades" + IDS_TIME_ENNEADECATERIS "Enneadecateris" + IDS_TIME_FORTNIGHTS "Fortnights" + IDS_TIME_HIPPARCHIC_CYCLE "Hipparchic cycle" + IDS_TIME_HOURS "Stunden" + IDS_TIME_JIFFIES "Jiffies" + IDS_TIME_JIFFIES_ALTERNATIVE "Jiffies (Alternative)" + IDS_TIME_LEAP_YEARS "Leap years" + IDS_TIME_LUSTRES "Lustres" + IDS_TIME_METONIC_CYCLES "Metonic cycles" + IDS_TIME_MICROSECONDS "Mikrosekunden" + IDS_TIME_MILLENIUMS_CALENDAR "Milleniums (Calendar)" + IDS_TIME_MILLENIUMS_GREGORIAN "Milleniums (Gregorian)" + IDS_TIME_MILLENIUMS_JULIAN "Milleniums (Julian)" + IDS_TIME_MILLISECONDS "Millisekunden" + IDS_TIME_MINUTES "Minuten" + IDS_TIME_MINUTUM "Minutum" + IDS_TIME_MOLAD "Molad" + IDS_TIME_MOMENTS "Moments" + IDS_TIME_NANOSECONDS "Nanosekunden" + IDS_TIME_OCTAETERIS "Octaeteris" + IDS_TIME_OUNCES "Ounces" + IDS_TIME_SECONDS "Sekunden" + IDS_TIME_SHAKES "Shakes" + IDS_TIME_SIDEREAL_DAYS "Sidereal days" + IDS_TIME_SIGMAS "Sigmas" + IDS_TIME_SOLS_MARS "Sol (Mars)" + IDS_TIME_SOTHIC_CYCLES "Sothic cycles" + IDS_TIME_STUNDE "Stunde" + IDS_TIME_SVEDBERG "Svedberg" + IDS_TIME_WEEKS "Wochen" + IDS_TIME_YEARS "Jahren" END // GESCHWINDIGKEITSTYPEN @@ -704,29 +811,94 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_BARGES "Barges" + IDS_WEIGHT_BERKOVETS "Berkovets" + IDS_WEIGHT_CATTY_CHINA "Catty (China)" + IDS_WEIGHT_CATTY_MALAYSIA "Catty (Malaysia)" + IDS_WEIGHT_CATTY_THAILAND "Catty (Thailand)" + IDS_WEIGHT_CENTNER "Centner" + IDS_WEIGHT_CHIN "Chin" IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_CLOVES "Cloves" + IDS_WEIGHT_CRITHS "Criths" + IDS_WEIGHT_DALTONS "Daltons" + IDS_WEIGHT_DECIGRAMS "Decigrams" + IDS_WEIGHT_DEKAGRAMS "Dekagrams" + IDS_WEIGHT_DOLIA "Dolia" IDS_WEIGHT_DON "Don" IDS_WEIGHT_QUINTAL_METRIC "Doppelzentner (metrisch)" + DS_WEIGHT_FUNT "Funt" + IDS_WEIGHT_GAMMA "Gamma" + IDS_WEIGHT_GEEPOUNDS "Geepounds" IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GIGAGRAMS "Gigagrams" + IDS_WEIGHT_GIN "Gin" + IDS_WEIGHT_GONGJIN "Gongjin" + IDS_WEIGHT_GRAINS "Grains" IDS_WEIGHT_GRAMS "Gramm" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_HECTOGRAMS "Hectograms" IDS_WEIGHT_JIN_CHINA "Jin (China)" IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_KAN "Kan" IDS_WEIGHT_CARATS "Karat" IDS_WEIGHT_KILOGRAMS "Kilogramm" IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_KIP "Kip" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIBRA "Libra" + IDS_WEIGHT_LIVRES "Livres" + IDS_WEIGHT_LOTS "Lots" + IDS_WEIGHT_LOT_RUSSIA "Lot (Russia)" + IDS_WEIGHT_MACE "Mace" + IDS_WEIGHT_MAHND "Mahnd" + IDS_WEIGHT_MARCS "Marcs" + IDS_WEIGHT_MARCO "Marco" + IDS_WEIGHT_MARKS "Marks" + IDS_WEIGHT_MASHA "Masha" + IDS_WEIGHT_MAUND "Maund" + IDS_WEIGHT_MEGADALTONS "Megadaltons" + IDS_WEIGHT_MEGAGRAMS "Megagrams" + IDS_WEIGHT_MEGATONNES "Megatonnes" + IDS_WEIGHT_MICROGRAMS "Micrograms" + IDS_WEIGHT_MILLIGRAMS "Milligrams" + IDS_WEIGHT_MILLIERS "Milliers" + IDS_WEIGHT_MINA "Mina" IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_MUGS "Mugs" + IDS_WEIGHT_NANOGRAMS "Nanograms" + IDS_WEIGHT_ONZA "Onza" + IDS_WEIGHT_PICOGRAMS "Picograms" + IDS_WEIGHT_POINTS "Points" + IDS_WEIGHT_POOD "Pood" + IDS_WEIGHT_QIAN "Qian" + IDS_WEIGHT_QUARTERS_LONG "Quarters (long)" + IDS_WEIGHT_QUARTERS_UK "Quarters (UK)" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unzen, Avoirdupois" IDS_WEIGHT_OUNCES_TROY "Unzen, Troy" - IDS_WEIGHT_POUNDS "Pfund" + IDS_WEIGHT_POUNDS "Pfund (Imperial)" + IDS_WEIGHT_POUNDS_METRIC "Pounds (Metric)" IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_SCRUPLES "Scruples" + IDS_WEIGHT_SEERS "Seers" + IDS_WEIGHT_SHEETS "Sheets" + IDS_WEIGHT_SHEQEL "Sheqel" + IDS_WEIGHT_SLINCHES "Slinches" + IDS_WEIGHT_SLUGS_METRIC "Slugs" IDS_WEIGHT_STONES "Stones" IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TAEL_CHINA "Tael (China)" + IDS_WEIGHT_TAEL_JAPAN "Tael (Japan)" + IDS_WEIGHT_TERAGRAMS "Teragrams" + IDS_WEIGHT_TOLA "Tola" + IDS_WEIGHT_TONNEAU "Tonneau" IDS_WEIGHT_TONNES "Tonnen" IDS_WEIGHT_TONS_UK "Tonnen (UK)" IDS_WEIGHT_TONS_US "Tonnen (USA)" + IDS_WEIGHT_UNZE "Unze" + IDS_WEIGHT_WEYS "Weys" + IDS_WEIGHT_ZENTNERS "Zentners" + IDS_WEIGHT_ZOLOTNIK "Zolotnik" END Index: base/applications/calc/lang/el-GR.rc =================================================================== --- base/applications/calc/lang/el-GR.rc (revision 54057) +++ base/applications/calc/lang/el-GR.rc (working copy) @@ -457,9 +457,24 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_DEGREES "Βαθμοί" - IDS_ANGLE_GRADIANS "Ακτίνια" - IDS_ANGLE_RADIANS "Μοίρες" + IDS_ANGLE_ARCMINUTES "Arcminutes" + IDS_ANGLE_ARCSECONDS "Arcseconds" + IDS_ANGLE_CENTESIMAL_MINUTES "Centesimal Minutes" + IDS_ANGLE_CENTESIMAL_SECONDS "Centesimal Seconds" + IDS_ANGLE_DEGREES "Βαθμοί" + IDS_ANGLE_GONS "Gons" + IDS_ANGLE_GRADIANS "Ακτίνια" + IDS_ANGLE_MILS "Mils" + IDS_ANGLE_MILLIARCSECONDS "Milliarcseconds" + IDS_ANGLE_MILLIGONS "Milligons" + IDS_ANGLE_MILLIRADIANS "Milliradians" + IDS_ANGLE_OCTANTS "Octants" + IDS_ANGLE_POINTS "Points" + IDS_ANGLE_QUADRANTS "Quadrants" + IDS_ANGLE_RADIANS "Μοίρες" + IDS_ANGLE_SEXTANTS "Sextants" + IDS_ANGLE_SIGNS "Signs" + IDS_ANGLE_STRECKS "Strecks" END // TYPES OF AREAS @@ -471,17 +486,43 @@ IDS_AREA_ACRES_SCOTS "Acres (Scots)" IDS_AREA_ACRES_US "Acres (US)" IDS_AREA_ARES "Ares" + IDS_AREA_BARNS "Barns" + IDS_AREA_BARONY "Baronys" + IDS_AREA_BOARDS "Boards" + IDS_AREA_CHO "Cho" IDS_AREA_CHOU "Chou" + IDS_AREA_CIRCULAR_INCHES "Circular Inches" + IDS_AREA_CIRCULAR_MILS "Circular Mils" + IDS_AREA_CORDS "Cords" + IDS_AREA_COTKA "Cotka" IDS_AREA_DANBO "Danbo" + IDS_AREA_DUNAM "Dunam" + IDS_AREA_FEDDAN "Feddan" IDS_AREA_HECTARES "Hectares" IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_JOCH "Joch" + IDS_AREA_KCMILS "Kcmils" + IDS_AREA_MAL "Mål" + IDS_AREA_MANZANA "Manzana" + IDS_AREA_MARLA "Marla" + IDS_AREA_MORGEN_AFRICA "Morgen (Africa)" + IDS_AREA_MORGEN_AUSTRIA "Morgen (Austria)" + IDS_AREA_MORGEN_DUTCH "Morgen (Dutch)" IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_PRUSSIA "Morgen (Prussia)" + IDS_AREA_MORGEN_SCANDINAVIA "Morgen (Scandinavia)" IDS_AREA_MU "Mu" + IDS_AREA_PERCH "Perch" IDS_AREA_PING "Ping" + IDS_AREA_POLE "Pole" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" + IDS_AREA_ROOD "Rood" IDS_AREA_SE "Se" + IDS_AREA_SITIO "Sitio" + IDS_AREA_SOENDRE "Soendre" + IDS_AREA_SOTKA "Sotka" IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" IDS_AREA_SQUARE_CHR "Square chr" IDS_AREA_SQUARE_FATHOMS "Square fathoms" @@ -490,13 +531,19 @@ IDS_AREA_SQUARE_INCHES "Square inches" IDS_AREA_SQUARE_KILOMETERS "Square kilometers" IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_LEGUA "Square legua" + IDS_AREA_SQUARE_LINKS "Square links" IDS_AREA_SQUARE_METER "Square meter" IDS_AREA_SQUARE_MILES "Square miles" + IDS_AREA_SQUARE_MILS "Square mils" 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_STANG "Stang" + IDS_AREA_STREMMA "Stremma" + IDS_AREA_TALANG_WAH "Talang Wah" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -536,18 +583,35 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - 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" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY "Atomic Units of Energy" + IDS_ENERGY_ATTAJOULES "Attajoules" + IDS_ENERGY_BTUS "British Thermal Units" + IDS_ENERGY_DYNA_CENTIMETERS "Dyna-Centimeters" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_GIGAJOULES "Gigajoules" + IDS_ENERGY_GIGAWATT_HOURS "Gigawatt hours" + IDS_ENERGY_HARTREES "Hartrees" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOELECTRONVOLTS "Kiloelectronvolts" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_MEGAELECTRONVOLTS "Megaelectronvolts" + IDS_ENERGY_MEGAJOULES "Megajoules" + IDS_ENERGY_MEGALERGS "Megalergs" + IDS_ENERGY_MEGATONS "Megatons" + IDS_ENERGY_MICROJOULES "Microjoules" + IDS_ENERGY_MILLIJOULES "Millijoules" + IDS_ENERGY_NANOJOULES "Nanojoules" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_QUADS "Quads" + IDS_ENERGY_RYDBERGS "Rydbergs" + IDS_ENERGY_THERMIES "Thermies" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" END // TYPES OF LENGTHS @@ -607,9 +671,15 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_GIGAWATTS "Gigawatts" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" + IDS_POWER_LUSECS "Lusecs" + IDS_POWER_MANPOWER "Manpower" IDS_POWER_MEGAWATTS "Megawatts" + IDS_POWER_MILLIHORSEPOWER "Millihorsepower" + IDS_POWER_MILLIWATTS "Milliwatts" + IDS_POWER_PONCELETS "Poncelets" IDS_POWER_WATTS "Watts" END @@ -618,11 +688,19 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Ατμόσφαιρες" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_BARYE "Barye" IDS_PRESSURE_HECTOPASCALS "Hectopascals" IDS_PRESSURE_KILOPASCALS "Kilopascals" + IDS_PRESSURE_MEGAPASCALS "Megapascals" + IDS_PRESSURE_MICROBARS "Microbars" + IDS_PRESSURE_MILLIBARS "Millibars" + IDS_PRESSURE_MM_OF_WATER "Millimeters of water" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_MILLIPASCALS "Millipascals" IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PIEZE "Pièze" IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_TORR "Torr" END // TYPES OF TEMPERATURES @@ -637,15 +715,44 @@ // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "Μέρες" - IDS_TIME_HOURS "Ώρες" - IDS_TIME_NANOSECONDS "Nanoseconds" - IDS_TIME_MICROSECONDS "Μικροδευτερόλεπτα" - IDS_TIME_MILLISECONDS "Μιλιδευτερόλεπτα" - IDS_TIME_MINUTES "Λεπτά" - IDS_TIME_SECONDS "Δευτερόλεπτα" - IDS_TIME_WEEKS "Εβδομάδες" - IDS_TIME_YEARS "Χρόνια" + IDS_TIME_ATOMS "Atoms" + IDS_TIME_CALLIPPIC_CYCLE "Callippic cycles" + IDS_TIME_CENTURIES_CALENDAR "Centuries (Calendar)" + IDS_TIME_CENTURIES_GREGORIAN "Centuries (Gregorian)" + IDS_TIME_CENTURIES_JULIAN "Centuries (Julian)" + IDS_TIME_DAYS "Μέρες" + IDS_TIME_DECADES "Decades" + IDS_TIME_ENNEADECATERIS "Enneadecateris" + IDS_TIME_FORTNIGHTS "Fortnights" + IDS_TIME_HIPPARCHIC_CYCLE "Hipparchic cycle" + IDS_TIME_HOURS "Ώρες" + IDS_TIME_JIFFIES "Jiffies" + IDS_TIME_JIFFIES_ALTERNATIVE "Jiffies (Alternative)" + IDS_TIME_LEAP_YEARS "Leap years" + IDS_TIME_LUSTRES "Lustres" + IDS_TIME_METONIC_CYCLES "Metonic cycles" + IDS_TIME_MICROSECONDS "Μικροδευτερόλεπτα" + IDS_TIME_MILLENIUMS_CALENDAR "Milleniums (Calendar)" + IDS_TIME_MILLENIUMS_GREGORIAN "Milleniums (Gregorian)" + IDS_TIME_MILLENIUMS_JULIAN "Milleniums (Julian)" + IDS_TIME_MILLISECONDS "Μιλιδευτερόλεπτα" + IDS_TIME_MINUTES "Λεπτά" + IDS_TIME_MINUTUM "Minutum" + IDS_TIME_MOLAD "Molad" + IDS_TIME_MOMENTS "Moments" + IDS_TIME_NANOSECONDS "Nanoseconds" + IDS_TIME_OCTAETERIS "Octaeteris" + IDS_TIME_OUNCES "Ounces" + IDS_TIME_SECONDS "Δευτερόλεπτα" + IDS_TIME_SHAKES "Shakes" + IDS_TIME_SIDEREAL_DAYS "Sidereal days" + IDS_TIME_SIGMAS "Sigmas" + IDS_TIME_SOLS_MARS "Sol (Mars)" + IDS_TIME_SOTHIC_CYCLES "Sothic cycles" + IDS_TIME_STUNDE "Stunde" + IDS_TIME_SVEDBERG "Svedberg" + IDS_TIME_WEEKS "Εβδομάδες" + IDS_TIME_YEARS "Χρόνια" END // TYPES OF VELOCITIES @@ -704,29 +811,94 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_BARGES "Barges" + IDS_WEIGHT_BERKOVETS "Berkovets" IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CATTY_CHINA "Catty (China)" + IDS_WEIGHT_CATTY_MALAYSIA "Catty (Malaysia)" + IDS_WEIGHT_CATTY_THAILAND "Catty (Thailand)" + IDS_WEIGHT_CENTNER "Centner" + IDS_WEIGHT_CHIN "Chin" IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_CLOVES "Cloves" + IDS_WEIGHT_CRITHS "Criths" + IDS_WEIGHT_DALTONS "Daltons" + IDS_WEIGHT_DECIGRAMS "Decigrams" + IDS_WEIGHT_DEKAGRAMS "Dekagrams" + IDS_WEIGHT_DOLIA "Dolia" IDS_WEIGHT_DON "Don" + IDS_WEIGHT_FUNT "Funt" + IDS_WEIGHT_GAMMA "Gamma" + IDS_WEIGHT_GEEPOUNDS "Geepounds" IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GIGAGRAMS "Gigagrams" + IDS_WEIGHT_GIN "Gin" + IDS_WEIGHT_GONGJIN "Gongjin" + IDS_WEIGHT_GRAINS "Grains" IDS_WEIGHT_GRAMS "Grams" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_HECTOGRAMS "Hectograms" 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_KIP "Kip" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIBRA "Libra" + IDS_WEIGHT_LIVRES "Livres" + IDS_WEIGHT_LOTS "Lots" + IDS_WEIGHT_LOT_RUSSIA "Lot (Russia)" + IDS_WEIGHT_MACE "Mace" + IDS_WEIGHT_MAHND "Mahnd" + IDS_WEIGHT_MARCS "Marcs" + IDS_WEIGHT_MARCO "Marco" + IDS_WEIGHT_MARKS "Marks" + IDS_WEIGHT_MASHA "Masha" + IDS_WEIGHT_MAUND "Maund" + IDS_WEIGHT_MEGADALTONS "Megadaltons" + IDS_WEIGHT_MEGAGRAMS "Megagrams" + IDS_WEIGHT_MEGATONNES "Megatonnes" + IDS_WEIGHT_MICROGRAMS "Micrograms" + IDS_WEIGHT_MILLIGRAMS "Milligrams" + IDS_WEIGHT_MILLIERS "Milliers" + IDS_WEIGHT_MINA "Mina" IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_MUGS "Mugs" + IDS_WEIGHT_NANOGRAMS "Nanograms" + IDS_WEIGHT_ONZA "Onza" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_PICOGRAMS "Picograms" + IDS_WEIGHT_POINTS "Points" + IDS_WEIGHT_POOD "Pood" + IDS_WEIGHT_POUNDS "Pounds (Imperial)" + IDS_WEIGHT_POUNDS_METRIC "Pounds (Metric)" + IDS_WEIGHT_QIAN "Qian" + IDS_WEIGHT_QUARTERS_LONG "Quarters (long)" + IDS_WEIGHT_QUARTERS_UK "Quarters (UK)" IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_SCRUPLES "Scruples" + IDS_WEIGHT_SEERS "Seers" + IDS_WEIGHT_SHEETS "Sheets" + IDS_WEIGHT_SHEQEL "Sheqel" + IDS_WEIGHT_SLINCHES "Slinches" + IDS_WEIGHT_SLUGS_METRIC "Slugs" IDS_WEIGHT_STONES "Stones" IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TAEL_CHINA "Tael (China)" + IDS_WEIGHT_TAEL_JAPAN "Tael (Japan)" + IDS_WEIGHT_TERAGRAMS "Teragrams" + IDS_WEIGHT_TOLA "Tola" + IDS_WEIGHT_TONNEAU "Tonneau" IDS_WEIGHT_TONNES "Tonnes" IDS_WEIGHT_TONS_UK "Tons (UK)" IDS_WEIGHT_TONS_US "Tons (US)" + IDS_WEIGHT_UNZE "Unze" + IDS_WEIGHT_WEYS "Weys" + IDS_WEIGHT_ZENTNERS "Zentners" + IDS_WEIGHT_ZOLOTNIK "Zolotnik" END Index: base/applications/calc/lang/en-US.rc =================================================================== --- base/applications/calc/lang/en-US.rc (revision 54057) +++ base/applications/calc/lang/en-US.rc (working copy) @@ -457,9 +457,24 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_DEGREES "Degrees" - IDS_ANGLE_GRADIANS "Gradians" - IDS_ANGLE_RADIANS "Radians" + IDS_ANGLE_ARCMINUTES "Arcminutes" + IDS_ANGLE_ARCSECONDS "Arcseconds" + IDS_ANGLE_CENTESIMAL_MINUTES "Centesimal Minutes" + IDS_ANGLE_CENTESIMAL_SECONDS "Centesimal Seconds" + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GONS "Gons" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_MILS "Mils" + IDS_ANGLE_MILLIARCSECONDS "Milliarcseconds" + IDS_ANGLE_MILLIGONS "Milligons" + IDS_ANGLE_MILLIRADIANS "Milliradians" + IDS_ANGLE_OCTANTS "Octants" + IDS_ANGLE_POINTS "Points" + IDS_ANGLE_QUADRANTS "Quadrants" + IDS_ANGLE_RADIANS "Radians" + IDS_ANGLE_SEXTANTS "Sextants" + IDS_ANGLE_SIGNS "Signs" + IDS_ANGLE_STRECKS "Strecks" END // TYPES OF AREAS @@ -471,17 +486,43 @@ IDS_AREA_ACRES_SCOTS "Acres (Scots)" IDS_AREA_ACRES_US "Acres (US)" IDS_AREA_ARES "Ares" + IDS_AREA_BARNS "Barns" + IDS_AREA_BARONY "Baronys" + IDS_AREA_BOARDS "Boards" + IDS_AREA_CHO "Cho" IDS_AREA_CHOU "Chou" + IDS_AREA_CIRCULAR_INCHES "Circular Inches" + IDS_AREA_CIRCULAR_MILS "Circular Mils" + IDS_AREA_CORDS "Cords" + IDS_AREA_COTKA "Cotka" IDS_AREA_DANBO "Danbo" + IDS_AREA_DUNAM "Dunam" + IDS_AREA_FEDDAN "Feddan" IDS_AREA_HECTARES "Hectares" IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_JOCH "Joch" + IDS_AREA_KCMILS "Kcmils" + IDS_AREA_MAL "Mål" + IDS_AREA_MANZANA "Manzana" + IDS_AREA_MARLA "Marla" + IDS_AREA_MORGEN_AFRICA "Morgen (Africa)" + IDS_AREA_MORGEN_AUSTRIA "Morgen (Austria)" + IDS_AREA_MORGEN_DUTCH "Morgen (Dutch)" IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_PRUSSIA "Morgen (Prussia)" + IDS_AREA_MORGEN_SCANDINAVIA "Morgen (Scandinavia)" IDS_AREA_MU "Mu" + IDS_AREA_PERCH "Perch" IDS_AREA_PING "Ping" + IDS_AREA_POLE "Pole" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" + IDS_AREA_ROOD "Rood" IDS_AREA_SE "Se" + IDS_AREA_SITIO "Sitio" + IDS_AREA_SOENDRE "Soendre" + IDS_AREA_SOTKA "Sotka" IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" IDS_AREA_SQUARE_CHR "Square chr" IDS_AREA_SQUARE_FATHOMS "Square fathoms" @@ -490,13 +531,19 @@ 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_LEGUA "Square legua" + IDS_AREA_SQUARE_LINKS "Square links" + IDS_AREA_SQUARE_METER "Square meters" + IDS_AREA_SQUARE_MILS "Square mils" 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_STANG "Stang" + IDS_AREA_STREMMA "Stremma" + IDS_AREA_TALANG_WAH "Talang Wah" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -536,18 +583,35 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - 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" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY "Atomic Units of Energy" + IDS_ENERGY_ATTAJOULES "Attajoules" + IDS_ENERGY_BTUS "British Thermal Units" + IDS_ENERGY_DYNA_CENTIMETERS "Dyna-Centimeters" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_GIGAJOULES "Gigajoules" + IDS_ENERGY_GIGAWATT_HOURS "Gigawatt hours" + IDS_ENERGY_HARTREES "Hartrees" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOELECTRONVOLTS "Kiloelectronvolts" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_MEGAELECTRONVOLTS "Megaelectronvolts" + IDS_ENERGY_MEGAJOULES "Megajoules" + IDS_ENERGY_MEGALERGS "Megalergs" + IDS_ENERGY_MEGATONS "Megatons" + IDS_ENERGY_MICROJOULES "Microjoules" + IDS_ENERGY_MILLIJOULES "Millijoules" + IDS_ENERGY_NANOJOULES "Nanojoules" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_QUADS "Quads" + IDS_ENERGY_RYDBERGS "Rydbergs" + IDS_ENERGY_THERMIES "Thermies" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" END // TYPES OF LENGTHS @@ -607,9 +671,15 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_GIGAWATTS "Gigawatts" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" + IDS_POWER_LUSECS "Lusecs" + IDS_POWER_MANPOWER "Manpower" + IDS_POWER_MEGAWATTS "Megawatts" + IDS_POWER_MILLIHORSEPOWER "Millihorsepower" + IDS_POWER_MILLIWATTS "Milliwatts" + IDS_POWER_PONCELETS "Poncelets" IDS_POWER_WATTS "Watts" END @@ -618,11 +688,19 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_BARYE "Barye" IDS_PRESSURE_HECTOPASCALS "Hectopascals" IDS_PRESSURE_KILOPASCALS "Kilopascals" + IDS_PRESSURE_MEGAPASCALS "Megapascals" + IDS_PRESSURE_MICROBARS "Microbars" + IDS_PRESSURE_MILLIBARS "Millibars" + IDS_PRESSURE_MM_OF_WATER "Millimeters of water" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_MILLIPASCALS "Millipascals" IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PIEZE "Pièze" IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_TORR "Torr" END // TYPES OF TEMPERATURES @@ -637,15 +715,44 @@ // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "Days" - IDS_TIME_HOURS "Hours" - IDS_TIME_NANOSECONDS "Nanoseconds" - IDS_TIME_MICROSECONDS "Microseconds" - IDS_TIME_MILLISECONDS "Milliseconds" - IDS_TIME_MINUTES "Minutes" - IDS_TIME_SECONDS "Seconds" - IDS_TIME_WEEKS "Weeks" - IDS_TIME_YEARS "Years" + IDS_TIME_ATOMS "Atoms" + IDS_TIME_CALLIPPIC_CYCLE "Callippic cycles" + IDS_TIME_CENTURIES_CALENDAR "Centuries (Calendar)" + IDS_TIME_CENTURIES_GREGORIAN "Centuries (Gregorian)" + IDS_TIME_CENTURIES_JULIAN "Centuries (Julian)" + IDS_TIME_DAYS "Days" + IDS_TIME_DECADES "Decades" + IDS_TIME_ENNEADECATERIS "Enneadecateris" + IDS_TIME_FORTNIGHTS "Fortnights" + IDS_TIME_HIPPARCHIC_CYCLE "Hipparchic cycle" + IDS_TIME_HOURS "Hours" + IDS_TIME_JIFFIES "Jiffies" + IDS_TIME_JIFFIES_ALTERNATIVE "Jiffies (Alternative)" + IDS_TIME_LEAP_YEARS "Leap years" + IDS_TIME_LUSTRES "Lustres" + IDS_TIME_METONIC_CYCLES "Metonic cycles" + IDS_TIME_MICROSECONDS "Microseconds" + IDS_TIME_MILLENIUMS_CALENDAR "Milleniums (Calendar)" + IDS_TIME_MILLENIUMS_GREGORIAN "Milleniums (Gregorian)" + IDS_TIME_MILLENIUMS_JULIAN "Milleniums (Julian)" + IDS_TIME_MILLISECONDS "Milliseconds" + IDS_TIME_MINUTES "Minutes" + IDS_TIME_MINUTUM "Minutum" + IDS_TIME_MOLAD "Molad" + IDS_TIME_MOMENTS "Moments" + IDS_TIME_NANOSECONDS "Nanoseconds" + IDS_TIME_OCTAETERIS "Octaeteris" + IDS_TIME_OUNCES "Ounces" + IDS_TIME_SECONDS "Seconds" + IDS_TIME_SHAKES "Shakes" + IDS_TIME_SIDEREAL_DAYS "Sidereal days" + IDS_TIME_SIGMAS "Sigmas" + IDS_TIME_SOLS_MARS "Sol (Mars)" + IDS_TIME_SOTHIC_CYCLES "Sothic cycles" + IDS_TIME_STUNDE "Stunde" + IDS_TIME_SVEDBERG "Svedberg" + IDS_TIME_WEEKS "Weeks" + IDS_TIME_YEARS "Years" END // TYPES OF VELOCITIES @@ -704,29 +811,94 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_BARGES "Barges" + IDS_WEIGHT_BERKOVETS "Berkovets" + IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CATTY_CHINA "Catty (China)" + IDS_WEIGHT_CATTY_MALAYSIA "Catty (Malaysia)" + IDS_WEIGHT_CATTY_THAILAND "Catty (Thailand)" + IDS_WEIGHT_CENTNER "Centner" + IDS_WEIGHT_CHIN "Chin" IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_CLOVES "Cloves" + IDS_WEIGHT_CRITHS "Criths" + IDS_WEIGHT_DALTONS "Daltons" + IDS_WEIGHT_DECIGRAMS "Decigrams" + IDS_WEIGHT_DEKAGRAMS "Dekagrams" + IDS_WEIGHT_DOLIA "Dolia" IDS_WEIGHT_DON "Don" + IDS_WEIGHT_FUNT "Funt" + IDS_WEIGHT_GAMMA "Gamma" + IDS_WEIGHT_GEEPOUNDS "Geepounds" IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GIGAGRAMS "Gigagrams" + IDS_WEIGHT_GIN "Gin" + IDS_WEIGHT_GONGJIN "Gongjin" + IDS_WEIGHT_GRAINS "Grains" IDS_WEIGHT_GRAMS "Grams" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_HECTOGRAMS "Hectograms" 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_KIP "Kip" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIBRA "Libra" + IDS_WEIGHT_LIVRES "Livres" + IDS_WEIGHT_LOTS "Lots" + IDS_WEIGHT_LOT_RUSSIA "Lot (Russia)" + IDS_WEIGHT_MACE "Mace" + IDS_WEIGHT_MAHND "Mahnd" + IDS_WEIGHT_MARCS "Marcs" + IDS_WEIGHT_MARCO "Marco" + IDS_WEIGHT_MARKS "Marks" + IDS_WEIGHT_MASHA "Masha" + IDS_WEIGHT_MAUND "Maund" + IDS_WEIGHT_MEGADALTONS "Megadaltons" + IDS_WEIGHT_MEGAGRAMS "Megagrams" + IDS_WEIGHT_MEGATONNES "Megatonnes" + IDS_WEIGHT_MICROGRAMS "Micrograms" + IDS_WEIGHT_MILLIGRAMS "Milligrams" + IDS_WEIGHT_MILLIERS "Milliers" + IDS_WEIGHT_MINA "Mina" IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_MUGS "Mugs" + IDS_WEIGHT_NANOGRAMS "Nanograms" + IDS_WEIGHT_ONZA "Onza" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_PICOGRAMS "Picograms" + IDS_WEIGHT_POINTS "Points" + IDS_WEIGHT_POOD "Pood" + IDS_WEIGHT_POUNDS "Pounds (Imperial)" + IDS_WEIGHT_POUNDS_METRIC "Pounds (Metric)" + IDS_WEIGHT_QIAN "Qian" + IDS_WEIGHT_QUARTERS_LONG "Quarters (long)" + IDS_WEIGHT_QUARTERS_UK "Quarters (UK)" IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_SCRUPLES "Scruples" + IDS_WEIGHT_SEERS "Seers" + IDS_WEIGHT_SHEETS "Sheets" + IDS_WEIGHT_SHEQEL "Sheqel" + IDS_WEIGHT_SLINCHES "Slinches" + IDS_WEIGHT_SLUGS_METRIC "Slugs" IDS_WEIGHT_STONES "Stones" IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TAEL_CHINA "Tael (China)" + IDS_WEIGHT_TAEL_JAPAN "Tael (Japan)" + IDS_WEIGHT_TERAGRAMS "Teragrams" + IDS_WEIGHT_TOLA "Tola" IDS_WEIGHT_TONNES "Tonnes" IDS_WEIGHT_TONS_UK "Tons (UK)" IDS_WEIGHT_TONS_US "Tons (US)" + IDS_WEIGHT_TONNEAU "Tonneau" + IDS_WEIGHT_UNZE "Unze" + IDS_WEIGHT_WEYS "Weys" + IDS_WEIGHT_ZENTNERS "Zentners" + IDS_WEIGHT_ZOLOTNIK "Zolotnik" END Index: base/applications/calc/resource.h =================================================================== --- base/applications/calc/resource.h (revision 54057) +++ base/applications/calc/resource.h (working copy) @@ -119,9 +119,24 @@ #define IDS_CONV_WEIGHT 2012 /* TYPES OF ANGLES */ -#define IDS_ANGLE_DEGREES 2100 -#define IDS_ANGLE_GRADIANS 2101 -#define IDS_ANGLE_RADIANS 2102 +#define IDS_ANGLE_ARCMINUTES 2100 +#define IDS_ANGLE_ARCSECONDS 2101 +#define IDS_ANGLE_CENTESIMAL_MINUTES 2102 +#define IDS_ANGLE_CENTESIMAL_SECONDS 2103 +#define IDS_ANGLE_DEGREES 2104 +#define IDS_ANGLE_GONS 2105 +#define IDS_ANGLE_GRADIANS 2106 +#define IDS_ANGLE_MILS 2107 +#define IDS_ANGLE_MILLIARCSECONDS 2108 +#define IDS_ANGLE_MILLIGONS 2109 +#define IDS_ANGLE_MILLIRADIANS 2110 +#define IDS_ANGLE_OCTANTS 2111 +#define IDS_ANGLE_POINTS 2112 +#define IDS_ANGLE_QUADRANTS 2113 +#define IDS_ANGLE_RADIANS 2114 +#define IDS_ANGLE_SEXTANTS 2115 +#define IDS_ANGLE_SIGNS 2116 +#define IDS_ANGLE_STRECKS 2117 /* TYPES OF AREAS */ #define IDS_AREA_ACRES 2200 @@ -130,34 +145,66 @@ #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 +#define IDS_AREA_BARNS 2206 +#define IDS_AREA_BARONY 2207 +#define IDS_AREA_BOARDS 2208 +#define IDS_AREA_CHO 2209 +#define IDS_AREA_CHOU 2210 +#define IDS_AREA_CIRCULAR_INCHES 2211 +#define IDS_AREA_CIRCULAR_MILS 2212 +#define IDS_AREA_CORDS 2213 +#define IDS_AREA_COTKA 2214 +#define IDS_AREA_DANBO 2215 +#define IDS_AREA_DUNAM 2216 +#define IDS_AREA_FEDDAN 2217 +#define IDS_AREA_HECTARES 2218 +#define IDS_AREA_JEONGBO 2219 +#define IDS_AREA_JOCH 2220 +#define IDS_AREA_KCMILS 2221 +#define IDS_AREA_MAL 2222 +#define IDS_AREA_MANZANA 2223 +#define IDS_AREA_MARLA 2224 +#define IDS_AREA_MORGEN_AFRICA 2225 +#define IDS_AREA_MORGEN_AUSTRIA 2226 +#define IDS_AREA_MORGEN_DUTCH 2227 +#define IDS_AREA_MORGEN_HUNGARY 2228 +#define IDS_AREA_MORGEN_PRUSSIA 2229 +#define IDS_AREA_MORGEN_SCANDINAVIA 2230 +#define IDS_AREA_MU 2231 +#define IDS_AREA_PERCH 2232 +#define IDS_AREA_PING 2233 +#define IDS_AREA_POLE 2234 +#define IDS_AREA_PYEONG 2235 +#define IDS_AREA_PYEONGBANGJA 2236 +#define IDS_AREA_RAI 2237 +#define IDS_AREA_ROOD 2238 +#define IDS_AREA_SE 2239 +#define IDS_AREA_SITIO 2240 +#define IDS_AREA_SOENDRE 2241 +#define IDS_AREA_SOTKA 2242 +#define IDS_AREA_SQUARE_CENTIMETERS 2243 +#define IDS_AREA_SQUARE_CHR 2244 +#define IDS_AREA_SQUARE_FATHOMS 2245 +#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2246 +#define IDS_AREA_SQUARE_FEET 2247 +#define IDS_AREA_SQUARE_INCHES 2248 +#define IDS_AREA_SQUARE_KILOMETERS 2249 +#define IDS_AREA_SQUARE_LAR 2250 +#define IDS_AREA_SQUARE_LEGUA 2251 +#define IDS_AREA_SQUARE_LINKS 2252 +#define IDS_AREA_SQUARE_METER 2253 +#define IDS_AREA_SQUARE_MILS 2254 +#define IDS_AREA_SQUARE_MILES 2255 +#define IDS_AREA_SQUARE_MILLIMETERS 2256 +#define IDS_AREA_SQUARE_SHAKU 2257 +#define IDS_AREA_SQUARE_TSUEN 2258 +#define IDS_AREA_SQUARE_VA 2259 +#define IDS_AREA_SQUARE_YARD 2260 +#define IDS_AREA_STANG 2261 +#define IDS_AREA_STREMMA 2262 +#define IDS_AREA_TALANG_WAH 2263 +#define IDS_AREA_TAN 2264 +#define IDS_AREA_TSUBO 2265 /* TYPES OF COMSUMPTIONS */ #define IDS_CONSUMPTION_KM_PER_L 2300 @@ -186,18 +233,35 @@ #define IDS_CURRENCY_SPANISH_PESETA 2417 /* TYPES OF ENERGIES */ -#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 +#define IDS_ENERGY_15_C_CALORIES 2500 +#define IDS_ENERGY_ATOMIC_UNITS_OF_ENERGY 2501 +#define IDS_ENERGY_ATTAJOULES 2502 +#define IDS_ENERGY_BTUS 2503 +#define IDS_ENERGY_DYNA_CENTIMETERS 2504 +#define IDS_ENERGY_ERGS 2505 +#define IDS_ENERGY_EVS 2506 +#define IDS_ENERGY_FOOT_POUNDS 2507 +#define IDS_ENERGY_GIGAJOULES 2508 +#define IDS_ENERGY_GIGAWATT_HOURS 2509 +#define IDS_ENERGY_HARTREES 2510 +#define IDS_ENERGY_IT_CALORIES 2511 +#define IDS_ENERGY_IT_KILOCALORIES 2512 +#define IDS_ENERGY_JOULES 2513 +#define IDS_ENERGY_KILOELECTRONVOLTS 2514 +#define IDS_ENERGY_KILOJOULES 2515 +#define IDS_ENERGY_KILOWATT_HOURS 2516 +#define IDS_ENERGY_MEGAELECTRONVOLTS 2517 +#define IDS_ENERGY_MEGAJOULES 2518 +#define IDS_ENERGY_MEGALERGS 2519 +#define IDS_ENERGY_MEGATONS 2520 +#define IDS_ENERGY_MICROJOULES 2521 +#define IDS_ENERGY_MILLIJOULES 2522 +#define IDS_ENERGY_NANOJOULES 2523 +#define IDS_ENERGY_NUTRITION_CALORIES 2524 +#define IDS_ENERGY_QUADS 2525 +#define IDS_ENERGY_RYDBERGS 2526 +#define IDS_ENERGY_THERMIES 2527 +#define IDS_ENERGY_TH_CALORIES 2528 /* TYPES OF LENGTHS */ #define IDS_LENGTH_ANGSTROMS 2600 @@ -251,19 +315,33 @@ /* TYPES OF POWERS */ #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 +#define IDS_POWER_GIGAWATTS 2702 +#define IDS_POWER_HORSEPOWER 2703 +#define IDS_POWER_KILOWATTS 2704 +#define IDS_POWER_LUSECS 2705 +#define IDS_POWER_MANPOWER 2706 +#define IDS_POWER_MEGAWATTS 2707 +#define IDS_POWER_MILLIHORSEPOWER 2708 +#define IDS_POWER_MILLIWATTS 2709 +#define IDS_POWER_PONCELETS 2710 +#define IDS_POWER_WATTS 2711 /* TYPE OF PRESSURES */ #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 +#define IDS_PRESSURE_BARYE 2802 +#define IDS_PRESSURE_HECTOPASCALS 2803 +#define IDS_PRESSURE_KILOPASCALS 2804 +#define IDS_PRESSURE_MEGAPASCALS 2805 +#define IDS_PRESSURE_MICROBARS 2806 +#define IDS_PRESSURE_MILLIBARS 2807 +#define IDS_PRESSURE_MM_OF_WATER 2808 +#define IDS_PRESSURE_MM_OF_MERCURY 2809 +#define IDS_PRESSURE_MILLIPASCALS 2810 +#define IDS_PRESSURE_PASCALS 2811 +#define IDS_PRESSURE_PIEZE 2812 +#define IDS_PRESSURE_PSI 2813 +#define IDS_PRESSURE_TORR 2814 /* TYPES OF TEMPERATURES */ #define IDS_TEMPERATURE_CELSIUS 2900 @@ -272,15 +350,44 @@ #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_MILLISECONDS 3004 -#define IDS_TIME_NANOSECONDS 3005 -#define IDS_TIME_MINUTES 3006 -#define IDS_TIME_SECONDS 3007 -#define IDS_TIME_WEEKS 3008 -#define IDS_TIME_YEARS 3009 +#define IDS_TIME_ATOMS 3001 +#define IDS_TIME_CALLIPPIC_CYCLE 3002 +#define IDS_TIME_CENTURIES_CALENDAR 3003 +#define IDS_TIME_CENTURIES_GREGORIAN 3004 +#define IDS_TIME_CENTURIES_JULIAN 3005 +#define IDS_TIME_DAYS 3006 +#define IDS_TIME_DECADES 3007 +#define IDS_TIME_ENNEADECATERIS 3008 +#define IDS_TIME_FORTNIGHTS 3009 +#define IDS_TIME_HIPPARCHIC_CYCLE 3010 +#define IDS_TIME_HOURS 3011 +#define IDS_TIME_JIFFIES 3012 +#define IDS_TIME_JIFFIES_ALTERNATIVE 3013 +#define IDS_TIME_LEAP_YEARS 3014 +#define IDS_TIME_LUSTRES 3015 +#define IDS_TIME_METONIC_CYCLES 3016 +#define IDS_TIME_MICROSECONDS 3017 +#define IDS_TIME_MILLENIUMS_CALENDAR 3018 +#define IDS_TIME_MILLENIUMS_GREGORIAN 3019 +#define IDS_TIME_MILLENIUMS_JULIAN 3020 +#define IDS_TIME_MILLISECONDS 3021 +#define IDS_TIME_MINUTES 3022 +#define IDS_TIME_MINUTUM 3023 +#define IDS_TIME_MOLAD 3024 +#define IDS_TIME_MOMENTS 3025 +#define IDS_TIME_NANOSECONDS 3026 +#define IDS_TIME_OCTAETERIS 3027 +#define IDS_TIME_OUNCES 3028 +#define IDS_TIME_SECONDS 3029 +#define IDS_TIME_SHAKES 3030 +#define IDS_TIME_SIDEREAL_DAYS 3031 +#define IDS_TIME_SIGMAS 3032 +#define IDS_TIME_SOLS_MARS 3033 +#define IDS_TIME_SOTHIC_CYCLES 3034 +#define IDS_TIME_STUNDE 3035 +#define IDS_TIME_SVEDBERG 3036 +#define IDS_TIME_WEEKS 3037 +#define IDS_TIME_YEARS 3038 /* TYPES OF VELOCITIES */ #define IDS_VELOCITY_CMS_SECOND 3100 @@ -330,31 +437,97 @@ /* TYPES OF WEIGHTS */ #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 +#define IDS_WEIGHT_BARGES 3301 +#define IDS_WEIGHT_BERKOVETS 3302 +#define IDS_WEIGHT_CARATS 3303 +#define IDS_WEIGHT_CATTY_CHINA 3304 +#define IDS_WEIGHT_CATTY_MALAYSIA 3305 +#define IDS_WEIGHT_CATTY_THAILAND 3306 +#define IDS_WEIGHT_CENTNER 3307 +#define IDS_WEIGHT_CHIN 3308 +#define IDS_WEIGHT_CHUNG 3309 +#define IDS_WEIGHT_CLOVES 3310 +#define IDS_WEIGHT_CRITHS 3311 +#define IDS_WEIGHT_DALTONS 3312 +#define IDS_WEIGHT_DECIGRAMS 3313 +#define IDS_WEIGHT_DEKAGRAMS 3314 +#define IDS_WEIGHT_DOLIA 3315 +#define IDS_WEIGHT_DON 3316 +#define IDS_WEIGHT_FUNT 3317 +#define IDS_WEIGHT_GAMMA 3318 +#define IDS_WEIGHT_GEEPOUNDS 3319 +#define IDS_WEIGHT_GEUN 3320 +#define IDS_WEIGHT_GIGAGRAMS 3321 +#define IDS_WEIGHT_GIN 3322 +#define IDS_WEIGHT_GONGJIN 3323 +#define IDS_WEIGHT_GRAINS 3324 +#define IDS_WEIGHT_GRAMS 3325 +#define IDS_WEIGHT_GWAN 3326 +#define IDS_WEIGHT_HARB 3327 +#define IDS_WEIGHT_HECTOGRAMS 3328 +#define IDS_WEIGHT_JIN_CHINA 3329 +#define IDS_WEIGHT_JIN_TAIWAN 3330 +#define IDS_WEIGHT_KAN 3331 +#define IDS_WEIGHT_KILOGRAMS 3332 +#define IDS_WEIGHT_KIN 3333 +#define IDS_WEIGHT_KIP 3334 +#define IDS_WEIGHT_LIANG_CHINA 3335 +#define IDS_WEIGHT_LIANG_TAIWAN 3336 +#define IDS_WEIGHT_LIBRA 3337 +#define IDS_WEIGHT_LIVRES 3338 +#define IDS_WEIGHT_LOTS 3339 +#define IDS_WEIGHT_LOT_RUSSIA 3340 +#define IDS_WEIGHT_MACE 3341 +#define IDS_WEIGHT_MAHND 3342 +#define IDS_WEIGHT_MARCS 3343 +#define IDS_WEIGHT_MARCO 3344 +#define IDS_WEIGHT_MARKS 3345 +#define IDS_WEIGHT_MASHA 3346 +#define IDS_WEIGHT_MAUND 3347 +#define IDS_WEIGHT_MEGADALTONS 3348 +#define IDS_WEIGHT_MEGAGRAMS 3349 +#define IDS_WEIGHT_MEGATONNES 3350 +#define IDS_WEIGHT_MICROGRAMS 3351 +#define IDS_WEIGHT_MILLIGRAMS 3352 +#define IDS_WEIGHT_MILLIERS 3353 +#define IDS_WEIGHT_MINA 3354 +#define IDS_WEIGHT_MONME 3355 +#define IDS_WEIGHT_MUGS 3356 +#define IDS_WEIGHT_NANOGRAMS 3357 +#define IDS_WEIGHT_ONZA 3358 +#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3359 +#define IDS_WEIGHT_OUNCES_TROY 3360 +#define IDS_WEIGHT_PICOGRAMS 3361 +#define IDS_WEIGHT_POINTS 3362 +#define IDS_WEIGHT_POOD 3363 +#define IDS_WEIGHT_POUNDS 3364 +#define IDS_WEIGHT_POUNDS_METRIC 3365 +#define IDS_WEIGHT_QIAN 3366 +#define IDS_WEIGHT_QUARTERS_LONG 3367 +#define IDS_WEIGHT_QUARTERS_UK 3368 +#define IDS_WEIGHT_QUINTAL_METRIC 3369 +#define IDS_WEIGHT_SALOUNG 3370 +#define IDS_WEIGHT_SCRUPLES 3371 +#define IDS_WEIGHT_SEERS 3372 +#define IDS_WEIGHT_SHEETS 3373 +#define IDS_WEIGHT_SHEQEL 3374 +#define IDS_WEIGHT_SLINCHES 3375 +#define IDS_WEIGHT_SLUGS_METRIC 3376 +#define IDS_WEIGHT_SNAILS 3377 +#define IDS_WEIGHT_STONES 3378 +#define IDS_WEIGHT_TAEL_CHINA 3379 +#define IDS_WEIGHT_TAEL_JAPAN 3380 +#define IDS_WEIGHT_TAMLUNG 3381 +#define IDS_WEIGHT_TERAGRAMS 3382 +#define IDS_WEIGHT_TOLA 3383 +#define IDS_WEIGHT_TONNEAU 3384 +#define IDS_WEIGHT_TONNES 3385 +#define IDS_WEIGHT_TONS_UK 3386 +#define IDS_WEIGHT_TONS_US 3387 +#define IDS_WEIGHT_UNZE 3388 +#define IDS_WEIGHT_WEYS 3389 +#define IDS_WEIGHT_ZENTNERS 3390 +#define IDS_WEIGHT_ZOLOTNIK 3391 /* MENU */ #define IDM_EDIT_COPY 40002 Index: base/applications/calc/utl.c =================================================================== --- base/applications/calc/utl.c (revision 54057) +++ base/applications/calc/utl.c (working copy) @@ -11,7 +11,7 @@ break; case IDC_RADIO_DEC: /* - * Modifed from 17 to 16 for fixing this bug: + * Modified from 17 to 16 for fixing this bug: * 14+14+6.3+6.3= 40.5999999 instead of 40.6 * So, it's probably better to leave the least * significant digit out of the display. @@ -25,7 +25,7 @@ TCHAR *ptr, *dst; ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); - /* format sring ensures there is a '.': */ + /* format string ensures there is a '.': */ dst = _tcschr(buffer, TEXT('.')); while (--ptr > dst) if (*ptr != TEXT('0')) Index: base/applications/calc/whatsnew.txt =================================================================== --- base/applications/calc/whatsnew.txt (revision 54057) +++ base/applications/calc/whatsnew.txt (working copy) @@ -3,14 +3,14 @@ * Updated translations (thanks to the friends at ReactOS' community). * Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not). * Added support for newer conversion units. -* Fixed mistake into english translation (lenghts -> lengths). +* Fixed mistake into English translation (lenghts -> lengths). * Now decimal and thousand separators can be also read directly from registry (NT only, not 9x/ME). * Fixed bug when pressing an operator twice (like '1++2=' caused error). * Now unary operators and constant generators won't break RPN queue. 1.10 (20080813) ======================= -* Added Norvegian and Korean translations. +* Added Norwegian and Korean translations. * Fixed Polish and Slovak translations. * Fixed percent mode. * Fixed some unsignaled overflow errors. @@ -34,7 +34,7 @@ * Corrected precision underflow/overflow when working with trigonometric functions. * cbrt() function is not used if compiling into ReactOS build system. * Resources are moved into /res directory. -* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukraianian. +* Added new (partial) support for other languages: Bulgarian, Spanish, German, Dutch, Polish, Russian, Slovak, Ukrainian. * Decimal precision of number with standard layout has been limited to 16 digits because the output display is smaller here (GMP version only). * Fixed buffer overflow with function update_lcd_display(). * The decimal point is now preserved when switching to temporary scientific notation. @@ -59,7 +59,7 @@ ======================= * The decimal separator is copied into the clipboard, but only if it has been typed by the user. * Now the [+/-] button can change the sign of any number into the output display. -* Added italian translation of the help file. +* Added Italian translation of the help file. 1.05 (20070503) ======================= @@ -97,7 +97,7 @@ 1.01 (20070331) ======================= -* Fixed english translation for "Radians" and "Gradians". +* Fixed English translation for "Radians" and "Gradians". * Corrected conversion between radians and gradians angles. * Added work-around for catching keys without the keyboard hook (selectable at compile time). * The version number of the programme has been moved from the resource files to ABOUT.C. Index: base/applications/calc/winmain.c =================================================================== --- base/applications/calc/winmain.c (revision 54057) +++ base/applications/calc/winmain.c (working copy) @@ -424,7 +424,7 @@ static void update_lcd_display(HWND hwnd) { /* - * muliply size of calc.buffer by 2 because it may + * multiply size of calc.buffer by 2 because it may * happen that separator is used between each digit. * Also added little additional space for dot and '\0'. */ @@ -1283,7 +1283,7 @@ case WM_COMMAND: /* * if selection of category is changed, we must - * updatethe content of the "from/to" combo boxes. + * update the content of the "from/to" combo boxes. */ if (wp == MAKEWPARAM(IDC_COMBO_CATEGORY, CBN_SELCHANGE)) { ConvAdjust(hWnd, SendDlgItemMessage(hWnd, IDC_COMBO_CATEGORY, CB_GETCURSEL, 0, 0));