Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 32411: Spanish localizations by Javier Ramacha Updated: control, solitaire, servman, 3dtext, taskmgr, explorer and expand New: msconfig See issue #3078 for more details.
by mpiulachs＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: mpiulachs Date: Mon Feb 18 20:19:52 2008 New Revision: 32411 URL: http://svn.reactos.org/svn/reactos?rev=32411&view=rev Log: Spanish localizations by Javier Ramacha Updated: control, solitaire, servman, 3dtext, taskmgr, explorer and expand New: msconfig See issue #3078 for more details. Added: trunk/reactos/base/applications/msconfig/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/control/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/system/expand/lang/es-ES.rc Modified: trunk/reactos/base/applications/control/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/control/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -17,7 +17,7 @@ BEGIN MENUITEM "&Cerrar", IDM_CLOSE END - POPUP "&View" + POPUP "&Ver" BEGIN MENUITEM "Iconos Grandes", IDM_LARGEICONS MENUITEM "Iconos Pequeños", IDM_SMALLICONS @@ -26,16 +26,16 @@ END POPUP "Ayuda" BEGIN - MENUITEM "Sobre", IDM_ABOUT + MENUITEM "Acerca de", IDM_ABOUT END END STRINGTABLE BEGIN - IDS_WINDOW_TITLE "Control Panel" - IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" - IDS_ABOUT_TITLE "About the Control Panel" - IDS_NO_ITEMS "No Items in ListView" - IDS_NAME "Name" - IDS_COMMENT "Comment" + IDS_WINDOW_TITLE "Panel de Control" + IDS_ABOUT "Panel de Control Simple (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" + IDS_ABOUT_TITLE "Acerca del Panel de Control" + IDS_NO_ITEMS "Sin elementos en la lista" + IDS_NAME "Nombre" + IDS_COMMENT "Comentario" END Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -49,8 +49,8 @@ BEGIN IDS_SOL_NAME "Solitario" IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib version 1.0." - IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Felicidadas, ¡¡Has ganado!!" + IDS_SOL_QUIT "¿Finalizar el juego actual?" + IDS_SOL_WIN "Felicidades, ¡¡Has ganado!!" END Added: trunk/reactos/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -1,0 +1,174 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Programa de configuración del Sistema" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "Aceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ayuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Activar todo",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Desactivar todo",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +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 "Mover &Arriba", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Mover A&bajo", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "&Permitir", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "&Bloquear", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "&Buscar", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Nuevo", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "Edi&ción", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "Permi&tir Todo", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Blo&quear Todo",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Ejecutar", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Activar todo",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Desactivar todo",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Selección de Inicio", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "Inicio &Normal - cargar todos los controladores de unidades y servicios", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "Inicio de &Diagnostico - cargar sólo los controladores y servicios básicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "Inicio S&electivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Cargar Servicios del Sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "C&argar elementos de Inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Verificar todas las rutas de Arranque", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Configurar por Defecto", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Mover &Arriba", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Mover A&bajo", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Opciones de Arranque", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 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 + PUSHBUTTON "Opciones A&vazadas...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Tiempo Máx:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "seg.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 +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 + 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 + 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 "/P&ROFILE", 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 + 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 + 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 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "Aceptar", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Cancelar", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "Programa de configuración del Sistema" + IDS_TAB_GENERAL "General" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Servicios" + IDS_TAB_STARTUP "Inicio" + IDS_TAB_TOOLS "Herramientas" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Servicio" + IDS_SERVICES_COLUMN_REQ "Requirido" + IDS_SERVICES_COLUMN_VENDOR "Vendedor" + IDS_SERVICES_COLUMN_STATUS "Estado" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Nombre" + IDS_TOOLS_COLUMN_DESCR "Descripción" + + IDS_TOOLS_CMD_NAME "Consola" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Versión" + IDS_TOOLS_INFO_DESCR "Muestra información de la versión." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Editor del Registro" + IDS_TOOLS_REGEDIT_DESCR "Abre el Editor del Registro." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Propiedades del sistema" + IDS_TOOLS_SYSDM_DESCR "Muestra información acerca de este equipo." + IDS_TOOLS_SYSDM_CMD "control.exe" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Elemento" + IDS_STARTUP_COLUMN_CMD "Comando" + IDS_STARTUP_COLUMN_PATH "Ruta" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "En ejecución" + IDS_SERVICES_STATUS_STOPPED "Detenido" + IDS_SERVICES_YES "Sí" + IDS_SERVICES_UNKNOWN "Desconocido" +END Propchange: trunk/reactos/base/applications/msconfig/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Mon Feb 18 20:19:52 2008 @@ -15,6 +15,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -165,7 +165,7 @@ CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "&Close", IDOK, 100, 70, 54, 13 + PUSHBUTTON "&Cerrar", IDOK, 100, 70, 54, 13 END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -2,7 +2,7 @@ IDD_CONFIG DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "3D Text Screensaver Settings" +CAPTION "Configuración del Salvapantallas Texto en 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Aceptar",IDOK,216,7,50,14 @@ -13,7 +13,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "3D Text ScreenSaver" + IDS_DESCRIPTION "Salvapantallas Texto en 3D" IDS_TITLE "Acerca de.." IDS_TEXT "Ninguna opción necesita ser configurada." END Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -35,7 +35,7 @@ POPUP "&Ver" BEGIN MENUITEM "&Actualizar Ahora", ID_VIEW_REFRESH - POPUP "Velocidad de A&ctualizacion" + POPUP "Velocidad de A&ctualización" BEGIN MENUITEM "A&lta", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL @@ -53,14 +53,14 @@ ID_VIEW_SELECTCOLUMNS POPUP "Historial de la &CPU" BEGIN - MENUITEM "&Una Grafica, Todas las CPUs", + MENUITEM "&Una Gráfica, Todas las CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Una Grafica, &Por CPU", + MENUITEM "Una Gráfica, &Por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "&Mostrar tiempos del Nucleo", + MENUITEM "&Mostrar tiempos del Núcleo", ID_VIEW_SHOWKERNELTIMES END POPUP "&Ventanas" @@ -148,7 +148,7 @@ POPUP "DUMMY" BEGIN MENUITEM "&Finalizar Proceso", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "Finalizar &Arbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE + MENUITEM "Finalizar &Árbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Depurador", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR @@ -168,7 +168,7 @@ END MENUITEM "Establecer &Afinidad...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "Editar &Canales de Depuracion...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "Editar &Canales de Depuración...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -234,14 +234,14 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Uso de la CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT - GROUPBOX "Uso de la MEMORIA",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uso de MEMORIA",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totales",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Memoria Fisica (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Memoria del Nucleo (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Manejadores",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Hilos",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + GROUPBOX "Carga de transacciones (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memoria Física (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memoria del Núcleo (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Identificadores",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Subprocesos",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Procesos",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -250,8 +250,8 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 - LTEXT "Pico",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "Límite",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Máximo",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | @@ -260,7 +260,7 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Total",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 LTEXT "Disponible",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Cache del Sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "Caché del Sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT @@ -292,7 +292,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canales de Depuracion" +CAPTION "Canales de Depuración" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | @@ -390,52 +390,52 @@ WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "&PID (Identificador de Proceso)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 - CONTROL "Uso de la &CPU",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "Uso de &CPU",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 - CONTROL "Ti&empos de la CPU",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + CONTROL "Ti&empo de CPU",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 - CONTROL "Uso de la &Memoria",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "Uso de &Memoria",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 - CONTROL "Uso de la Memoria &Delta",IDC_MEMORYUSAGEDELTA,"Button", + CONTROL "Di&ferencia de uso de memoria",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 - CONTROL "Pi&co de Uso de la Memory",IDC_PEAKMEMORYUSAGE,"Button", + CONTROL "Uso má&ximo de la Memoria",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 - CONTROL "&Fallos de Pagina",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + CONTROL "Err&ores de Página",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,53,10 - CONTROL "Objetos de &USUARIO",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "O&bjetos de USUARIO",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 CONTROL "Lecturas E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 CONTROL "Bytes E/S Leidos",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 - CONTROL "ID de &Sesion",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "I&D de Sesion",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 CONTROL "&Nombre de Usuario",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,51,10 - CONTROL "F&allos de Pagina Delta",IDC_PAGEFAULTSDELTA,"Button", + CONTROL "Diferencia de erro&res de página",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 CONTROL "Tamaño de la Memoria &Virtual",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 - CONTROL "Pa&ged Pool",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + CONTROL "B&loque paginado",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,50,53,10 - CONTROL "N&on-paged Pool",IDC_NONPAGEDPOOL,"Button", + CONTROL "Blo&que no paginado",IDC_NONPAGEDPOOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 CONTROL "P&rioridad Base",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 - CONTROL "&Handle Count",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "&Recuento de identificadores",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,59,10 - CONTROL "&Thread Count",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "Nú&mero de subprocesos",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,59,10 - CONTROL "Objetos GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "Objetos &GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 - CONTROL "Escrituras E/S",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + CONTROL "Escrituras de E/S",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,49,10 - CONTROL "Bytes E/S Escritos",IDC_IOWRITEBYTES,"Button", + CONTROL "Bytes de escritura de E/S",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 - CONTROL "Otros E/S",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + CONTROL "Otros de E/S",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 - CONTROL "Bytes E/S Otros",IDC_IOOTHERBYTES,"Button", + CONTROL "Otros Bytes de E/S",IDC_IOOTHERBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 END @@ -591,12 +591,12 @@ ID_WINDOWS_CASCADE "Mostrar las ventanas en diagonal sobre el escritorio en forma de cascada" ID_WINDOWS_BRINGTOFRONT "Trae el frente de ventana, pero no cambiar a ella" ID_HELP_TOPICS "Mostrar Temas de ayuda del Administrador de Tareas" - ID_HELP_ABOUT "Mostrar informacion del programa, numero de version y copyright" + ID_HELP_ABOUT "Mostrar información del programa, número de versión y copyright" ID_FILE_EXIT "Cerrar el Administrador de Tareas" ID_OPTIONS_SHOW16BITTASKS "Mostrar tareas de 16-bit bajo el ntvdm.exe asociado" ID_VIEW_SELECTCOLUMNS "Seleccionar que columnas seran visibles en la pagina de Procesos" - ID_VIEW_SHOWKERNELTIMES "Mostrar tiempos del nucleo en los graficos de rendimiento" + ID_VIEW_SHOWKERNELTIMES "Mostrar tiempos del núcleo en los graficos de rendimiento" ID_VIEW_CPUHISTORY_ONEGRAPHALL "Un simple histograma muestra el uso total de la CPU" ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Cada CPU tiene su histograma propio" @@ -611,7 +611,7 @@ ID_RESTORE "Restaurar el Administrador de Tareas de su estado oculto" ID_PROCESS_PAGE_ENDPROCESS "Eliminar el proceso del sistema" ID_PROCESS_PAGE_ENDPROCESSTREE - "Eliminar este proceso y todos sus hijos del sistema" + "Eliminar este proceso y todos sus subprocesos del sistema" ID_PROCESS_PAGE_DEBUG "Ata a la depuración a este proceso" ID_PROCESS_PAGE_SETAFFINITY "Controlar en que procesadores puede ejecutarse cada proceso" @@ -636,7 +636,7 @@ IDS_TAB_PROCESSES "Procesos" IDS_TAB_PERFORMANCE "Rendimiento" IDS_TAB_TASK "Tareas" - IDS_TAB_STATUS "Estatus" + IDS_TAB_STATUS "Estado" IDS_TAB_IMAGENAME "Nombre de Imagen" IDS_TAB_PID "PID" IDS_TAB_USERNAME "Nombre Usuario" @@ -645,14 +645,14 @@ IDS_TAB_CPUTIME "Tiempo CPU" IDS_TAB_MEMUSAGE "Uso de Mem" IDS_TAB_PEAKMEMUSAGE "Pico uso de Mem" - IDS_TAB_MEMDELTA "Delta Mem" + IDS_TAB_MEMDELTA "Diferencia de Mem" IDS_TAB_PAGEFAULT "Faltas de Pagina" - IDS_TAB_PFDELTA "FP Delta" + IDS_TAB_PFDELTA "Diferencia de FP" IDS_TAB_VMSIZE "Tamaño MV(Maquina Virtual)" IDS_TAB_PAGEDPOOL "Grupo Paginado" IDS_TAB_NPPOOL "Grupo NP" IDS_TAB_BASEPRI "Base Pri" - IDS_TAB_HANDLES "Manijas(Handles)" + IDS_TAB_HANDLES "Manejadores" IDS_TAB_THREADS "Hilos" IDS_TAB_USERPBJECTS "Objetos USER" IDS_TAB_GDIOBJECTS "Objetos GDI" @@ -663,7 +663,7 @@ IDS_TAB_IOWRITESBYTES "I/O Bytes Escritos" IDS_TAB_IOOTHERBYTES "I/O Otros Bytes" IDS_MENU_SELECTCOLUMNS "&Seleccione Columnas..." - IDS_MENU_16BITTASK "&Eseñe tareas 16-bit" + IDS_MENU_16BITTASK "Mos&trar tareas 16-bit" IDS_MENU_WINDOWS "&Ventanas" IDS_MENU_LARGEICONS "Iconos G&randes" IDS_MENU_SMALLICONS "Iconos &Pequeños" @@ -671,19 +671,19 @@ IDS_MENU_ONEGRAPHALLCPUS "&Una Grafica, Todos CPUs" IDS_MENU_ONEGRAPHPERCPU "Una Grafica &Por CPU" IDS_MENU_CPUHISTORY "Historial &CPU" - IDS_MENU_SHOWKERNELTIMES "Mues&tra tiempos Nucleo" + IDS_MENU_SHOWKERNELTIMES "Mues&tra tiempos Núcleo" IDS_CREATENEWTASK "Crear Tarea Nueva" - IDS_CREATENEWTASK_DESC "Escriba el nombre de un programa, carpeta, documento, o recurso de internet, y Task Manager lo habrera por ti." - IDS_MSG_ACCESSPROCESSAFF "Incapaz de accesar o alterar Afinidad del Proceso" + IDS_CREATENEWTASK_DESC "Escriba el nombre del programa, carpeta, documento, o recurso de Internet, y el Administrador de Tareas lo abrira por ti." + IDS_MSG_ACCESSPROCESSAFF "Incapaz de acceder o configurar la Afinidad del Proceso" IDS_MSG_PROCESSONEPRO "El proceso debe tener afinidad con por lo menos un procesador." IDS_MSG_INVALIDOPTION "Opción Invalida" IDS_MSG_UNABLEDEBUGPROCESS "Incapaz de depurar proceso" IDS_MSG_WARNINGDEBUG "ADVERTENCIA: La depuración de este proceso puede resultar en perdidad de data.\n¿Esta seguro que quiere usar el depurador?" IDS_MSG_TASKMGRWARNING "Advertencia de Manejador de Tareas" - IDS_MSG_WARNINGTERMINATING "ADVERTENCIA: Terminando un proceso puede causar resultados indeseados\nresultados que incluyen la posible perdida de data o inestabilidad del systema. El\nproceso no se le dara un chance de grabar su estado o\ndata antes de ser terminado. ¿Está seguro que quiere \nterminar el proceso?" + IDS_MSG_WARNINGTERMINATING "ADVERTENCIA: Si temina un proceso puede obtener resultados no deseados\ncomo la pérdida de datos y la inestabilidad del sistema. El\nproceso no se le dara tiempo para guardar su estado o\ndata antes de ser terminado. ¿Está seguro que quiere \nterminar el proceso?" IDS_MSG_UNABLETERMINATEPRO "Incapaz de cerrar el Proceso" IDS_MSG_UNABLECHANGEPRIORITY "Incapaz de cambiar la prioridad" - IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: Cambiando la clase de prioridad de este proceso puede\ncausar resultados indeseados incluyendo posible inestabilidad del sistema. ¿Está seguro que\nusted quiera cambiar la Clase de Prioridad?" + IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: Si cambia la clase de prioridad de este proceso, puede\nobtener resultados no deseados, incluso la inestabilidad del sistema. ¿Está seguro que\ndesea cambiar la Clase de Prioridad?" IDS_MSG_TRAYICONCPUUSAGE "Promedio CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK" IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc Mon Feb 18 20:19:52 2008 @@ -71,7 +71,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Configuración...", ID_DESKTOPBAR_SETTINGS MENUITEM "&Administrador de Tareas...", ID_TASKMGR MENUITEM SEPARATOR MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER @@ -124,7 +124,7 @@ END POPUP "&Ayuda" BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "Preguntas &Frecuentes...", ID_EXPLORER_FAQ MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS END @@ -231,13 +231,13 @@ BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Texto de Info:",IDC_LABEL1,8,44,51,8 + LTEXT "&Texto de Información:",IDC_LABEL1,8,44,51,8 EDITTEXT IDC_NOTIFY_TOOLTIP,82,42,117,14,ES_AUTOHSCROLL LTEXT "Título de la V&entana:",IDC_LABEL2,8,63,70,8 EDITTEXT IDC_NOTIFY_TITLE,82,60,117,14,ES_AUTOHSCROLL LTEXT "&Parche del Módulo:",IDC_LABEL3,8,81,65,8 EDITTEXT IDC_NOTIFY_MODULE,82,78,117,14,ES_AUTOHSCROLL - GROUPBOX "Modo de &Display",IDC_LABEL4,7,96,157,28 + GROUPBOX "Modo de &Visualización",IDC_LABEL4,7,96,157,28 CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,108,38,10 CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, @@ -262,13 +262,13 @@ BEGIN LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", IDC_STATIC,7,7,170,18 - CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + CONTROL "&MDI (Interface de Multiples Documentos)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,123,10 - CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + CONTROL "&SDI (Interface de Ún Documento)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,116,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Open Subfolders in s&eparate windows", + CONTROL "Abrir Subcarpetas en ventanas s&eparadas", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 LTEXT "Esta configuración se usará por defecto y apartir de ahora para todas las ventanas del explorador.", @@ -277,6 +277,20 @@ PUSHBUTTON "&Cancelar",IDCANCEL,106,136,50,14 END +IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Acerca de Explorador de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Explorador de ReactOS",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&Aceptar",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -385,3 +399,4 @@ + Modified: trunk/reactos/base/system/expand/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/es… ============================================================================== --- trunk/reactos/base/system/expand/lang/es-ES.rc (original) +++ trunk/reactos/base/system/expand/lang/es-ES.rc Mon Feb 18 20:19:52 2008 @@ -10,7 +10,7 @@ IDS_Copy, "ReactOS Utilidad de Descompresión de Archivos Versión 1.0\n\ Copyright Victor Schneider 1997\n\n\ -Usage: %s archivo entrada [archivo salida]\n" +Utilización: %s archivo entrada [archivo salida]\n" IDS_FAILS "LZCopy falló: el resultado es %ld\n" END

1 0

[dchapyshev] 32410: - Update Russian translation
by dchapyshev＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: dchapyshev Date: Mon Feb 18 01:21:30 2008 New Revision: 32410 URL: http://svn.reactos.org/svn/reactos?rev=32410&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Feb 18 01:21:30 2008 @@ -900,7 +900,7 @@ { 6, 15, - " § â¥¬ ¡¥à¨â¥ ®¢®¥ ¨¬ï ¤¨à¥ªâ®à¨¨ ¤«ï ãáâ ®¢ª¨ ReactOS", + " § â¥¬ ¡¥à¨â¥ ®¢®¥ ¨¬ï ¤¨à¥ªâ®à¨¨ ¤«ï ãáâ ®¢ª¨ ReactOS.", TEXT_NORMAL }, { @@ -974,7 +974,7 @@ { 6, 8, - "áâ ®¢ª § £àã§ç¨ª ReactOS", + "áâ ®¢ª § £àã§ç¨ª ReactOS:", TEXT_NORMAL }, { @@ -1589,7 +1589,7 @@ {STRING_NONFORMATTEDPART, "ë ¢ë¡à «¨ ãáâ ®¢ªã ReactOS ®¢ë© ¥®âä®à¬ â¨à®¢ ë© à §¤¥«."}, {STRING_INSTALLONPART, - "áâ ¢«¨¢ ¥âáï ReactOS à §¤¥«"}, + "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, {STRING_QUITCONTINUE, @@ -1641,31 +1641,31 @@ {STRING_KEEPFORMAT, " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c ¯¨áì %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + " %I64u %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + " %I64u %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "¥áâª¨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c ¯¨áì %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + " ¦¥áâª®¬ ¤¨áª¥ %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c ¯¨áì %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s ¥áâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "à®£à ¬¬ ãáâ ®¢ª¨ á®§¤ « ®¢ë© à §¤¥« :"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, {0, 0} };

1 0

[dreimer] 32409: Seems like there got one string lost... fixed now. Thx to Kario for noticing.
by dreimer＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: dreimer Date: Mon Feb 18 00:57:55 2008 New Revision: 32409 URL: http://svn.reactos.org/svn/reactos?rev=32409&view=rev Log: Seems like there got one string lost... fixed now. Thx to Kario for noticing. Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Feb 18 00:57:55 2008 @@ -1662,6 +1662,8 @@ "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0} Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Mon Feb 18 00:57:55 2008 @@ -1667,6 +1667,8 @@ "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0}

1 0

[spetreolle] 32408: french usetup translation update see complete filenames when "Copying file :"
by spetreolle＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: spetreolle Date: Sun Feb 17 22:56:37 2008 New Revision: 32408 URL: http://svn.reactos.org/svn/reactos?rev=32408&view=rev Log: french usetup translation update see complete filenames when "Copying file :" Modified: trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sun Feb 17 22:56:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sun Feb 17 22:56:37 2008 @@ -1585,99 +1585,99 @@ {STRING_PLEASEWAIT, " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Installer C = Créer Partition F3 = Quitter"}, + " ENTER = Installer C = Crer Partition F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, {STRING_CHOOSENEWPARTITION, - "Vous avez choisi de créer une nouvelle partition sur"}, + "Vous avez choisi de crer une nouvelle partition sur"}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "Veuillez entrer la taille de la nouvelle partition en mgaoctets."}, {STRING_CREATEPARTITION, - " ENTER = Créer Partition ESC = Annuler F3 = Quitter"}, + " ENTER = Crer Partition ESC = Annuler F3 = Quitter"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "Cette Partition sera ensuite formate."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "Vous avez choisi d'installer ReactOS sur une nouvelle partition."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "Setup vrifie la partition slectionne."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= Quitter ENTER = Continuer"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = Redmarrer l'ordinateur"}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + " \xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM, - "Mémoire paginée"}, + "Mmoire pagine"}, {STRING_NONPAGEDMEM, - "Mémoire non paginée"}, + "Mmoire non pagine"}, {STRING_FREEMEM, - "Mémoire libre"}, + "Mmoire libre"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " Mise jour de la base de registre..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " Importe %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " Mise jour des paramtres du registre pour l'cran..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " Mise jour des paramtres rgionaux..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " Mise jour des paramtres de la dispoition clavier..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Ajout des informations de pages de codes la base de registres..."}, {STRING_DONE, - " Done..."}, + " Termin..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = Redmarrer l'ordinateur"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Impossible d'ouvrir la console\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "La cause propbable est l'utilisation d'un clavier USB\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "Les claviers USB ne sont pas compltement supports actuellement\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "Setup formate votre disque"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Setup vrifie votre disque"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " Formater la partition comme systme de fichiers %S(formatage rapide) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " Formater la partition comme systme de fichiers %S "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " Garder le systme de fichiers courant(pas de changements) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "Setup a cr une nouvelle partition sur"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " Espace non partitionn %6lu %s"}, {0, 0} };

1 0

[navaraf] 32407: Fix some typos.
by navaraf＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: navaraf Date: Sun Feb 17 22:39:28 2008 New Revision: 32407 URL: http://svn.reactos.org/svn/reactos?rev=32407&view=rev Log: Fix some typos. Modified: trunk/reactos/base/setup/usetup/lang/en-US.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sun Feb 17 22:39:28 2008 @@ -1395,7 +1395,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", + "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { @@ -1589,7 +1589,7 @@ {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE,

1 0

[dreimer] 32406: Bug 3070: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru Bug 3078: czech translation for solitaire by radekliska@gmail.com Bug 3083: usetup update by Paolo Devoti - devotip@tiscali.it Added the English Strings to all USETUP Resources and activated these. This makes translating easier. Renamed German to Deutsch and Russian to Russkij, which seems like it does not work... (thx to Caemyr anyway)
by dreimer＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: dreimer Date: Sun Feb 17 21:05:08 2008 New Revision: 32406 URL: http://svn.reactos.org/svn/reactos?rev=32406&view=rev Log: Bug 3070: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Bug 3078: czech translation for solitaire by radekliska(a)gmail.com Bug 3083: usetup update by Paolo Devoti - devotip(a)tiscali.it Added the English Strings to all USETUP Resources and activated these. This makes translating easier. Renamed German to Deutsch and Russian to Russkij, which seems like it does not work... (thx to Caemyr anyway) Added: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/shell/cmd/lang/uk-UA.rc Added: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc Sun Feb 17 21:05:08 2008 @@ -1,0 +1,87 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/cs-CZ.rc + * PURPOSE: Czech Language File for Solitaire + * TRANSLATOR: Black_Fox <radekliska at gmail dot com> + * DATE OF TR.: 13-07-2007 + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ +#include "resource.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Monosti" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Obrátit", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Jednu kartu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Tøi karty", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "È&asovì neomezená hra", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Stavový øád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Vybrat rub karet" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Storno", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0." + IDS_SOL_QUIT "Ukonèit rozehranou hru?" + IDS_SOL_WIN "Gratulujeme, zvítìzili jste!!" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Hra" + BEGIN + MENUITEM "&Rozdat\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Rub& karet...", IDM_GAME_DECK + MENUITEM "&Monosti...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Konec", IDM_GAME_EXIT + END + POPUP "Nápo&vìda" + BEGIN + MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS + MENUITEM "O høe &Solitaire", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Sun Feb 17 21:05:08 2008 @@ -7,6 +7,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Feb 17 21:05:08 2008 @@ -1628,7 +1628,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO1), + MUIGetString(STRING_HDINFOPARTCREATE), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1640,7 +1640,7 @@ else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO2), + MUIGetString(STRING_HDDINFOUNK1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1798,7 +1798,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO3), + MUIGetString(STRING_HDDINFOUNK2), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1836,7 +1836,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFO4), + MUIGetString(STRING_HDINFOPARTDELETE), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1848,7 +1848,7 @@ else { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFO5), + MUIGetString(STRING_HDDINFOUNK3), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1975,7 +1975,7 @@ PartType); #endif - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFO6), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), DiskEntry->DiskNumber, DiskSize, DiskUnit, @@ -2001,7 +2001,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFO7), + MUIGetString(STRING_HDDINFOUNK4), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -2019,7 +2019,7 @@ PartUnit); } - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDINFO8), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS), DiskEntry->DiskNumber, DiskSize, DiskUnit, Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Sun Feb 17 21:05:08 2008 @@ -1577,4 +1577,105 @@ } }; +MUI_STRING bgBGStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Sun Feb 17 21:05:08 2008 @@ -1646,27 +1646,27 @@ " Formatiere Partition als %S Dateisystem "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Vernderungen) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Typ %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Typ %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Typ %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup erstellte eine neue Partition auf"}, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Sun Feb 17 21:05:08 2008 @@ -1568,4 +1568,105 @@ } }; +MUI_STRING elGRStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sun Feb 17 21:05:08 2008 @@ -1640,27 +1640,27 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Sun Feb 17 21:05:08 2008 @@ -1567,4 +1567,105 @@ } }; +MUI_STRING esESStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sun Feb 17 21:05:08 2008 @@ -1652,27 +1652,27 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Sun Feb 17 21:05:08 2008 @@ -112,7 +112,7 @@ { 0, 0, - " INVIO = Continuare R = Riparare F3 = Termina", + " INVIO = Continua R = Ripara F3 = Termina", TEXT_STATUS }, { @@ -193,12 +193,6 @@ }, { 8, - 19, - "- La verifica dei volumi non stata ancora implementata.", - TEXT_NORMAL - }, - { - 8, 23, "\x07 Premere INVIO per installare ReactOS.", TEXT_NORMAL @@ -212,7 +206,7 @@ { 0, 0, - " INVIO = Continuare F3 = Termina", + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -336,7 +330,7 @@ { 0, 0, - " INVIO = Ritornare", + " INVIO = Ritorna", TEXT_STATUS }, { @@ -405,31 +399,31 @@ { 6, 20, - "Premere INVIO per modificare la configurazione", + "Premere INVIO per modificare la configurazione alternativa.", TEXT_NORMAL }, { 6, 21, - "alternativa.", + " ", TEXT_NORMAL }, { 6, 23, - "Quando le impostazioni saranno corrette, scegliere \"Accettare la configurazione", + "Quando le impostazioni saranno corrette, selezionare", TEXT_NORMAL }, { 6, 24, - "delle periferiche\" e premere INVIO.", - TEXT_NORMAL - }, - { - 0, - 0, - " INVIO = Continuare F3 = Termina", + "\"Accettare la configurazione delle periferiche\" e premere INVIO.", + TEXT_NORMAL + }, + { + 0, + 0, + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -544,7 +538,7 @@ { 0, 0, - " INVIO = Continuare ESC = Annulla F3 = Termina", + " INVIO = Continua ESC = Annulla F3 = Termina", TEXT_STATUS }, { @@ -681,7 +675,7 @@ { 0, 0, - " INVIO = Continuare ESC = Annullare F3 = Termina", + " INVIO = Continua ESC = Annulla F3 = Termina", TEXT_STATUS }, { @@ -727,7 +721,7 @@ { 0, 0, - " INVIO = Riavviare il computer", + " INVIO = Riavvia il computer", TEXT_STATUS }, { @@ -773,7 +767,7 @@ { 0, 0, - " INVIO = Continuare F3 = Termina", + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -888,31 +882,31 @@ { 6, 8, - "Setup installer i file di ReactOS nella partizione selezionata. Scegliere una", + "Setup installer i file di ReactOS nella partizione selezionata.", TEXT_NORMAL }, { 6, 9, - "cartella dove volete che ReactOS verr installato:", + "Scegliere una cartella dove volete che ReactOS verr installato:", TEXT_NORMAL }, { 6, 14, - "Per modificare la cartella suggerita premere CANC", + "Per modificare la cartella suggerita premere CANC e poi digitate", TEXT_NORMAL }, { 6, 15, - "e poi digitate la cartella dove volete che ReactOS sia", + "la cartella dove volete che ReactOS sia installato.", TEXT_NORMAL }, { 6, 16, - "installato.", + " ", TEXT_NORMAL }, { @@ -940,13 +934,13 @@ { 11, 12, - "Attendere mentre il setup di ReactOS copia i file nella cartella di", - TEXT_NORMAL - }, - { - 30, + "Attendere mentre il setup di ReactOS copia i file nella", + TEXT_NORMAL + }, + { + 18, 13, - "installazione di ReactOS.", + "cartella di installazione di ReactOS.", TEXT_NORMAL }, { @@ -1473,6 +1467,7 @@ } }; + MUI_PAGE itITPages[] = { { @@ -1573,4 +1568,105 @@ } }; +MUI_STRING itITStrings[] = +{ + {STRING_PLEASEWAIT, + " Attendere..."}, + {STRING_INSTALLCREATEPARTITION, + " INVIO = Installa C = Crea Partizione F3 = Esci"}, + {STRING_INSTALLDELETEPARTITION, + " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, + {STRING_PARTITIONSIZE, + "Dimensione della nuova partizione:"}, + {STRING_CHOOSENEWPARTITION, + "Avete scelto di creare una nuova partizione su"}, + {STRING_HDDSIZE, + "Indicare la dimensione della nuova partizione in megabyte."}, + {STRING_CREATEPARTITION, + " INVIO = Creare la partizione ESC = Annulla F3 = Esci"}, + {STRING_PARTFORMAT, + "Questa partizione verrà formattata successivamente."}, + {STRING_NONFORMATTEDPART, + "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, + {STRING_INSTALLONPART, + "Setup installerà ReactOS sulla partitione"}, + {STRING_CHECKINGPART, + "Setup sta controllando la partizione selezionata."}, + {STRING_QUITCONTINUE, + "F3= Esci INVIO = Continua"}, + {STRING_REBOOTCOMPUTER, + "INVIO = Riavvia il computer"}, + {STRING_TXTSETUPFAILED, + "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copia di: %S"}, + {STRING_SETUPCOPYINGFILES, + "Copia dei file in corso..."}, + {STRING_PAGEDMEM, + "Memoria paginata"}, + {STRING_NONPAGEDMEM, + "Memoria non paginata"}, + {STRING_FREEMEM, + "Memoria libera"}, + {STRING_REGHIVEUPDATE, + " Aggiornamento del registry hives..."}, + {STRING_IMPORTFILE, + " Importazione di %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Aggiornamento delle impostazioni del display nel registry..."}, + {STRING_LOCALESETTINGSUPDATE, + " Aggiornamento delle impostazioni di regionalizzazione..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Aggiornamento delle impostazioni della tastiera..."}, + {STRING_CODEPAGEINFOUPDATE, + " Aggiunta delle informazioni di codepage al registry..."}, + {STRING_DONE, + " Fatto..."}, + {STRING_REBOOTCOMPUTER2, + " INVIO = Riavvia il computer"}, + {STRING_CONSOLEFAIL1, + "Impossibile aprire la console\n\n"}, + {STRING_CONSOLEFAIL2, + "La causa piu' frequente di questo e' l'uso di una tastiera USB\n"}, + {STRING_CONSOLEFAIL3, + "le tastiere USB non sono ancora supportate per intero\n"}, + {STRING_FORMATTINGDISK, + "Setup sta formattando il disco"}, + {STRING_CHECKINGDISK, + "Setup sta controllando il disco"}, + {STRING_FORMATDISK1, + " Formatta la partizione con file system %S (formattazione rapida) "}, + {STRING_FORMATDISK2, + " Formatta la partizione con file system %S "}, + {STRING_KEEPFORMAT, + " Mantieni il file system attuale (nessuna modifica) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, + {STRING_HDDINFOUNK3, + "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Tipo %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup ha creato una nuova partizione su"}, + {STRING_UNPSPACE, + " Spazio non partizionato %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Sun Feb 17 21:05:08 2008 @@ -1577,4 +1577,105 @@ } }; +MUI_STRING ltLTStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Sun Feb 17 21:05:08 2008 @@ -1648,27 +1648,27 @@ " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Sun Feb 17 21:05:08 2008 @@ -1640,30 +1640,28 @@ " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S "}, {STRING_KEEPFORMAT, " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0} Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sun Feb 17 21:05:08 2008 @@ -1645,30 +1645,28 @@ " Naform tova oblas ako systm s£borov %S "}, {STRING_KEEPFORMAT, " Ponecha s£asnì systm s£borov (bez zmeny) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0} Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Sun Feb 17 21:05:08 2008 @@ -1567,4 +1567,105 @@ } }; +MUI_STRING svSEStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Sun Feb 17 21:05:08 2008 @@ -82,7 +82,7 @@ { 8, 17, - "\x07 â¨áiâì <R> é®¡ ¢_¤®¢¨â¨ ReactOS.", + "\x07 â¨áiâì <R> é®¡ ¢i¤®¢¨â¨ ReactOS.", TEXT_NORMAL }, { @@ -1241,7 +1241,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1275,7 +1275,7 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1334,14 +1334,14 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1475,8 +1475,8 @@ ukUALanguagePageEntries }, { - START_PAGE, - ukUAWelcomePageEntries + START_PAGE, + ukUAWelcomePageEntries }, { INSTALL_INTRO_PAGE, @@ -1568,4 +1568,105 @@ } }; +MUI_STRING ukUAStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sun Feb 17 21:05:08 2008 @@ -50,32 +50,32 @@ /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000401", L"00000401", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000405", L"00000405", L"1250", L"852", L"10029", L"Czech", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, {NULL, NULL, NULL, NULL, NULL} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Sun Feb 17 21:05:08 2008 @@ -104,17 +104,17 @@ #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 -#define STRING_HDDINFO1 36 -#define STRING_HDDINFO2 37 -#define STRING_HDDINFO3 38 -#define STRING_HDDINFO4 39 -#define STRING_HDDINFO5 40 -#define STRING_HDDINFO6 41 -#define STRING_HDDINFO7 42 -#define STRING_HDDINFO8 43 -#define STRING_HDDINFO9 44 -#define STRING_HDDINFO10 45 -#define STRING_HDDINFO11 46 +#define STRING_HDINFOPARTCREATE 36 +#define STRING_HDDINFOUNK1 37 +#define STRING_HDDINFOUNK2 38 +#define STRING_HDINFOPARTDELETE 39 +#define STRING_HDDINFOUNK3 40 +#define STRING_HDINFOPARTZEROED 41 +#define STRING_HDDINFOUNK4 42 +#define STRING_HDINFOPARTEXISTS 43 +#define STRING_HDDINFOUNK5 44 +#define STRING_HDINFOPARTSELECT 45 +#define STRING_HDDINFOUNK6 46 #define STRING_NEWPARTITION 47 #define STRING_UNPSPACE 48 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sun Feb 17 21:05:08 2008 @@ -1194,7 +1194,7 @@ if (PartType == NULL) { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO9), + MUIGetString(STRING_HDDINFOUNK5), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1288,7 +1288,7 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO10), + MUIGetString(STRING_HDINFOPARTSELECT), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1300,7 +1300,7 @@ else { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO11), + MUIGetString(STRING_HDDINFOUNK6), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Sun Feb 17 21:05:08 2008 @@ -27,23 +27,23 @@ /D Îáðîáêà òàêîæ ³ ïàïîê\n\n\ Ââåä³òü ATTRIB áåç ïàðàìåòðà, ùîá âèâåñòè àòðèáóòè âñ³õ ôàéë³â.\n" -STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ -ALIAS [alias=[command]]\n\n\ - alias Name for an alias.\n\ - command Text to be substituted for an alias.\n\n\ -To list all aliases:\n\ +STRING_ALIAS_HELP, "Âñòàíîâëåííÿ, âèäàëåííÿ àáî ïîêàç ïñåâäîí³ì³â.\n\n\ +ALIAS [ïñåâäîí³ì=[êîìàíäà]]\n\n\ + ïñåâäîí³ì ²ì'ÿ ïñåâäîí³ìà.\n\ + êîìàíäà Òåêñò, ùî ï³äñòàâëÿºòüñÿ çàì³ñòü ïñåâäîí³ìà.\n\n\ +Âèâåäåííÿ ñïèñêó âñ³õ ïñåâäîí³ì³â:\n\ ALIAS\n\n\ -To set a new or replace an existing alias:\n\ +Âñòàíîâëåííÿ àáî çì³íà ³ñíóþ÷îãî ïñåâäîí³ìà:\n\ ALIAS da=dir a:\n\n\ -To remove an alias from the alias list:\n\ +Âèäàëåííÿ ïñåâäîí³ìà ç³ ñïèñêó:\n\ ALIAS da=" -STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP\n" - -STRING_CALL_HELP, "Calls one batch program from another.\n\n\ -CALL [drive:][path]filename [batch-parameter]\n\n\ - batch-parameter Specifies any command-line information required by the\n\ - batch program." +STRING_BEEP_HELP, "Çâóêîâèé ñèãíàë ñï³êåðà.\n\nBEEP\n" + +STRING_CALL_HELP, "Âèêëèê îäí³º¿ ïàêåòíî¿ ïðîãðàìè ç ³íøî¿.\n\n\ +CALL [äèñê:][øëÿõ]³ì'ÿ_ôàéëà [ïàðàìåòðè]\n\n\ + ïàðàìåòðè Íàá³ð ïàðàìåòð³â êîìàíäíîãî ðÿäêà, íåîáõ³äíèõ äëÿ ïàêåòíîãî\n\ + ôàéëó." STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ CHDIR [/D][drive:][path]\n\

1 0

[fireball] 32405: - Fix a bug, when the page first was marked as free and put into free pages list to zero out, and then was marked as used for PFN database, but *not* removed from that list! Certainly it was zeroed out later, introducing a corruption within the free list and a pagefault. - This revision completely removes hacks introduced in 32386. See issue #3076 for more details.
by fireball＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: fireball Date: Sun Feb 17 19:24:24 2008 New Revision: 32405 URL: http://svn.reactos.org/svn/reactos?rev=32405&view=rev Log: - Fix a bug, when the page first was marked as free and put into free pages list to zero out, and then was marked as used for PFN database, but *not* removed from that list! Certainly it was zeroed out later, introducing a corruption within the free list and a pagefault. - This revision completely removes hacks introduced in 32386. See issue #3076 for more details. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Feb 17 19:24:24 2008 @@ -20,8 +20,6 @@ #define KERNEL_RVA(x) RVA(x,KSEG0_BASE) #define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT) #endif - -ULONG MmFreeLdrPageDirectoryEnd; typedef struct _BIOS_MEMORY_DESCRIPTOR { @@ -922,8 +920,6 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; - if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = KeLoaderBlock = LoaderBlock = &BldrLoaderBlock; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Feb 17 19:24:24 2008 @@ -251,7 +251,6 @@ return Pfn; } -#if 0 VOID NTAPI MmInitializePageList(VOID) @@ -375,7 +374,15 @@ i <= MmPageArraySize; i++) { - /* Mark them as used kernel memory */ + /* If this page was marked as free it should be removed from + the unzeroed free pages list */ + if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + RemoveEntryList(&MmPageArray[i].ListEntry); + UnzeroedPageCount--; + } + + /* Mark it as used kernel memory */ MmPageArray[i] = UsedPage; MmStats.NrSystemPages++; } @@ -386,198 +393,6 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } -#else -VOID -NTAPI -MmInitializePageList() -{ - ULONG i; - ULONG Reserved; - NTSTATUS Status; - PFN_TYPE Pfn = 0; - PHYSICAL_PAGE UsedPage; - ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - ULONG PdePageStart, PdePageEnd; - ULONG VideoPageStart, VideoPageEnd; - ULONG KernelPageStart, KernelPageEnd; - ULONG_PTR KernelStart, KernelEnd; - extern ULONG MiKSeg0Start, MiKSeg0End, MmFreeLdrPageDirectoryEnd; - - /* Initialize the page lists */ - KeInitializeSpinLock(&PageListLock); - InitializeListHead(&UserPageListHead); - InitializeListHead(&FreeUnzeroedPageListHead); - InitializeListHead(&FreeZeroedPageListHead); - - DPRINT1("HACK: Using old incorrect MmInitializePageList(). " - "Please bugfix the new version and delete this one\n"); - - /* Set the size and start of the PFN Database */ - MmPageArray = (PHYSICAL_PAGE *)MmPfnDatabase; - MmPageArraySize = MmHighestPhysicalPage; - Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; - - /* Loop every page required to hold the PFN database */ - for (i = 0; i < Reserved; i++) - { - PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); - - /* Check if FreeLDR has already allocated it for us */ - if (!MmIsPagePresent(NULL, Address)) - { - /* Use one of our highest usable pages */ - Pfn = MmAllocEarlyPage(); - - /* Set the PFN */ - Status = MmCreateVirtualMappingForKernel(Address, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } - } - else - { - /* Setting the page protection is necessary to set the global bit */ - MmSetPageProtect(NULL, Address, PAGE_READWRITE); - } - } - - /* Clear the PFN database */ - RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); - - /* This is what a used page looks like */ - RtlZeroMemory(&UsedPage, sizeof(UsedPage)); - UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; - UsedPage.Flags.Consumer = MC_NPPOOL; - UsedPage.ReferenceCount = 2; - UsedPage.MapCount = 1; - - /* We'll be applying a bunch of hacks -- precompute some static values */ - KernelStart = MiKSeg0Start - KSEG0_BASE; - KernelEnd = MiKSeg0End - KSEG0_BASE; - PdePageStart = PdeStart / PAGE_SIZE; - PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; - VideoPageStart = 0xA0000 / PAGE_SIZE; - VideoPageEnd = 0x100000 / PAGE_SIZE; - KernelPageStart = KernelStart / PAGE_SIZE; - KernelPageEnd = KernelEnd / PAGE_SIZE; - - // Glorious Hack: - // The kernel seems to crash if the region of memory that FreeLDR maps - // (those evil 6MB) is not *entirely* marked "in use", even though only - // 3 or 4MB of it may actually be in use. - // This wasn't noticed before, because the PFN database pages which are - // *VIRTUALLY* continous after the kernel end were also marked as - // *PHYSICALLY* continous (even though they were allocated at the very far - // end of physical memory). - // - // So we'll simply gobble up whatever is left of what FreeLDR mapped. - // - // PS. This is really sinister - // - KernelEnd += (KernelStart + 0x600000) - KernelEnd; - KernelPageEnd = KernelEnd / PAGE_SIZE; - - /* Loop every page on the system */ - for (i = 0; i <= MmPageArraySize; i++) - { - /* Check if it's part of RAM */ - if (/*MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)*/TRUE) - { - /* Apply assumptions that all computers are built the same way */ - if (i == 0) - { - /* Page 0 is reserved for the IVT */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i == 1) - { - /* Page 1 is reserved for the PCR */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i == 2) - { - /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= PdePageStart) && (i < PdePageEnd)) - { - /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= VideoPageStart) && (i < VideoPageEnd)) - { - /* - * These pages are usually for the Video ROM BIOS. - * Supposedly anyway. We'll simply ignore the fact that - * many systems have this area somewhere else entirely - * (which we'll assume to be "free" a couple of lines below) - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } - else if ((i >= KernelPageStart) && (i < KernelPageEnd)) - { - /* These are pages beloning to the kernel */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) - { - /* These are pages we allocated above to hold the PFN DB */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else - { - /* - * These are supposedly free pages. - * By the way, not all of them are, some contain vital - * FreeLDR data, but since we choose to ignore the Memory - * Descriptor List, why bother, right? - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[i].ReferenceCount = 0; - InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[i].ListEntry); - UnzeroedPageCount++; - MmStats.NrFreePages++; - } - } - else - { - /* These are pages reserved by the BIOS/ROMs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } - } - - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); - /* - DPRINT1("Unzeroed pages: %x\n", UnzeroedPageCount); - { - ULONG j = 0; - for (j=0; j<=MmPageArraySize; j++) - { - if (j % 0x10 == 0) DbgPrint ("\n0x%x\t", j); - DbgPrint("0x%x\t", MmPageArray[j].AllFlags); - } - }*/ - MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; - MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); -} -#endif VOID NTAPI

1 0

[gbrunmar] 32404: Fixed duplicate typedef in DirectX headers for real this time :)
by gbrunmar＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: gbrunmar Date: Sun Feb 17 17:51:26 2008 New Revision: 32404 URL: http://svn.reactos.org/svn/reactos?rev=32404&view=rev Log: Fixed duplicate typedef in DirectX headers for real this time :) Modified: trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/dmemmgr.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 17:51:26 2008 @@ -68,7 +68,10 @@ /* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */ /************************************************************************/ struct _DD_GETHEAPALIGNMENTDATA; +#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; +#define DD_GETHEAPALIGNMENTDATA_DECLARED +#endif /************************************************************************/ /* Video memory info structures */ Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:51:26 2008 @@ -126,6 +126,20 @@ DWORD dwAgpCommitMaskSize; } VMEMHEAP, *LPVMEMHEAP; +typedef struct _DD_GETHEAPALIGNMENTDATA +{ + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + VOID* GetHeapAlignment; + HEAPALIGNMENT Alignment; +} DD_GETHEAPALIGNMENTDATA; + +#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED +typedef DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; +#define DD_GETHEAPALIGNMENTDATA_DECLARED +#endif + extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);

1 0

[gbrunmar] 32403: Fixed duplicate typedefs in DirectX headers
by gbrunmar＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: gbrunmar Date: Sun Feb 17 17:40:23 2008 New Revision: 32403 URL: http://svn.reactos.org/svn/reactos?rev=32403&view=rev Log: Fixed duplicate typedefs in DirectX headers Modified: trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/dmemmgr.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 17:40:23 2008 @@ -57,7 +57,10 @@ #define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) #endif +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:40:23 2008 @@ -17,10 +17,21 @@ #endif #ifndef __NTDDKCOMP__ + +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif + typedef struct _VIDMEM *LPVIDMEM; + #else + +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif + typedef struct _VIDEOMEMORY *LPVIDMEM; #endif @@ -115,15 +126,6 @@ DWORD dwAgpCommitMaskSize; } VMEMHEAP, *LPVMEMHEAP; -typedef struct _DD_GETHEAPALIGNMENTDATA -{ - ULONG_PTR dwInstance; - DWORD dwHeap; - HRESULT ddRVal; - VOID* GetHeapAlignment; - HEAPALIGNMENT Alignment; -} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; - extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);

1 0

[gbrunmar] 32402: Oops, removed OsThunkD3dDrawPrimitives2 from d3d8thk.h.
by gbrunmar＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: gbrunmar Date: Sun Feb 17 16:42:02 2008 New Revision: 32402 URL: http://svn.reactos.org/svn/reactos?rev=32402&view=rev Log: Oops, removed OsThunkD3dDrawPrimitives2 from d3d8thk.h. Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/include/reactos/dll/directx/d3d8thk.h (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h Sun Feb 17 16:42:02 2008 @@ -23,6 +23,16 @@ DWORD STDCALL OsThunkD3dContextDestroyAll( LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL OsThunkD3dDrawPrimitives2( + HANDLE hCmdBuf, + HANDLE hVBuf, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx ); DWORD STDCALL OsThunkD3dValidateTextureStageState(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs