diff --git a/reactos/base/applications/calc/convert.c b/reactos/base/applications/calc/convert.c
index 5ce75c4137b..c1de5558a94 100644
--- a/reactos/base/applications/calc/convert.c
+++ b/reactos/base/applications/calc/convert.c
@@ -337,7 +337,7 @@ static const conv_t conv_TIME[] = {
     DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",       "$/60")
     DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",    "$/86400")
     DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",     "$/3600")
-    DECLARE_CONV_UNIT(TIME, MILISECONDS,  "$*0.001",    "$/0.001")
+    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",    "$/0.001")
     DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001")
     DECLARE_CONV_UNIT(TIME, SECONDS,      "$",          "$")
     DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",   "$/604800")
diff --git a/reactos/base/applications/calc/lang/bg-BG.rc b/reactos/base/applications/calc/lang/bg-BG.rc
index 898c5696ac0..a5f26ab04f0 100644
--- a/reactos/base/applications/calc/lang/bg-BG.rc
+++ b/reactos/base/applications/calc/lang/bg-BG.rc
@@ -640,7 +640,7 @@ BEGIN
     IDS_TIME_DAYS         "Äíè"
     IDS_TIME_HOURS        "×àñè"
     IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè"
-    IDS_TIME_MILISECONDS  "Ìèëèñåêóíäè"
+    IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè"
     IDS_TIME_MINUTES      "Ìèíóòè"
     IDS_TIME_SECONDS      "Ñåêóíäè"
     IDS_TIME_WEEKS        "Ñåäìèöè"
diff --git a/reactos/base/applications/calc/lang/cs-CZ.rc b/reactos/base/applications/calc/lang/cs-CZ.rc
index 77a75db1d88..19abb0c880b 100644
--- a/reactos/base/applications/calc/lang/cs-CZ.rc
+++ b/reactos/base/applications/calc/lang/cs-CZ.rc
@@ -462,9 +462,9 @@ END
 // TYPES OF ANGLES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ANGLE_GRADIANS "Grady"
-    IDS_ANGLE_RADIANS  "Radiány"
-    IDS_ANGLE_DEGREES  "Stupnì"
+    IDS_ANGLE_GRADIANS      "Grady"
+    IDS_ANGLE_RADIANS       "Radiány"
+    IDS_ANGLE_DEGREES       "Stupnì"
 END
 
 // TYPES OF AREAS
@@ -518,7 +518,6 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-
     IDS_CURRENCY_BELGIAN_FRANC      "Belgický frank"
     IDS_CURRENCY_CZECH_KORUNA       "Èeská koruna"
     IDS_CURRENCY_EURO               "Euro"
@@ -646,7 +645,7 @@ BEGIN
     IDS_TIME_DAYS         "Dny"
     IDS_TIME_HOURS        "Hodiny"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
-    IDS_TIME_MILISECONDS  "Milisekundy"
+    IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minuty"
     IDS_TIME_SECONDS      "Sekundy"
     IDS_TIME_YEARS        "Roky"
diff --git a/reactos/base/applications/calc/lang/de-DE.rc b/reactos/base/applications/calc/lang/de-DE.rc
index c81df011bff..a60d12545c6 100644
--- a/reactos/base/applications/calc/lang/de-DE.rc
+++ b/reactos/base/applications/calc/lang/de-DE.rc
@@ -337,7 +337,6 @@ BEGIN
                     SS_SUNKEN
 END
 
-
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -451,6 +450,16 @@ BEGIN
     IDS_CONV_CONSUMPTION    "Verbrauch (Motoren)"
     IDS_CONV_VOLUME         "Volumeneinheit"
     IDS_CONV_CURRENCY       "Währung"
+    IDS_CONV_ANGLE          "Winkel"
+    IDS_CONV_TIME           "Zeit"
+END
+
+// WINKELTYPEN
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_GRADIANS      "Gon"
+    IDS_ANGLE_DEGREES       "Grad"
+    IDS_ANGLE_RADIANS       "Radiant"
 END
 
 // FLÄCHENTYPEN
@@ -520,16 +529,21 @@ BEGIN
     IDS_CURRENCY_SLOVAK_KORUNA      "Slowakische Krone"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenische Tolar"
     IDS_CURRENCY_SPANISH_PESETA     "Spanische Peseta"
+    IDS_CURRENCY_CZECH_KORUNA       "Tschechische Krone"
     IDS_CURRENCY_CYPRIOT_POUND      "Zypriotische Pfund"
 END
 
 // ENERGIETYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C Kalorien"
+    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"
@@ -565,6 +579,7 @@ BEGIN
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_MILES                "Meilen"
     IDS_LENGTH_METERS               "Meter"
+    IDS_LENGTH_MICRONS              "Mikrometer"
     IDS_LENGTH_MILLIMETERS          "Millimeter"
     IDS_LENGTH_NAUTICAL_MILES       "Nautische Meilen"
     IDS_LENGTH_NIEU                 "Nieu"
@@ -572,6 +587,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -589,6 +605,8 @@ END
 // ARBEITSTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "BTU pro Minute"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-Pound pro Minute"
     IDS_POWER_KILOWATTS             "Kilowatt"
     IDS_POWER_MEGAWATTS             "Megawatt"
     IDS_POWER_HORSEPOWER            "Pferdestärken"
@@ -600,6 +618,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosphären"
     IDS_PRESSURE_BARS               "Bar"
+    IDS_PRESSURE_HECTOPASCALS       "Hektopascal"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascal"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeter auf dem Quecksilber"
     IDS_PRESSURE_PASCALS            "Pascal"
     IDS_PRESSURE_PSI                "Pfunddruck pro Quadratzoll"
@@ -614,9 +634,24 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "Tagen"
+    IDS_TIME_HOURS        "Stunden"
+    IDS_TIME_MICROSECONDS "Mikrosekunden"
+    IDS_TIME_MILLISECONDS "Millisekunden"
+    IDS_TIME_MINUTES      "Minuten"
+    IDS_TIME_SECONDS      "Sekunden"
+    IDS_TIME_WEEKS        "Wochen"
+    IDS_TIME_YEARS        "Jahren"
+END
+
 // GESCHWINDIGKEITSTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Zentimeter/Sekunde"
+    IDS_VELOCITY_FEET_SECOND        "Fuß/Sekunde"
     IDS_VELOCITY_FEET_HOUR          "Fuß/Stunde"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometer/Stunde"
     IDS_VELOCITY_KNOTS              "Knoten"
diff --git a/reactos/base/applications/calc/lang/el-GR.rc b/reactos/base/applications/calc/lang/el-GR.rc
index 2255a931d6a..df648b715bf 100644
--- a/reactos/base/applications/calc/lang/el-GR.rc
+++ b/reactos/base/applications/calc/lang/el-GR.rc
@@ -436,7 +436,7 @@ BEGIN
     IDS_QUICKHELP           "Quick help"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_CONV_ANGLE          "Ãùíßá"
@@ -639,8 +639,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "ÌÝñåò"
     IDS_TIME_HOURS        "¿ñåò"
-    IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILISECONDS  "Miliseconds"
+    IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá"
+    IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá"
     IDS_TIME_MINUTES      "ËåðôÜ"
     IDS_TIME_SECONDS      "Äåõôåñüëåðôá"
     IDS_TIME_WEEKS        "ÅâäïìÜäåò"
diff --git a/reactos/base/applications/calc/lang/en-US.rc b/reactos/base/applications/calc/lang/en-US.rc
index 83cdc017277..620bc451736 100644
--- a/reactos/base/applications/calc/lang/en-US.rc
+++ b/reactos/base/applications/calc/lang/en-US.rc
@@ -436,7 +436,7 @@ BEGIN
     IDS_QUICKHELP           "Quick help"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_CONV_ANGLE          "Angle"
@@ -553,7 +553,7 @@ END
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ANGSTROMS            "Ångströms"
     IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimeters"
@@ -640,7 +640,7 @@ BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
     IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILISECONDS  "Miliseconds"
+    IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"
     IDS_TIME_SECONDS      "Seconds"
     IDS_TIME_WEEKS        "Weeks"
diff --git a/reactos/base/applications/calc/lang/es-ES.rc b/reactos/base/applications/calc/lang/es-ES.rc
index b0fbcd9e88d..f827bbef0f1 100644
--- a/reactos/base/applications/calc/lang/es-ES.rc
+++ b/reactos/base/applications/calc/lang/es-ES.rc
@@ -14,14 +14,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
-                    10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
-                    10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
-                    10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
-                    26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -346,7 +342,6 @@ BEGIN
                     SS_SUNKEN
 END
 
-
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -394,10 +389,10 @@ BEGIN
         MENUITEM "Científica",                  IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversión",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Hexadecimal\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Hexadecimal\tF5",             IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
         MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binario\tF8",                  IDM_VIEW_BIN, CHECKED
+        MENUITEM "Binario\tF8",                 IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
         MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
@@ -433,7 +428,7 @@ BEGIN
     BEGIN
         MENUITEM "Temas de ayuda",              IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Acerca de Calculadora ReactOS",          IDM_HELP_ABOUT
+        MENUITEM "Acerca de Calculadora ReactOS", IDM_HELP_ABOUT
     END
 END
 
@@ -446,9 +441,10 @@ BEGIN
     IDS_QUICKHELP           "Ayuda rápida"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CONV_ANGLE          "Ángulo"
     IDS_CONV_AREA           "Área"
     IDS_CONV_CONSUMPTION    "Consumo (motores)"
     IDS_CONV_CURRENCY       "Monedas"
@@ -457,11 +453,20 @@ BEGIN
     IDS_CONV_POWER          "Potencia"
     IDS_CONV_PRESSURE       "Presión"
     IDS_CONV_TEMPERATURE    "Temperatura"
+    IDS_CONV_TIME           "Tiempo"
     IDS_CONV_VELOCITY       "Velocidad"
     IDS_CONV_VOLUME         "Volumen"
     IDS_CONV_WEIGHT         "Peso"
 END
 
+// TYPES OF ANGLES
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_DEGREES       "Grados sexagesimales"
+    IDS_ANGLE_GRADIANS      "Grados centesimales"
+    IDS_ANGLE_RADIANS       "Radianes"
+END
+
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -516,6 +521,7 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling Austriaco"
     IDS_CURRENCY_BELGIAN_FRANC      "Franco Belga"
     IDS_CURRENCY_CYPRIOT_POUND      "Libra Chipriota"
+    IDS_CURRENCY_CZECH_KORUNA       "Corona Checa"
     IDS_CURRENCY_DEUTSCHE_MARK      "Marco Alemán"
     IDS_CURRENCY_DUTCH_GUILDER      "Florín Neerlandés"
     IDS_CURRENCY_EURO               "Euro"
@@ -535,9 +541,13 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C calorías"
+    IDS_ENERGY_15_C_CALORIES        "15 °C calorías"
+    IDS_ENERGY_BTUS                 "BTU"
     IDS_ENERGY_ERGS                 "Ergios"
+    IDS_ENERGY_EVS                  "Electronovoltios"
+    IDS_ENERGY_FOOT_POUNDS          "Ft·Lbs"
     IDS_ENERGY_IT_CALORIES          "Tabla internacional de calorías"
+    IDS_ENERGY_IT_KILOCALORIES      "Tabla internacional de kilocalorías"
     IDS_ENERGY_JOULES               "Julios"
     IDS_ENERGY_KILOJOULES           "Kilojulios"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatios hora"
@@ -548,7 +558,7 @@ END
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ANGSTROMS            "Ångströms"
     IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centímetros"
@@ -575,6 +585,7 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Años luz"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Metros"
+    IDS_LENGTH_MICRONS              "Micrómetros"
     IDS_LENGTH_MILES                "Millas"
     IDS_LENGTH_MILLIMETERS          "Milímetros"
     IDS_LENGTH_NAUTICAL_MILES       "Millas nauticas"
@@ -583,6 +594,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -598,6 +610,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "BTU/Minuto"
+    IDS_POWER_FPS_PER_MINUTE        "Ft·Lbs/Minuto"
     IDS_POWER_HORSEPOWER            "Caballos de vapor"
     IDS_POWER_KILOWATTS             "Kilowatios"
     IDS_POWER_MEGAWATTS             "Megawatios"
@@ -609,6 +623,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmósferas"
     IDS_PRESSURE_BARS               "Bares"
+    IDS_PRESSURE_HECTOPASCALS       "Kilopascales"
+    IDS_PRESSURE_KILOPASCALS        "Hectopascales"
     IDS_PRESSURE_MM_OF_MERCURY      "Milímetros de mercurio"
     IDS_PRESSURE_PASCALS            "Pascales"
     IDS_PRESSURE_PSI                "Libras fuerza por pulgada cuadrada"
@@ -623,10 +639,25 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "Días"
+    IDS_TIME_HOURS        "Horas"
+    IDS_TIME_MICROSECONDS "Microsegundos"
+    IDS_TIME_MILLISECONDS "Milisegundos"
+    IDS_TIME_MINUTES      "Minutos"
+    IDS_TIME_SECONDS      "Segundos"
+    IDS_TIME_WEEKS        "Semanas"
+    IDS_TIME_YEARS        "Años"
+END
+
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Centímetros/segundo"
     IDS_VELOCITY_FEET_HOUR          "Pies/hora"
+    IDS_VELOCITY_FEET_SECOND        "Pies/segundo"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometros/hora"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
diff --git a/reactos/base/applications/calc/lang/fr-FR.rc b/reactos/base/applications/calc/lang/fr-FR.rc
index 7a6b61765da..3dc93006846 100644
--- a/reactos/base/applications/calc/lang/fr-FR.rc
+++ b/reactos/base/applications/calc/lang/fr-FR.rc
@@ -640,7 +640,7 @@ BEGIN
     IDS_TIME_DAYS         "Jours"
     IDS_TIME_HOURS        "Heures"
     IDS_TIME_MICROSECONDS "Microsecondes"
-    IDS_TIME_MILISECONDS  "Millisecondes"
+    IDS_TIME_MILLISECONDS "Millisecondes"
     IDS_TIME_MINUTES      "Minutes"
     IDS_TIME_SECONDS      "Secondes"
     IDS_TIME_WEEKS        "Semaines"
diff --git a/reactos/base/applications/calc/lang/it-IT.rc b/reactos/base/applications/calc/lang/it-IT.rc
index 01ee9e8ecfe..ae20a9d18a0 100644
--- a/reactos/base/applications/calc/lang/it-IT.rc
+++ b/reactos/base/applications/calc/lang/it-IT.rc
@@ -640,7 +640,7 @@ BEGIN
     IDS_TIME_DAYS         "Giorni"
     IDS_TIME_HOURS        "Ore"
     IDS_TIME_MICROSECONDS "Microsecondi"
-    IDS_TIME_MILISECONDS  "Millisecondi"
+    IDS_TIME_MILLISECONDS "Millisecondi"
     IDS_TIME_MINUTES      "Minuti"
     IDS_TIME_SECONDS      "Secondi"
     IDS_TIME_WEEKS        "Settimane"
diff --git a/reactos/base/applications/calc/lang/ko-KR.rc b/reactos/base/applications/calc/lang/ko-KR.rc
index 673ea6385ad..76cf871e048 100644
--- a/reactos/base/applications/calc/lang/ko-KR.rc
+++ b/reactos/base/applications/calc/lang/ko-KR.rc
@@ -348,13 +348,13 @@ BEGIN
     POPUP "ÆíÁý"
     BEGIN
         MENUITEM "º¹»ç\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",            IDM_EDIT_PASTE
     END
     POPUP "º¸±â"
     BEGIN
-        MENUITEM "ÀϹÝ",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "°øÇÐ",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Àüȯ",                  IDM_VIEW_CONVERSION
+        MENUITEM "ÀϹÝ",                        IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "°øÇÐ",                        IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Àüȯ",                        IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
@@ -365,13 +365,13 @@ BEGIN
         MENUITEM "Radians\tF3",                 IDM_VIEW_RAD, CHECKED
         MENUITEM "Grads\tF4",                   IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",            IDM_VIEW_GROUP, CHECKED
     END
     POPUP "µµ¿ò¸»"
     BEGIN
         MENUITEM "µµ¿ò¸» Ç׸ñ",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS °è»ê±â Á¤º¸",          IDM_HELP_ABOUT
+        MENUITEM "ReactOS °è»ê±â Á¤º¸",         IDM_HELP_ABOUT
     END
 END
 
@@ -380,13 +380,13 @@ BEGIN
     POPUP "ÆíÁý"
     BEGIN
         MENUITEM "º¹»ç\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",            IDM_EDIT_PASTE
     END
     POPUP "º¸±â"
     BEGIN
-        MENUITEM "ÀϹÝ",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "°øÇÐ",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Àüȯ",                  IDM_VIEW_CONVERSION
+        MENUITEM "ÀϹÝ",                        IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "°øÇÐ",                        IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Àüȯ",                        IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
@@ -398,13 +398,13 @@ BEGIN
         MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "Byte\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",            IDM_VIEW_GROUP, CHECKED
     END
     POPUP "µµ¿ò¸»"
     BEGIN
         MENUITEM "µµ¿ò¸» Ç׸ñ",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS °è»ê±â Á¤º¸",          IDM_HELP_ABOUT
+        MENUITEM "ReactOS °è»ê±â Á¤º¸",         IDM_HELP_ABOUT
     END
 END
 
@@ -413,21 +413,21 @@ BEGIN
     POPUP "ÆíÁý"
     BEGIN
         MENUITEM "º¹»ç\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "ºÙ¿©³Ö±â\tCTRL-V",            IDM_EDIT_PASTE
     END
     POPUP "º¸±â"
     BEGIN
-        MENUITEM "ÀϹÝ",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "°øÇÐ",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Àüȯ",                  IDM_VIEW_CONVERSION
+        MENUITEM "ÀϹÝ",                        IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "°øÇÐ",                        IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Àüȯ",                        IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§",            IDM_VIEW_GROUP, CHECKED
     END
     POPUP "µµ¿ò¸»"
     BEGIN
         MENUITEM "µµ¿ò¸» Ç׸ñ",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS °è»ê±â Á¤º¸",          IDM_HELP_ABOUT
+        MENUITEM "ReactOS °è»ê±â Á¤º¸",         IDM_HELP_ABOUT
     END
 END
 
@@ -440,9 +440,10 @@ BEGIN
     IDS_QUICKHELP           "ºü¸¥ µµ¿ò¸»"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CONV_ANGLE          "°¢µµ"
     IDS_CONV_AREA           "Area"
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Currencies"
@@ -451,11 +452,20 @@ BEGIN
     IDS_CONV_POWER          "Power"
     IDS_CONV_PRESSURE       "Pressure"
     IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_TIME           "°¢µµ"
     IDS_CONV_VELOCITY       "Velocity"
     IDS_CONV_VOLUME         "Volume"
     IDS_CONV_WEIGHT         "Weights"
 END
 
+// TYPES OF ANGLES
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_DEGREES       "Degrees"
+    IDS_ANGLE_GRADIANS      "Gradians"
+    IDS_ANGLE_RADIANS       "Radians"
+END
+
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -510,6 +520,7 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_CZECH_KORUNA       "Czech Koruna"
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     IDS_CURRENCY_EURO               "Euro"
@@ -529,9 +540,13 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_15_C_CALORIES        "15 ¡ÆC calories"
+    IDS_ENERGY_BTUS                 "British Thermal Units"
     IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_EVS                  "ÀüÀÚº¼Æ®"
+    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"
@@ -542,7 +557,7 @@ END
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ANGSTROMS            "¿Ë½ºÆ®·Ò"
     IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimeters"
@@ -569,6 +584,7 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MICRONS              "Microns"
     IDS_LENGTH_MILES                "Miles"
     IDS_LENGTH_MILLIMETERS          "Millimeters"
     IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
@@ -577,6 +593,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -592,6 +609,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
     IDS_POWER_HORSEPOWER            "Horsepower"
     IDS_POWER_KILOWATTS             "Kilowatts"
     IDS_POWER_MEGAWATTS             "Megawatts"
@@ -603,6 +622,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
     IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Pounds-force per square inch"
@@ -617,10 +638,25 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "Days"
+    IDS_TIME_HOURS        "Hours"
+    IDS_TIME_MICROSECONDS "Microseconds"
+    IDS_TIME_MILLISECONDS "Milliseconds"
+    IDS_TIME_MINUTES      "Minutes"
+    IDS_TIME_SECONDS      "Seconds"
+    IDS_TIME_WEEKS        "Weeks"
+    IDS_TIME_YEARS        "Years"
+END
+
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
     IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_FEET_SECOND        "Feet/second"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
diff --git a/reactos/base/applications/calc/lang/nl-NL.rc b/reactos/base/applications/calc/lang/nl-NL.rc
index 9083ecfd6a2..5d80f658d9a 100644
--- a/reactos/base/applications/calc/lang/nl-NL.rc
+++ b/reactos/base/applications/calc/lang/nl-NL.rc
@@ -9,14 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
-                    10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
-                    10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
-                    10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
-                    26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -341,7 +337,6 @@ BEGIN
                     SS_SUNKEN
 END
 
-
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -441,9 +436,10 @@ BEGIN
     IDS_QUICKHELP           "Snelle hulp"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CONV_ANGLE          "Hoek"
     IDS_CONV_AREA           "Area"
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Currencies"
@@ -452,11 +448,20 @@ BEGIN
     IDS_CONV_POWER          "Power"
     IDS_CONV_PRESSURE       "Pressure"
     IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_TIME           "Tijd"
     IDS_CONV_VELOCITY       "Velocity"
     IDS_CONV_VOLUME         "Volume"
     IDS_CONV_WEIGHT         "Weights"
 END
 
+// TYPES OF ANGLES
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_DEGREES       "Graden"
+    IDS_ANGLE_GRADIANS      "Gradiënten"
+    IDS_ANGLE_RADIANS       "Radialen"
+END
+
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -511,6 +516,7 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_CZECH_KORUNA       "Tsjechische kroon"
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     IDS_CURRENCY_EURO               "Euro"
@@ -530,9 +536,13 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_15_C_CALORIES        "15 °C calories"
+    IDS_ENERGY_BTUS                 "British thermal units"
     IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_EVS                  "Elektronvolt"
+    IDS_ENERGY_FOOT_POUNDS          "Voet-pond"
     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"
@@ -570,6 +580,7 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MICRONS              "Microns"
     IDS_LENGTH_MILES                "Miles"
     IDS_LENGTH_MILLIMETERS          "Millimeters"
     IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
@@ -578,6 +589,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -593,6 +605,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
     IDS_POWER_HORSEPOWER            "Horsepower"
     IDS_POWER_KILOWATTS             "Kilowatts"
     IDS_POWER_MEGAWATTS             "Megawatts"
@@ -604,6 +618,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
     IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Pounds-force per square inch"
@@ -618,10 +634,25 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "**"
+    IDS_TIME_HOURS        "**"
+    IDS_TIME_MICROSECONDS "**"
+    IDS_TIME_MILLISECONDS "**"
+    IDS_TIME_MINUTES      "**"
+    IDS_TIME_SECONDS      "**"
+    IDS_TIME_WEEKS        "**"
+    IDS_TIME_YEARS        "**"
+END
+
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
     IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_FEET_SECOND        "Feet/second"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
diff --git a/reactos/base/applications/calc/lang/no-NO.rc b/reactos/base/applications/calc/lang/no-NO.rc
index c9ee1495b20..9651e6eed48 100644
--- a/reactos/base/applications/calc/lang/no-NO.rc
+++ b/reactos/base/applications/calc/lang/no-NO.rc
@@ -309,7 +309,7 @@ CAPTION "Om ReactOS kalkulator"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,105,148,52,16
-    CONTROL         106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
+    CONTROL         IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48
     LTEXT           "ReactOS kalkulator",IDC_STATIC,120,12,132,8,
                     SS_CENTERIMAGE
@@ -337,38 +337,37 @@ BEGIN
                     SS_SUNKEN
 END
 
-
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
 BEGIN
     POPUP "Rediger"
     BEGIN
-        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
     END
     POPUP "Vis"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Konvertering",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Heksadesimalt\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Desimalt\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktalt\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Heksadesimalt\tF5",           IDM_VIEW_HEX, CHECKED
+        MENUITEM "Desimalt\tF6",                IDM_VIEW_DEC, CHECKED
+        MENUITEM "Oktalt\tF7",                  IDM_VIEW_OCT, CHECKED
         MENUITEM "Binært\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grader\tF2",                 IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radianer\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradienter\tF4",                   IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Grader\tF2",                  IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radianer\tF3",                IDM_VIEW_RAD, CHECKED
+        MENUITEM "Gradienter\tF4",              IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Siffergruppering",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Siffergruppering",            IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Hjelp"
     BEGIN
-        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS kalkulator",          IDM_HELP_ABOUT
+        MENUITEM "Om ReactOS kalkulator",       IDM_HELP_ABOUT
     END
 END
 
@@ -376,18 +375,18 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE
 BEGIN
     POPUP "Rediger"
     BEGIN
-        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
     END
     POPUP "Vis"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "konvertering",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Heksadesimalt\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Heksadesimalt\tF5",           IDM_VIEW_HEX, CHECKED
         MENUITEM "Desimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktalt\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Oktalt\tF7",                  IDM_VIEW_OCT, CHECKED
         MENUITEM "Binært\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
@@ -395,13 +394,13 @@ BEGIN
         MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "Tegn\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Digital gruppe",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Digital gruppe",              IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Hjelp"
     BEGIN
-        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS Kalkulator",          IDM_HELP_ABOUT
+        MENUITEM "Om ReactOS Kalkulator",       IDM_HELP_ABOUT
     END
 END
 
@@ -409,22 +408,22 @@ IDR_MENU_STANDARD MENU DISCARDABLE
 BEGIN
     POPUP "Rediger"
     BEGIN
-        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
     END
     POPUP "Vis"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "konvertering",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Siffergruppering",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Siffergruppering",            IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Hjelp"
     BEGIN
-        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om Reactos Kalkulator",          IDM_HELP_ABOUT
+        MENUITEM "Om Reactos Kalkulator",       IDM_HELP_ABOUT
     END
 END
 
@@ -437,9 +436,10 @@ BEGIN
     IDS_QUICKHELP           "Rask hjelp"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CONV_ANGLE          "Vinkel"
     IDS_CONV_AREA           "Område"
     IDS_CONV_CONSUMPTION    "Forbruk (maskin)"
     IDS_CONV_CURRENCY       "Valuta"
@@ -448,11 +448,20 @@ BEGIN
     IDS_CONV_POWER          "Strøm"
     IDS_CONV_PRESSURE       "Trykk"
     IDS_CONV_TEMPERATURE    "Temperatur"
+    IDS_CONV_TIME           "Tid"
     IDS_CONV_VELOCITY       "Hastighet"
     IDS_CONV_VOLUME         "Volum"
     IDS_CONV_WEIGHT         "Vekt"
 END
 
+// TYPES OF ANGLES
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_DEGREES       "Grader"
+    IDS_ANGLE_GRADIANS      "Gradianer"
+    IDS_ANGLE_RADIANS       "Radianer"
+END
+
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -507,6 +516,7 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_CZECH_KORUNA       "Tsjekkisk koruna"
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     IDS_CURRENCY_EURO               "Euro"
@@ -526,9 +536,13 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_15_C_CALORIES        "15 °C calories"
+    IDS_ENERGY_BTUS                 "British Thermal Units"
     IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_EVS                  "Electron-Volts"
+    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
     IDS_ENERGY_IT_CALORIES          "International Table calories"
+    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
     IDS_ENERGY_JOULES               "Joules"
     IDS_ENERGY_KILOJOULES           "Kilojoules"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
@@ -566,6 +580,7 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MICRONS              "Microns"
     IDS_LENGTH_MILES                "Miles"
     IDS_LENGTH_MILLIMETERS          "Millimeters"
     IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
@@ -574,6 +589,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -589,6 +605,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
     IDS_POWER_HORSEPOWER            "hestekrefter"
     IDS_POWER_KILOWATTS             "Kilowatt"
     IDS_POWER_MEGAWATTS             "Megawatt"
@@ -600,6 +618,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosfæretrykk"
     IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Pounds-force per square inch"
@@ -614,10 +634,25 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "**"
+    IDS_TIME_HOURS        "**"
+    IDS_TIME_MICROSECONDS "**"
+    IDS_TIME_MILLISECONDS "**"
+    IDS_TIME_MINUTES      "**"
+    IDS_TIME_SECONDS      "**"
+    IDS_TIME_WEEKS        "**"
+    IDS_TIME_YEARS        "**"
+END
+
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
     IDS_VELOCITY_FEET_HOUR          "Feet/time"
+    IDS_VELOCITY_FEET_SECOND        "Feet/second"
     IDS_VELOCITY_KILOMETERS_HOUR    "kilometer/time"
     IDS_VELOCITY_KNOTS              "Knot"
     IDS_VELOCITY_MACH               "Mach"
@@ -664,3 +699,33 @@ BEGIN
     IDS_VOLUME_TO                   "To"
 END
 
+// TYPES OF WEIGHTS
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_WEIGHT_BAHT                 "Baht"
+    IDS_WEIGHT_CARATS               "Carats"
+    IDS_WEIGHT_CHUNG                "Chung"
+    IDS_WEIGHT_DON                  "Don"
+    IDS_WEIGHT_GEUN                 "Geun"
+    IDS_WEIGHT_GRAMS                "Grams"
+    IDS_WEIGHT_GWAN                 "Gwan"
+    IDS_WEIGHT_HARB                 "Harb"
+    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
+    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
+    IDS_WEIGHT_KAN                  "Kan"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
+    IDS_WEIGHT_KIN                  "Kin"
+    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
+    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
+    IDS_WEIGHT_MONME                "Monme"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
+    IDS_WEIGHT_POUNDS               "Pounds"
+    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
+    IDS_WEIGHT_SALOUNG              "Saloung"
+    IDS_WEIGHT_STONES               "Stones"
+    IDS_WEIGHT_TAMLUNG              "Tamlung"
+    IDS_WEIGHT_TONNES               "Tonnes"
+    IDS_WEIGHT_TONS_UK              "Tons (UK)"
+    IDS_WEIGHT_TONS_US              "Tons (US)"
+END
diff --git a/reactos/base/applications/calc/lang/pl-PL.rc b/reactos/base/applications/calc/lang/pl-PL.rc
index 75bc23792a8..df2976f3579 100644
--- a/reactos/base/applications/calc/lang/pl-PL.rc
+++ b/reactos/base/applications/calc/lang/pl-PL.rc
@@ -16,14 +16,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
-                    10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
-                    10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
-                    10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
-                    26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -348,38 +344,37 @@ BEGIN
                     SS_SUNKEN
 END
 
-
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl¹d"
     BEGIN
-        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Szesnastkowo\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dziesiêtnie\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Ósemkowo\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binarnie\tF8",                  IDM_VIEW_BIN, CHECKED
+        MENUITEM "Szesnastkowo\tF5",            IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dziesiêtnie\tF6",             IDM_VIEW_DEC, CHECKED
+        MENUITEM "Ósemkowo\tF7",                IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binarnie\tF8",                IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Stopni\tF2",                 IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radianów\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradianów\tF4",                   IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Stopni\tF2",                  IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radianów\tF3",                IDM_VIEW_RAD, CHECKED
+        MENUITEM "Gradianów\tF4",               IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
     END
 END
 
@@ -387,32 +382,32 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl¹d"
     BEGIN
-        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Szesnastkowo\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dziesiêtnie\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Ósemkowo\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binarnie\tF8",                  IDM_VIEW_BIN, CHECKED
+        MENUITEM "Szesnastkowo\tF5",            IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dziesiêtnie\tF6",             IDM_VIEW_DEC, CHECKED
+        MENUITEM "Ósemkowo\tF7",                IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binarnie\tF8",                IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
         MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
         MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "Bajt\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
     END
 END
 
@@ -420,22 +415,22 @@ IDR_MENU_STANDARD MENU DISCARDABLE
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl¹d"
     BEGIN
-        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
     END
 END
 
@@ -448,9 +443,10 @@ BEGIN
     IDS_QUICKHELP           "Szybka pomoc"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CONV_ANGLE          "K¹t"
     IDS_CONV_AREA           "Powierzchnia"
     IDS_CONV_CONSUMPTION    "Zu¿ycie (silniki)"
     IDS_CONV_CURRENCY       "Waluty"
@@ -459,11 +455,20 @@ BEGIN
     IDS_CONV_POWER          "Moc"
     IDS_CONV_PRESSURE       "Ciœnienie"
     IDS_CONV_TEMPERATURE    "Temperatura"
+    IDS_CONV_TIME           "Czas"
     IDS_CONV_VELOCITY       "Prêdkoœæ"
     IDS_CONV_VOLUME         "Objêtoœæ"
     IDS_CONV_WEIGHT         "Waga"
 END
 
+// TYPES OF ANGLES
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ANGLE_DEGREES       "Stopni"
+    IDS_ANGLE_GRADIANS      "Gradianów"
+    IDS_ANGLE_RADIANS       "Radianów"
+END
+
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -518,6 +523,7 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austriacki szyling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgijski frank"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypryjski funt"
+    IDS_CURRENCY_CZECH_KORUNA       "Czeska korona"
     IDS_CURRENCY_DEUTSCHE_MARK      "Niemiecka marka"
     IDS_CURRENCY_DUTCH_GUILDER      "Holenderki gulden"
     IDS_CURRENCY_EURO               "Euro"
@@ -537,9 +543,13 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^C kalorii"
+    IDS_ENERGY_15_C_CALORIES        "15 °C kalorii"
+    IDS_ENERGY_BTUS                 "British Thermal Unit"
     IDS_ENERGY_ERGS                 "Ergów"
+    IDS_ENERGY_EVS                  "Elektronowolt"
+    IDS_ENERGY_FOOT_POUNDS          "Foot-pound"
     IDS_ENERGY_IT_CALORIES          "Miêdzynarodowa Tablica kalorii"
+    IDS_ENERGY_IT_KILOCALORIES      "Miêdzynarodowa Tablica kilokalorii"
     IDS_ENERGY_JOULES               "D¿uli"
     IDS_ENERGY_KILOJOULES           "Kilod¿uli"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatogodzin"
@@ -577,6 +587,7 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Lat œwietlnych"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Metrów"
+    IDS_LENGTH_MICRONS              "Mikrometrów"
     IDS_LENGTH_MILES                "Mil"
     IDS_LENGTH_MILLIMETERS          "Millimetrów"
     IDS_LENGTH_NAUTICAL_MILES       "Mil morskich"
@@ -585,6 +596,7 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -600,6 +612,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_POWER_BTUS_PER_MINUTE       "BTU na minutê"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-pound na minutê"
     IDS_POWER_HORSEPOWER            "Koni mechanicznych"
     IDS_POWER_KILOWATTS             "Kilowatów"
     IDS_POWER_MEGAWATTS             "Megawatów"
@@ -611,6 +625,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosfer"
     IDS_PRESSURE_BARS               "Barów"
+    IDS_PRESSURE_HECTOPASCALS       "Hektopaskali"
+    IDS_PRESSURE_KILOPASCALS        "Kilopaskali"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimetrów s³upka rtêci"
     IDS_PRESSURE_PASCALS            "Paskali"
     IDS_PRESSURE_PSI                "Funtów na cal kwadratowy"
@@ -625,10 +641,25 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankina"
 END
 
+// TYPES OF TIME
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TIME_DAYS         "Dni"
+    IDS_TIME_HOURS        "Godzin"
+    IDS_TIME_MICROSECONDS "Mikrosekund"
+    IDS_TIME_MILLISECONDS "Milisekund"
+    IDS_TIME_MINUTES      "Minut"
+    IDS_TIME_SECONDS      "Sekund"
+    IDS_TIME_WEEKS        "Tygodni"
+    IDS_TIME_YEARS        "Lat"
+END
+
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_VELOCITY_CMS_SECOND         "Centimetrów/sekundê"
     IDS_VELOCITY_FEET_HOUR          "Stóp/godzinê"
+    IDS_VELOCITY_FEET_SECOND        "Stóp/sekundê"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometrów/godzinê"
     IDS_VELOCITY_KNOTS              "Wêz³ów"
     IDS_VELOCITY_MACH               "Machów"
diff --git a/reactos/base/applications/calc/lang/ru-RU.rc b/reactos/base/applications/calc/lang/ru-RU.rc
index fd593b6ce21..4a5e131a65a 100644
--- a/reactos/base/applications/calc/lang/ru-RU.rc
+++ b/reactos/base/applications/calc/lang/ru-RU.rc
@@ -640,7 +640,7 @@ BEGIN
     IDS_TIME_DAYS         "äåíü"
     IDS_TIME_HOURS        "÷àñ"
     IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà"
-    IDS_TIME_MILISECONDS  "ìèëëèñåêóíäà"
+    IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà"
     IDS_TIME_MINUTES      "ìèíóòà"
     IDS_TIME_SECONDS      "ñåêóíäà"
     IDS_TIME_WEEKS        "íåäåëÿ"
diff --git a/reactos/base/applications/calc/lang/sk-SK.rc b/reactos/base/applications/calc/lang/sk-SK.rc
index dd49dc34e1c..313a6d4e826 100644
--- a/reactos/base/applications/calc/lang/sk-SK.rc
+++ b/reactos/base/applications/calc/lang/sk-SK.rc
@@ -649,7 +649,7 @@ BEGIN
     IDS_TIME_DAYS         "Dni"
     IDS_TIME_HOURS        "Hodiny"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
-    IDS_TIME_MILISECONDS  "Milisekundy"
+    IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minúty"
     IDS_TIME_YEARS        "Roky"
     IDS_TIME_SECONDS      "Sekundy"
diff --git a/reactos/base/applications/calc/lang/th-TH.rc b/reactos/base/applications/calc/lang/th-TH.rc
index 8600b0e576d..df2c96781cf 100644
--- a/reactos/base/applications/calc/lang/th-TH.rc
+++ b/reactos/base/applications/calc/lang/th-TH.rc
@@ -1,6 +1,6 @@
 /*
  *  ReactOS Calc (Thai resource file)
- *  Last modified: 2009-01-27
+ *  Last modified: 2009-02-02
  */
 
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
@@ -645,7 +645,7 @@ BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
     IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILISECONDS  "Miliseconds"
+    IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"
     IDS_TIME_SECONDS      "Seconds"
     IDS_TIME_WEEKS        "Weeks"
diff --git a/reactos/base/applications/calc/lang/uk-UA.rc b/reactos/base/applications/calc/lang/uk-UA.rc
index 08b4c152949..83709d899f8 100644
--- a/reactos/base/applications/calc/lang/uk-UA.rc
+++ b/reactos/base/applications/calc/lang/uk-UA.rc
@@ -648,7 +648,7 @@ BEGIN
     IDS_TIME_DAYS         "äîáà"
     IDS_TIME_HOURS        "ãîäèíà"
     IDS_TIME_MICROSECONDS "ì³êðîñåêóíäà"
-    IDS_TIME_MILISECONDS  "ì³ë³ñåêóíäà"
+    IDS_TIME_MILLISECONDS "ì³ë³ñåêóíäà"
     IDS_TIME_MINUTES      "õâèëèíà"
     IDS_TIME_SECONDS      "ñåêóíäà"
     IDS_TIME_WEEKS        "òèæäåíü"
diff --git a/reactos/base/applications/calc/resource.h b/reactos/base/applications/calc/resource.h
index c061b6b437a..1886cc74109 100644
--- a/reactos/base/applications/calc/resource.h
+++ b/reactos/base/applications/calc/resource.h
@@ -275,7 +275,7 @@
 #define IDS_TIME_DAYS                   3001
 #define IDS_TIME_HOURS                  3002
 #define IDS_TIME_MICROSECONDS           3003
-#define IDS_TIME_MILISECONDS            3004
+#define IDS_TIME_MILLISECONDS           3004
 #define IDS_TIME_MINUTES                3005
 #define IDS_TIME_SECONDS                3006
 #define IDS_TIME_WEEKS                  3007