Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dgorbachev] 39292: Move hack to other place because of bug #4120.
by dgorbachev＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: dgorbachev Date: Mon Feb 2 16:31:54 2009 New Revision: 39292 URL: http://svn.reactos.org/svn/reactos?rev=39292&view=rev Log: Move hack to other place because of bug #4120. Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Feb 2 16:31:54 2009 @@ -224,6 +224,12 @@ if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); + /* HACK HACK HACK */ + TdiCloseDevice( FCB->Connection.Handle, + FCB->Connection.Object ); + TdiCloseDevice( FCB->AddressFile.Handle, + FCB->AddressFile.Object ); + ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); @@ -247,12 +253,6 @@ KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); - - /* HACK HACK HACK */ - TdiCloseDevice( FCB->Connection.Handle, - FCB->Connection.Object ); - TdiCloseDevice( FCB->AddressFile.Handle, - FCB->AddressFile.Object ); FileObject->FsContext = NULL; DestroySocket( FCB );

1 0

[dgorbachev] 39291: Add new strings to translations.
by dgorbachev＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: dgorbachev Date: Mon Feb 2 15:44:31 2009 New Revision: 39291 URL: http://svn.reactos.org/svn/reactos?rev=39291&view=rev Log: Add new strings to translations. Modified: trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/resource.h Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -337,7 +337,7 @@ 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") Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -640,7 +640,7 @@ IDS_TIME_DAYS "Äíè" IDS_TIME_HOURS "×àñè" IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè" - IDS_TIME_MILISECONDS "Ìèëèñåêóíäè" + IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè" IDS_TIME_MINUTES "Ìèíóòè" IDS_TIME_SECONDS "Ñåêóíäè" IDS_TIME_WEEKS "Ñåäìèöè" Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -462,9 +462,9 @@ // 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 @@ // 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -337,7 +337,6 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -451,6 +450,16 @@ 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 @@ 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -436,7 +436,7 @@ IDS_QUICKHELP "Quick help" END -// types of conversion +// Types of conversion STRINGTABLE DISCARDABLE BEGIN IDS_CONV_ANGLE "Ãùíßá" @@ -639,8 +639,8 @@ 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 "ÅâäïìÜäåò" Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -436,7 +436,7 @@ IDS_QUICKHELP "Quick help" END -// types of conversion +// Types of conversion STRINGTABLE DISCARDABLE BEGIN IDS_CONV_ANGLE "Angle" @@ -553,7 +553,7 @@ // 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -14,14 +14,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -346,7 +342,6 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -394,10 +389,10 @@ 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 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 @@ IDS_QUICKHELP "Ayuda rápida" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "Ángulo" IDS_CONV_AREA "Área" IDS_CONV_CONSUMPTION "Consumo (motores)" IDS_CONV_CURRENCY "Monedas" @@ -457,9 +453,18 @@ 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 @@ -516,6 +521,7 @@ 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 @@ // 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 @@ // 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -640,7 +640,7 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -640,7 +640,7 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -348,13 +348,13 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 SEPARATOR - MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_VIEW_GROUP, CHECKED + MENUITEM "ÀÏ¹Ý", IDM_VIEW_STANDARD, CHECKED + MENUITEM "°øÇÐ", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÀüÈ¯", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_VIEW_GROUP, CHECKED END POPUP "µµ¿ò¸»" BEGIN MENUITEM "µµ¿ò¸» Ç×¸ñ", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "ReactOS °è»ê±â Á¤º¸", IDM_HELP_ABOUT + MENUITEM "ReactOS °è»ê±â Á¤º¸", IDM_HELP_ABOUT END END @@ -440,9 +440,10 @@ IDS_QUICKHELP "ºü¸¥ µµ¿ò¸»" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "°¢µµ" IDS_CONV_AREA "Area" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -451,9 +452,18 @@ IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_TIME "°¢µµ" IDS_CONV_VELOCITY "Velocity" IDS_CONV_VOLUME "Volume" IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "Radians" END // TYPES OF AREAS @@ -510,6 +520,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Czech Koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" IDS_CURRENCY_EURO "Euro" @@ -529,9 +540,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 ¡ÆC calories" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "ÀüÀÚº¼Æ®" + 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 @@ // 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -341,7 +337,6 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -441,9 +436,10 @@ IDS_QUICKHELP "Snelle hulp" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "Hoek" IDS_CONV_AREA "Area" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -452,9 +448,18 @@ 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 @@ -511,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Tsjechische kroon" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" IDS_CURRENCY_EURO "Euro" @@ -530,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_BTUS "British thermal units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -309,7 +309,7 @@ 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 @@ 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 SEPARATOR - MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Desimalt\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Oktalt\tF7", IDM_VIEW_OCT, CHECKED + 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 "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 SEPARATOR - MENUITEM "Siffergruppering", IDM_VIEW_GROUP, 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 END POPUP "Hjelp" BEGIN - MENUITEM "Emner i hjelp", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Om ReactOS kalkulator", IDM_HELP_ABOUT + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om ReactOS kalkulator", IDM_HELP_ABOUT END END @@ -376,18 +375,18 @@ 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 SEPARATOR - MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "konvertering", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + 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 @@ 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 SEPARATOR - MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT END END @@ -409,22 +408,22 @@ 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 SEPARATOR - MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "konvertering", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED END POPUP "Hjelp" BEGIN - MENUITEM "Emner i hjelp", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT END END @@ -437,9 +436,10 @@ IDS_QUICKHELP "Rask hjelp" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// 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,9 +448,18 @@ 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 @@ -507,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Tsjekkisk koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" IDS_CURRENCY_EURO "Euro" @@ -526,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" @@ -566,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "Light years" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MICRONS "Microns" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -574,6 +589,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -589,6 +605,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "hestekrefter" IDS_POWER_KILOWATTS "Kilowatt" IDS_POWER_MEGAWATTS "Megawatt" @@ -600,6 +618,8 @@ 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 @@ 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 @@ IDS_VOLUME_TO "To" END +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin (China)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang (China)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Ounces, troy" + IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "Tonnes" + IDS_WEIGHT_TONS_UK "Tons (UK)" + IDS_WEIGHT_TONS_US "Tons (US)" +END Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -16,14 +16,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -348,38 +344,37 @@ 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 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 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 SEPARATOR - MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED + 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 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 SEPARATOR + MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED END POPUP "Pomoc" BEGIN - MENUITEM "Tematy pomocy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT + MENUITEM "Tematy pomocy", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT END END @@ -387,32 +382,32 @@ 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 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 "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 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 SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT + MENUITEM "Tematy pomocy", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT END END @@ -420,22 +415,22 @@ 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 SEPARATOR - MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED + 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 END POPUP "Pomoc" BEGIN - MENUITEM "Tematy pomocy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT + MENUITEM "Tematy pomocy", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT END END @@ -448,9 +443,10 @@ IDS_QUICKHELP "Szybka pomoc" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// 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,9 +455,18 @@ IDS_CONV_POWER "Moc" IDS_CONV_PRESSURE "Cinienie" 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 @@ -518,6 +523,7 @@ 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 @@ // 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -640,7 +640,7 @@ IDS_TIME_DAYS "äåíü" IDS_TIME_HOURS "÷àñ" IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà" - IDS_TIME_MILISECONDS "ìèëëèñåêóíäà" + IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà" IDS_TIME_MINUTES "ìèíóòà" IDS_TIME_SECONDS "ñåêóíäà" IDS_TIME_WEEKS "íåäåëÿ" Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -649,7 +649,7 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -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 @@ 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" Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -648,7 +648,7 @@ IDS_TIME_DAYS "äîáà" IDS_TIME_HOURS "ãîäèíà" IDS_TIME_MICROSECONDS "ì³êðîñåêóíäà" - IDS_TIME_MILISECONDS "ì³ë³ñåêóíäà" + IDS_TIME_MILLISECONDS "ì³ë³ñåêóíäà" IDS_TIME_MINUTES "õâèëèíà" IDS_TIME_SECONDS "ñåêóíäà" IDS_TIME_WEEKS "òèæäåíü" Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Mon Feb 2 15:44:31 2009 @@ -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

1 0

[khornicek] 39290: - sync dinput with wine
by khornicek＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: khornicek Date: Mon Feb 2 15:09:39 2009 New Revision: 39290 URL: http://svn.reactos.org/svn/reactos?rev=39290&view=rev Log: - sync dinput with wine Modified: trunk/reactos/dll/directx/dinput/data_formats.c trunk/reactos/dll/directx/dinput/device.c trunk/reactos/dll/directx/dinput/device_private.h trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dinput/dinput_main.c trunk/reactos/dll/directx/dinput/dinput_private.h trunk/reactos/dll/directx/dinput/effect_linuxinput.c trunk/reactos/dll/directx/dinput/joystick_linux.c trunk/reactos/dll/directx/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/dinput/keyboard.c trunk/reactos/dll/directx/dinput/mouse.c trunk/reactos/dll/directx/dinput/regsvr.c trunk/reactos/dll/directx/dinput/version.rc trunk/reactos/include/psdk/dinput.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dinput/data_formats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/data_fo… Modified: trunk/reactos/dll/directx/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/device.… Modified: trunk/reactos/dll/directx/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/device_… Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… Modified: trunk/reactos/dll/directx/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Modified: trunk/reactos/dll/directx/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Modified: trunk/reactos/dll/directx/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/effect_… Modified: trunk/reactos/dll/directx/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Modified: trunk/reactos/dll/directx/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Modified: trunk/reactos/dll/directx/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/keyboar… Modified: trunk/reactos/dll/directx/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/mouse.c… Modified: trunk/reactos/dll/directx/dinput/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/regsvr.… Modified: trunk/reactos/dll/directx/dinput/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/version… Modified: trunk/reactos/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinput.h?rev=… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[cwittich] 39289: halfplement MmCanFileBeTruncated
by cwittich＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cwittich Date: Mon Feb 2 11:14:24 2009 New Revision: 39289 URL: http://svn.reactos.org/svn/reactos?rev=39289&view=rev Log: halfplement MmCanFileBeTruncated Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Feb 2 11:14:24 2009 @@ -4714,8 +4714,31 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, IN PLARGE_INTEGER NewFileSize) { + + /* Check whether an ImageSectionObject exists */ + if (SectionObjectPointer->ImageSectionObject != NULL) + { + return FALSE; + } + + if (SectionObjectPointer->DataSectionObject != NULL) + { + PMM_SECTION_SEGMENT Segment; + + Segment = (PMM_SECTION_SEGMENT)SectionObjectPointer-> + DataSectionObject; + + if (Segment->ReferenceCount != 0) + { + /* FIXME: check if NewFileSize <= current file size */ + return FALSE; + } + } + + /* FIXME: check for outstanding write probes */ UNIMPLEMENTED; - return (FALSE); + + return FALSE; }

1 0

[cfinck] 39288: Merge 39284
by cfinck＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cfinck Date: Mon Feb 2 07:59:48 2009 New Revision: 39288 URL: http://svn.reactos.org/svn/reactos?rev=39288&view=rev Log: Merge 39284 Modified: branches/ros-branch-0_3_8/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: branches/ros-branch-0_3_8/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_8/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon Feb 2 07:59:48 2009 @@ -503,7 +503,7 @@ HWND hwndDlg; HANDLE hEventLog; EVENTLOGRECORD *pevlr; - DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; + DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; LPWSTR lpSourceName; LPWSTR lpComputerName; LPWSTR lpEventStr;

1 0

[cfinck] 39287: Merge 39274
by cfinck＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cfinck Date: Mon Feb 2 07:55:23 2009 New Revision: 39287 URL: http://svn.reactos.org/svn/reactos?rev=39287&view=rev Log: Merge 39274 Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Feb 2 07:55:23 2009 @@ -170,6 +170,9 @@ { PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; + LPWSTR lpFullEnv = NULL; + LPCWSTR wstr; + SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; @@ -215,7 +218,48 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - /* FIXME: Append variables of Session->Profile->pszEnvironment */ + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) + { + /* Count required size for full environment */ + wstr = (LPCWSTR)lpEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + EnvBlockSize += size; + } + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + ProfileSize += size; + } + + /* Allocate enough memory */ + lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + if (!lpFullEnv) + { + TRACE("HeapAlloc() failed\n"); + goto cleanup; + } + + /* Fill user environment block */ + CopyMemory( + lpFullEnv, + lpEnvironment, + EnvBlockSize * sizeof(WCHAR)); + CopyMemory( + &lpFullEnv[EnvBlockSize], + Session->Profile->pszEnvironment, + ProfileSize * sizeof(WCHAR)); + lpFullEnv[EnvBlockSize + ProfileSize] = UNICODE_NULL; + } + else + { + lpFullEnv = (LPWSTR)lpEnvironment; + } DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -236,7 +280,7 @@ Session->Gina.Context, L"Default", NULL, /* FIXME */ - lpEnvironment)) + lpFullEnv)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -263,6 +307,8 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } + if (lpFullEnv != lpEnvironment) + HeapFree(GetProcessHeap(), 0, lpFullEnv); if (lpEnvironment) DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session);

1 0

[cfinck] 39286: Remove Arabic, add Finnish to match the currently supported languages in RosCMS
by cfinck＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cfinck Date: Mon Feb 2 07:05:50 2009 New Revision: 39286 URL: http://svn.reactos.org/svn/reactos?rev=39286&view=rev Log: Remove Arabic, add Finnish to match the currently supported languages in RosCMS Modified: trunk/web/reactos.org/htdocs/roscms/inc/language_detection.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/language_detection.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/language_detection.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/language_detection.php [iso-8859-1] Mon Feb 2 07:05:50 2009 @@ -5,7 +5,6 @@ switch($lang) { - case 'ar': case 'bg': case 'ca': case 'cz': @@ -14,6 +13,7 @@ case 'el': case 'en': case 'es': + case 'fi': case 'fr': case 'he': case 'hu':

1 0

[dgorbachev] 39285: Hack-close TCP connection. Bug #1283.
by dgorbachev＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: dgorbachev Date: Mon Feb 2 06:28:31 2009 New Revision: 39285 URL: http://svn.reactos.org/svn/reactos?rev=39285&view=rev Log: Hack-close TCP connection. Bug #1283. Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Feb 2 06:28:31 2009 @@ -248,6 +248,12 @@ if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); + /* HACK HACK HACK */ + TdiCloseDevice( FCB->Connection.Handle, + FCB->Connection.Object ); + TdiCloseDevice( FCB->AddressFile.Handle, + FCB->AddressFile.Object ); + FileObject->FsContext = NULL; DestroySocket( FCB );

1 0

[cwittich] 39284: init dwTotalRecords to 0 fixes a crash in case of GetNumberOfEventLogRecords fails
by cwittich＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cwittich Date: Mon Feb 2 02:54:57 2009 New Revision: 39284 URL: http://svn.reactos.org/svn/reactos?rev=39284&view=rev Log: init dwTotalRecords to 0 fixes a crash in case of GetNumberOfEventLogRecords fails Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon Feb 2 02:54:57 2009 @@ -503,7 +503,7 @@ HWND hwndDlg; HANDLE hEventLog; EVENTLOGRECORD *pevlr; - DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; + DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; LPWSTR lpSourceName; LPWSTR lpComputerName; LPWSTR lpEventStr;

1 0

[arty] 39283: Suppress a warning about -1, since wchar_t is typically unsigned.
by arty＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: arty Date: Mon Feb 2 00:19:01 2009 New Revision: 39283 URL: http://svn.reactos.org/svn/reactos?rev=39283&view=rev Log: Suppress a warning about -1, since wchar_t is typically unsigned. Modified: trunk/reactos/tools/utf16le/utf16le.cpp Modified: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Feb 2 00:19:01 2009 @@ -169,7 +169,7 @@ } wchar_t get_wchar_t() { - wchar_t ret = -1; + wchar_t ret = (wchar_t)-1; switch (encoding) { case detect: // if still unknwon

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009