Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[dreimer] 35313: ... YES... NEVER COMMIT when you are awake WAAAY too long.
by dreimer＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: dreimer Date: Wed Aug 13 15:12:04 2008 New Revision: 35313 URL: http://svn.reactos.org/svn/reactos?rev=35313&view=rev Log: ... YES... NEVER COMMIT when you are awake WAAAY too long. Modified: trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc Modified: trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] Wed Aug 13 15:12:04 2008 @@ -45,7 +45,7 @@ /showclassid Viser alle klasse IDene for DHCP som er tillatt for kortet.\n \ /setclassid Endrer klasse-IDene for DHCP.\n \ \n \ - Standardverdien er å bare vise IP-addressen, nettverksmasken og + Standardverdien er å bare vise IP-addressen, nettverksmasken og\n \ standard gatewayen for hver kort knyttet til TCP/IP.\n \ \n \ For Release og Renew, hvis ingen kortnavn er angitt, vil IP addressen\n \

1 0

[dreimer] 35312: Bug 3649: Slovak update by Mario Kacmar Bug 3631: Norwegian Update by Lars Martin Hambro
by dreimer＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: dreimer Date: Wed Aug 13 13:48:51 2008 New Revision: 35312 URL: http://svn.reactos.org/svn/reactos?rev=35312&view=rev Log: Bug 3649: Slovak update by Mario Kacmar Bug 3631: Norwegian Update by Lars Martin Hambro Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc (with props) Modified: trunk/reactos/base/applications/msconfig/lang/no-NO.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc trunk/reactos/base/system/format/lang/sk-SK.rc trunk/reactos/dll/cpl/console/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.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] Wed Aug 13 13:48:51 2008 @@ -4,7 +4,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "System configuration program" +CAPTION "Systemkonfigurasjon" FONT 8, "MS Shell Dlg" BEGIN CONTROL "kategori1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 @@ -28,18 +28,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + PUSHBUTTON "Flytt &opp", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Flytt &ned", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + PUSHBUTTON "&Aktiver", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "D&eaktiver", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "&Finn", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Ny", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "Re&diger", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "A&ktiver Alt", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Dektiver A&lt",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 @@ -83,11 +83,11 @@ PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 - CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 - CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 - CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + CHECKBOX "/Sik&ker oppstart", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&Ingen grafisk oppstart", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&Oppstart logg", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/Enkel& grafikk", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/H&jelp", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 LTEXT "&Tidsavbrudd:", -1, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT @@ -98,21 +98,21 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + CHECKBOX "/&Maksimalt minnestørrelse:=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 - CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + CHECKBOX "/&Antall prosessorer:=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/&PCI lås", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 CHECKBOX "/P&ROFIL", IDC_CBX_PROFILE, 10, 55, 50, 10 CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT - CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 - CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + CHECKBOX "/&Globale feilsøkingsinnstillinger", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/F&eilsøkingsport:", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + CHECKBOX "/&Overføringshastighet", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + CHECKBOX "/&Kanal", IDC_CBX_CHANNEL, 20, 130, 50, 10 EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12 @@ -121,7 +121,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_MSCONFIG "System konfigurasjon program" + IDS_MSCONFIG "Systemkonfigurasjon" IDS_TAB_GENERAL "Generelt" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -38,7 +38,7 @@ IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remote Desktop Connection" +CAPTION "Tilkobling til eksternt skrivebord" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Koble til",IDOK,147,245,50,14 @@ -59,5 +59,5 @@ IDS_FULLSCREEN "Full skjerm" IDS_BROWSESERVER "<Bla gjennom etter flere...>" IDS_HEADERTEXT1 "Eksternt skrivebord" - IDS_HEADERTEXT2 "Koble til" + IDS_HEADERTEXT2 "Tilkobling" END Modified: trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -25,33 +25,33 @@ /* Please keep the spacing/formatting as per En.rc when translating */ IDS_USAGE "\nUSAGE:\n \ - ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n \ + ipconfig [/? | /all | /renew [kort] | /release [kort] |\n \ /flushdns | /displaydns | /registerdns |\n \ - /showclassid adapter |\n \ - /setclassid adapter [classid] ]\n \ + /showclassid kort |\n \ + /setclassid kort [classid] ]\n \ \n \ - where\n \ - adapter Connection name\n \ - (wildcard characters * and ? allowed, see examples)\n \ + der\n \ + kort Tilkoblingsnavn\n \ + (jokertegnene * og ? er tillatt, se eksemplene)\n \ \n \ Eksempler:\n \ - /? Vis denne hjelp meldingen\n \ - /all Vis detaljert informasjon.\n \ - /release Release the IP address for the specified adapter.\n \ + /? Viser denne hjelpe meldingen\n \ + /all Viser detaljert informasjon.\n \ + /release Frigir IP addressen for det angitte kortet.\n \ /renew Forny alle IP addresser for alle valgte kort.\n \ - /flushdns Purges the DNS Resolver cache.\n \ - /registerdns Refreshes all DHCP leases and re-registers DNS names.\n \ - /displaydns Display the contents of the DNS Resolver Cache.\n \ - /showclassid Displays all the dhcp class IDs allowed for adapter.\n \ - /setclassid Modifies the dhcp class id.\n \ + /flushdns Tømmer DNS Resolver-bufferen.\n \ + /registerdns Oppdaterer alle DHCP leieavtaler og registerer DNS navn på nytt.\n \ + /displaydns Viser innhold av DNS Resolver-bufferen.\n \ + /showclassid Viser alle klasse IDene for DHCP som er tillatt for kortet.\n \ + /setclassid Endrer klasse-IDene for DHCP.\n \ \n \ - The default is to display only the IP address, subnet mask and\n \ - default gateway for each adapter bound to TCP/IP.\n \ + Standardverdien er å bare vise IP-addressen, nettverksmasken og + standard gatewayen for hver kort knyttet til TCP/IP.\n \ \n \ - For Release and Renew, if no adapter name is specified, then the IP address\n \ - leases for all adapters bound to TCP/IP will be released or renewed.\n \ + For Release og Renew, hvis ingen kortnavn er angitt, vil IP addressen\n \ + for alle kort knyttet til TCP/IP frigis eller fornyes hvis det ikke angis et kortnavn.\n \ \n \ - For Setclassid, if no ClassId is specified, then the ClassId is removed.\n \ + For Setclassid, fjernes ClassId hvis det ikke angis en ClassId.\n \ \n \ Examples:\n \ > ipconfig ... Vis informasjon.\n \ @@ -60,6 +60,6 @@ > ipconfig /renew EL* ... Forny alle kort med navn som\n \ begynner med EL\n \ > ipconfig /release *Til* ... Frigi alle samsvarende tilkoblinger,\n \ - for eksempel ""Lokal tilkobling 1"" or\n \ + for eksempel ""Lokal tilkobling 1"" eller\n \ ""Lokaltilkobling 2""\n" END Modified: trunk/reactos/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk… ============================================================================== --- trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 15-02-2008 +/* TRANSLATOR : M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 07-08-2008 + * LAST CHANGE: 08-08-2008 */ #include "resource.h" @@ -7,13 +8,13 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -/* menovka zväzku = volume label, drive = jednotka */ -STRING_HELP, "Pouitie: %S jednotka: [-FS:systém súborov] [-V:menovka] [-Q] [-A:ve¾kos] [-C]\n\n\ - [jednotka:] Specifies the drive to format.\n\ - -FS:systém súborov Specifies the type of file system (%s).\n\ - -V:menovka Specifies volume label.\n\ - -Q Performs a quick format.\n\ - -A:ve¾kos Overrides the default allocation unit size. Default settings\n\ +/* menovka zvzku = volume label, drive = jednotka */ +STRING_HELP, "Pou§itie: %S jednotka: [-FS:systm s£borov] [-V:menovka] [-Q] [-A:vekos] [-C]\n\n\ + [jednotka:] Uruje jednotku k naform tovaniu.\n\ + -FS:systm s£borov Uruje typ s£borovho systmu (%s).\n\ + -V:menovka Uruje menovku zvzku.\n\ + -Q Vykon va rìchle form tovanie.\n\ + -A:vekos Overrides the default allocation unit size. Default settings\n\ are strongly recommended for general use\n\ NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\ @@ -22,31 +23,31 @@ -C Files created on the new volume will be compressed by\n\ default.\n\n" -STRING_COMPLETE "Dokonèené na %lu percent.\r" +STRING_COMPLETE "Dokonen na %lu percent.\r" -STRING_FORMAT_FAIL "FormatEx was unable to complete successfully.\n\n" +STRING_FORMAT_FAIL "FormatEx nebol schopnì £speçne skoni.\n\n" -STRING_NO_SUPPORT "Operácia nie je podporovaná" +STRING_NO_SUPPORT "Oper cia nie je podporovan " STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" -STRING_UNKNOW_ARG "Neznámy argument: %S\n" +STRING_UNKNOW_ARG "Nezn my argument: %S\n" -STRING_DRIVE_PARM "Chýba nevyhnutný parameter jednotky.\n\n" +STRING_DRIVE_PARM "Chìba nevyhnutnì parameter jednotky.\n\n" STRING_ERROR_DRIVE_TYPE "Could not get drive type" -STRING_INSERT_DISK "Vlote novú disketu do jednotky %C:\na potom stlaète ENTER..." +STRING_INSERT_DISK "Vlo§te nov£ disketu do jednotky %C:\na potom stlate ENTER..." STRING_NO_VOLUME "Could not query volume" STRING_NO_VOLUME_SIZE "Could not query volume size" -STRING_FILESYSTEM "Typ systému súborov je %S.\n" +STRING_FILESYSTEM "Typ systmu s£borov je %S.\n" -STRING_LABEL_NAME_EDIT "Vlote súèasnú menovku zväzku pre jednotku %C: " +STRING_LABEL_NAME_EDIT "Vlo§te s£asn£ menovku zvzku pre jednotku %C: " -STRING_ERROR_LABEL "Bola zadaná nesprávna menovka zväzku pre túto jednotku.\n" +STRING_ERROR_LABEL "Bola zadan nespr vna menovka zvzku pre t£to jednotku.\n" STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ DRIVE %C: WILL BE LOST!\nProceed with Format (A/N)? " @@ -55,19 +56,19 @@ STRING_VERIFYING "Overovanie" -STRING_FAST_FMT "Rýchle formátovanie" +STRING_FAST_FMT "Rìchle form tovanie" -STRING_CREATE_FSYS "Vytváram truktúru súborového systému.\n" +STRING_CREATE_FSYS "Vytv ram çtrukt£ru s£borovho systmu.\n" -STRING_FMT_COMPLETE "Formátovanie dokonèené.\n" +STRING_FMT_COMPLETE "Form tovanie dokonen.\n" -STRING_VOL_COMPRESS "Zväzok nepodporuje kompresiu.\n" +STRING_VOL_COMPRESS "Zvzok nepodporuje kompresiu.\n" -STRING_ENTER_LABEL "Menovka zväzku (11 znakov, ak nechcete zada tak iba Enter)? " +STRING_ENTER_LABEL "Menovka zvzku (11 znakov, ak nechcete zada, stlate ENTER)? " -STRING_NO_LABEL "Zväzok sa nedá pomenova" +STRING_NO_LABEL "Zvzok sa ned pomenova" -STRING_FREE_SPACE "\nCelkové diskové miesto: %I64d bajtov.\nDostupné miesto na disku: %I64d bajtov.\n" +STRING_FREE_SPACE "\nCelkov diskov miesto: %I64d bajtov.\nDostupn miesto na disku: %I64d bajtov.\n" -STRING_SERIAL_NUMBER "\nSériové èíslo zväzku je %04X-%04X\n" +STRING_SERIAL_NUMBER "\nSriov ¡slo zvzku je %04X-%04X\n" END Modified: trunk/reactos/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -16,24 +16,24 @@ CAPTION "Valg" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Cursor Size", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Markørstørrelse", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Små", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 CONTROL "&Middels", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 CONTROL "&Store", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 GROUPBOX "Skjerminnstillinger", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "&Vindu", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull skjerm", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 GROUPBOX "Kommando historie", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Buffer Størrelse:", -1, 14, 101, 70, 12 + LTEXT "&Bufferstørrelse:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 - LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12 + LTEXT "&Antall buffere:", -1, 14, 124, 70, 12 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + CHECKBOX "&Fjern gamle duplikater", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 GROUPBOX "Rediger valg", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP - CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Hurtigredigeringsmodus", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Innsettingsmodus", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 @@ -46,11 +46,11 @@ CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Skrift:", -1, 10, 105, 33, 10 - CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + CHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 - LTEXT "Each character is:", -1, 124, 166, 75, 10 + LTEXT "Hver tegn er:", -1, 124, 166, 75, 10 LTEXT "Skjerm piksel bred\nskjerm piksel høy", -1, 136, 180, 101, 20 LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 @@ -58,12 +58,12 @@ IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Layout" +CAPTION "Oppsett" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Vindu forhåndsvisning:", -1, 8, 6, 95, 10 CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 - GROUPBOX "Screen Buffer Size", -1, 130, 12, 115, 50 + GROUPBOX "Størrelse på skjermbuffer", -1, 130, 12, 115, 50 LTEXT "&Bredde:", -1, 140, 28, 40, 10 LTEXT "&Høyde:", -1, 140, 46, 39, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP @@ -77,14 +77,14 @@ CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 - GROUPBOX "Window Position", -1, 130, 116, 115, 64 + GROUPBOX "Vindusplassering", -1, 130, 116, 115, 64 LTEXT "&Venstre:", -1, 140, 132, 38, 10 LTEXT "&Topp:", -1, 140, 149, 40, 10 EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 + CHECKBOX "Automatisk &vindusplassering", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 @@ -94,9 +94,9 @@ BEGIN CONTROL "Skjerm &tekst", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 CONTROL "Skjerm &bakgrunn", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 + CONTROL "&Hurtigmenytekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Hurtig&menybakgrunn", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Valgte fargeverdier", -1, 129, 7, 118, 73 LTEXT "&Rød:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 @@ -122,19 +122,19 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 + GROUPBOX "Valgte skjermfarger", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 + GROUPBOX "Valgte hurtigmenyfarger", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Apply Properties" +CAPTION "Godta innstillinger" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 - CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + CONTROL "&Godta innstillinger for bare nåværende vindu", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Godta innstillinger for fremtidlige vinduer med samme navn", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END @@ -142,7 +142,7 @@ STRINGTABLE BEGIN IDS_CPLNAME "Konsoll" - IDS_CPLDESCRIPTION "Configures console properties." + IDS_CPLDESCRIPTION "Konfigurere Konsoll innstillinger." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -20,7 +20,7 @@ IDS_DEVONPARENT "på %1" IDS_TROUBLESHOOTDEV "&Feilsøking..." IDS_ENABLEDEV "A&ktiver enhet" - IDS_REINSTALLDRV "Re&install Driver" + IDS_REINSTALLDRV "Installere driver på nytt" IDS_PROPERTIES "E&genskaper" IDS_UPDATEDRV "O&ppdater driveren..." IDS_REBOOT "Restart &datamaskinen..." @@ -34,61 +34,61 @@ BEGIN IDS_DEV_NO_PROBLEM "Denne enheten fungerer som den skal." IDS_DEV_NOT_CONFIGURED "Denne enheten er ikke riktig konfigurert." - IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two $1 bus types." - IDS_DEV_DEVLOADER_FAILED2 "The $1 device loader(s) for this device could not load the device driver." - IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." - IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." - IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." - IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." - IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." - IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." - IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." - IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." - IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " - IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." - IDS_DEV_NORMAL_CONFLICT "This device cannot find any free $1 resources to use." - IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_NEED_RESTART "This device cannot work properly until you restart your computer." - IDS_DEV_REENUMERATION "This device is causing a resource conflict." - IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." - IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." - IDS_DEV_REINSTALL "The drivers for this device need to be reinstalled." + IDS_DEV_DEVLOADER_FAILED "ReactOS kunne ikke laste driver for denne enheten fordi datamaskinen rapporterer to $1 buss typer." + IDS_DEV_DEVLOADER_FAILED2 "$1 enhetslaster(e) for denne enheten kunne ikke laste enhetsdriveren." + IDS_DEV_OUT_OF_MEMORY "Driveren for denne enheten kan være dårlig, eller så kan systemet ditt ha for lite minne eller ha for andre resusser." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Denne enheten virker ikke fordi en av driverene kan være dårlig, eller at ditt register kan være dårlig." + IDS_DEV_LACKED_ARBITRATOR "Driveren for denne enheter trenger en ressurs som ReactOS ikke vet hvordan skal brukes." + IDS_DEV_BOOT_CONFIG_CONFLICT "En annen enhet bruker ressurs som denne enheten trenger å bruke." + IDS_DEV_FAILED_FILTER "Driveren for denne enheten trenger å bli installert på nytt." + IDS_DEV_DEVLOADER_NOT_FOUND "Denne enheten fungerer ikke som den skal fordi ReactOS kan ikke laste filen $1 som laster driveren for denne enheten." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Denne enheten fungerer ikke som den skal fordi filen $1 som laster driveren for denne enheten er dårlig." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Enhet mislykket: Prøv å bytt driveren for denne enheten. Hvis dette ikke virker, se på din maskinvare dokumentasjon." + IDS_DEV_INVALID_DATA "Denne enheten fungerer ikke som den skal fordi BIOS på din datamaskin rapporterer at ressursen for denne enheten er feil." + IDS_DEV_INVALID_DATA2 "Denne enheten fungerer ikke som den skal fordi BIOS på enheten rapporterer at ressursen for denne enheten er feil. " + IDS_DEV_FAILED_START "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke de driverene som trengs." + IDS_DEV_LIAR "ReactOS har stoppet reaksjon mens attempting for å starte denne enheten, og derfor vil den aldri forsøke å starte denne enheten igjen." + IDS_DEV_NORMAL_CONFLICT "Denne enheten kan ikke finne noen ledige $1 ressurser for å kunne brukes." + IDS_DEV_NOT_VERIFIED "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." + IDS_DEV_NEED_RESTART "Denne enheten vil ikke fungere som den skal før du startet datamaskinen på nytt." + IDS_DEV_REENUMERATION "Denne enheten har krasjet på grunn av en ressurs konflikt." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS kunne ikke finne alle ressurser som denne enheten bruker." + IDS_DEV_UNKNOWN_RESOURCE "Driver informasjon filen $1 forteller at denne barne enheten, for å bruke en ressurs som denne foreldre enheten ikke har eller kjenne igjen." + IDS_DEV_REINSTALL "Driveren for denne enheten trenger å bli installert på nytt." IDS_DEV_REGISTRY "Det kan være noe feil med registeret." IDS_DEV_WILL_BE_REMOVED "ReactOS fjerner denne enheten." IDS_DEV_DISABLED "Denne enheten er ikke startet." IDS_DEV_DISABLED2 "Denne enheten er deaktivert." - IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_MOVED "ReactOS is in the process of setting up this device." - IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." - IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." - IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." - IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." - IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." - IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." - IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." - IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." - IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." - IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." - IDS_DEV_FAILED_POST_START "ReactOS has stopped this device because it has reported problems." - IDS_DEV_HALTED "An application or service has shut down this hardware device." - IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." - IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." - IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" - IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." - IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_DEVLOADER_NOT_READY "Oppstartlasteren for denne enheten kan ikke laste de nødvendige filene." + IDS_DEV_DEVLOADER_NOT_READY2 "Dette skjermkortet fungerer som det skal." + IDS_DEV_DEVLOADER_NOT_READY3 "Oppstartlasteren for denne enheten kan ikke laste de nødvendige driverene." + IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." + IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten." + IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten." + IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." + IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." + IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." + IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal." + IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." + IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren." + IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." + IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." + IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS kan ikke få tilgang til denne maskinvaren fordi dens tjeneste nøkkel informasjon i registret mangler eller er uriktig." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS har fullført å laste denne enhetsdriverne for for maskinvare men kan ikke finne maskinvare enheten." + IDS_DEV_DUPLICATE_DEVICE "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi det er en duplikat enhet som allerede kjører på systemet." + IDS_DEV_FAILED_POST_START "ReactOS har stoppet denne enheten fordi det har rapportert problemer." + IDS_DEV_HALTED "Et program eller tjeneste har slått av denne maskinvare enheten." + IDS_DEV_PHANTOM "Nåværende, denne maskinvare enheten er ikke koblet til datamaskinen." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS kan ikke få tilgang til denne maskinvare enheten fordi operativssystemet er i prosessen for å slås av." + IDS_DEV_HELD_FOR_EJECT "ReactOS kan ikke bruke denne maskinvare enheten fordi den har blitt forbredt på sikker fjerning, men har ikke blitt fjernet fra datamaskinen" + IDS_DEV_DRIVER_BLOCKED "Programvaren for denne enheten har blitt blokket fra å starte fordi det et kjent for å ha problemer med ReactOS. Kontact maskinvare produsenten for nye drivere." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS kan ikke starte ny maskinvare enhet fordi system filen er for stor (Endre Registet størrelse begrensning)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS var ikke tilgjengelig for å endre innstillinger for denne enheten." END IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -37,7 +37,7 @@ STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld byte" - IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_HOURS " t" IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_TIME_INTERVAL_SECONDS " sek" } Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -203,33 +203,33 @@ IDS_CMT_CALC "Start Kalkulator" IDS_CMT_CMD "Åpne command prompt" IDS_CMT_EXPLORER "Start Explorer" - IDS_CMT_NOTEPAD "Start Tekst Editor" - IDS_CMT_REGEDIT "Start Register Editor" - IDS_CMT_WORDPAD "Start Dokument Editor" + IDS_CMT_NOTEPAD "Start Tekstredigering" + IDS_CMT_REGEDIT "Start Registerredigering" + IDS_CMT_WORDPAD "Start Dokument redigering" IDS_CMT_SCREENSHOT "Ta skjermbilde" IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" - IDS_CMT_RDESKTOP "Launch Remote Desktop" + IDS_CMT_RDESKTOP "Start Ekstern skrivebord" END STRINGTABLE BEGIN IDS_GAMES "Spill" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" -END - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" - IDS_CMT_MAGNIFY "Magnify" + IDS_CMT_SOLITAIRE "Kabal" + IDS_CMT_WINEMINE "Minnesveiper" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "System verktøy" + IDS_CMT_CHARMAP "Tegnkart" + IDS_CMT_KBSWITCH "Endre tastatur valg" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Tilgjengelighet" + IDS_CMT_MAGNIFY "Forstørrelse" END STRINGTABLE Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:48:51 2008 @@ -1,0 +1,47 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avslutt program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Avslutt Program... Vennligst vent",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Avslutt nå",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avslutt program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Avbryt",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Avslutt nå",IDC_END_NOW,78,98,43,17 + LTEXT "Programmet svarer ikke",IDC_STATIC,7,7,178,8 + LTEXT "For å returnere til ReactOS for å sjekke statusen på programmet, trykk på avbryt", + IDC_STATIC,7,26,178,16 + LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå", + IDC_STATIC,7,53,178,26 +END +STRINGTABLE +BEGIN + IDS_EDIT "Rediger" + IDS_MARK "Merk" + IDS_COPY "Kopier\tEnter" + IDS_PASTE "Lim inn" + IDS_SELECTALL "Velg alt" + IDS_SCROLL "Rull" + IDS_FIND "Finn..." + IDS_DEFAULTS "Standard" + IDS_PROPERTIES "Egenskaper" + IDS_SCROLLHERE "Rull her" + IDS_SCROLLTOP "Rull til toppen" + IDS_SCROLLBOTTOM "Rull knapp" + IDS_SCROLLPAGE_UP "Side opp" + IDS_SCROLLPAGE_DOWN "Side ned" + IDS_SCROLLUP "Rull opp" + IDS_SCROLLDOWN "Rull ned" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 35311: Polish Shell32 Update by Olaf Siejka Bug 3655: IDS_PROPERTIES Translation by Victor Martinez Calvo Bug 3642: Italian resource file update by Paolo Devoti Bug 3651: msconfig french translation (base/applications/msconfig) Bug 3652: French translation for Access.cpl (dll/cpl/access) Bug 3653: translation of regsvr32/Fr.rc (base/system/regsvr32/)
by dreimer＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: dreimer Date: Wed Aug 13 13:25:01 2008 New Revision: 35311 URL: http://svn.reactos.org/svn/reactos?rev=35311&view=rev Log: Polish Shell32 Update by Olaf Siejka Bug 3655: IDS_PROPERTIES Translation by Victor Martinez Calvo Bug 3642: Italian resource file update by Paolo Devoti Bug 3651: msconfig french translation (base/applications/msconfig) Bug 3652: French translation for Access.cpl (dll/cpl/access) Bug 3653: translation of regsvr32/Fr.rc (base/system/regsvr32/) Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/system/regsvr32/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -156,7 +156,7 @@ IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "Propriétés système" - IDS_TOOLS_SYSDM_DESCR "Affiche/modifie des information à propos de l'ordinateur." + IDS_TOOLS_SYSDM_DESCR "Affiche/modifie des informations à propos de l'ordinateur." IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -86,7 +86,7 @@ MENUITEM "Valore stringa &espandibile", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS + MENUITEM "&Permessi...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Elimina\tDel", ID_EDIT_DELETE MENUITEM "&Rinomina", ID_EDIT_RENAME Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -1,12 +1,127 @@ -/* $Id$ */ - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "Installazione di ReactOS" - IDS_TEXT "Non è possibile installare direttamente ReactOS da questo CD!\n\nPer installare ReactOS, riavvia il computer da questo CD." + LTEXT "Benvenuto al wizard di installazione di ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! "\ + "E' necessario riavviare il computer da questo CD per procedere "\ + "alla instalazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Lingua per l'installazione:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Tastiera o metodo di input:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Cliccare Avanti per selezionare il tipo di installazione.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tipo di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Installa ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Ripara o aggiorna una installazione precedente di ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Impostazione dei dispositivi", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Tastiera:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partizione per l'installazione di ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Crea", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Impostazioni avanzate delle partizioni" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Cartella di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Installazione del Boot loader sul disco fisso (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Azione di installazione", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "File da installare...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completamento della installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completamento della prima fase della installazione di ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "La prima fase è stata completata in modo regolare.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "Se presente rimuovere il CD dal lettore e per riavviare "\ + "il computer cliccare Fine.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Selezione della lingua" + IDS_LANGSUBTITLE "Scegliere la lingua per la installazione e per il sistema finale." + IDS_TYPETITLE "Benvenuti alla installazione di ReactOS" + IDS_TYPESUBTITLE "Scegliere il tipo di installazione." + IDS_DEVICETITLE "Impostazione dei dispositivi di base" + IDS_DEVICESUBTITLE "Impostazione di monitor e tastiera." + IDS_DRIVETITLE "Impostazione della partizione e della cartella per la installazione" + IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Boot loader." + IDS_PROCESSTITLE "Preparazione della partizione, copia dei file e configurazione del sistema" + IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Boot loader" + IDS_RESTARTTITLE "Prima fase della installazione completata" + IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase" + IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" + IDS_ABORTSETUP2 "Volete interrompere l'installazione?" +END + /* EOF */ Modified: trunk/reactos/base/system/regsvr32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/fr-FR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -12,13 +12,13 @@ BEGIN IDS_UsageMessage, "%s\n\nUtilisation : regsvr32 [/u] [/s] [/c] [/n] [/i[:lignedecommande]] nomDLL\n\ -/u - Serveur non enregistré\n\ +/u - Désenregistrement du serveur\n\ /s - Silence; ne pas afficher les messages\n\ /c - Sortie sur la console\n\ /i - Installe la DLL avec des options dans la [:lignedecommande] ; si /u est présent, cela provoque la désinstallation de la DLL\n\ -/n - Ne pas faire d'appel au serveur d'enregistrement ; cette option doit être utilisé avec l'option /i" +/n - Ne pas faire d'appel au serveur d'enregistrement ; cette option doit être utilisée avec l'option /i" -IDS_NoDllSpecified, "Pas de DLL indiqué." +IDS_NoDllSpecified, "Aucune indication de nom de DLL." IDS_InvalidFlag, "Option non reconnue : %s" Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -19,7 +19,7 @@ PUSHBUTTON "P&aramètres",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Touches bascules",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaque fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Para&mètres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -15,7 +15,7 @@ LTEXT "Esempi", -1, 14, 73, 70, 10 LTEXT "Numero:", -1, 16, 86, 48, 10 LTEXT "Valuta:", -1, 16, 101, 48, 10 - LTEXT "Ota:", -1, 16, 116, 48, 10 + LTEXT "Ora:", -1, 16, 116, 48, 10 LTEXT "Data breve:", -1, 16, 131, 48, 10 LTEXT "Data estesa:", -1, 16, 146, 48, 10 EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP @@ -23,7 +23,7 @@ EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Ubicazione geografica", -1, 5, 172, 234, 55 + GROUPBOX "Posizione geografica", -1, 5, 172, 234, 55 LTEXT "Per ottenere informazioni locali, come notizie e previsioni meteo, selezionare la località corrente:", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -57,8 +57,8 @@ BEGIN IDS_LOGGEDOUTSAS "Benvenuti!" IDS_LOCKEDSAS "Il computer al momento è bloccato." - IDS_PRESSCTRLALTDELETE "Premere Ctrl+Alt+Canc per accedre." + IDS_PRESSCTRLALTDELETE "Premere Ctrl+Alt+Canc per accedere." IDS_ASKFORUSER "Nome utente: " IDS_ASKFORPASSWORD "Password: " - IDS_FORCELOGOFF "Questo terminerà la sessione dell'utente attuale e verranno persi tutti i dati non salvati. Volete procedere?" + IDS_FORCELOGOFF "Verrà terminata la sessione dell'utente attuale e tutti i dati non salvati verranno persi. Volete procedere?" END Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -622,10 +622,10 @@ IDS_SELECT "Èçáîð" IDS_OPEN "Îòâàðÿíå" IDS_CREATELINK "Ñúçäàâàíå íà &âðúçêà" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "Çà&ïîìíÿíå" + IDS_DELETE "Èç&òðèâàíå" + IDS_PROPERTIES "&Ñâîéñòâà" + IDS_CUT "Èç&ðÿçâàíå" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -621,10 +621,10 @@ IDS_SELECT "Vybrat" IDS_OPEN "Otevøít" IDS_CREATELINK "Vytvoøit zástupc&e" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Kopírovat" + IDS_DELETE "O&dstranit" + IDS_PROPERTIES "&Vlastnosti" + IDS_CUT "Vyj&mout" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nelze vytvoøit novou sloku, protoe pøístup byl odepøen." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -619,10 +619,10 @@ IDS_SELECT "ÅðéëïãÞ" IDS_OPEN "¢íïéãìá" IDS_CREATELINK "Äçìéïõñãßá &óõíôüìåõóçò" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "Á&íôéãñáöÞ" + IDS_DELETE "&ÄéáãñáöÞ" + IDS_PROPERTIES "&Éäéüôçôåò" + IDS_CUT "Á&ðïêïðÞ" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -619,10 +619,10 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" - IDS_COPY "Copy" + IDS_COPY "&Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_CUT "C&ut" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -2,6 +2,7 @@ * Copyright 1998 Juergen Schmied * Copyright 2003,2004 José Manuel Ferrer Ortiz * Actualizado Javier Remacha 2008 + * ACtualizado Victor Martinez 2008 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -621,11 +622,11 @@ IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" IDS_CREATELINK "C&rear acceso directo" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" - IDS_RESTORE "Restore" + IDS_COPY "&Copiar" + IDS_DELETE "&Eliminar" + IDS_PROPERTIES "&Propiedades" + IDS_CUT "C&ortar" + IDS_RESTORE "Restaurar" IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado." IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -619,10 +619,10 @@ IDS_SELECT "Valitse" IDS_OPEN "Avaa" IDS_CREATELINK "Lu&o Linkki" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Kopioi" + IDS_DELETE "&Poista" + IDS_PROPERTIES "&Ominaisuudet" + IDS_CUT "&Leikkaa" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivät riitä." Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -623,10 +623,10 @@ IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" IDS_CREATELINK "Créer un &lien" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Copier" + IDS_DELETE "&Supprimer" + IDS_PROPERTIES "&Propriétés" + IDS_CUT "C&ouper" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -622,10 +622,10 @@ IDS_SELECT "Kiválaszt" IDS_OPEN "Megnyit" IDS_CREATELINK "Parancsikon létrehozása" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "Másolás" + IDS_DELETE "Törlés" + IDS_PROPERTIES "Tulajdonságok" + IDS_CUT "Kivágás" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nem hozható létre új mappa: Nincs hozzá engedélyed." Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -620,10 +620,10 @@ IDS_SELECT "Selezione" IDS_OPEN "Apri" IDS_CREATELINK "&Crea Collegamento" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Copia" + IDS_DELETE "&Cancella" + IDS_PROPERTIES "&Proprietà" + IDS_CUT "&Taglia" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -619,10 +619,10 @@ IDS_SELECT "Ið" IDS_OPEN "J" IDS_CREATELINK "V[gJbgÌì¬(&L)" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "Rs[(&C)" + IDS_DELETE "í(&D)" + IDS_PROPERTIES "vpeB(&P)" + IDS_CUT "Øèæè(&U)" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -598,10 +598,10 @@ IDS_SELECT "Velg" IDS_OPEN "Åpne" IDS_CREATELINK "&Opprett snarvei" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Kopier" + IDS_DELETE "&Slett" + IDS_PROPERTIES "Egenska&per" + IDS_CUT "Klipp &ut" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -16,7 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * translation updated by Caemyr - Olaf Siejka (Jan,Mar,Apr,Jul 2008) + * ReactOS shell32 fork translation updated by Caemyr - + * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -371,7 +372,7 @@ ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Wybierz program, którego chcesz u¿yæ do otwarcia tego pliku:", -1, 44, 12, 211, 10 LTEXT "Plik: ", 14001, 44, 25, 188, 10 - GROUPBOX "&Programs", -1, 7, 42, 249, 187 + GROUPBOX "&Programy", -1, 7, 42, 249, 187 LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE AUTOCHECKBOX "&Zawsze u¿ywaj danego programu do otwierania tego typu plików", 14003, 20, 193, 225, 10 PUSHBUTTON "&Przegl¹daj", 14004, 198, 207, 50, 14 @@ -598,17 +599,17 @@ IDS_SHV_COLUMN9 "Komentarz" IDS_SHV_COLUMN10 "W³aciciel" IDS_SHV_COLUMN11 "Grupa" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" - IDS_SHV_COLUMN_DELFROM "Lokacja oryginalna" + IDS_SHV_COLUMN12 "Nazwa pliku" + IDS_SHV_COLUMN13 "Kategoria" + IDS_SHV_COLUMN_DELFROM "Lokalizacja oryginalna" IDS_SHV_COLUMN_DELDATE "Data usuniêcia" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_FONTTYPE "Czcionka" + IDS_SHV_COLUMN_WORKGROUP "Grupa Robocza" + IDS_SHV_NETWORKLOCATION "Lokalizacja Sieciowa" + IDS_SHV_COLUMN_DOCUMENTS "Dokumenty" + IDS_SHV_COLUMN_STATUS "Stan" + IDS_SHV_COLUMN_COMMENTS "Komentarze" + IDS_SHV_COLUMN_LOCATION "Lokalizacja" IDS_SHV_COLUMN_MODEL "Model" /* special folders */ @@ -625,11 +626,11 @@ IDS_SELECT "Zaznacz" IDS_OPEN "Otwórz" IDS_CREATELINK "Utwórz &Skrót" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" - IDS_RESTORE "Restore" + IDS_COPY "Kopiuj" + IDS_DELETE "Usuñ" + IDS_PROPERTIES "W³aciwoci" + IDS_CUT "Wytnij" + IDS_RESTORE "Przywróæ" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." @@ -732,7 +733,7 @@ IDS_PREVIEW_VERB "Podgl¹d" IDS_FILE_FOLDER "%u Plików, %u Katalogów" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." -END + IDS_PRINTERS "Drukarki" + IDS_FONTS "Czcionki" + IDS_INSTALLNEWFONT "Zainstaluj Now¹ Czcionkê..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -621,10 +621,10 @@ IDS_SELECT "Selecionar" IDS_OPEN "Abrir" IDS_CREATELINK "Criar a&talho" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Copiar" + IDS_DELETE "E&xcluir" + IDS_PROPERTIES "Propriedades" + IDS_CUT "C&ortar" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Não pode criar nova pasta: Permissão negada." Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -625,10 +625,10 @@ IDS_SELECT "Vybra" IDS_OPEN "Otvori" IDS_CREATELINK "Vytvori o&dkaz" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Kopírova" + IDS_DELETE "&Odstráni" + IDS_PROPERTIES "Vl&astnosti" + IDS_CUT "&Vystrihnú" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -619,10 +619,10 @@ IDS_SELECT "Seç" IDS_OPEN "Aç" IDS_CREATELINK "Kýsayol O&luþtur" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "K&opyala" + IDS_DELETE "&Sil" + IDS_PROPERTIES "&Özellikler" + IDS_CUT "&Kes" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Yeni dizin oluþturulamýyor: Eriþim engellendi." Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -620,10 +620,10 @@ IDS_SELECT "Âè&áðàòè" IDS_OPEN "Â³&äêðèòè" IDS_CREATELINK "Ñòâîðèòè &ÿðëèê" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "&Êîï³þâàòè" + IDS_DELETE "Â&èäàëèòè" + IDS_PROPERTIES "Â&ëàñòèâîñò³" + IDS_CUT "&Âèð³çàòè" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Aug 13 13:25:01 2008 @@ -608,10 +608,10 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "´´½¨¿ì½Ý·½Ê½(&L)" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" + IDS_COPY "¸´ÖÆ(&C)" + IDS_DELETE "É¾³ý(&D)" + IDS_PROPERTIES "ÊôÐÔ(&P)" + IDS_CUT "¼ôÇÐ(&U)" IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."

1 0

[sginsberg] 35310: - Fix MiSyncThreadProcessViews in KeInitThread too as requested by Alex
by sginsberg＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: sginsberg Date: Wed Aug 13 13:00:23 2008 New Revision: 35310 URL: http://svn.reactos.org/svn/reactos?rev=35310&view=rev Log: - Fix MiSyncThreadProcessViews in KeInitThread too as requested by Alex Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Aug 13 13:00:23 2008 @@ -813,7 +813,8 @@ /* Make sure that we are in the right page directory */ MiSyncThreadProcessViews(Process, (PVOID)Thread->StackLimit, - KERNEL_STACK_SIZE); + Thread->LargeStack ? + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); /* Enter SEH to avoid crashes due to user mode */

1 0

[sginsberg] 35309: - Remove KiRawTicks -- this was previously a ros-specific kernel export, but is now unused - Fix a comment typo
by sginsberg＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: sginsberg Date: Wed Aug 13 12:24:22 2008 New Revision: 35309 URL: http://svn.reactos.org/svn/reactos?rev=35309&view=rev Log: - Remove KiRawTicks -- this was previously a ros-specific kernel export, but is now unused - Fix a comment typo Modified: trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] Wed Aug 13 12:24:22 2008 @@ -17,7 +17,6 @@ LARGE_INTEGER KeBootTime; ULONGLONG KeBootTimeBias; volatile KSYSTEM_TIME KeTickCount = {0}; -volatile ULONG KiRawTicks = 0; ULONG KeMaximumIncrement; ULONG KeMinimumIncrement; ULONG KeTimeAdjustment; @@ -95,7 +94,7 @@ Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); NextEntry = NextEntry->Flink; - /* Is is absolute? */ + /* Is it absolute? */ if (Timer->Header.Absolute) { /* Remove it from the timer list */

1 0

[sginsberg] 35308: - "Sync" to the next thread's initial stack in KiSwapThread. This fixes an invalid page fault (faulting while interrupts are disabled) during context switching, where we access the next thread's initial stack before performing the address space switch. Many thanks to Alex for his help with this bug! - Fix stack size calculations in KeAttachProcess and KeStackAttachProcess (thanks to Alex for pointing this out)
by sginsberg＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: sginsberg Date: Wed Aug 13 12:00:49 2008 New Revision: 35308 URL: http://svn.reactos.org/svn/reactos?rev=35308&view=rev Log: - "Sync" to the next thread's initial stack in KiSwapThread. This fixes an invalid page fault (faulting while interrupts are disabled) during context switching, where we access the next thread's initial stack before performing the address space switch. Many thanks to Alex for his help with this bug! - Fix stack size calculations in KeAttachProcess and KeStackAttachProcess (thanks to Alex for pointing this out) Modified: trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Wed Aug 13 12:00:49 2008 @@ -451,7 +451,7 @@ MiSyncThreadProcessViews(Process, (PVOID)Thread->StackLimit, Thread->LargeStack ? - KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); /* Check if we're already in that process */ @@ -581,7 +581,7 @@ MiSyncThreadProcessViews(Process, (PVOID)Thread->StackLimit, Thread->LargeStack ? - KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); /* Crash system if DPC is being executed! */ Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Wed Aug 13 12:00:49 2008 @@ -347,6 +347,10 @@ MiSyncThreadProcessViews(PsGetCurrentProcess(), ((PETHREAD)NextThread)->ThreadsProcess, sizeof(EPROCESS)); + MiSyncThreadProcessViews(PsGetCurrentProcess(), + (PVOID)((PETHREAD)NextThread)->Tcb.StackLimit, + NextThread->LargeStack ? + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); /* Swap contexts */ ApcState = KiSwapContext(CurrentThread, NextThread);

1 0

[jmorlan] 35307: cmd_start: - Allow space between /D and directory. - Allow /W as a synonym for /WAIT. - Give an error message on invalid switches. - Clean up the function a bit.
by jmorlan＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: jmorlan Date: Wed Aug 13 10:17:51 2008 New Revision: 35307 URL: http://svn.reactos.org/svn/reactos?rev=35307&view=rev Log: cmd_start: - Allow space between /D and directory. - Allow /W as a synonym for /WAIT. - Give an error message on invalid switches. - Clean up the function a bit. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Wed Aug 13 10:17:51 2008 @@ -48,10 +48,9 @@ INT cmd_start (LPTSTR First, LPTSTR Rest) { TCHAR szFullName[CMDLINE_LENGTH]; - TCHAR *rest = NULL; + TCHAR rest[CMDLINE_LENGTH]; TCHAR *param = NULL; TCHAR *dot; - TCHAR RestWithoutArgs[CMDLINE_LENGTH]; INT size; LPTSTR comspec; BOOL bWait = FALSE; @@ -90,6 +89,12 @@ else if (_totupper(*option) == _T('D')) { lpDirectory = option + 1; + if (!*lpDirectory) + { + while (_istspace(*Rest)) + Rest++; + lpDirectory = GetParameter(&Rest); + } StripQuotes(lpDirectory); } else if (!_tcsicmp(option, _T("MIN"))) @@ -124,9 +129,15 @@ { Priority = BELOW_NORMAL_PRIORITY_CLASS; } - else if (!_tcsicmp(option, _T("WAIT"))) + else if (!_tcsicmp(option, _T("W")) || + !_tcsicmp(option, _T("WAIT"))) { bWait = TRUE; + } + else + { + ConErrResPrintf(STRING_TYPE_ERROR1, option); + return 0; } } else @@ -136,7 +147,7 @@ break; } } - _tcscpy(RestWithoutArgs, Rest); + _tcscpy(rest, Rest); /* get comspec */ comspec = cmd_alloc ( MAX_PATH * sizeof(TCHAR)); @@ -149,10 +160,7 @@ size = GetEnvironmentVariable (_T("COMSPEC"), comspec, MAX_PATH); if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) { - RestWithoutArgs[0] = _T('c'); - RestWithoutArgs[1] = _T('m'); - RestWithoutArgs[2] = _T('d'); - RestWithoutArgs[3] = _T('\0'); + _tcscpy(comspec, _T("cmd")); } else { @@ -169,80 +177,31 @@ nErrorLevel = 0; - if(!_tcslen(RestWithoutArgs)) - { - _tcscpy(RestWithoutArgs,_T("\"")); - _tcscat(RestWithoutArgs,comspec); - _tcscat(RestWithoutArgs,_T("\"")); - } - - rest = cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); - if (rest == NULL) - { - if(comspec != NULL) - cmd_free(comspec); - error_out_of_memory(); - return 1; - } - - param = cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); - if (param == NULL) - { - if(comspec != NULL) - cmd_free(comspec); - cmd_free(rest); - error_out_of_memory(); - return 1; - } - - param[0] = _T('\0'); - - - _tcscpy(rest,RestWithoutArgs); + if(!*rest) + { + _tcscpy(rest,_T("\"")); + _tcscat(rest,comspec); + _tcscat(rest,_T("\"")); + } /* Parsing the command that gets called by start, and it's parameters */ - if(!_tcschr(rest,_T('\"'))) - { - INT count = _tcslen(rest); - - /* find the end of the command and start of the args */ - for(i = 0; i < count; i++) - { - if(rest[i] == _T(' ')) - { - - _tcscpy(param,&rest[i+1]); - rest[i] = _T('\0'); - break; - } - } - } - else - { - INT count = _tcslen(rest); + { BOOL bInside = FALSE; /* find the end of the command and put the arguments in param */ - for(i = 0; i < count; i++) + for(i = 0; rest[i]; i++) { if(rest[i] == _T('\"')) bInside = !bInside; if((rest[i] == _T(' ')) && !bInside) { - _tcscpy(param,&rest[i+1]); + param = &rest[i+1]; rest[i] = _T('\0'); break; } } - i = 0; /* remove any slashes */ - while(i < count) - { - if(rest[i] == _T('\"')) - memmove(&rest[i],&rest[i + 1], _tcslen(&rest[i]) * sizeof(TCHAR)); - else - i++; - } + StripQuotes(rest); } /* check for a drive change */ @@ -258,13 +217,7 @@ if (szPath[0] != (TCHAR)_totupper (*rest)) ConErrResPuts (STRING_FREE_ERROR1); - if (rest != NULL) - cmd_free(rest); - - if (param != NULL) - cmd_free(param); - if (comspec != NULL) - cmd_free(comspec); + cmd_free(comspec); return 0; } @@ -274,14 +227,7 @@ { error_bad_command (); - if (rest != NULL) - cmd_free(rest); - - if (param != NULL) - cmd_free(param); - - if (comspec != NULL) - cmd_free(comspec); + cmd_free(comspec); return 1; } @@ -291,25 +237,13 @@ if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { bBat = TRUE; - memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR)); - - - _tcscpy(szFullCmdLine,comspec); - - memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K \""), 6 * sizeof(TCHAR)); - memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR)); - memcpy(&szFullCmdLine[1], &szFullCmdLine[0], _tcslen(szFullCmdLine) * sizeof(TCHAR)); - szFullCmdLine[0] = _T('\"'); - szFullCmdLine[_tcslen(szFullCmdLine)] = _T('\"'); - } - + _stprintf(szFullCmdLine, _T("\"%s\" /K \"%s\""), comspec, szFullName); TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - - + } + else + { TRACE ("[EXEC: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); /* build command line for CreateProcess() */ - if (bBat == FALSE) - { _tcscpy (szFullCmdLine, rest); if( param != NULL ) { @@ -317,7 +251,7 @@ _tcscat(szFullCmdLine, _T(" ") ); _tcscat (szFullCmdLine, param); } - } + } /* fill startup info */ memset (&stui, 0, sizeof (STARTUPINFO)); @@ -359,14 +293,7 @@ } - if (rest != NULL) - cmd_free(rest); - - if (param != NULL) - cmd_free(param); - - if (comspec != NULL) - cmd_free(comspec); + cmd_free(comspec); return 0; }

1 0

[cgutman] 35306: - Set Buf to NULL so we don't try to free it again later
by cgutman＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: cgutman Date: Wed Aug 13 09:53:22 2008 New Revision: 35306 URL: http://svn.reactos.org/svn/reactos?rev=35306&view=rev Log: - Set Buf to NULL so we don't try to free it again later Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Aug 13 09:53:22 2008 @@ -123,6 +123,7 @@ } ExFreePool( Buf ); + Buf = NULL; } /* Produce a kernel-land handle array with handles replaced by object

1 0

[sginsberg] 35305: - Fix a (comment) typo
by sginsberg＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: sginsberg Date: Wed Aug 13 09:30:35 2008 New Revision: 35305 URL: http://svn.reactos.org/svn/reactos?rev=35305&view=rev Log: - Fix a (comment) typo Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Aug 13 09:30:35 2008 @@ -858,7 +858,7 @@ IN PVOID Teb, IN PVOID KernelStack) { - /* Initailize and start the thread on success */ + /* Initialize and start the thread on success */ if (NT_SUCCESS(KeInitThread(Thread, KernelStack, SystemRoutine,

1 0

[fireball] 35304: - Replace crt's lnx_sprintf implementation with the one from lib/rtl (46kb of useless code substituted by 14kb of code, works the same).
by fireball＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: fireball Date: Wed Aug 13 06:47:34 2008 New Revision: 35304 URL: http://svn.reactos.org/svn/reactos?rev=35304&view=rev Log: - Replace crt's lnx_sprintf implementation with the one from lib/rtl (46kb of useless code substituted by 14kb of code, works the same). Added: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c (contents, props changed) - copied, changed from r35303, trunk/reactos/lib/rtl/sprintf.c Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c trunk/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c trunk/reactos/lib/sdk/crt/stdio/lnx_vsprintf.c trunk/reactos/lib/sdk/crt/stdio/lnx_vswprintf.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Aug 13 06:47:34 2008 @@ -239,10 +239,6 @@ <file>find.c</file> <file>fmode.c</file> <file>lnx_sprintf.c</file> - <file>lnx_vfprintf.c</file> - <file>lnx_vfwprint.c</file> - <file>lnx_vsprintf.c</file> - <file>lnx_vswprintf.c</file> <file>perror.c</file> <file>popen.c</file> <file>waccess.c</file> Copied: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c (from r35303, trunk/reactos/lib/rtl/sprintf.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Wed Aug 13 06:47:34 2008 @@ -17,7 +17,10 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ -#include <rtl.h> +#include <precomp.h> + +#include <wchar.h> +#include <tchar.h> #define ZEROPAD 1 /* pad with zero */ #define SIGN 2 /* unsigned/signed long */ @@ -27,42 +30,6 @@ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ #define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} double_t; - -static -__inline -int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); -} - -static -__inline -int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); -} - static __inline @@ -383,7 +350,7 @@ /* * @implemented */ -int __cdecl _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) +int __cdecl lnx_vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) { int len; unsigned long long num; @@ -700,18 +667,18 @@ /* * @implemented */ -int sprintf(char * buf, const char *fmt, ...) +int lnx_sprintf(char * buf, const char *fmt, ...) { va_list args; int i; va_start(args, fmt); - i=_vsnprintf(buf,MAXLONG,fmt,args); + i=lnx_vsnprintf(buf,MAXLONG,fmt,args); va_end(args); return i; } - +#if 0 /* * @implemented */ @@ -734,5 +701,5 @@ { return _vsnprintf(buf,MAXLONG,fmt,args); } - +#endif /* EOF */ Propchange: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c ------------------------------------------------------------------------------ svn:mergeinfo = Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_vfpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c (removed) @@ -1,874 +1,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <precomp.h> - -extern int __mb_cur_max; -int __vfprintf(FILE*, const char*, va_list); - -/* - * @implemented - */ -int lnx_vfprintf(FILE* f, const char* fmt, va_list ap) -{ - int len; - char localbuf[BUFSIZ]; - -#if 0 - __fileno_lock(_fileno(f)); -#endif - if (f->_flag & _IONBF) { - f->_flag &= ~_IONBF; - f->_ptr = f->_base = localbuf; - f->_bufsiz = f->_cnt = BUFSIZ; - len = __vfprintf(f, fmt, ap); - (void)fflush(f); - f->_flag |= _IONBF; - f->_base = NULL; - f->_bufsiz = 0; - f->_cnt = 0; - } else { - len = __vfprintf(f,fmt, ap); - } -#if 0 - __fileno_unlock(_fileno(f)); -#endif - return (ferror(f) ? EOF : len); -} - - -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - -/* - * Appropiated for the reactos kernel, March 1998 -- David Welch - */ - -#include <stdarg.h> - -#include <ctype.h> -#include <string.h> -#include <math.h> -#include <internal/ieee.h> - - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define ZEROTRUNC 128 /* truncate zero 's */ - - -static int skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - - -static int do_div(LONGLONG *n,int base) -{ - int __res = ((ULONGLONG) *n) % (unsigned) base; - *n = ((ULONGLONG) *n) / (unsigned) base; - return __res; -} - - -static int number(FILE * f, LONGLONG num, int base, int size, int precision ,int type) -{ - char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; - int i, done = 0; - - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return done; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]='0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putc(' ',f) == EOF) - return -1; - done++; - } - if (sign) - { - if (putc(sign,f) == EOF) - return -1; - done++; - } - if (type & SPECIAL) { - if (base==8) { - if (putc('0',f) == EOF) - return -1; - done++; - } - else if (base==16) { - if (putc('0', f) == EOF) - return -1; - done++; - if (putc(digits[33],f) == EOF) - return -1; - done++; - } - } - if (!(type & LEFT)) - while (size-- > 0) - { - if (putc(c,f) == EOF) - return -1; - done++; - } - while (i < precision--) - { - if (putc('0', f) == EOF) - return -1; - done++; - } - while (i-- > 0) - { - if (putc(tmp[i],f) == EOF) - return -1; - done++; - } - while (size-- > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - return done; -} - - -static int numberf(FILE * f, double __n, char exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - //int x; - char *buf, *tmp; - int i = 0; - int j = 0; - //int k = 0; - - double frac, intr; - double p; - char sign; - char c; - char ro = 0; - int result, done = 0; - - union - { - double* __n; - double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) - { - if ( 0 == n.n->mantissal && 0 == n.n->mantissah && 0 == n.n->exponent ) - { - ie = 0; - } - else - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - } - - exponent = ie/3.321928; - } - - - if ( exp_sign == 'g' || exp_sign == 'G' ) { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - } - - if ( exp_sign == 'e' || exp_sign == 'E' ) { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type); - if (result < 0) - return -1; - done += result; - if (putc( exp_sign,f) == EOF) - return -1; - done++; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = number(f,ie, 10,2, 2,type ); - if (result < 0) - return -1; - done += result; - return done; - } - - if ( exp_sign == 'f' ) { - buf = alloca(4096); - if (type & LEFT) { - type &= ~ZEROPAD; - } - - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (__n < 0) { - sign = '-'; - __n = fabs(__n); - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; - while ( i >= 0 ) { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + '0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) { - ro = 1; - } - - if ( precision >= 1 || type & SPECIAL) { - buf[i++] = '.'; - size--; - } - } - - if ( intr == 0.0 ) { - buf[i++] = '0'; - size--; - } - else { - while ( intr > 0.0 ) { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + '0'; - size--; - } - } - - j = 0; - while ( j < i && ro == 1) { - if ( buf[j] >= '0' && buf[j] <= '8' ) { - buf[j]++; - ro = 0; - } - else if ( buf[j] == '9' ) { - buf[j] = '0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = '1'; - - buf[i] = 0; - - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putc(' ',f) == EOF) - return -1; - done++; - } - if (sign) - { - if (putc( sign,f) == EOF) - return -1; - done++; - } - - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putc(' ',f) == EOF) - return -1; - done++; - } - if (type & SPECIAL) { - } - - if (!(type & LEFT)) - while (size-- > 0) - { - if (putc(c,f) == EOF) - return -1; - done++; - } - - tmp = buf; - - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { - j = 0; - while ( j < i && *tmp == L'0' ) { - tmp++; - i--; - } - if ( j < i && *tmp == L'.' ) { - tmp++; - i--; - } - } - - -// else -// while (i < precision--) -// putc('0', f); - while (i-- > 0) - { - if (putc(tmp[i],f) == EOF) - return -1; - done++; - } - while (size-- > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - } - return done; -} - - - - -static int string(FILE *f, const char* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - for (i = 0; i < len; ++i) - { - if (putc(*s++, f) == EOF) - return -1; - done++; - } - while (len < field_width--) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - return done; -} - -static int stringw(FILE *f, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - char * mb; - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - mb = malloc(MB_CUR_MAX * sizeof(char)); - if(!mb) - return -1; - for (i = 0; i < len; ++i) - { - int mbcount, j; - mbcount = wctomb(mb, *sw++); - if (mbcount <= 0) - { - break; - } - for (j = 0; j < mbcount; j++) - { - if (putc(mb[j], f) == EOF) - { - free(mb); - return -1; - } - done++; - } - } - while (len < field_width--) - { - if (putc(' ', f) == EOF) - { - free(mb); - return -1; - } - done++; - } - free(mb); - return done; -} - -int __vfprintf(FILE *f, const char *fmt, va_list args) -{ - int len; - ULONGLONG num; - int base; - double _double; - const char *s; - const wchar_t *sw; - int result, done = 0; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) { - if (*fmt != '%') { - if (putc(*fmt,f) == EOF) - return -1; - done++; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = 0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == 'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case 'o': - case 'b': - case 'X': - case 'x': - case 'd': - case 'i': - case 'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == 'l' ) { - ++fmt; - qualifier = 'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - if (qualifier == 'l' || qualifier == 'w') - { - if (putc((unsigned char)(wchar_t) va_arg(args, int), f) == EOF) - return -1; - done++; - } - else - { - if (putc((unsigned char) va_arg(args, int), f) == EOF) - return -1; - done++; - } - while (--field_width > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - continue; - - case 'C': - if (!(flags & LEFT)) - while (--field_width > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - if (qualifier == 'h') - { - if (putc((unsigned char) va_arg(args, int), f) == EOF) - return -1; - done++; - } - else - { - if (putc((unsigned char)(wchar_t) va_arg(args, int), f) == EOF) - return -1; - done++; - } - while (--field_width > 0) - { - if (putc(' ', f) == EOF) - return -1; - done++; - } - continue; - - case 's': - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case 'Z': - if (qualifier == 'w') { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - result = stringw(f, sw, len, field_width, precision, flags); - } else { - /* print counted ascii string */ - PANSI_STRING pas = va_arg(args, PANSI_STRING); - if ((pas == NULL) || (pas->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pas->Buffer; - len = pas->Length; - } - result = string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) { - s = "Nan"; - len = 3; - while ( len > 0 ) { - if (putc(*s++,f) == EOF) - return -1; - done++; - len --; - } - } else if ( _isinf(_double) < 0 ) { - s = "-Inf"; - len = 4; - while ( len > 0 ) { - if (putc(*s++,f) == EOF) - return -1; - done++; - len --; - } - } else if ( _isinf(_double) > 0 ) { - s = "+Inf"; - len = 4; - while ( len > 0 ) { - if (putc(*s++,f) == EOF) - return -1; - done++; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - result = numberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - return -1; - done += result; - } - continue; - - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = number(f, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - return -1; - done += result; - continue; - - case 'n': - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt != '%') - { - if (putc('%', f) == EOF) - return -1; - done++; - } - if (*fmt) - { - if (putc(*fmt, f) == EOF) - return -1; - done++; - } - else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = number(f, num, base, field_width, precision, flags); - if (result < 0) - return -1; - done += result; - } - //putc('\0',f); - return done; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_vfwp… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c (removed) @@ -1,847 +1,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ - -#include <precomp.h> - - -int -__vfwprintf(FILE *fp, const wchar_t *fmt0, va_list argp); - - -/* - * @implemented - */ -int -lnx_vfwprintf(FILE *f, const wchar_t *fmt, va_list ap) -{ - int len; - wchar_t localbuf[BUFSIZ]; - -#if 0 - __fileno_lock(_fileno(f)); -#endif - if (f->_flag & _IONBF) { - f->_flag &= ~_IONBF; - f->_ptr = f->_base = (char *)localbuf; - f->_bufsiz = BUFSIZ; - len = __vfwprintf(f,fmt,ap); - (void)fflush(f); - f->_flag |= _IONBF; - f->_base = NULL; - f->_bufsiz = 0; - f->_cnt = 0; - } else - len = __vfwprintf(f,fmt,ap); -#if 0 - __fileno_unlock(_fileno(f)); -#endif - return (ferror(f) ? EOF : len); -} - - - -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - -/* - * Appropiated for the reactos kernel, March 1998 -- David Welch - */ - -#include <math.h> -#include <internal/ieee.h> - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define ZEROTRUNC 128 /* truncate zero 's */ - - -static int skip_wtoi(const wchar_t **s) -{ - int i=0; - - while (iswdigit(**s)) - i = i*10 + *((*s)++) - L'0'; - return i; -} - - -static int do_div(LONGLONG *n,int base) -{ - int __res = ((ULONGLONG) *n) % (unsigned) base; - *n = ((ULONGLONG) *n) / (unsigned) base; - return __res; -} - - -static int number(FILE * f, LONGLONG num, int base, int size, int precision ,int type) -{ - wchar_t c,sign,tmp[66]; - const wchar_t *digits=L"0123456789abcdefghijklmnopqrstuvwxyz"; - int i, done = 0; - - if (type & LARGE) - digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return done; - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = L'-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = L' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]=L'0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putwc(L' ',f) == WEOF) - return -1; - done++; - } - - if (sign) - { - if (putwc(sign,f) == WEOF) - return -1; - done++; - } - if (type & SPECIAL) { - if (base==8) { - if (putwc(L'0',f) == WEOF) - return -1; - done++; - } - else if (base==16) { - if (putwc(L'0', f) == WEOF) - return -1; - done++; - if (putwc(digits[33],f) == WEOF) - return -1; - done++; - } - } - if (!(type & LEFT)) - while (size-- > 0) - { - if (putwc(c,f) == WEOF) - return -1; - done++; - } - while (i < precision--) - { - if (putwc(L'0', f) == WEOF) - return -1; - done++; - } - while (i-- > 0) - { - if (putwc(tmp[i],f) == WEOF) - return -1; - done++; - } - while (size-- > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - return done; -} - - -static int numberf(FILE * f, double __n, wchar_t exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - //int x; - char *buf, *tmp; - int i = 0; - int j = 0; - //int k = 0; - - double frac, intr; - double p; - wchar_t sign; - wchar_t c; - char ro = 0; - int result, done = 0; - - union - { - double* __n; - double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) - { - if ( 0 == n.n->mantissal && 0 == n.n->mantissah && 0 == n.n->exponent ) - { - ie = 0; - } - else - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - } - - exponent = ie/3.321928; - } - - - if ( exp_sign == L'g' || exp_sign == L'G' ) { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - } - - if ( exp_sign == L'e' || exp_sign == L'E' ) { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = numberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type); - if (result < 0) - return -1; - done += result; - if (putwc( exp_sign,f) == WEOF) - return -1; - done++; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = number(f,ie, 10,2, 2,type ); - if (result < 0) - return -1; - done += result; - return done; - } - - if ( exp_sign == 'f' ) { - buf = alloca(4096); - if (type & LEFT) { - type &= ~ZEROPAD; - } - - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) { - if (__n < 0) { - sign = L'-'; - __n = fabs(__n); - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = L' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; - while ( i >= 0 ) { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + L'0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) { - ro = 1; - } - - if ( precision >= 1 || type & SPECIAL) { - buf[i++] = '.'; - size--; - } - } - - if ( intr == 0.0 ) { - buf[i++] = L'0'; - size--; - } - else { - while ( intr > 0.0 ) { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + L'0'; - size--; - } - } - - j = 0; - while ( j < i && ro == 1 ) { - if ( buf[j] >= L'0' && buf[j] <= L'8' ) { - buf[j]++; - ro = 0; - } - else if ( buf[j] == L'9' ) { - buf[j] = L'0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = L'1'; - - buf[i] = 0; - - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putwc(L' ',f) == WEOF) - return -1; - done++; - } - if (sign) - { - if (putwc( sign,f) == WEOF) - return -1; - done++; - } - - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - if (putwc(L' ',f) == WEOF) - return -1; - done++; - } - if (type & SPECIAL) { - } - - if (!(type & LEFT)) - while (size-- > 0) - { - if (putwc(c,f) == WEOF) - return -1; - done++; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { - j = 0; - while ( j < i && *tmp == L'0' ) { - tmp++; - i--; - } - if ( j < i && *tmp == L'.' ) { - tmp++; - i--; - } - } -// else -// while (i < precision--) -// putwc(L'0', f); - while (i-- > 0) - { - if (putwc(tmp[i],f) == WEOF) - return -1; - done++; - } - while (size-- > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - } - return done; -} - - - -static int string(FILE *f, const char* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - for (i = 0; i < len; ++i) - { - if (putwc(*s++, f) == WEOF) - return -1; - done++; - } - while (len < field_width--) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - return done; -} - -static int stringw(FILE *f, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - for (i = 0; i < len; ++i) - { - if (putwc(*sw++, f) == WEOF) - return -1; - done++; - } - while (len < field_width--) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - return done; -} - -int __vfwprintf(FILE *f, const wchar_t *fmt, va_list args) -{ - int len = 0; - ULONGLONG num; - int base; - double _double; - const char *s; - const wchar_t* sw; - int result, done = 0; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) { - if (*fmt != L'%') { - if (putwc(*fmt,f) == WEOF) - return -1; - done++; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case L'-': flags |= LEFT; goto repeat; - case L'+': flags |= PLUS; goto repeat; - case L' ': flags |= SPACE; goto repeat; - case L'#': flags |= SPECIAL; goto repeat; - case L'0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isxdigit(*fmt)) - field_width = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == L'.') { - ++fmt; - if (iswdigit(*fmt)) - precision = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier=0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == 'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case L'o': - case L'b': - case L'X': - case L'x': - case L'd': - case L'i': - case L'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == L'l' ) { - ++fmt; - qualifier = L'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case L'c': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - if (qualifier == L'h') - { - if (putwc((wchar_t) va_arg(args, int), f) == WEOF) - return -1; - } - else - { - if (putwc((wchar_t) va_arg(args, int), f) == WEOF) - return -1; - } - done++; - while (--field_width > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - continue; - - case L'C': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - if (qualifier == L'l' || qualifier == L'w') - { - if (putwc((unsigned char) va_arg(args, int), f) == WEOF) - return -1; - } - else - { - if (putwc((unsigned char) va_arg(args, int), f) == WEOF) - return -1; - } - done++; - while (--field_width > 0) - { - if (putwc(L' ', f) == WEOF) - return -1; - done++; - } - continue; - - case L's': /* finished */ - if (qualifier == L'h') { - /* print ascii string */ - s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case L'S': - if (qualifier == L'l' || qualifier == L'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case L'Z': /* finished */ - if (qualifier == L'w') { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - } - result = stringw(f, sw, len, field_width, precision, flags); - } else { - /* print counted ascii string */ - PANSI_STRING pus = va_arg(args, PANSI_STRING); - if ((pus == NULL) || (pus->Buffer)) { - s = NULL; - len = -1; - } else { - s = pus->Buffer; - len = pus->Length; - } - result = string(f, s, len, field_width, precision, flags); - } - if (result < 0) - return -1; - done += result; - continue; - - case L'e': /* finished */ - case L'E': - case L'f': - case L'g': - case L'G': - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) { - sw = L"Nan"; - len = 3; - while ( len > 0 ) { - if (putwc(*sw++,f) == WEOF) - return -1; - done++; - len --; - } - } else if ( _isinf(_double) < 0 ) { - sw = L"-Inf"; - len = 4; - while ( len > 0 ) { - if (putwc(*sw++,f) == WEOF) - return -1; - done++; - len --; - } - } else if ( _isinf(_double) > 0 ) { - sw = L"+Inf"; - len = 4; - while ( len > 0 ) { - if (putwc(*sw++,f) == WEOF) - return -1; - done++; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - result = numberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - return -1; - done += result; - } - continue; - - case L'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = number(f, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - return -1; - done += result; - continue; - - case L'n': - if (qualifier == L'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case L'o': - base = 8; - break; - - case L'b': - base = 2; - break; - - case L'X': - flags |= LARGE; - case L'x': - base = 16; - break; - - case L'd': - case L'i': - flags |= SIGN; - case L'u': - break; - - default: - if (*fmt != L'%') - { - if (putwc(L'%', f) == WEOF) - return -1; - done++; - } - if (*fmt) - { - if (putwc(*fmt, f) == WEOF) - return -1; - done++; - } - else - --fmt; - continue; - } - - if (qualifier == L'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == L'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == L'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = number(f, num, base, field_width, precision, flags); - if (result < 0) - return -1; - done += result; - } - //putwc(L'\0',f); - return done; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_vsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_vspr… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_vsprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_vsprintf.c (removed) @@ -1,41 +1,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <precomp.h> -#include <tchar.h> - -/* - * @implemented - */ -int -lnx__vstprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap) -{ - FILE f = {0}; - int len; - - f._flag = _IOWRT|_IOSTRG|_IOBINARY; - f._ptr = (char*)str; - f._cnt = INT_MAX; - f._file = -1; - len = lnx_vftprintf(&f,fmt, ap); - *(_TCHAR*)f._ptr = 0; - return len; -} - - -/* - * @implemented - */ -int -lnx__vsntprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap) -{ - FILE f = {0}; - int len; - - f._flag = _IOWRT|_IOSTRG|_IOBINARY; - f._ptr = (char*)str; - f._cnt = maxlen * sizeof(_TCHAR); - f._file = -1; - len = lnx_vftprintf(&f,fmt, ap); - // what if the buffer is full ?? - *(_TCHAR *)f._ptr = 0; - return len; -} Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_vswprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_vswp… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_vswprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_vswprintf.c (removed) @@ -1,4 +1,0 @@ -#define UNICODE -#define _UNICODE - -#include "lnx_vsprintf.c"

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008