Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [USETUP] de-DE Fix typo CORE-16792

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75edf1071a73821ea499b… commit 75edf1071a73821ea499bd6b4314cd9c304c2b56 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 6 20:55:18 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 6 20:55:18 2020 +0200 [USETUP] de-DE Fix typo CORE-16792 Fix typo in my last changeset 0.4.14-dev-1323-g d079342e0a0684b4fb6530ee7ea4728f2a0ae985 --- base/setup/usetup/lang/de-DE.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 7baf2f9c4e6..cb35979456d 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -623,7 +623,7 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 6, 12, - "Die Reparaturfunkzionen sind noch nicht alle implementiert.", + "Die Reparaturfunktionen sind noch nicht alle implementiert.", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC },

4 years, 6 months

[reactos] 01/01: [USETUP] de-DE Overhaul german translation CORE-16792

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d079342e0a0684b4fb653… commit d079342e0a0684b4fb6530ee7ea4728f2a0ae985 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 6 20:49:44 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 6 20:49:44 2020 +0200 [USETUP] de-DE Overhaul german translation CORE-16792 --- base/setup/usetup/lang/de-DE.h | 152 ++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index d8b9276f304..7baf2f9c4e6 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -15,21 +15,21 @@ static MUI_ENTRY deDESetupInitPageEntries[] = { 0, 20, - "Please wait while the ReactOS Setup initializes itself", + "Bitte warten Sie w\204hrend das ReactOS Setup startet", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, TEXT_ID_STATIC }, { 0, 21, - "and discovers your devices...", + "und Ihre Ger\204te detektiert...", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, TEXT_ID_STATIC }, { 0, 0, - "Please wait...", + "Bitte warten...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -67,7 +67,7 @@ static MUI_ENTRY deDELanguagePageEntries[] = { 11, 11, - "verwenden wollen. Best\204tigen Sie die Auswahl mit der EINGABETASTE.", + "verwenden wollen. Best\204tigen Sie die Auswahl mit der EINGABETASTE.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -126,21 +126,21 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 8, 15, - "\x07 Press ENTER to install or upgrade ReactOS.", + "\x07 Dr\201cken Sie EINGABETASTE, um ReactOS zu installieren / aktualisieren", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Dr\201cken Sie R, um ReactOS zu reparieren.", + "\x07 Dr\201cken Sie R, um ReactOS zu reparieren. (Wiederherstellungskonsole)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Dr\201cken Sie L, um die Lizenzabkommen von ReactOS zu lesen.", + "\x07 Dr\201cken Sie L, um das Lizenzabkommen von ReactOS zu lesen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -168,7 +168,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen R = Reparieren L = Lizenz F3 = Beenden", + "EINGABETASTE = Fortsetzen R = Reparieren L = Lizenz F3 = Beenden", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -199,56 +199,56 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "ReactOS befindet sich noch im Alpha Stadium. Noch sind nicht alle", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "wichtigen Funktionen implementiert und Sie m\201ssen mit dem Auftreten", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "schwerwiegender Fehler rechnen. Verwenden Sie es daher nur", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, - 15, - "Backup your data or test on a secondary computer if you attempt", + 14, + "zu Testzwecken auf einem Zweitcomputer, nicht als Produktivsystem!", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "to run ReactOS on real hardware.", + "Sichern Sie unbedingt vorher ihre bestehenden Daten!", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 Dr\201cken Sie EINGABETASTE, um das ReactOS Setup fortzusetzen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Dr\201cken Sie F3, um abzubrechen ohne ReactOS zu installieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ENTER = Continue F3 = Quit", + "EINGABETASTE = Fortsetzen F3 = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -300,7 +300,7 @@ static MUI_ENTRY deDELicensePageEntries[] = { 8, 11, - "S\204mtliche Software in ReactOS daher unter der", + "S\204mtliche Softwarebestandteile in ReactOS sind daher unter der", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -578,7 +578,7 @@ static MUI_ENTRY deDERepairPageEntries[] = { 0, 0, - "ESC = Zur\201ck U = Aktualisieren R = Wiederherst. EINGABETASTE = Neustart", + "ESC = Zur\201ck U = Aktualisieren R = Wiederherst. EINGABETASTE = Neustart", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -602,63 +602,63 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 6, 8, - "The ReactOS Setup can upgrade one of the available ReactOS installations", + "Das ReactOS Setup kann eine der unten aufgef\201hrten Installationen", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 9, - "listed below, or, if a ReactOS installation is damaged, the Setup program", + "aktualisieren, oder versuchen,", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 10, - "can attempt to repair it.", + "eine besch\204digte ReactOS Installation zu reparieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "The repair functions are not all implemented yet.", + "Die Reparaturfunkzionen sind noch nicht alle implementiert.", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 8, 15, - "\x07 Press UP or DOWN to select an OS installation.", + "\x07 W\204hlen Sie mit den PFEILTASTEN die gew\201nste Installation aus.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "\x07 Press U for upgrading the selected OS installation.", + "\x07 Dr\201cken Sie U, um die gew\204hlte Installation zu aktualisieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press ESC to continue with a new installation.", + "\x07 Dr\201cken Sie ESC, um eine Neuinstallation vorzunehmen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Dr\201cken Sie F3, um abzubrechen ohne ReactOS zu installieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "U = Upgrade ESC = Do not upgrade F3 = Quit", + "U = Aktualisieren ESC = Neuinstallation F3 = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -717,7 +717,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", + "EINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -866,7 +866,7 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { 0, 0, - "EEINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", + "EINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1068,105 +1068,105 @@ static MUI_ENTRY deDEChangeSystemPartition[] = { 6, 8, - "The current system partition of your computer", + "Die derzeitige aktive Partition", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "on the system disk", + "auf dem Systemlaufwerk", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "uses a format not supported by ReactOS.", + "verwendet eine von ReactOS nicht unterst\201tzte Formatierung.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 18, - "In order to successfully install ReactOS, the Setup program must change", + "Um ReactOS installieren zu k\224nnen, muss das Setup Programm", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 19, - "the current system partition to a new one.", + "die Partition �ndern, die derzeit als aktiv markiert ist.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 21, - "The new candidate system partition is:", + "Folgende Partition wird k\201nftig die aktive Systempartition sein:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 25, - "\x07 To accept this choice, press ENTER.", + "\x07 Dr\201cken Sie ENTER, um diesen Vorschlag zu akzeptieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 27, - "\x07 To manually change the system partition, press ESC to go back to", + "\x07 Dr\201cken Sie ESC, um manuell eine andere Systempartition festzulegen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 28, - " the partition selection list, then select or create a new system", + " Erstellen Sie dazu eine neue Partition oder w\204hlen eine existierende in der folgenden Liste", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 29, - " partition on the system disk.", + " der Partitionen auf dem Systemlaufwerk.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 32, - "In case there are other operating systems that depend on the original", + "Falls sich noch weitere Betriebssysteme auf die alte Systempartition beziehen,", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 33, - "system partition, you may need to either reconfigure them for the new", + "k\224nnen Sie entweder manuell versuchen, diese nachtr\204glich anzupassen", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 34, - "system partition, or you may need to change the system partition back", + "oder Sie markieren die alte aktive Partition wieder als aktiv", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 35, - "to the original one after finishing the installation of ReactOS.", + "nachdem das ReactOS Setup abgeschlossen wurde.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ENTER = Continue ESC = Cancel", + "EINGABETASTE = Fortsetzen ESC = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1190,91 +1190,91 @@ static MUI_ENTRY deDEConfirmDeleteSystemPartitionEntries[] = { 6, 8, - "You have chosen to delete the system partition.", + "Sind Sie sicher, dass Sie die aktive Systempartition l\224schen wollen?", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 10, - "System partitions can contain diagnostic programs, hardware configuration", + "Systempartitionen enthalten oft wichtige Diagnose-Programme oder", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "Ger\204tetreiber, die ben\224tigt werden, um den Computer starten", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "programs provided by the hardware manufacturer.", + "oder einen fr\201heren Zustand wiederherstellen zu k\224nnen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "L\224schen Sie die aktive Systempartition nur falls Sie sicher sind,", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + "dass sich keine derartigen Programme auf dieser Partition befinden oder", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "dass Sie keinerlei Daten von dieser Partition l\204nger ben\224tigen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "Erst nach Abschluss des Setup wird der Computer wieder startf\204hig sein.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 Dr\201cken Sie ENTER, um die aktive Systempartition zu l\224schen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 21, - " to confirm the deletion of the partition again later.", + " Das L\224schen der Partition muss ein weiteres Mal best\204tigt werden.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 Dr\201cken Sie ESC, um zur vorherigen Seite zur\201ckzukehren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 25, - " not be deleted.", + " Die Partition wird nicht gel\224scht.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ENTER=Continue ESC=Cancel", + "ENTER=Fortsetzen ESC=Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1520,7 +1520,7 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { 8, 11, - " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit der EINGABETASTE.", + " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit der EINGABETASTE.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1791,22 +1791,22 @@ MUI_ERROR deDEErrorEntries[] = "\n" " \x07 Dr\201cken Sie die EINGABETASTE, um die Installation fortzusetzen.\n" " \x07 Dr\201cken Sie F3, um die Installation zu beenden.", - "F3 = Beenden EINGABETASTE = Fortsetzen" + "F3 = Beenden EINGABETASTE = Fortsetzen" }, { // ERROR_NO_BUILD_PATH - "Failed to build the installation paths for the ReactOS installation directory!\n" - "ENTER = Reboot computer" + "Die Installationspfade f\201r das ReactOS Installationsverzeichnis konnten nicht erstellt werden!\n" + "EINGABETASTE = Computer neu starten" }, { // ERROR_SOURCE_PATH - "You cannot delete the partition containing the installation source!\n" - "ENTER = Reboot computer" + "Die Partition kann nicht gel\224scht werden, weil sie die Installationsquellen beherbergt!\n" + "EINGABETASTE = Computer neu starten" }, { // ERROR_SOURCE_DIR - "You cannot install ReactOS within the installation source directory!\n" - "ENTER = Reboot computer" + "ReactOS kann nicht in dasselbe Verzeichnis installiert werden, in dem die Installationsquellen liegen!\n" + "EINGABETASTE = Computer neu starten" }, { // ERROR_NO_HDD @@ -1872,7 +1872,7 @@ MUI_ERROR deDEErrorEntries[] = "\n" " \x07 Dr\201cken Sie F3, um die Installation zu beenden.\n" " \x07 Dr\201cken Sie die EINGABETASTE, um die Installation fortzusetzen.", - "F3 = Beenden ENTER = EINGABETASTE" + "F3 = Beenden EINGABETASTE = Fortsetzen" }, { // ERROR_NEW_PARTITION, @@ -2028,10 +2028,10 @@ MUI_ERROR deDEErrorEntries[] = }, { // ERROR_FORMATTING_PARTITION, - "Setup is unable to format the partition:\n" + "Setup konnte die Partition nicht formatieren:\n" " %S\n" "\n" - "ENTER = Reboot computer" + "EINGABETASTE = Computer neu starten" }, { NULL, @@ -2160,13 +2160,13 @@ MUI_STRING deDEStrings[] = {STRING_PLEASEWAIT, " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, - " EINGABETASTE = Installieren P = Prim\204re E = Erweiterte F3 = Installation abbr."}, + " EINGABETASTE = Installieren P = Prim\204re E = Erweiterte F3 = Installation abbr."}, {STRING_INSTALLCREATELOGICAL, - " EINGABETASTE = Installieren L = Logisches Laufwerk F3 = Installation abbr."}, + " EINGABETASTE = Installieren L = Logisches Laufwerk F3 = Installation abbr."}, {STRING_INSTALLDELETEPARTITION, - " EINGABETASTE = Installieren D = Partition l\224schen F3 = Installation abbr."}, + " EINGABETASTE = Installieren D = Partition l\224schen F3 = Installation abbr."}, {STRING_DELETEPARTITION, - " D = Partition l\224schen F3 = Installation abbrechen"}, + " D = Partition l\224schen F3 = Installation abbrechen"}, {STRING_PARTITIONSIZE, "Gr\224\341e der neuen Partition:"}, {STRING_CHOOSENEWPARTITION, @@ -2178,7 +2178,7 @@ MUI_STRING deDEStrings[] = {STRING_HDDSIZE, "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, - " EINGABETASTE = Partition erstellen ESC = Abbrechen F3 = Installation abbr."}, + " EINGABETASTE = Partition erstellen ESC = Abbrechen F3 = Installation abbr."}, {STRING_PARTFORMAT, "Diese Partition wird als n\204chstes formatiert."}, {STRING_NONFORMATTEDPART, @@ -2194,7 +2194,7 @@ MUI_STRING deDEStrings[] = {STRING_CONTINUE, "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, - "F3 = Beenden EINGABETASTE = Fortsetzen"}, + "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, "EINGABETASTE = Computer neu starten"}, {STRING_DELETING, @@ -2224,7 +2224,7 @@ MUI_STRING deDEStrings[] = {STRING_REBOOTCOMPUTER2, " EINGABETASTE = Computer neu starten"}, {STRING_REBOOTPROGRESSBAR, - " Your computer will reboot in %li second(s)... "}, + " Der Computer wird in %li Sekunde(n) neugestartet... "}, {STRING_CONSOLEFAIL1, "Konsole konnte nicht ge\224ffnet werden\r\n\r\n"}, {STRING_CONSOLEFAIL2,

4 years, 6 months

[reactos] 01/01: [USETUP] de-DE Split a line of text into two parts CORE-16791

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed0701983125b64bd689… commit 7ed0701983125b64bd6895ca6244f212c24db84d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 6 17:11:45 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 6 17:11:45 2020 +0200 [USETUP] de-DE Split a line of text into two parts CORE-16791 --- base/setup/usetup/lang/de-DE.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 11f1f67f35b..d8b9276f304 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1305,7 +1305,14 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { 6, 10, - "Die gew\201nschte Partition wird nun formatiert. Dr\201cken Sie die EINGABETASTE, um fortzufahren.", + "Die gew\201nschte Partition wird nun formatiert.", + TEXT_STYLE_NORMAL, + TEXT_ID_FORMAT_PROMPT + }, + { + 6, + 12, + "Dr\201cken Sie die EINGABETASTE, um fortzufahren.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT },

4 years, 6 months

[reactos] 01/01: [TRANSLATION] Updating Spanish translation (#2503)

by Julen Urizar Compains

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6e0fe78e741fa8af9ec8… commit d6e0fe78e741fa8af9ec80b7ef70853fda14b8d6 Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Mon Apr 6 13:17:20 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 6 13:17:20 2020 +0200 [TRANSLATION] Updating Spanish translation (#2503) Updating translation for: notepad, reactos, usetup, explorer, netshell, msgina, setupapi, shell32. - Complete and Fix the SPANISH TRANSLATION on Setup - Correct the random names, fixing the denominations, translate of the English words, and fixing random and incorrect denominations like "Cabinet" or "distribuciones". - Fixed the notepad shortcuts of "Save" (Ctrl+g) and "Replace". --- base/applications/notepad/lang/es-ES.rc | 6 ++-- base/setup/reactos/lang/es-ES.rc | 47 +++++++++++++++-------------- base/setup/usetup/lang/es-ES.h | 53 +++++++++++++++++---------------- base/shell/explorer/lang/es-ES.rc | 11 +++---- dll/shellext/netshell/lang/es-ES.rc | 8 ++--- dll/win32/msgina/lang/es-ES.rc | 15 +++++----- dll/win32/setupapi/lang/es-ES.rc | 7 +++-- dll/win32/shell32/lang/es-ES.rc | 45 ++++++++++++++-------------- 8 files changed, 99 insertions(+), 93 deletions(-) diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 96b90adcb17..4d3ebbf6aaa 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -8,11 +8,11 @@ BEGIN "^C", CMD_COPY "^B", CMD_SEARCH "^T", CMD_GOTO - "R", CMD_REPLACE, VIRTKEY, CONTROL + "^R", CMD_REPLACE, VIRTKEY, CONTROL "^N", CMD_NEW "^A", CMD_OPEN "^P", CMD_PRINT - "^S", CMD_SAVE + "^G", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT "^Z", CMD_UNDO @@ -26,7 +26,7 @@ BEGIN BEGIN MENUITEM "&Nuevo\tCtrl+N", CMD_NEW MENUITEM "&Abrir\tCtrl+A", CMD_OPEN - MENUITEM "&Guardar\tCtrl+S", CMD_SAVE + MENUITEM "&Guardar\tCtrl+G", CMD_SAVE MENUITEM "Guardar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Configurar &página...", CMD_PAGE_SETUP diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 0f4bd8dfa07..5800da79b19 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -4,6 +4,7 @@ * PURPOSE: Spanish locale file * COPYRIGHT: Javier Remacha 2008 * Julio Carchi Ruiz 2018 + * Julen Urizar Compains 2020 */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -14,7 +15,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al Asistente de Instalación de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! Por favor, reinicie su equipo desde este CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 + LTEXT "¡Aún no puede instalar ReactOS directamente desde el CD! Por favor, reinicie su equipo desde el CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 END @@ -24,20 +25,20 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos, programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP + LTEXT "Instala una nueva copia de ReactOS. Esta opción no protege sus archivos, programas y ajustes. Puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Actualizar o reparar una instalación existente de ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP + LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción protege sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en este equipo.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 + LTEXT "El instalador de ReactOS puede actualizar una de las instalaciones disponibles listadas a continuación o, si la instalación de ReactOS está dañada, intentar repararla.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 + PUSHBUTTON "&No actualizar", IDC_SKIPUPGRADE, 230, 128, 80, 14 LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END @@ -104,25 +105,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "Tipo de instalación:", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + LTEXT "Fuente de instalación:", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + LTEXT "Arquitectura:", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "Equipo:", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "Pantalla:", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "Teclado:", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + LTEXT "Volumen de destino:", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + LTEXT "Directorio de destino:", IDC_STATIC, 18, 89, 74, 11 EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + AUTOCHECKBOX "Confirmo que las configuraciones de instalación son correctas. También conozco \nque ReactOS está en un fase de software Alpha y podría romper mi ordenador y corromper mis datos.", IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE - LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 + LTEXT "Por favor, confirme que todas las configuraciones son correctas, \nluego haga clic en Instalar para empezar el Proceso de Instalación.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -140,11 +141,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Completando el Asistente de Instalación de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Cuando presione Finalizar, su equipo será reiniciado.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Cuando presione Finalizar, su equipo se reiniciará.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Si hay un CD en alguna unidad, retírelo. Luego, para reiniciar su equipo, presione Finalizar.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE @@ -169,9 +170,9 @@ END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "Nombre" + IDS_INSTALLATION_PATH "Ruta de instalación" + IDS_INSTALLATION_VENDOR "Fabricante" END STRINGTABLE @@ -179,5 +180,5 @@ BEGIN IDS_PARTITION_NAME "Nombre" IDS_PARTITION_TYPE "Tipo" IDS_PARTITION_SIZE "Tamaño" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_STATUS "Estado" END diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index b80e04bcc3d..f036d1fe93b 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -114,27 +114,28 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 6, 11, - "Este paso de la instalaci\242n copiar\240 ReactOS en el equipo y", + "Este es el primer paso de instalaci\242n, que copiar\240 ReactOS en", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "prepara el segundo paso de la instalaci\242n.", + "el equipo y preparar\303\241 el segundo paso de instalaci\242n.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "\x07 Press ENTER to install or upgrade ReactOS.", + "\x07 Pulse INTRO para instalar o actualizar ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, +// "\x07 Pulse R para reparar una instalación de ReactOS usando la Consola de Recuperación.", "\x07 Pulse R para reparar ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -208,7 +209,7 @@ static MUI_ENTRY esESIntroPageEntries[] = { 6, 12, - "completo y est\240 bajo intenso desarrollo. Se recomienda su uso solo", + "completo y est\240 bajo intenso desarrollo. Se recomienda usarlo solo", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -229,7 +230,7 @@ static MUI_ENTRY esESIntroPageEntries[] = { 6, 16, - "en caso de que pruebes ReactOS en hardware real.", + "en caso de que uses ReactOS en hardware real.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -323,7 +324,7 @@ static MUI_ENTRY esESLicensePageEntries[] = { 8, 15, - "Este software NO TIENE GARANTIA ni restricciones de uso", + "Este software NO TIENE GARANT\303\215A ni restricciones de uso", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -486,14 +487,14 @@ static MUI_ENTRY esESDevicePageEntries[] = { 6, 23, - "Cuando la configuraci\242n sea la correcta, escoja \"Aceptar la configuraci\242n", + "Cuando la configuraci\242n sea la correcta, escoja \"Aceptar la", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 24, - "de los dispostivos\" y pulse INTRO.", + "configuraci\242n de los dispostivos\" y pulse INTRO.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -677,14 +678,14 @@ static MUI_ENTRY esESComputerPageEntries[] = { 6, 8, - "Desea modificar el tipo de equipo en el va a instalar el SO.", + "Puede modificar el tipo de equipo en el que instalar\303\241 el SO.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 10, - "\x07 Pulse ARRIBA y ABAJO para escoger el tipo.", + "\x07 Pulse ARRIBA y ABAJO para escoger modelo.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -736,7 +737,7 @@ static MUI_ENTRY esESFlushPageEntries[] = { 10, 6, - "El sistema est\240 procurando almacenar todos los datos en el disco.", + "El sistema se est\240 asegurando que los datos est\240n en el disco.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -833,14 +834,14 @@ static MUI_ENTRY esESDisplayPageEntries[] = { 6, 8, - "Desea modificar el tipo de pantalla a instalar.", + "Puede modificar el tipo de pantalla a instalar.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 10, - "\x07 Pulse ARRIBA y ABAJO para modificar el tipo.", + "\x07 Pulse ARRIBA y ABAJO para modificar la resoluci\303\263n.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1026,7 +1027,7 @@ static MUI_ENTRY esESSelectPartitionEntries[] = 8, 15, "\x07 Pulse P para crear una Partici\242n Primaria.", -// "\x07 Pulse C para crear una Nueva Partici�n.", +// "\x07 Pulse C para crear una Nueva Partici\242n.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1127,7 +1128,7 @@ static MUI_ENTRY esESChangeSystemPartition[] = { 8, 27, - "\x07 Para cambiar manualmente el sistema de pariciones, pulse ESC para volver atr\240s", + "\x07 Para cambiar manualmente el sistema de particiones, pulse ESC para volver", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1207,21 +1208,21 @@ static MUI_ENTRY esESConfirmDeleteSystemPartitionEntries[] = { 6, 10, - "\220sta puede contener programas de diagn\242stico, configuraci\242n de dispositivos,", + "\220sta puede contener programas de diagn\242stico, configuraci\242n de,", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 11, - "software, sistemas de arranque de un sistema operativo (como ReactOS) u otros", + "dispositivos, software, sistemas de arranque de un SO (como ReactOS)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "programas fundamentales proporcionados por el fabricante del hardware.", + "u otros programas fundamentales proporcionados por el fabricante del hardware.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1235,7 +1236,7 @@ static MUI_ENTRY esESConfirmDeleteSystemPartitionEntries[] = { 6, 15, - "haya programas de ese tipo en la partici\242n, o cuando est\202 seguro de borrarlos.", + "haya programas de ese tipo en la partici\242n, o cuando quiera borrarlos.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1509,7 +1510,7 @@ static MUI_ENTRY esESKeyboardSettingsEntries[] = { 6, 8, - "Desea cambiar el tipo de teclado instalado.", + "Puede cambiar el tipo de teclado instalado.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1568,7 +1569,7 @@ static MUI_ENTRY esESLayoutSettingsEntries[] = { 6, 8, - "Seleccione la distribuci\242n de teclado a instalar de forma predeterminada.", + "Seleccione la distribuci\242n de teclado que quiera instalar.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1582,7 +1583,7 @@ static MUI_ENTRY esESLayoutSettingsEntries[] = { 8, 11, - " deseada. Luego, pulse INTRO.", + " deseada. Luego, pulse INTRO.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1934,17 +1935,17 @@ MUI_ERROR esESErrorEntries[] = }, { // ERROR_INVALID_CABINET_INF, - "El Gabinete -CAB- no tiene un archivo inf v\240lido.\n", + "El Gabinete (CAB) no tiene un archivo inf v\240lido.\n", "INTRO = Reiniciar el equipo" }, { // ERROR_CABINET_MISSING, - "No se encuentra Gabinete -CAB-.\n", + "No se encuentra Gabinete (CAB).\n", "INTRO = Reiniciar el equipo" }, { // ERROR_CABINET_SCRIPT, - "El Gabinete -CAB- no tiene ning\243n script de instalaci\242n.\n", + "El Gabinete (CAB) no tiene ning\243n script de instalaci\242n.\n", "INTRO = Reiniciar el equipo" }, { @@ -1966,7 +1967,7 @@ MUI_ERROR esESErrorEntries[] = { // ERROR_CABINET_SECTION, "El instalador fall\242 al buscar la secci\242n '%S'\n" - "en el Gabinete -CAB-.\n", + "en el Gabinete (CAB).\n", "INTRO = Reiniciar el equipo" }, { diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 64ad3a2377b..a96312bc925 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -7,6 +7,7 @@ * UPDATED: 2009-07 Gabriel Ilardi (gabrielilardi [at] hotmail [dot] it) * UPDATED: 2014-12-31 Ismael Ferreras Morezuelas (swyterzone [plus] ros [at] gmail [dot] com) * UPDATED: 2018-08-01 Julio Carchi Ruiz (contacto [at] julcar [dot] info [dot] tm) + * UPDATED: 2020-03-06 Julen Urizar Compains (julenuri [at] hotmail [dot] com) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -111,7 +112,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Personalizar notificaciones" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS muestra íconos para tareas activas o urgentes, y oculta las inactivas. Usted puede cambiar este comportamiento en la siguiente lista.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "ReactOS muestra iconos para tareas activas o urgentes, y oculta las inactivas. Usted puede cambiar este comportamiento en la siguiente lista.", IDC_STATIC, 6, 6, 220, 30 LTEXT "Seleccione un elemento, entonces elija su comportamiento:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS @@ -151,7 +152,7 @@ BEGIN LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP AUTOCHECKBOX "&No ejecutar esta revisión al iniciar el sistema", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "Ya existe un archivo o carpeta en su computadora con el nombre %s el cual podría causar que ciertos programas dejen de funcionar correctamente. Renombrarlo a %s resolvería este problema. ¿Le gustaría renombrarlo ahora?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Ya existe un archivo o carpeta en su equipo con el nombre %s, lo que podría causar que ciertos programas dejen de funcionar correctamente. Renombrarlo a %s resolvería este problema. ¿Le gustaría renombrarlo ahora?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 @@ -175,11 +176,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Seleccione el tamaño de los íconos", IDC_STATIC, 7, 7, 238, 37 + GROUPBOX "Seleccione el tamaño de los iconos", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "Íconos &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "Íconos &pequeños", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "Iconos &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Iconos &pequeños", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "Programas ", IDC_STATIC, 7, 49, 238, 70 LTEXT "El Menú Inicio contiene accesos directos a los programas más usados. Borrar esta lista no desinstala los programas.", IDC_STATIC, 14, 63, 224, 20 LTEXT "&Número de programas en el Menú Inicio:", IDC_STATIC, 14, 86, 112, 8 diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index 8122b0e68a6..3c26304e557 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -117,13 +117,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalador de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "¿Desea que esta computadora sea miembro de un dominio?\n\ + LTEXT "¿Desea que este equipo sea miembro de un dominio?\n\ (Puede obtener más información de su administrador de red.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, esta computadora será parte de un grupo de trabajo.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Si, esta computadora será parte de un dominio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + AUTORADIOBUTTON "No, este equipo será parte de un grupo de trabajo.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sí, este equipo será parte de un dominio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Nombre del dominio o grupo de trabajo:", IDC_STATIC, 33, 72, 152, 20 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: Si esta computadora no va a ser parte de una red, usted no tiene suficientes privilegios para unirse a un dominio, o si simplemente no sabe qué elejir, entonces seleccione ""Grupo de trabajo"" por ahora. Éstas opciones pueden ser cambiadas después.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTE: Si este equipo no va a ser parte de una red, usted no tiene suficientes privilegios para unirse a un dominio, o si simplemente no sabe qué elejir, entonces seleccione ""Grupo de trabajo"" por ahora. Éstas opciones pueden ser cambiadas después.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index ead1e28bfed..ed688a96651 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -4,6 +4,7 @@ * PURPOSE: Spanish Language Resource File * COPYRIGHT: 2015-01-02 Ismael Ferreras Morezuelas * 2018-08-04 Julio Carchi Ruiz + 2020-03-06 Julen Urizar Compains */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -156,7 +157,7 @@ BEGIN COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Eventos de Apagado", IDC_STATIC, 9, 122, 257, 146 - LTEXT "Seleccione la opción que mejor describa el motivo del apagado de esta computadora.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "Seleccione la opción que mejor describa el motivo del apagado de este equipo.", IDC_STATIC, 39, 134, 190, 17 LTEXT "&Opción:", IDC_STATIC, 39, 154, 80, 8 AUTOCHECKBOX "&Planificado", IDC_REASON_PLANNED, 182, 154, 47, 10 COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -207,14 +208,14 @@ BEGIN IDS_PASSWORDCHANGED "La contraseña se ha cambiado correctamente." IDS_LOGONTITLE "Mensaje de inicio de sesión" IDS_LOGONWRONGUSERORPWD "El sistema no pudo iniciar sesión. Asegúrese de que su usuario y dominio son correctos y pruebe de nuevo. Las contraseñas distinguen entre mayúsculas y minúsculas." - IDS_LOGONUSERDISABLED "La cuenta ha sido desactivada. Contacte con su administrador del sistema." + IDS_LOGONUSERDISABLED "La cuenta ha sido desactivada. Contacte con su Administrador del Sistema." IDS_PASSWORDMUSTCHANGE "Es necesario cambiar la contraseña en el primer inicio de sesión." IDS_PASSWORDEXPIRED "La contraseña ha expirado y debe cambiarse." IDS_ACCOUNTEXPIRED "Su cuenta ha expirado. Contacte con su administrador del sistema." - IDS_ACCOUNTLOCKED "Unable to log you on beacuse your account has been locked out. Please see your system administrator." - IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." - IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." - IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_ACCOUNTLOCKED "Es imposible acceder porque tu cuenta ha sido bloqueada. Contacte con su Administrador del Sistema." + IDS_INVALIDLOGONHOURS "En este momento, tu cuenta tiene restricciones horarias para acceder. Inténtelo de nuevo más tarde." + IDS_INVALIDWORKSTATION "Su cuenta está configurada para no permitirte usar este equipo. Inténtelo en otro equipo." + IDS_ACCOUNTRESTRICTION "Es imposible acceder porque tu cuenta tiene restricciones." END /* Shutdown Dialog Strings */ @@ -229,6 +230,6 @@ BEGIN IDS_SHUTDOWN_LOGOFF_DESC "Termina la sesión actual permitiendo que otros usuarios inicien sesión en el sistema." IDS_SHUTDOWN_SHUTDOWN_DESC "Termina la sesión actual y apaga el sistema para que el equipo se pueda desenchufar con seguridad." IDS_SHUTDOWN_RESTART_DESC "Termina la sesión actual y reinicia el sistema." - IDS_SHUTDOWN_SLEEP_DESC "Pone el sistema en modo de bajo consumo." + IDS_SHUTDOWN_SLEEP_DESC "Pone el sistema en modo de bajo consumo o suspensión." IDS_SHUTDOWN_HIBERNATE_DESC "Guarda la sesión actual y apaga el equipo." END diff --git a/dll/win32/setupapi/lang/es-ES.rc b/dll/win32/setupapi/lang/es-ES.rc index 5bf04bf2f4a..afbefe28992 100644 --- a/dll/win32/setupapi/lang/es-ES.rc +++ b/dll/win32/setupapi/lang/es-ES.rc @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Spanish language file * COPYRIGHT: 2018 Julio Carchi Ruiz + * 2020 Julen Urizar Compains */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -25,7 +26,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Archivos faltantes" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Inserte el disco de instalación proporcionado por el fabricante,\ny entonces asegúrese de que el controlador adecuado está seleccionado abajo", IDC_FILENEEDED, 10, 10, 250, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Inserte el disco de instalación proporcionado por el fabricante,\ny asegúrese de que el controlador adecuado está seleccionado abajo", IDC_FILENEEDED, 10, 10, 250, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Copiar controladores desde:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 @@ -39,12 +40,12 @@ BEGIN IDS_PROMPTDISK "El archivo '%1' en %2 no se encuentra" IDS_UNKNOWN "Desconocido" IDS_COPYFROM "Copiar archivos desde:" - IDS_INFO "Busque la ruta donde se localiza el archivo, y luego presione Aceptar." + IDS_INFO "Busque la ruta donde se localiza el archivo y luego, pulse Aceptar." END STRINGTABLE BEGIN - IDS_QUERY_REBOOT_TEXT "Su computadora debe reiniciarse para completar la instalación. ¿Desea continuar?" + IDS_QUERY_REBOOT_TEXT "Su equipo debe reiniciarse para completar la instalación. ¿Desea continuar?" IDS_QUERY_REBOOT_CAPTION "Reiniciar" IDS_INF_FILE "Información del instalador" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 9daa33b40a5..52c67204da1 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -4,6 +4,7 @@ * PURPOSE: Spanish locale file * COPYRIGHT: Ismael Ferreras Morezuelas * Julio Carchi Ruiz + * Julen Urizar Compains (2020) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -776,17 +777,17 @@ BEGIN IDS_PASTE "Insertar" IDS_EJECT "Extraer" IDS_DISCONNECT "Desconectar" - IDS_OPENFILELOCATION "Open f&ile location" - IDS_DESKLINK "Desktop (Create shortcut)" - IDS_SENDTO_MENU "Se&nd To" - - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" - IDS_MOVEERRORSAMEFOLDER "Cannot move '%s': The destination folder is the same as the source folder." - IDS_MOVEERRORSAME "Cannot move '%s': The source and destination file names are the same." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_OPENFILELOCATION "Abrir &ubicación del archivo" + IDS_DESKLINK "Crear acceso directo en el Escritorio" + IDS_SENDTO_MENU "E&nviar a" + + IDS_MOVEERRORTITLE "Error moviendo Archivo o Carpeta" + IDS_COPYERRORTITLE "Error copiando Archivo o Carpeta" + IDS_MOVEERRORSAMEFOLDER "Imposible mover '%s': La carpeta de destino es la misma que la de origen." + IDS_MOVEERRORSAME "Imposible mover '%s': El archivo de origen y el de destino son el mismo." + IDS_COPYERRORSAME "Imposible copiar '%s': El archivo de origen y el de destino son el mismo." + IDS_MOVEERRORSUBFOLDER "Imposible mover '%s': La carpeta de destino es un subdirectorio de la de origen." + IDS_COPYERRORSUBFOLDER "Imposible copiar '%s': La carpeta de destino es un subdirectorio de la de origen." IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" @@ -817,9 +818,9 @@ BEGIN IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" /* Format Dialog Strings */ - IDS_FORMAT_TITLE "Format Local Disk" - IDS_FORMAT_WARNING "WARNING: Formatting will erase ALL data on this disk.\nTo format the disk, click OK. To quit, click CANCEL." - IDS_FORMAT_COMPLETE "Format Complete." + IDS_FORMAT_TITLE "Formatear Disco LocalFormat Local Disk" + IDS_FORMAT_WARNING "ADVERTENCIA: Formatear eliminará TODOS los datos de este disco.\n Para formatear, haga clic en OK. Para salir, haga clic en CANCELAR." + IDS_FORMAT_COMPLETE "Formato completo." /* Run File dialog */ IDS_RUNDLG_ERROR "No se pudo mostrar el diálogo Ejecutar (error interno)" @@ -885,19 +886,19 @@ BEGIN IDS_PICK_ICON_FILTER "Archivos de icono (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Todos los archivos (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "No se pudo bloquear la unidad (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "No se pudo desmontar la unidad (Error Code: %lu)." - IDS_CANTEJECTMEDIA "No se pudo extraer la unidad (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "No se puede mostrar las propiedades (Error Code: %lu)." - IDS_CANTDISCONNECT "No se pudo desconectar (Error Code: %lu)." - IDS_NONE "(None)" + IDS_CANTLOCKVOLUME "No se pudo bloquear la unidad (Código de Error: %lu)." + IDS_CANTDISMOUNTVOLUME "No se pudo desmontar la unidad (Código de Error: %lu)." + IDS_CANTEJECTMEDIA "No se pudo extraer la unidad (Código de Error: %lu)." + IDS_CANTSHOWPROPERTIES "No se puede mostrar las propiedades (Código de Error: %lu)." + IDS_CANTDISCONNECT "No se pudo desconectar (Código de Error: %lu)." + IDS_NONE "(Nada)" /* Friendly File Type Names */ IDS_DIRECTORY "Directorio" IDS_BAT_FILE "Archivo por lotes de ReactOS" IDS_CMD_FILE "Script de comandos ReactOS" IDS_COM_FILE "Aplicación DOS" - IDS_CPL_FILE "Elemento del Panel de control" + IDS_CPL_FILE "Elemento del Panel de Control" IDS_CUR_FILE "Cursor" IDS_DB__FILE "Base de datos" IDS_DLL_FILE "Biblioteca de aplicación" @@ -980,7 +981,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "A&vanzado >>" IDS_NEWEXT_NEW "<Nuevo>" IDS_NEWEXT_SPECIFY_EXT "Debe especificar una extensión." - IDS_NEWEXT_ALREADY_ASSOC "La extensión %s ya está asociada con el tipo de archivo %s. ¿Desea desasociar %s con %s y crear un nuevo tipo de arcivo?" + IDS_NEWEXT_ALREADY_ASSOC "La extensión %s ya está asociada con el tipo de archivo %s. ¿Desea desasociar %s con %s y crear un nuevo tipo de archivo?" IDS_NEWEXT_EXT_IN_USE "Ésta extensión ya está en uso" IDS_REMOVE_EXT "Si elimina una extensión de archivo, no podrá abrir archivos con esa extensión haciendo doble click en sus íconos.\n\n¿Está seguro de eliminar esta extensión?"

4 years, 6 months

[reactos] 03/03: [NTOS:MM] Since the _MMPTE_SUBSECTION structure for x86 (without PAE) uses the SubsectionAddressLow truncated by the least significant three bits, the _CONTROL_AREA, _LARGE_CONTROL_AREA, _SUBSECTION, _MSUBSECTION structures must be 8-byte aligned. Corresponding checks in MmArmInitSystem() have been removed.

by Vadim Galyant

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c585d0e3879a8d445c04… commit 3c585d0e3879a8d445c04dd038158d88a98c3292 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Fri Jan 24 09:29:40 2020 +0900 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:16:34 2020 +0200 [NTOS:MM] Since the _MMPTE_SUBSECTION structure for x86 (without PAE) uses the SubsectionAddressLow truncated by the least significant three bits, the _CONTROL_AREA, _LARGE_CONTROL_AREA, _SUBSECTION, _MSUBSECTION structures must be 8-byte aligned. Corresponding checks in MmArmInitSystem() have been removed. --- ntoskrnl/mm/ARM3/mminit.c | 4 ---- sdk/include/ndk/mmtypes.h | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index bcccc0c5a5e..b83588a4cca 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -2298,10 +2298,6 @@ MmArmInitSystem(IN ULONG Phase, MiInitMachineDependent(LoaderBlock); #if DBG - /* The subection PTE format depends on things being 8-byte aligned */ - ASSERT((sizeof(CONTROL_AREA) % 8) == 0); - ASSERT((sizeof(SUBSECTION) % 8) == 0); - /* Prototype PTEs are assumed to be in paged pool, so check if the math works */ PointerPte = (PMMPTE)MmPagedPoolStart; MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); diff --git a/sdk/include/ndk/mmtypes.h b/sdk/include/ndk/mmtypes.h index 5c271938320..a19b5f1ee60 100644 --- a/sdk/include/ndk/mmtypes.h +++ b/sdk/include/ndk/mmtypes.h @@ -505,7 +505,7 @@ typedef struct _MMSUBSECTION_FLAGS2 } MMSUBSECTION_FLAGS2; // -// Control Area Structures +// Control Area Structures (8-byte aligned) // typedef struct _CONTROL_AREA { @@ -528,6 +528,7 @@ typedef struct _CONTROL_AREA ULONG WritableUserReferences; ULONG QuadwordPad; } CONTROL_AREA, *PCONTROL_AREA; +C_ASSERT((sizeof(CONTROL_AREA) % 8) == 0); typedef struct _LARGE_CONTROL_AREA { @@ -553,9 +554,10 @@ typedef struct _LARGE_CONTROL_AREA LIST_ENTRY UserGlobalList; ULONG SessionId; } LARGE_CONTROL_AREA, *PLARGE_CONTROL_AREA; +C_ASSERT((sizeof(LARGE_CONTROL_AREA) % 8) == 0); // -// Subsection and Mapped Subsection +// Subsection and Mapped Subsection (8-byte aligned) // typedef struct _SUBSECTION { @@ -572,6 +574,7 @@ typedef struct _SUBSECTION ULONG PtesInSubsection; struct _SUBSECTION *NextSubsection; } SUBSECTION, *PSUBSECTION; +C_ASSERT((sizeof(SUBSECTION) % 8) == 0); typedef struct _MSUBSECTION { @@ -595,6 +598,7 @@ typedef struct _MSUBSECTION MMSUBSECTION_FLAGS2 SubsectionFlags2; } u2; } MSUBSECTION, *PMSUBSECTION; +C_ASSERT((sizeof(MSUBSECTION) % 8) == 0); // // Segment Object

4 years, 6 months

[reactos] 02/03: [NTOS:MM] In MmArmInitSystem, perform self-tests after per-arch initialization.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5032a40d33a4edc9cdf7a… commit 5032a40d33a4edc9cdf7acad08b8eb2d928c9793 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 8 20:05:02 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:16:34 2020 +0200 [NTOS:MM] In MmArmInitSystem, perform self-tests after per-arch initialization. Mm(Non)PagedPoolStart won't be initialized otherwise, making the tests pretty pointless. --- ntoskrnl/mm/ARM3/mminit.c | 68 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index d72e7186193..bcccc0c5a5e 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -2123,40 +2123,6 @@ MmArmInitSystem(IN ULONG Phase, /* Set the based section highest address */ MmHighSectionBase = (PVOID)((ULONG_PTR)MmHighestUserAddress - 0x800000); -#if DBG - /* The subection PTE format depends on things being 8-byte aligned */ - ASSERT((sizeof(CONTROL_AREA) % 8) == 0); - ASSERT((sizeof(SUBSECTION) % 8) == 0); - - /* Prototype PTEs are assumed to be in paged pool, so check if the math works */ - PointerPte = (PMMPTE)MmPagedPoolStart; - MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); - TestPte = MiProtoPteToPte(&TempPte); - ASSERT(PointerPte == TestPte); - - /* Try the last nonpaged pool address */ - PointerPte = (PMMPTE)MI_NONPAGED_POOL_END; - MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); - TestPte = MiProtoPteToPte(&TempPte); - ASSERT(PointerPte == TestPte); - - /* Try a bunch of random addresses near the end of the address space */ - PointerPte = (PMMPTE)((ULONG_PTR)MI_HIGHEST_SYSTEM_ADDRESS - 0x37FFF); - for (j = 0; j < 20; j += 1) - { - MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); - TestPte = MiProtoPteToPte(&TempPte); - ASSERT(PointerPte == TestPte); - PointerPte++; - } - - /* Subsection PTEs are always in nonpaged pool, pick a random address to try */ - PointerPte = (PMMPTE)((ULONG_PTR)MmNonPagedPoolStart + (MmSizeOfNonPagedPoolInBytes / 2)); - MI_MAKE_SUBSECTION_PTE(&TempPte, PointerPte); - TestPte = MiSubsectionPteToSubsection(&TempPte); - ASSERT(PointerPte == TestPte); -#endif - /* Loop all 8 standby lists */ for (i = 0; i < 8; i++) { @@ -2331,6 +2297,40 @@ MmArmInitSystem(IN ULONG Phase, /* Initialize the platform-specific parts */ MiInitMachineDependent(LoaderBlock); +#if DBG + /* The subection PTE format depends on things being 8-byte aligned */ + ASSERT((sizeof(CONTROL_AREA) % 8) == 0); + ASSERT((sizeof(SUBSECTION) % 8) == 0); + + /* Prototype PTEs are assumed to be in paged pool, so check if the math works */ + PointerPte = (PMMPTE)MmPagedPoolStart; + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + + /* Try the last nonpaged pool address */ + PointerPte = (PMMPTE)MI_NONPAGED_POOL_END; + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + + /* Try a bunch of random addresses near the end of the address space */ + PointerPte = (PMMPTE)((ULONG_PTR)MI_HIGHEST_SYSTEM_ADDRESS - 0x37FFF); + for (j = 0; j < 20; j += 1) + { + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + PointerPte++; + } + + /* Subsection PTEs are always in nonpaged pool, pick a random address to try */ + PointerPte = (PMMPTE)((ULONG_PTR)MmNonPagedPoolStart + (MmSizeOfNonPagedPoolInBytes / 2)); + MI_MAKE_SUBSECTION_PTE(&TempPte, PointerPte); + TestPte = MiSubsectionPteToSubsection(&TempPte); + ASSERT(PointerPte == TestPte); +#endif + // // Build the physical memory block //

4 years, 6 months

[reactos] 01/03: [NTOS:MM] Initialize MmSubsectionBase on x86 builds. CORE-16731

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74a2c6ba4269bcdfcfba9… commit 74a2c6ba4269bcdfcfba92284fed65bf4ebf7d92 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 8 20:03:33 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:16:34 2020 +0200 [NTOS:MM] Initialize MmSubsectionBase on x86 builds. CORE-16731 Spotted by Vadim Galyant. --- ntoskrnl/mm/ARM3/i386/init.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/ARM3/i386/init.c b/ntoskrnl/mm/ARM3/i386/init.c index 79ed102c230..bd14a83e19b 100644 --- a/ntoskrnl/mm/ARM3/i386/init.c +++ b/ntoskrnl/mm/ARM3/i386/init.c @@ -418,6 +418,8 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) StartPde++; } + MmSubsectionBase = (ULONG_PTR)MmNonPagedPoolStart; + // // Now remember where the expansion starts //

4 years, 6 months

[reactos] 02/02: [NTOS:MM] Get rid of unnecessary MmZeroingPageThreadActive.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25a5aee86f43e9f526d4d… commit 25a5aee86f43e9f526d4d360e4e4f35feb9d22b4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 22 12:31:54 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:13:55 2020 +0200 [NTOS:MM] Get rid of unnecessary MmZeroingPageThreadActive. --- ntoskrnl/mm/ARM3/miarm.h | 1 - ntoskrnl/mm/ARM3/mminit.c | 5 ++--- ntoskrnl/mm/ARM3/pfnlist.c | 3 +-- ntoskrnl/mm/ARM3/zeropage.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index c242b795af6..9d85c42afff 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -639,7 +639,6 @@ extern PMMPDE MiHighestUserPde; extern PFN_NUMBER MmSystemPageDirectory[PPE_PER_PAGE]; extern PMMPTE MmSharedUserDataPte; extern LIST_ENTRY MmProcessList; -extern BOOLEAN MmZeroingPageThreadActive; extern KEVENT MmZeroingPageEvent; extern ULONG MmSystemPageColor; extern ULONG MmProcessColorSeed; diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 7cd7af10838..d72e7186193 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -2181,9 +2181,8 @@ MmArmInitSystem(IN ULONG Phase, /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); - /* Set the zero page event */ - KeInitializeEvent(&MmZeroingPageEvent, SynchronizationEvent, FALSE); - MmZeroingPageThreadActive = FALSE; + /* Set up the zero page event */ + KeInitializeEvent(&MmZeroingPageEvent, NotificationEvent, FALSE); /* Initialize the dead stack S-LIST */ InitializeSListHead(&MmDeadStackSListHead); diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index eac3a043418..f175541a500 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -701,10 +701,9 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) ColorTable->Count++; /* Notify zero page thread if enough pages are on the free list now */ - if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) + if (ListHead->Total >= 8) { /* Set the event */ - MmZeroingPageThreadActive = TRUE; KeSetEvent(&MmZeroingPageEvent, IO_NO_INCREMENT, FALSE); } diff --git a/ntoskrnl/mm/ARM3/zeropage.c b/ntoskrnl/mm/ARM3/zeropage.c index 6d859f6806f..5fe22294199 100644 --- a/ntoskrnl/mm/ARM3/zeropage.c +++ b/ntoskrnl/mm/ARM3/zeropage.c @@ -17,7 +17,6 @@ /* GLOBALS ********************************************************************/ -BOOLEAN MmZeroingPageThreadActive; KEVENT MmZeroingPageEvent; /* PRIVATE FUNCTIONS **********************************************************/ @@ -73,7 +72,7 @@ MmZeroPageThread(VOID) { if (!MmFreePageListHead.Total) { - MmZeroingPageThreadActive = FALSE; + KeClearEvent(&MmZeroingPageEvent); MiReleasePfnLock(OldIrql); break; }

4 years, 6 months

[reactos] 01/02: [NTOS:MM] Fix MmZeroingPageThreadActive race condition.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5280deecfa288fe32a753… commit 5280deecfa288fe32a7538347871da0cd47cd141 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 16 20:23:07 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:13:55 2020 +0200 [NTOS:MM] Fix MmZeroingPageThreadActive race condition. If a thread calls MiInsertPageInFreeList after the zero page thread has woken up from its wait but before it acquired the PFN lock, MmZeroingPageEvent might get set again even though there is no additional work to be done. By setting MmZeroingPageThreadActive together with the event, the variable correctly indicates for future callers that the zero thread will process newly added free pages. This partially reverts r72990. --- ntoskrnl/mm/ARM3/pfnlist.c | 1 + ntoskrnl/mm/ARM3/zeropage.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index f79a5013250..eac3a043418 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -704,6 +704,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) { /* Set the event */ + MmZeroingPageThreadActive = TRUE; KeSetEvent(&MmZeroingPageEvent, IO_NO_INCREMENT, FALSE); } diff --git a/ntoskrnl/mm/ARM3/zeropage.c b/ntoskrnl/mm/ARM3/zeropage.c index e2b96ca56a8..6d859f6806f 100644 --- a/ntoskrnl/mm/ARM3/zeropage.c +++ b/ntoskrnl/mm/ARM3/zeropage.c @@ -68,7 +68,6 @@ MmZeroPageThread(VOID) NULL, NULL); OldIrql = MiAcquirePfnLock(); - MmZeroingPageThreadActive = TRUE; while (TRUE) {

4 years, 6 months

[reactos] 01/01: [NTOS:PO] Call power IRP handlers at PASSIVE_LEVEL when needed. CORE-11648 CORE-16704

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34f4b218deb628e02a226… commit 34f4b218deb628e02a2261177740d5b2ee8d982c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 23 16:18:18 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 6 11:12:47 2020 +0200 [NTOS:PO] Call power IRP handlers at PASSIVE_LEVEL when needed. CORE-11648 CORE-16704 This means we now correctly handle the DO_POWER_PAGABLE flag. In particular, Windows's usbhub.sys calls KeDelayExecutionThread from a power IRP dispatch routine. We now handle this correctly. --- ntoskrnl/po/power.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/po/power.c b/ntoskrnl/po/power.c index fe26c0f4620..d29c85658bc 100644 --- a/ntoskrnl/po/power.c +++ b/ntoskrnl/po/power.c @@ -30,6 +30,100 @@ SYSTEM_POWER_CAPABILITIES PopCapabilities; /* PRIVATE FUNCTIONS *********************************************************/ +static WORKER_THREAD_ROUTINE PopPassivePowerCall; +_Use_decl_annotations_ +static +VOID +NTAPI +PopPassivePowerCall( + PVOID Parameter) +{ + PIRP Irp = Parameter; + PIO_STACK_LOCATION IoStack; + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + _Analysis_assume_(Irp != NULL); + IoStack = IoGetNextIrpStackLocation(Irp); + + (VOID)IoCallDriver(IoStack->DeviceObject, Irp); +} + +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_requires_same_ +static +NTSTATUS +PopPresentIrp( + _In_ PIO_STACK_LOCATION NextStack, + _In_ PIRP Irp) +{ + NTSTATUS Status; + BOOLEAN CallAtPassiveLevel; + PDEVICE_OBJECT DeviceObject; + PWORK_QUEUE_ITEM WorkQueueItem; + + ASSERT(NextStack->MajorFunction == IRP_MJ_POWER); + + DeviceObject = NextStack->DeviceObject; + + /* Determine whether the IRP must be handled at PASSIVE_LEVEL. + * Only SET_POWER to working state can happen at raised IRQL. */ + CallAtPassiveLevel = TRUE; + if ((NextStack->MinorFunction == IRP_MN_SET_POWER) && + !(DeviceObject->Flags & DO_POWER_PAGABLE)) + { + if (NextStack->Parameters.Power.Type == DevicePowerState && + NextStack->Parameters.Power.State.DeviceState == PowerDeviceD0) + { + CallAtPassiveLevel = FALSE; + } + if (NextStack->Parameters.Power.Type == SystemPowerState && + NextStack->Parameters.Power.State.SystemState == PowerSystemWorking) + { + CallAtPassiveLevel = FALSE; + } + } + + if (CallAtPassiveLevel) + { + /* We need to fit a work item into the DriverContext below */ + C_ASSERT(sizeof(Irp->Tail.Overlay.DriverContext) >= sizeof(WORK_QUEUE_ITEM)); + + if (KeGetCurrentIrql() == PASSIVE_LEVEL) + { + /* Already at passive, call next driver directly */ + return IoCallDriver(DeviceObject, Irp); + } + + /* Need to schedule a work item and return pending */ + NextStack->Control |= SL_PENDING_RETURNED; + + WorkQueueItem = (PWORK_QUEUE_ITEM)&Irp->Tail.Overlay.DriverContext; + ExInitializeWorkItem(WorkQueueItem, + PopPassivePowerCall, + Irp); + ExQueueWorkItem(WorkQueueItem, DelayedWorkQueue); + + return STATUS_PENDING; + } + + /* Direct call. Raise IRQL in debug to catch invalid paged memory access. */ +#if DBG + { + KIRQL OldIrql; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); +#endif + + Status = IoCallDriver(DeviceObject, Irp); + +#if DBG + KeLowerIrql(OldIrql); + } +#endif + + return Status; +} + static NTSTATUS NTAPI @@ -480,18 +574,35 @@ PoSetHiberRange(IN PVOID HiberContext, /* * @implemented */ +_IRQL_requires_max_(DISPATCH_LEVEL) NTSTATUS NTAPI -PoCallDriver(IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp) +PoCallDriver( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ __drv_aliasesMem PIRP Irp) { - NTSTATUS Status; + PIO_STACK_LOCATION NextStack; - /* Forward to Io -- FIXME! */ - Status = IoCallDriver(DeviceObject, Irp); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - /* Return status */ - return Status; + ASSERT(DeviceObject); + ASSERT(Irp); + + NextStack = IoGetNextIrpStackLocation(Irp); + ASSERT(NextStack->MajorFunction == IRP_MJ_POWER); + + /* Set DeviceObject for PopPresentIrp */ + NextStack->DeviceObject = DeviceObject; + + /* Only QUERY_POWER and SET_POWER use special handling */ + if (NextStack->MinorFunction != IRP_MN_SET_POWER && + NextStack->MinorFunction != IRP_MN_QUERY_POWER) + { + return IoCallDriver(DeviceObject, Irp); + } + + /* Call the next driver, either directly or at PASSIVE_LEVEL */ + return PopPresentIrp(NextStack, Irp); } /*

4 years, 6 months

← Newer
1
...
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020