Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[janderwald] 39984: - Fix KSDATAFORMAT_WAVEFORMATEX & KSDATAFORMAT_DSOUND alignment
by janderwald＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: janderwald Date: Thu Mar 12 20:51:28 2009 New Revision: 39984 URL: http://svn.reactos.org/svn/reactos?rev=39984&view=rev Log: - Fix KSDATAFORMAT_WAVEFORMATEX & KSDATAFORMAT_DSOUND alignment Modified: trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Thu Mar 12 20:51:28 2009 @@ -300,6 +300,9 @@ */ //#if defined(_INC_MMREG) +#if !defined( PACK_PRAGMAS_NOT_SUPPORTED ) +#include <pshpack1.h> +#endif typedef struct { KSDATAFORMAT DataFormat; WAVEFORMATEX WaveFormatEx; @@ -315,6 +318,10 @@ KSDATAFORMAT DataFormat; KSDSOUND_BUFFERDESC BufferDesc; } KSDATAFORMAT_DSOUND, *PKSDATAFORMAT_DSOUND; + +#if !defined( PACK_PRAGMAS_NOT_SUPPORTED ) +#include <poppack.h> +#endif //#endif

1 0

[fireball] 39983: - Remove two unnecessary boot types (Windows2000 and WindowsXP), and add ReactOSSetup2 type for WinLdr-style setup loader. - Add a stub for LoadReactOSSetup2().
by fireball＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: fireball Date: Thu Mar 12 17:42:02 2009 New Revision: 39983 URL: http://svn.reactos.org/svn/reactos?rev=39983&view=rev Log: - Remove two unnecessary boot types (Windows2000 and WindowsXP), and add ReactOSSetup2 type for WinLdr-style setup loader. - Add a stub for LoadReactOSSetup2(). Added: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Thu Mar 12 17:42:02 2009 @@ -116,25 +116,22 @@ LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } #ifdef FREELDR_REACTOS_SETUP - else if (_stricmp(SettingValue, "ReactOSSetup") == 0) - { - // In future we could pass the selected OS details through this - // to have different install methods, etc. - LoadReactOSSetup(); - } + else if (_stricmp(SettingValue, "ReactOSSetup") == 0) + { + // In future we could pass the selected OS details through this + // to have different install methods, etc. + LoadReactOSSetup(); + } + else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) + { + // WinLdr-style boot + LoadReactOSSetup2(); + } #endif #ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4); - } - else if (_stricmp(SettingValue, "Windows2000") == 0) - { - LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_WIN2K); - } - else if (_stricmp(SettingValue, "WindowsXP") == 0) - { - LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_WINXP); } else if (_stricmp(SettingValue, "Windows2003") == 0) { Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Thu Mar 12 17:42:02 2009 @@ -123,5 +123,6 @@ /* Special hack for ReactOS setup OS type */ VOID LoadReactOSSetup(VOID); +VOID LoadReactOSSetup2(VOID); #endif // defined __FREELDR_H Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Mar 12 17:42:02 2009 @@ -15,6 +15,9 @@ <file>inffile.c</file> </directory> <directory name="reactos"> - <file>setupldr.c</file> + <file>setupldr.c</file> + </directory> + <directory name="windows"> + <file>setupldr2.c</file> </directory> </module> Added: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Thu Mar 12 17:42:02 2009 @@ -1,0 +1,29 @@ +/* + * FreeLoader + * + * Copyright (C) 2009 Aleksey Bragin <aleksey(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <freeldr.h> + +#include <ndk/ldrtypes.h> +#include <debug.h> + +VOID LoadReactOSSetup2(VOID) +{ +} + Propchange: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 39982: - Don't use a tag if there is none assigned - Fixes a crash in es1370mp driver
by janderwald＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: janderwald Date: Thu Mar 12 17:01:56 2009 New Revision: 39982 URL: http://svn.reactos.org/svn/reactos?rev=39982&view=rev Log: - Don't use a tag if there is none assigned - Fixes a crash in es1370mp driver Modified: trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Thu Mar 12 17:01:56 2009 @@ -35,7 +35,7 @@ return STATUS_INVALID_PARAMETER; } - KsWorker = ExAllocatePoolWithTag(NonPagedPool, sizeof(KS_WORKER), 0); + KsWorker = ExAllocatePool(NonPagedPool, sizeof(KS_WORKER)); if (!KsWorker) return STATUS_INSUFFICIENT_RESOURCES; @@ -80,7 +80,7 @@ KeReleaseSpinLock(&KsWorker->Lock, OldIrql); } - ExFreePoolWithTag(KsWorker, 0); + ExFreePool(KsWorker); } /*

1 0

[mkupfer] 39981: - fix some German dialog ressources (2nd attempt)
by mkupfer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: mkupfer Date: Thu Mar 12 16:43:33 2009 New Revision: 39981 URL: http://svn.reactos.org/svn/reactos?rev=39981&view=rev Log: - fix some German dialog ressources (2nd attempt) Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] Thu Mar 12 16:43:33 2009 @@ -83,7 +83,7 @@ CONTROL "&Symbol in der Taskleiste anzeigen",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,200,10 CONTROL "&Kennwort beim Reaktivieren aus dem Standbymodus anfordern",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,55,210,10 + WS_TABSTOP,15,55,220,10 CONTROL "&Helligkeit der Anzeige beim Batteriebetrieb verringern",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,200,10 GROUPBOX "Netzschaltervorgänge",-1,5,100,240,105 Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] Thu Mar 12 16:43:33 2009 @@ -15,7 +15,7 @@ CONTROL "Treiber automatisch installieren",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Treiber von einer bestimmten Position installieren",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,120,133,170,14 + "Button",BS_AUTORADIOBUTTON,120,133,180,14 END IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193

1 0

[mkupfer] 39980: - use symbolic names instead of numeric values (made for English and German, other languages needs to change)
by mkupfer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: mkupfer Date: Thu Mar 12 16:27:26 2009 New Revision: 39980 URL: http://svn.reactos.org/svn/reactos?rev=39980&view=rev Log: - use symbolic names instead of numeric values (made for English and German, other languages needs to change) Modified: trunk/reactos/dll/win32/user32/lang/de-DE.rc trunk/reactos/dll/win32/user32/lang/en-US.rc Modified: trunk/reactos/dll/win32/user32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/de-DE.rc [iso-8859-1] Thu Mar 12 16:27:26 2009 @@ -41,13 +41,13 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN - MENUITEM "&Wiederherstellen", 61728 - MENUITEM "&Verschieben", 61456 - MENUITEM "&Größe", 61440 - MENUITEM "Mi&nimieren", 61472 - MENUITEM "Ma&ximieren", 61488 + MENUITEM "&Wiederherstellen", SC_RESTORE + MENUITEM "&Verschieben", SC_MOVE + MENUITEM "&Größe", SC_SIZE + MENUITEM "Mi&nimieren", SC_MINIMIZE + MENUITEM "Ma&ximieren", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "S&chließen\tAlt-F4", 61536 + MENUITEM "S&chließen\tAlt-F4", SC_CLOSE END ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/dll/win32/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/en-US.rc [iso-8859-1] Thu Mar 12 16:27:26 2009 @@ -39,13 +39,13 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN - MENUITEM "&Restore", 61728 - MENUITEM "&Move", 61456 - MENUITEM "&Size", 61440 - MENUITEM "Mi&nimize", 61472 - MENUITEM "Ma&ximize", 61488 + MENUITEM "&Restore", SC_RESTORE + MENUITEM "&Move", SC_MOVE + MENUITEM "&Size", SC_SIZE + MENUITEM "Mi&nimize", SC_MINIMIZE + MENUITEM "Ma&ximize", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Close\tAlt-F4", 61536 + MENUITEM "&Close\tAlt-F4", SC_CLOSE END /////////////////////////////////////////////////////////////////////////////

1 0

[dgorbachev] 39979: Dutch translation, Jan Roeloffzen, bug #4263.
by dgorbachev＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: dgorbachev Date: Thu Mar 12 15:35:27 2009 New Revision: 39979 URL: http://svn.reactos.org/svn/reactos?rev=39979&view=rev Log: Dutch translation, Jan Roeloffzen, bug #4263. Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc 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] Thu Mar 12 15:35:27 2009 @@ -151,7 +151,7 @@ BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "BACKSPACE",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + PUSHBUTTON "Terug",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, WS_EX_CLIENTEDGE @@ -227,25 +227,25 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "ReactOS Rekenmachine" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Converteren",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Categorie:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Converteren van:",IDC_STATIC,4,49,66,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Converteren naar:",IDC_STATIC,4,76,66,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 - CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + CONTROL "Terug",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, 40,17 RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, @@ -367,7 +367,7 @@ BEGIN MENUITEM "Help-onderwerpen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Info", IDM_HELP_ABOUT + MENUITEM "Over ReactOS Calc", IDM_HELP_ABOUT END END @@ -382,7 +382,7 @@ BEGIN MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Omzetten", IDM_VIEW_CONVERSION + MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED MENUITEM "Decimaal\tF6", IDM_VIEW_DEC, CHECKED @@ -398,9 +398,9 @@ END POPUP "Help" BEGIN - MENUITEM "Help-onderpwerpen", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Info", IDM_HELP_ABOUT + MENUITEM "Help-onderwerpen", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Over ReactOS Calc", IDM_HELP_ABOUT END END @@ -415,7 +415,7 @@ BEGIN MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Omzetten", IDM_VIEW_CONVERSION + MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED END @@ -423,7 +423,7 @@ BEGIN MENUITEM "Help-onderwerpen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Info", IDM_HELP_ABOUT + MENUITEM "Over ReactOS Calc", IDM_HELP_ABOUT END END @@ -431,7 +431,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de GNU GPL licentie vier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Fout" IDS_QUICKHELP "Snelle hulp" END @@ -440,18 +440,18 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CONV_ANGLE "Hoek" - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_AREA "Oppervlakte" + IDS_CONV_CONSUMPTION "Verbruik (motoren)" + IDS_CONV_CURRENCY "Valuta" + IDS_CONV_ENERGY "Energie" + IDS_CONV_LENGTH "Lengte" + IDS_CONV_POWER "Vermogen" + IDS_CONV_PRESSURE "Druk" + IDS_CONV_TEMPERATURE "Temperatuur" IDS_CONV_TIME "Tijd" - IDS_CONV_VELOCITY "Velocity" + IDS_CONV_VELOCITY "Snelheid" IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_WEIGHT "Gewicht" END // TYPES OF ANGLES @@ -482,21 +482,21 @@ IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_SQUARE_CENTIMETERS "Vierkante centimeters" + IDS_AREA_SQUARE_CHR "Vierkante chr" + IDS_AREA_SQUARE_FATHOMS "Vierkante fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Vierkante fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "Vierkante feet" + IDS_AREA_SQUARE_INCHES "Vierkante inches" + IDS_AREA_SQUARE_KILOMETERS "Vierkante kilometers" + IDS_AREA_SQUARE_LAR "Vierkante lar" + IDS_AREA_SQUARE_METER "Vierkante meter" + IDS_AREA_SQUARE_MILES "Vierkante miles" + IDS_AREA_SQUARE_MILLIMETERS "Vierkante millimeters" + IDS_AREA_SQUARE_SHAKU "Vierkante shaku" + IDS_AREA_SQUARE_TSUEN "Vierkante tsuen" + IDS_AREA_SQUARE_VA "Vierkante va" + IDS_AREA_SQUARE_YARD "Vierkante yard" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -504,8 +504,8 @@ // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" + IDS_CONSUMPTION_KM_PER_L "Kilometers/liter" + IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometer" IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" END @@ -513,41 +513,41 @@ // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Oostenrijkse schilling" + IDS_CURRENCY_BELGIAN_FRANC "Belgische franc" + IDS_CURRENCY_CYPRIOT_POUND "Cypriotische pound" IDS_CURRENCY_CZECH_KORUNA "Tsjechische kroon" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_DEUTSCHE_MARK "Duitse Mark" + IDS_CURRENCY_DUTCH_GUILDER "Nederlandse gulden" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" + IDS_CURRENCY_FINNISH_MARKKA "Finse markka" + IDS_CURRENCY_FRENCH_FRANC "Franse franc" + IDS_CURRENCY_GREEK_DRACHMA "Griekse Drachma" + IDS_CURRENCY_IRISH_POUND "Ierse pound" + IDS_CURRENCY_ITALIAN_LIRA "Italiaanse lira" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_SLOVENIAN_TOLAR "Sloveense tolar" + IDS_CURRENCY_SPANISH_PESETA "Spaanse peseta" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_15_C_CALORIES "15 °C calorieën" 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_EVS "Elektronvolts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_IT_CALORIES "International Table calorieën" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalorieën" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt uur" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calorieën" + IDS_ENERGY_TH_CALORIES "Thermochemical calorieën" END // TYPES OF LENGTHS @@ -577,10 +577,10 @@ IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KILOMETERS "Kilometers" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "Lichtjaren" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MICRONS "Microns" + IDS_LENGTH_MICRONS "Micrometers" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -605,8 +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_BTUS_PER_MINUTE "British Thermal Units per minuut" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minuut" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" IDS_POWER_MEGAWATTS "Megawatts" @@ -616,13 +616,13 @@ // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" + IDS_PRESSURE_ATMOSPHERES "Atmosfeer" IDS_PRESSURE_BARS "Bars" IDS_PRESSURE_HECTOPASCALS "Hectopascals" IDS_PRESSURE_KILOPASCALS "Kilopascals" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_MM_OF_MERCURY "Millimeters kwik" IDS_PRESSURE_PASCALS "Pascals" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_PSI "Pounds-force per vierkante inch" END // TYPES OF TEMPERATURES @@ -637,27 +637,27 @@ // 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 "**" + IDS_TIME_DAYS "Dagen" + IDS_TIME_HOURS "Uren" + IDS_TIME_MICROSECONDS "Microseconden" + IDS_TIME_MILLISECONDS "Milliseconden" + IDS_TIME_MINUTES "Minuten" + IDS_TIME_SECONDS "Seconden" + IDS_TIME_WEEKS "Weken" + IDS_TIME_YEARS "Jaren" 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_CMS_SECOND "Centimeters/uur" + IDS_VELOCITY_FEET_HOUR "Feet/uur" + IDS_VELOCITY_FEET_SECOND "Feet/seconde" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/uur" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_METERS_SECOND "Meters/seconde" + IDS_VELOCITY_MILES_HOUR "Miles/uur" END // TYPES OF VOLUMES @@ -668,11 +668,11 @@ IDS_VOLUME_BUN "Bun" IDS_VOLUME_BUSHELS_UK "Bushels (UK)" IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_CUBIC_CENTIMETERS "Kubieke centimeters" + IDS_VOLUME_CUBIC_FEET "Kubieke feet" + IDS_VOLUME_CUBIC_INCHES "Kubieke inches" + IDS_VOLUME_CUBIC_METERS "Kubieke meters" + IDS_VOLUME_CUBIC_YARDS "Kubieke yards" IDS_VOLUME_DOE "Doe" IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" @@ -707,13 +707,13 @@ IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GRAMS "Grammen" 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_KILOGRAMS "Kilogrammen" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"

1 0

[fireball] 39978: - Unhack usb mouse driver after endpoint parsing code was corrected. - Cleanup usb mouse driver source code, make its structure similar to the usb keyboard driver.
by fireball＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: fireball Date: Thu Mar 12 14:29:09 2009 New Revision: 39978 URL: http://svn.reactos.org/svn/reactos?rev=39978&view=rev Log: - Unhack usb mouse driver after endpoint parsing code was corrected. - Cleanup usb mouse driver source code, make its structure similar to the usb keyboard driver. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] Thu Mar 12 14:29:09 2009 @@ -7,21 +7,12 @@ */ #include "usbdriver.h" -#include "kbdmou.h" - -/* Data for embedded drivers */ -CONNECT_DATA MouseClassInformation; - -PDEVICE_OBJECT MouseFdo = NULL; - BOOLEAN mouse_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); VOID mouse_irq(PURB purb, PVOID pcontext); -static NTSTATUS -MouseCreateDevice(IN PDRIVER_OBJECT DriverObject); - +static NTSTATUS MouseCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PMOUSE_DRVR_EXTENSION DriverExtension); BOOLEAN mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) @@ -61,11 +52,8 @@ pdriver->disp_tbl.dev_stop = mouse_stop; pdriver->disp_tbl.dev_reserved = NULL; - // Zero out the class information structure - RtlZeroMemory(&MouseClassInformation, sizeof(CONNECT_DATA)); - // Create the device - MouseCreateDevice(dev_mgr->usb_driver_obj); + MouseCreateDevice(dev_mgr->usb_driver_obj, pdrvr_ext); usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): mouse driver is initialized\n")); return TRUE; @@ -118,69 +106,13 @@ return FALSE; } - // Endpoint-finding code - if (param->if_desc) - { - // Get a pointer to the config packet from compdev - PUCHAR Buffer = (PUCHAR)param->if_desc; - ULONG Offset = 0; - BOOLEAN FoundEndpoint = FALSE; - - // Find our the only needed endpoint descriptor - while (Offset < 512) - { - pendp_desc = (PUSB_ENDPOINT_DESC)&Buffer[Offset]; - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): DescType=0x%x, Attrs=0x%x, Len=%d\n", - pendp_desc->bDescriptorType, pendp_desc->bmAttributes, pendp_desc->bLength)); - - if (pendp_desc->bDescriptorType == USB_DT_ENDPOINT && - pendp_desc->bLength == sizeof(USB_ENDPOINT_DESC)) - { - // Found it - FoundEndpoint = TRUE; - break; - } - - Offset += pendp_desc->bLength; - } - - if (!FoundEndpoint) - return FALSE; - - // FIXME: Check if it's INT endpoint - // (pendp_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) - - // endpoint must be IN - if ((pendp_desc->bEndpointAddress & USB_DIR_IN) == 0) - return FALSE; - } - - - // Endpoint descriptor substitution code - { - ULONG if_idx, endp_idx; - PUSB_ENDPOINT pendp; - - //FoundEndpoint = FALSE; - for(if_idx = 0; if_idx < MAX_INTERFACES_PER_CONFIG /*pdev->usb_config->if_count*/; if_idx++) - { - for(endp_idx = 0; endp_idx < MAX_ENDPS_PER_IF /*pdev->usb_config->interf[if_idx].endp_count*/; endp_idx++) - { - pendp = &pdev->usb_config->interf[if_idx].endp[endp_idx]; - - if (pendp->pusb_endp_desc != NULL) - { - //HACKHACK: for some reason this usb driver chooses different and completely wrong - // endpoint. Since I don't have time to research this, I just find the - // endpoint descriptor myself and copy it - memcpy(pendp->pusb_endp_desc, pendp_desc, pendp_desc->bLength); - - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): [%i][%i] DescType=0x%x, Attrs=0x%x, Len=%d\n",if_idx, endp_idx, - pendp->pusb_endp_desc->bDescriptorType, pendp->pusb_endp_desc->bmAttributes, pendp->pusb_endp_desc->bLength)); - } - } - } - } + // Get pointer to the endpoint descriptor + pendp_desc = pdev->usb_config->interf[0].endp[0].pusb_endp_desc; + + // Store max packet size + MaxPacketSize = pendp_desc->wMaxPacketSize; + if (MaxPacketSize > 8) + MaxPacketSize = 8; // Unlock USB Device usb_unlock_dev(pdev); @@ -190,10 +122,6 @@ if (purb == NULL) return FALSE; RtlZeroMemory(purb, sizeof(URB)); - - MaxPacketSize = pendp_desc->wMaxPacketSize; - if (MaxPacketSize > 8) - MaxPacketSize = 8; // Build a URB for our interrupt transfer UsbBuildInterruptOrBulkTransferRequest(purb, @@ -201,7 +129,7 @@ (PUCHAR)&pdev_ext->mouse_data, MaxPacketSize, //use max packet size mouse_irq, - pdev_ext, + pdev_ext->device_ext, 0); // Call USB driver stack @@ -221,8 +149,9 @@ MOUSE_INPUT_DATA MouseInputData; ULONG InputDataConsumed; NTSTATUS status; - PMOUSE_DRVR_EXTENSION pdev_ext = (PMOUSE_DRVR_EXTENSION)pcontext; - signed char *data = pdev_ext->mouse_data; + PMOUSE_DRVR_EXTENSION pdev_ext; + PMOUSE_DEVICE_EXTENSION DeviceExtension = (PMOUSE_DEVICE_EXTENSION)pcontext; + signed char *data; usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): called\n")); ASSERT(purb); @@ -230,8 +159,11 @@ if (purb->status != STATUS_SUCCESS) { usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): purb->status 0x%08X\n", purb->status)); - //return; - } + return; + } + + pdev_ext = DeviceExtension->DriverExtension; + data = pdev_ext->mouse_data; usb_dbg_print(DBGLVL_MAXIMUM, ("Mouse input: x %d, y %d, w %d, btn: 0x%02x\n", data[1], data[2], data[3], data[0])); @@ -275,13 +207,13 @@ } // Commit the input data somewhere... - if (MouseClassInformation.ClassService) + if (DeviceExtension->ConnectData.ClassService) { KIRQL OldIrql; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (*(PSERVICE_CALLBACK_ROUTINE)MouseClassInformation.ClassService)( - MouseClassInformation.ClassDeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ConnectData.ClassService)( + DeviceExtension->ConnectData.ClassDeviceObject, &MouseInputData, (&MouseInputData)+1, &InputDataConsumed); @@ -339,12 +271,15 @@ MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PMOUSE_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n", DeviceObject, IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode)); - if (DeviceObject == MouseFdo) + if (DeviceObject == DeviceExtension->Fdo) { // it's mouse's IOCTL PIO_STACK_LOCATION Stk; @@ -363,7 +298,7 @@ goto intcontfailure2; } - RtlCopyMemory(&MouseClassInformation, + RtlCopyMemory(&DeviceExtension->ConnectData, Stk->Parameters.DeviceIoControl.Type3InputBuffer, sizeof(CONNECT_DATA)); @@ -437,10 +372,10 @@ } static NTSTATUS -MouseCreateDevice(IN PDRIVER_OBJECT DriverObject) +MouseCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PMOUSE_DRVR_EXTENSION DriverExtension) { UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerPortUSB"); - PDEVEXT_HEADER DeviceExtension; + PMOUSE_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT Fdo; NTSTATUS Status; @@ -452,7 +387,7 @@ } Status = IoCreateDevice(DriverObject, - sizeof(DEVEXT_HEADER), + sizeof(MOUSE_DEVICE_EXTENSION), &DeviceName, FILE_DEVICE_MOUSE, FILE_DEVICE_SECURE_OPEN, @@ -464,12 +399,14 @@ usb_dbg_print(DBGLVL_MINIMUM, ("IoCreateDevice() for usb mouse driver failed with status 0x%08lx\n", Status)); return Status; } - DeviceExtension = (PDEVEXT_HEADER)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(DEVEXT_HEADER)); - - DeviceExtension->dispatch = MouseDispatch; - - MouseFdo = Fdo; + DeviceExtension = (PMOUSE_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(MOUSE_DEVICE_EXTENSION)); + + DeviceExtension->hdr.dispatch = MouseDispatch; + DeviceExtension->DriverExtension = DriverExtension; + DriverExtension->device_ext = DeviceExtension; + + DeviceExtension->Fdo = Fdo; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; usb_dbg_print(DBGLVL_MEDIUM, ("Created mouse Fdo: %p\n", Fdo)); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h [iso-8859-1] Thu Mar 12 14:29:09 2009 @@ -1,18 +1,26 @@ #ifndef __MOUSE_H__ #define __MOUSE_H__ +#include "kbdmou.h" + typedef struct _MOUSE_DRVR_EXTENSION { - //INTERRUPT_DATA_BLOCK idb; PUSB_INTERFACE_DESC pif_desc; - UCHAR if_idx, out_endp_idx, in_endp_idx, int_endp_idx; - PUSB_ENDPOINT_DESC pout_endp_desc, pin_endp_desc, pint_endp_desc; PUSB_DEV_MANAGER dev_mgr; signed char mouse_data[8]; UCHAR btn_old; + + struct _MOUSE_DEVICE_EXTENSION *device_ext; // back pointer } MOUSE_DRVR_EXTENSION, *PMOUSE_DRVR_EXTENSION; +typedef struct _MOUSE_DEVICE_EXTENSION +{ + DEVEXT_HEADER hdr; // mandatory header + PMOUSE_DRVR_EXTENSION DriverExtension; + CONNECT_DATA ConnectData; + PDEVICE_OBJECT Fdo; +} MOUSE_DEVICE_EXTENSION, *PMOUSE_DEVICE_EXTENSION; BOOLEAN mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);

1 0

[dreimer] 39977: Bug 4255: ReactOS norwegian translate files by Lars Martin Hambro
by dreimer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: dreimer Date: Thu Mar 12 14:28:33 2009 New Revision: 39977 URL: http://svn.reactos.org/svn/reactos?rev=39977&view=rev Log: Bug 4255: ReactOS norwegian translate files by Lars Martin Hambro Added: trunk/reactos/base/applications/mplay32/lang/no-NO.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/msconfig/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/shell/explorer/explorer-no.rc 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] Thu Mar 12 14:28:33 2009 @@ -168,7 +168,7 @@ BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Tibake",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + PUSHBUTTON "Tilbake",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, WS_EX_CLIENTEDGE @@ -305,13 +305,13 @@ IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Om ReactOS kalkulator" +CAPTION "Om ReactOS Kalkulator" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 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, + LTEXT "ReactOS Kalkulator",IDC_STATIC,120,12,132,8, SS_CENTERIMAGE LTEXT "Versjon ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE LTEXT "Laget av Carlo Bramini",IDC_STATIC,120,32,132,8, @@ -367,7 +367,7 @@ BEGIN 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 @@ -415,7 +415,7 @@ BEGIN MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "konvertering", IDM_VIEW_CONVERSION + MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED END @@ -431,7 +431,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "ReactOS kalkulator er gratis programvare utgitt under GNU GPL lisensen.\r\n\r\nDu kan få en kopi av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan også få en oversettelse av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_STRING_LICENSE "ReactOS Kalkulator er gratis programvare utgitt under GNU GPL lisensen.\r\n\r\nDu kan få en kopi av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan også få en oversettelse av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Feil" IDS_QUICKHELP "Rask hjelp" END @@ -466,7 +466,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" + IDS_AREA_ACRES_BRAZIL "Acres (Brasil)" IDS_AREA_ACRES_FRANCE "Acres (France)" IDS_AREA_ACRES_SCOTS "Acres (Scots)" IDS_AREA_ACRES_US "Acres (US)" @@ -482,21 +482,21 @@ IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_SQUARE_CENTIMETERS "Kvadrat centimeter" + IDS_AREA_SQUARE_CHR "Kvadrat chr" + IDS_AREA_SQUARE_FATHOMS "Kvadrat fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Kvadrat fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "Kvadrat feet" + IDS_AREA_SQUARE_INCHES "Kvadrat tommer" + IDS_AREA_SQUARE_KILOMETERS "Kvadrat kilometer" + IDS_AREA_SQUARE_LAR "kvadrat lar" + IDS_AREA_SQUARE_METER "Kvadrat meter" + IDS_AREA_SQUARE_MILES "Kvadrat mil" + IDS_AREA_SQUARE_MILLIMETERS "Kvadrat millimeter" + IDS_AREA_SQUARE_SHAKU "Kvadrat shaku" + IDS_AREA_SQUARE_TSUEN "Kvadrat tsuen" + IDS_AREA_SQUARE_VA "Kvadrat va" + IDS_AREA_SQUARE_YARD "Kvadrat yard" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -505,49 +505,49 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + IDS_CONSUMPTION_L_PER_100_KM "Liter/100 kilometer" + IDS_CONSUMPTION_MILES_GALLON_UK "Mil/gallon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Mil/gallon (US)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Østerriksk schilling" + IDS_CURRENCY_BELGIAN_FRANC "Belgisk franc" + IDS_CURRENCY_CYPRIOT_POUND "Kypriotisk pound" IDS_CURRENCY_CZECH_KORUNA "Tsjekkisk koruna" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_DEUTSCHE_MARK "Tusk Mark" + IDS_CURRENCY_DUTCH_GUILDER "Nederlansk guilder" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_FINNISH_MARKKA "Finisk markka" + IDS_CURRENCY_FRENCH_FRANC "Fransk franc" + IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma" + IDS_CURRENCY_IRISH_POUND "Irisk pound" + IDS_CURRENCY_ITALIAN_LIRA "Italiask lira" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovansk koruna" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenansk tolar" + IDS_CURRENCY_SPANISH_PESETA "Spansk peseta" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN IDS_ENERGY_15_C_CALORIES "15 °C calories" - IDS_ENERGY_BTUS "British Thermal Units" + IDS_ENERGY_BTUS "Britisk varme-enhet" IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_EVS "Electron-Volts" - IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_EVS "Elektrisk-Volt" + IDS_ENERGY_FOOT_POUNDS "Fot-Pound" IDS_ENERGY_IT_CALORIES "International Table calories" IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt timer" + IDS_ENERGY_NUTRITION_CALORIES "Ernæring kalori" + IDS_ENERGY_TH_CALORIES "Termokjemisk kalori" END // TYPES OF LENGTHS @@ -556,34 +556,34 @@ IDS_LENGTH_ANGSTROMS "Angstroms" IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_CENTIMETERS "Centimeter" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Ungarn)" IDS_LENGTH_FEET "Feet" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" IDS_LENGTH_HANDS "Hands" IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_INCHES "Tomme" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_KILOMETERS "Kilometer" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" - IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_LIGHT_YEARS "Lysende år" + IDS_LENGTH_LINKS_UK "Linker (UK)" IDS_LENGTH_METERS "Meters" IDS_LENGTH_MICRONS "Microns" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_MILES "Mil" + IDS_LENGTH_MILLIMETERS "Millimeter" + IDS_LENGTH_NAUTICAL_MILES "Nautisk mil" IDS_LENGTH_NIEU "Nieu" IDS_LENGTH_PARSECS "Parsecs" IDS_LENGTH_PICAS "Picas" @@ -605,9 +605,9 @@ // 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_BTUS_PER_MINUTE "Britisk varme-enhet per minutt" + IDS_POWER_FPS_PER_MINUTE "Fot-pund per minutt" + IDS_POWER_HORSEPOWER "Hestekrefter" IDS_POWER_KILOWATTS "Kilowatt" IDS_POWER_MEGAWATTS "Megawatt" IDS_POWER_WATTS "Watt" @@ -650,14 +650,14 @@ // 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_CMS_SECOND "Centimeter/timer" + IDS_VELOCITY_FEET_HOUR "Fot/timer" + IDS_VELOCITY_FEET_SECOND "Fot/sekund" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometer/timer" IDS_VELOCITY_KNOTS "Knot" IDS_VELOCITY_MACH "Mach" IDS_VELOCITY_METERS_SECOND "Meter/sekunder" - IDS_VELOCITY_MILES_HOUR "Mil/time" + IDS_VELOCITY_MILES_HOUR "Mil/timer" END // TYPES OF VOLUMES @@ -668,11 +668,11 @@ IDS_VOLUME_BUN "Bun" IDS_VOLUME_BUSHELS_UK "Bushels (UK)" IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_CUBIC_CENTIMETERS "Kubisk centimeter" + IDS_VOLUME_CUBIC_FEET "Kubisk fot" + IDS_VOLUME_CUBIC_INCHES "Kubisk tomme" + IDS_VOLUME_CUBIC_METERS "Kubisk meter" + IDS_VOLUME_CUBIC_YARDS "Kubisk yards" IDS_VOLUME_DOE "Doe" IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" @@ -683,9 +683,9 @@ IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_LITERS "Liter" IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Milliliters" + IDS_VOLUME_MILLILITERS "Milliliter" IDS_VOLUME_PINTS_UK "Pints (UK)" IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" @@ -707,16 +707,16 @@ IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GRAMS "Gram" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" - IDS_WEIGHT_JIN_CHINA "Jin (China)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_JIN_CHINA "Jin (Kina)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwaner)" IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KILOGRAMS "Kilogram" IDS_WEIGHT_KIN "Kin" - IDS_WEIGHT_LIANG_CHINA "Liang (China)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIANG_CHINA "Liang (Kina)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwaner)" IDS_WEIGHT_MONME "Monme" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" IDS_WEIGHT_OUNCES_TROY "Ounces, troy" Added: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc (added) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Thu Mar 12 14:28:33 2009 @@ -1,0 +1,29 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Åpne...", IDM_OPEN_FILE + MENUITEM "&Lukk", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "&Avslutt", IDM_EXIT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Alle kompaktible filer (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Spill av" + IDS_TOOLTIP_STOP "Stopp" + IDS_TOOLTIP_EJECT "Løs ut" + IDS_TOOLTIP_BACKWARD "Spole tilbake" + IDS_TOOLTIP_SEEKBACK "Søke tilbake" + IDS_TOOLTIP_SEEKFORW "Søke fremover" + IDS_TOOLTIP_FORWARD "Spole fremover" + IDS_APPTITLE "ReactOS Multimedia avspiller" +END Propchange: trunk/reactos/base/applications/mplay32/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Thu Mar 12 14:28:33 2009 @@ -6,6 +6,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/msconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/no-NO.rc [iso-8859-1] Thu Mar 12 14:28:33 2009 @@ -143,7 +143,7 @@ IDS_TOOLS_COLUMN_NAME "Navn" IDS_TOOLS_COLUMN_DESCR "Beskrivelse" - IDS_TOOLS_CMD_NAME "ledertekst" + IDS_TOOLS_CMD_NAME "Ledertekst" IDS_TOOLS_CMD_DESCR "" IDS_TOOLS_CMD_CMD "cmd.exe" @@ -151,8 +151,8 @@ IDS_TOOLS_INFO_DESCR "Vis versjon informasjon." IDS_TOOLS_INFO_CMD "winver.exe" - IDS_TOOLS_REGEDIT_NAME "Register-Editor" - IDS_TOOLS_REGEDIT_DESCR "Åpne Register-Editor." + IDS_TOOLS_REGEDIT_NAME "Registerredigering" + IDS_TOOLS_REGEDIT_DESCR "Åpne registerredigering." IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "System egenskaper" @@ -161,7 +161,7 @@ IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" - IDS_STARTUP_COLUMN_CMD "kommando" + IDS_STARTUP_COLUMN_CMD "Kommando" IDS_STARTUP_COLUMN_PATH "Plassering" END Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] Thu Mar 12 14:28:33 2009 @@ -49,7 +49,7 @@ MENUITEM "&Lagre\tCtrl+S", CMD_SAVE MENUITEM "Lagre &som...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Side &Innstillinger...", CMD_PAGE_SETUP + MENUITEM "Side &innstillinger...", CMD_PAGE_SETUP MENUITEM "&Utskrift\tCtrl+P", CMD_PRINT MENUITEM "U&tskrift innstillinger...", CMD_PRINTER_SETUP MENUITEM SEPARATOR @@ -99,7 +99,7 @@ FONT 8, "MS Shell Dlg" CAPTION "Side innstillinger" BEGIN -LTEXT "&Header:", 0x140, 10, 07, 40, 15 +LTEXT "&Topptekst:", 0x140, 10, 07, 40, 15 EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP LTEXT "&Bunntekst:", 0x142, 10, 24, 40, 15 EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP @@ -203,5 +203,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "Linje %d, kolonne %d" +END Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] Thu Mar 12 14:28:33 2009 @@ -92,7 +92,7 @@ POPUP "" BEGIN MENUITEM "&Vis skjulte ikoner", ID_SHOW_HIDDEN_ICONS - MENUITEM "Vis Ikon &knapp", ID_SHOW_ICON_BUTTON + MENUITEM "Vis ikon &knapp", ID_SHOW_ICON_BUTTON MENUITEM "&Konfigurere notifikasjoner...", ID_CONFIG_NOTIFYAREA MENUITEM "Still Dato/&Tid...", ID_CONFIG_TIME MENUITEM SEPARATOR @@ -326,21 +326,21 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "ReactOS Explorer" + IDS_TITLE "ReactOS Utforsker" IDS_START "Start" IDS_LOGOFF "Logg av..." IDS_SHUTDOWN "Slå av..." - IDS_RESTART "Restart..." + IDS_RESTART "Start på nytt..." IDS_LAUNCH "Kjør..." IDS_START_HELP "Hjelp" IDS_SEARCH_FILES "Søk..." - IDS_DOCUMENTS "Mine Dokumenter" + IDS_DOCUMENTS "Mine dokumenter" IDS_FAVORITES "Favoritter" IDS_PROGRAMS "Programmer" IDS_SETTINGS "Innstillinger" IDS_EXPLORE "Utforsker" IDS_EMPTY "(Tom)" - IDS_RECENT "Siste Dokumenter" + IDS_RECENT "Siste dokumenter" IDS_ADMIN "Administrasjon" END @@ -378,7 +378,7 @@ IDS_ABOUT_EXPLORER "&Om Explorer..." IDS_LAUNCH_MANY_PROGRAMS "Du har valgt mer enn et program.\nEr du sikker på at du vil kjøre alle på en gang?" - IDS_DESKTOPBAR_SETTINGS "Skrivebord Innstillinger" + IDS_DESKTOPBAR_SETTINGS "Skrivebord innstillinger" IDS_DESKTOP "Skrivebord" IDS_TASKBAR "Oppgavelinje" IDS_NAMECOLUMN "Navn"

1 0

[dreimer] 39976: Bug 4260: slovak translation for mplay32 by Mario Kacmar Bug 4261: Translate Patch, Dutch for mplay32 by Jan Roeloffzen
by dreimer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: dreimer Date: Thu Mar 12 13:52:00 2009 New Revision: 39976 URL: http://svn.reactos.org/svn/reactos?rev=39976&view=rev Log: Bug 4260: slovak translation for mplay32 by Mario Kacmar Bug 4261: Translate Patch, Dutch for mplay32 by Jan Roeloffzen Added: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc (with props) trunk/reactos/base/applications/mplay32/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/mplay32/rsrc.rc Added: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Thu Mar 12 13:52:00 2009 @@ -1,0 +1,29 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Openen...", IDM_OPEN_FILE + MENUITEM "&Sluiten", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "&Over...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Mediabestanden (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Afspelen" + IDS_TOOLTIP_STOP "Stoppen" + IDS_TOOLTIP_EJECT "Uitwerpen" + IDS_TOOLTIP_BACKWARD "Vorige" + IDS_TOOLTIP_SEEKBACK "Terugspoelen" + IDS_TOOLTIP_SEEKFORW "Vooruitspoelen" + IDS_TOOLTIP_FORWARD "Volgende" + IDS_APPTITLE "ReactOS Multimedia Player" +END Propchange: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Thu Mar 12 13:52:00 2009 @@ -1,0 +1,34 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 12-03-2009 + * LAST CHANGE: 12-03-2009 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Otvori...", IDM_OPEN_FILE + MENUITEM "&Zavrie", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "S&konèi", IDM_EXIT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "È&o je...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Vetky podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Prehra" + IDS_TOOLTIP_STOP "Zastavi" + IDS_TOOLTIP_EJECT "Vysunú" + IDS_TOOLTIP_BACKWARD "Preskoèi dozadu" + IDS_TOOLTIP_SEEKBACK "Vyh¾ada dozadu" + IDS_TOOLTIP_SEEKFORW "Vyh¾ada dopredu" + IDS_TOOLTIP_FORWARD "Preskoèi dopredu" + IDS_APPTITLE "Multimediálny prehrávaè systému ReactOS" +END Propchange: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Thu Mar 12 13:52:00 2009 @@ -5,6 +5,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/sk-SK.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[fireball] 39975: Evgeniy Boltik <bstsoft@narod.ru> - Use bitmap's DIB palette, if it exists. Fixes problems described in bug 4147. See issue #4147 for more details.
by fireball＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: fireball Date: Thu Mar 12 13:48:52 2009 New Revision: 39975 URL: http://svn.reactos.org/svn/reactos?rev=39975&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Use bitmap's DIB palette, if it exists. Fixes problems described in bug 4147. See issue #4147 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Mar 12 13:48:52 2009 @@ -271,8 +271,17 @@ return 0; } - // Destination palette obtained from the hDC - hDCPalette = PALETTE_LockPalette(((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault); + // Use hDIBPalette if it exists + if (bitmap->hDIBPalette) + { + DDB_Palette = bitmap->hDIBPalette; + } + else + { + // Destination palette obtained from the hDC + DDB_Palette = ((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault; + } + hDCPalette = PALETTE_LockPalette(DDB_Palette); if (NULL == hDCPalette) { EngUnlockSurface(SourceSurf); @@ -282,7 +291,6 @@ return 0; } DDB_Palette_Type = hDCPalette->Mode; - DDB_Palette = ((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault; PALETTE_UnlockPalette(hDCPalette); // Source palette obtained from the BITMAPINFO

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
49
Older →

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 March 2009