From a7afba7703a348c110bf78ebf36c7da7b094ab6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 30 Dec 2017 18:21:42 +0100 Subject: [PATCH] [SETUPLIB] Remove a deprecated error number (that gets merged with ERROR_TXTSETUP_SECTION). [USETUP] Improve usage of ERROR_TXTSETUP_SECTION and ERROR_CABINET_SECTION error codes, correctly display associated error message, and remove a deprecated string. --- base/setup/lib/errorcode.h | 1 - base/setup/usetup/lang/bg-BG.h | 94 +++++++++++++--------------- base/setup/usetup/lang/bn-BD.h | 94 +++++++++++++--------------- base/setup/usetup/lang/cs-CZ.h | 94 +++++++++++++--------------- base/setup/usetup/lang/da-DK.h | 110 +++++++++++++++------------------ base/setup/usetup/lang/de-DE.h | 110 +++++++++++++++------------------ base/setup/usetup/lang/el-GR.h | 92 +++++++++++++-------------- base/setup/usetup/lang/en-US.h | 94 +++++++++++++--------------- base/setup/usetup/lang/es-ES.h | 94 +++++++++++++--------------- base/setup/usetup/lang/et-EE.h | 93 +++++++++++++--------------- base/setup/usetup/lang/fr-FR.h | 94 +++++++++++++--------------- base/setup/usetup/lang/he-IL.h | 94 +++++++++++++--------------- base/setup/usetup/lang/it-IT.h | 94 +++++++++++++--------------- base/setup/usetup/lang/ja-JP.h | 94 +++++++++++++--------------- base/setup/usetup/lang/lt-LT.h | 94 +++++++++++++--------------- base/setup/usetup/lang/ms-MY.h | 92 +++++++++++++-------------- base/setup/usetup/lang/nl-NL.h | 94 +++++++++++++--------------- base/setup/usetup/lang/pl-PL.h | 94 +++++++++++++--------------- base/setup/usetup/lang/pt-BR.h | 94 +++++++++++++--------------- base/setup/usetup/lang/ro-RO.h | 98 ++++++++++++++--------------- base/setup/usetup/lang/ru-RU.h | 94 +++++++++++++--------------- base/setup/usetup/lang/sk-SK.h | 110 +++++++++++++++------------------ base/setup/usetup/lang/sq-AL.h | 88 +++++++++++++------------- base/setup/usetup/lang/sv-SE.h | 94 +++++++++++++--------------- base/setup/usetup/lang/tr-TR.h | 94 +++++++++++++--------------- base/setup/usetup/lang/uk-UA.h | 94 +++++++++++++--------------- base/setup/usetup/mui.c | 27 +++++--- base/setup/usetup/mui.h | 9 ++- base/setup/usetup/usetup.c | 16 ++--- 29 files changed, 1130 insertions(+), 1314 deletions(-) diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h index b440e4e8d3b..a7fd84e95f8 100644 --- a/base/setup/lib/errorcode.h +++ b/base/setup/lib/errorcode.h @@ -46,7 +46,6 @@ typedef enum _ERROR_NUMBER ERROR_TXTSETUP_SECTION, ERROR_CABINET_SECTION, ERROR_CREATE_INSTALL_DIR, - ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, ERROR_ADDING_CODEPAGE, ERROR_UPDATE_LOCALESETTINGS, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 214ff21bfd8..ad8ca21c37a 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1438,7 +1438,7 @@ MUI_ERROR bgBGErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "¥ ªâŽ‘ ­¥ ¥ ­ ¯ê«­® á«®¦¥­ ­  ª®¬¯îâêà \n" "¢¨. €ª® ᥣ  ¨§«¥§¥â¥ ®â á« £ ­¥â¥, é¥ âàï¡¢ \n" "¤  ¯ã᭥⥠­ áâனª â  ®â­®¢®, §  ¤  ¨­áâ «¨à â¥ ¥ ªâŽ‘.\n" @@ -1448,62 +1448,62 @@ MUI_ERROR bgBGErrorEntries[] = "F3 = ˆ§å®¤ ENTER = தꫦ ¢ ­¥" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD " áâன¢ çêâ ­¥ ­ ¬¥à¨ â¢êठ¤¨áª.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE " áâன¢ çêâ ­¥ ­ ¬¥à¨ ¨§å®¤­®â® ᨠãáâனá⢮.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF " áâன¢ çêâ ­¥ ãá¯ï ¤  ­ ¬¥à¨ ä ©« TXTSETUP.SIF.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF " áâன¢ çêâ ­ ¬¥à¨ ¯®¢à¥¤¥­ ä ©« TXTSETUP.SIF.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, " áâன¢ çêâ ­ ¬¥à¨ ­¥à¥¤¥­ ¯®¤¯¨á ¢ TXTSETUP.SIF.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION " áâன¢ çêâ ­¥ ãá¯ï ¤  ®âªà¨¥ ᢥ¤¥­¨ïâ  ­  á¨á⥬­®â® ¢¨ ãáâனá⢮.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "¥ãᯥ譮 á« £ ­¥ ­  ®§­ ç ¢ è § ¯¨á (bootcode) §  FAT ¢ á¨á⥬­¨ï ¤ï«.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, " áâன¢ çêâ ­¥ ãá¯ï ¤  § à¥¤¨ ᯨáꪠ á ¢¨¤®¢¥â¥ ª®¬¯îâà¨.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, " áâன¢ çêâ ­¥ ãá¯ï ¤  § à¥¤¨ ᯨáꪠ á ­ âனª¨ §  ¬®­¨â®à¨.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, " áâன¢ çêâ ­¥ ãá¯ï ¤  § à¥¤¨ ᯨáꪠ á ¢¨¤®¢¥â¥ ª« ¢¨ âãà¨.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, " áâன¢ çêâ ­¥ ãá¯ï ¤  § à¥¤¨ ᯨáꪠ á ª« ¢¨ âã୨⥠¯®¤à¥¤¡¨.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, " áâன¢ çêâ ãáâ ­®¢¨, ç¥ ¯®­¥ ¥¤¨­ â¢êठ¤¨áª áê¤êঠ ­¥áꢬ¥á⨬ \n" "¤ï«®¢  â ¡«¨æ , á ª®ïâ® ­¥ ¬®¦¥ ¤  ᥠࠡ®â¨ ¯à ¢¨«­®!\n" "\n" @@ -1514,7 +1514,7 @@ MUI_ERROR bgBGErrorEntries[] = "F3 = ˆ§å®¤ ENTER = தꫦ ¢ ­¥" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "¥ ¬®¦¥â¥ ¤  áꧤ ¤¥â¥ ­®¢ ¤ï« ¢ ¤ï«,\n" "ª®©â® ¢¥ç¥ áêé¥áâ¢ã¢ !\n" "\n" @@ -1522,135 +1522,129 @@ MUI_ERROR bgBGErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "¥ ¬®¦¥â¥ §  ¨§âਥ⥠­¥à §¯à¥¤¥«¥­®â® ¤¨áª®¢® ¬ïáâ®!\n" "\n" " *  â¨á­¥â¥ ª« ¢¨è, §  ¤  ¯à®¤ê«¦¨â¥.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, //"Setup failed to install the FAT bootcode on the system partition.", "¥ãᯥ譮 á« £ ­¥ ­  ®¡ã¢ é¨ï ª®¤ §  FAT ­  á¨á⥬­¨ï ¤ï«.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "‚ ãáâனá⢮ A: ­ï¬  ­®á¨â¥«.", "ENTER = தꫦ ¢ ­¥" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "¥ãᯥ譮 ®¡­®¢ï¢ ­¥ ­  ­ áâனª¨â¥ ­  ª« ¢¨ âãà­ â  ¯®¤à¥¤¡ .", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "¥ãᯥ譮 ®¡­®¢ï¢ ­¥ ­  ॣ¨áâêà­¨ ­ áâனª¨ §  ¬®­¨â®à .", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "¥ãᯥ譮 ¢­ áï­¥ ­  ஥¢¨ï ä ©«.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "¥ ¡ïå  ®âªà¨â¨ ä ©«®¢¥â¥ á ॣ¨áâêà­¨ ¤ ­­¨.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, " áâன¢ çêâ ­¥ ãá¯ï ¤  áꧤ ¤¥ ॣ¨áâê୨⥠஥¢¥.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, //There is something wrong with this line. "¥ãᯥ譮 § ¤ ¢ ­¥ ­  ­ ç «­¨ á⮩­®á⨠­  ॣ¨áâêà .", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cab ä ©«ê⠭ﬠ ¯à ¢¨«¥­ inf ä ©«.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cab ä ©«êâ ­¥ ¥ ®âªà¨â.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cab ä ©«ê⠭ﬠ ­ áâ஥筮 ¯¨á ­¨¥.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "¥ãᯥ譮 ®â¢ àï­¥ ­  ®¯ èª â  ®â ä ©«®¢¥ §  § ¯¨á.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "¥ãᯥ譮 áꧤ ¢ ­¥ ­  ¯ ¯ª¨â¥ §  á« £ ­¥.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_TXTSETUP_SECTION, - " §¤¥«êâ 'Directories' ­¥ ¡¥ ®âªà¨â\n" + // ERROR_TXTSETUP_SECTION, + " §¤¥«êâ '%S' ­¥ ¡¥ ®âªà¨â\n" "¢ TXTSETUP.SIF.\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CABINET_SECTION, - " §¤¥«êâ 'Directories' ­¥ ¡¥ ®âªà¨â\n" + // ERROR_CABINET_SECTION, + " §¤¥«êâ '%S' ­¥ ¡¥ ®âªà¨â\n" "¢ cab ä ©« .\n", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "¥ãᯥ譮 áꧤ ¢ ­¥ ­  ¯ ¯ª â  §  á« £ ­¥.", "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_FIND_SETUPDATA, - " §¤¥«êâ 'SetupData' ­¥ ¡¥ ®âªà¨â\n" - "¢ TXTSETUP.SIF.\n", - "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "¥ãᯥ譮 § ¯¨á¢ ­¥ ­  ¤ï«®¢¨â¥ â ¡«¨æ¨.\n" "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "¥ãᯥ譮 ¤®¡ ¢ï­¥ ­  §­ ª®¢¨ï ­ ¡®à ¢ ॣ¨áâêà .\n" "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "¥ãᯥ譮 ãáâ ­®¢ï¢ ­¥ ­  ¬¥á⭨⥠­ áâனª¨.\n" "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "¥ãᯥ譮 ¤®¡ ¢ï­¥ ­  ª« ¢¨ âã୨⥠¯®¤à¥¤¡¨ ¢ ॣ¨áâêà .\n" "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, " áâனª â  ­¥ ¬®¦  ¤  ãáâ ­®¢¨ ®§­ ç¨â¥«ï ­  £¥®£à ä᪮⮠¯®«®¦¥­¨¥.\n" "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1658,20 +1652,20 @@ MUI_ERROR bgBGErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1835,8 +1829,6 @@ MUI_STRING bgBGStrings[] = "F3 = ˆ§å®¤ ENTER = தꫦ ¢ ­¥"}, {STRING_REBOOTCOMPUTER, "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà "}, - {STRING_TXTSETUPFAILED, - "¥ ¡¥ ­ ¬¥à¥­ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"}, {STRING_COPYING, " ‡ ¯¨á ­  ä ©«: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index a0632f5f5b1..7bd3756922d 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1430,7 +1430,7 @@ MUI_ERROR bnBDErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR bnBDErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR bnBDErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1514,133 +1514,127 @@ MUI_ERROR bnBDErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1648,20 +1642,20 @@ MUI_ERROR bnBDErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1823,8 +1817,6 @@ MUI_STRING bnBDStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 81e82c1f5e7..1b83285d49d 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1436,7 +1436,7 @@ MUI_ERROR csCZErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nen¡ ve vaçem poŸ¡taŸi kompletnØ nainstalov n.\n" "Pokud nyn¡ instalaci ukonŸ¡te, budete ji muset pro\n" "nainstalov n¡ ReactOS spustit znovu.\n" @@ -1446,62 +1446,62 @@ MUI_ERROR csCZErrorEntries[] = "F3 = UkonŸit ENTER = PokraŸovat" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Instalace nedok zala naj¡t harddisk.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Instalace nedok zala naj¡t svou zdrojovou mechaniku.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Nepodaýilo se naŸ¡st soubor TXTSETUP.SIF.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Soubor TXTSETUP.SIF je poçkozen.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Soubor TXTSETUP.SIF je neplatnØ podepsanì.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Instalace nedok zala z¡skat informace o syst‚movìch disc¡ch.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Nepodaýilo se nainstalovat FAT zavadØŸ na syst‚movì odd¡l.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Nepodaýilo se naŸ¡st seznam typ… poŸ¡taŸe.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Nepodaýilo se naŸ¡st seznam nastaven¡ obrazovek.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Nepodaýilo se naŸ¡st seznam typ… kl vesnic.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Nepodaýilo se naŸ¡st seznam rozlo§en¡ kl ves.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Instalace zjistila, §e alespoå jeden pevnì disk obsahuje\n" "nekompatibiln¡ tabulku odd¡l…, kter  nem…§e bìt spr vnØ zpracov na!\n" "\n" @@ -1512,7 +1512,7 @@ MUI_ERROR csCZErrorEntries[] = "F3 = UkonŸit ENTER = PokraŸovat" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Nelze vytvoýit novì odd¡l uvnitý ji§\n" "existuj¡c¡ho odd¡lu!\n" "\n" @@ -1520,133 +1520,127 @@ MUI_ERROR csCZErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Nelze vymazat m¡sto na disku, kter‚ nepatý¡ § dn‚mu odd¡lu!\n" "\n" " * PokraŸujte stisknut¡m libovoln‚ kl vesy.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Nepodaýilo se nainstalovat FAT zavadØŸ na syst‚movì odd¡l.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "V jednotce A: nen¡ disketa.", "ENTER = PokraŸovat" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Nepodaýilo se aktualizovat nastaven¡ rozlo§en¡ kl ves.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Nepodaýilo se aktualizovat nastaven¡ zobrazen¡ registru.", //display registry settings "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Nepodaýilo se naimportovat soubor registru.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Nepodaýilo se nal‚zt datov‚ soubory registru.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Nepodaýilo se zalo§it registr.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Nepodaýilo se inicializovat registry.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "V archivu nen¡ platnì soubor inf.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Archiv nebyl nalezen.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Archiv neobsahuje instalaŸn¡ skript.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Nepodaýilo se otevý¡t frontu kop¡rov n¡.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Nepodaýilo se vytvoýit instalaŸn¡ adres ýe.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_TXTSETUP_SECTION, - "Nepodaýilo se nal‚zt sekci 'Directories' v souboru\n" + // ERROR_TXTSETUP_SECTION, + "Nepodaýilo se nal‚zt sekci '%S' v souboru\n" "TXTSETUP.SIF.\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CABINET_SECTION, - "Nepodaýilo se nal‚zt sekci 'Directories' v archivu.\n" + // ERROR_CABINET_SECTION, + "Nepodaýilo se nal‚zt sekci '%S' v archivu.\n" "\n", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Nepodaýilo se vytvoýit instalaŸn¡ adres ý.", "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_FIND_SETUPDATA, - "Nepodaýilo se nal‚zt sekci 'SetupData' v souboru\n" - "TXTSETUP.SIF.\n", - "ENTER = Restartovat poŸ¡taŸ" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Nepodaýilo se zapsat tabulky odd¡l….\n" "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Nepodaýilo se pýidat k¢dovou str nku do registru.\n" "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Nepodaýilo se nastavit m¡stn¡ nastaven¡.\n" "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Nepodaýilo se pýidat rozlo§en¡ kl vesnice do registru.\n" "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Nepodaýilo se nastavit geo id.\n" "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Neplatnì n zev adres ýe.\n" "\n" " * PokraŸujte stisknut¡m libovoln‚ kl vesy." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Zvolenì odd¡l nen¡ pro instalaci ReactOS dostateŸnØ velkì.\n" "InstalaŸn¡ odd¡l mus¡ m¡t velikost alespoå %lu MB.\n" "\n" @@ -1654,20 +1648,20 @@ MUI_ERROR csCZErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Nepodaýilo se vytvoýit novì prim rn¡ nebo rozç¡ýenì odd¡l\n" "v tabulce odd¡l… na zvolen‚m disku, proto§e tabulka odd¡l… je pln .\n" "\n" " * PokraŸujte stisknut¡m libovoln‚ kl vesy." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Nen¡ mo§n‚ vytvoýit v¡ce ne§ jeden rozç¡ýenì odd¡l na disk.\n" "\n" " * PokraŸujte stisknut¡m libovoln‚ kl vesy." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1829,8 +1823,6 @@ MUI_STRING csCZStrings[] = "F3 = UkonŸit ENTER = PokraŸovat"}, {STRING_REBOOTCOMPUTER, "ENTER = Restartovat poŸ¡taŸ"}, - {STRING_TXTSETUPFAILED, - "Nepodaýilo se naj¡t sekci '%S' v souboru\n TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kop¡ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 6ad0d8a04cc..bf356241e25 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1443,7 +1443,7 @@ MUI_ERROR daDKErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS er endnu ikke f‘rdiginstalleret p†\n" "din computer. Hvis du afslutter installationen nu skal\n" "du k›rer installationen igen for at installere ReactOS.\n" @@ -1453,62 +1453,62 @@ MUI_ERROR daDKErrorEntries[] = "F3 = Afslut ENTER = Forts‘t" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Installationen kunne ikke finde en harddisk.\n", "ENTER = Genstart" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Installationen kunne ikke finde dets kildedrev.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Installationen kunne ikke indl‘st TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Installationen fasdt en ›delagt TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Installationen fandt en ubrugbar signatur i TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Installationen kunne ikke hente information fra registreringsdatabasen.\n", "ENTER = Genstart" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Installationen kunne ikke installere FAT-startkode p† systempartitionen.", "ENTER = Genstart" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Installationen kunne ikke indl‘se listen over computertyper.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Installationen kunne ikke indl‘ste listen over sk‘rmindstillinger.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Installationen kunne ikke indl‘se listen over tastaturtyper.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Installationen kunne ikke indl‘se listen over tastaturlayouts.\n", "ENTER = Genstart" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Installationen fandt ud af at midst en harddisk indeholder en\n" "indkompatibel partitionstabel og kan ikke h†ndteeres korrekt!\n" "\n" @@ -1519,7 +1519,7 @@ MUI_ERROR daDKErrorEntries[] = "F3 = Afslut ENTER = Forts‘t" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Du kan ikke lave en partitionstabel\n" "inde i en allerede eksisterende partition!\n" "\n" @@ -1527,133 +1527,127 @@ MUI_ERROR daDKErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Du kan ikke slette upartitionernet diskplads!\n" "\n" " * Tryk p† en vilk†rligtast for at forts‘tte.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Installationen kunne ikke installere FAT-startkode p† systempartitionen.", "ENTER = Genstart" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Der er ingen diskette i drev A:.", "ENTER = Forts‘t" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Installationen kunne ikke opdatere indstillingene for tastaturlayout.", "ENTER = Genstart" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Installationen kunne ikke opdatere indstillingerne for sk‘rmregistrereing", "ENTER = Genstart" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Installationen kunne ikke importere registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Installationen kunne ikke finde filerne til registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Installationen kunne ikke lave registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Installationen kunne ikke indl‘e registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet-filen indeholder ingen brugbar inf-fil.\n", "ENTER = Genstart" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet-filen blev ikke fundet.\n", "ENTER = Genstart" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet-filen har ingen installationsscript.\n", "ENTER = Genstart" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Installationen kunne ikke †bne filkopieringsk›en.\n", "ENTER = Genstart" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Installationen kunne ikke lave installationsmapperne.", "ENTER = Genstart" }, { - //ERROR_TXTSETUP_SECTION, - "Installationen kunne ikke finde 'Directories'-sektionen\n" - "in TXTSETUP.SIF.\n", - "ENTER = Genstart" - }, - { - //ERROR_CABINET_SECTION, - "Installationen kunne ikke finde 'Directories'-sektionen\n" - "i cabinet-filen.\n", - "ENTER = Genstart" - }, - { - //ERROR_CREATE_INSTALL_DIR - "Installationen kunne ikke lave installationsmappen.", - "ENTER = Genstart" - }, - { - //ERROR_FIND_SETUPDATA, - "Installationen kunne ikkde finde 'SetupData'-sektionen\n" + // ERROR_TXTSETUP_SECTION, + "Installationen kunne ikke finde '%S'-sektionen\n" "i TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_WRITE_PTABLE, + // ERROR_CABINET_SECTION, + "Installationen kunne ikke finde '%S'-sektionen\n" + "i cabinet-filen.\n", + "ENTER = Genstart" + }, + { + // ERROR_CREATE_INSTALL_DIR + "Installationen kunne ikke lave installationsmappen.", + "ENTER = Genstart" + }, + { + // ERROR_WRITE_PTABLE, "Installationen kunne ikke skrive partitionstabllerne.\n" "ENTER = Genstart" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Installationen kunne ikke tilf›je en tegntabel til registreringsdatabasen.\n" "ENTER = Genstart" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Installationen kunne ikke s‘tte systemsproget.\n" "ENTER = Genstart" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Installationen kunne ikke tilf›je tastaturlayouts til registrereingsdatabasen.\n" "ENTER = Genstart" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Installationen kunne ikke s‘tte geo id'et.\n" "ENTER = Genstart" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Ubrugligt mappenavn.\n" "\n" " * Tryk p† en vilk†rligtast for at forts‘tte." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Den valgte partition er ikke stor nok til at installere ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "installationspartitionen skal mindst have %lu MB ledig.\n" @@ -1662,20 +1656,20 @@ MUI_ERROR daDKErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Du kan ikke lave en ny prim‘r eller udviddet partition i\n" "partitionstabellen p† denne disk da den er fuld..\n" "\n" " * Tryk p† en vilk†rligtast for at forts‘tte." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Du kan ikke lave mere end en udviddet partition per disk.\n" "\n" " * Tryk p† en vilk†rligtast for at forts‘tte." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Installationen kan ikke formatere partitionen:\n" " %S\n" "\n" @@ -1837,8 +1831,6 @@ MUI_STRING daDKStrings[] = "F3 = Afslut ENTER = Forts‘t"}, {STRING_REBOOTCOMPUTER, "ENTER = Genstart"}, - {STRING_TXTSETUPFAILED, - "Installationen kunne ikke finde '%S'-sektionen\ni TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiere filen: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 729335f9e79..23d7be39476 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1430,7 +1430,7 @@ MUI_ERROR deDEErrorEntries[] = "Erfolg\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS wurde nicht vollst„ndig auf Ihrem System installiert.\n" "Wenn Sie die Installation jetzt beenden, mssen Sie diese\n" "erneut starten, um ReactOS zu installieren.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR deDEErrorEntries[] = "F3 = Beenden EINGABETASTE = Fortsetzen" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Es konnte keine Festplatte gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Es konnte kein Installationsmedium gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "TXTSETUP.SIF konnte nicht gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "TXTSETUP.SIF scheint besch„digt zu sein.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Es wurde eine ungltige Signatur in TXTSETUP.SIF gefunden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Es konnten keine Laufwerksinformationen abgefragt werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Computertypenliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Displayeinstellungsliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Tastaturtypenliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Die Liste der Tastaturlayouts konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Es wurde mindestens eine Festplatte mit einer inkompatiblen\n" "Partitionstabelle gefunden, die nicht richtig verwendet werden kann.\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR deDEErrorEntries[] = "F3 = Beenden ENTER = EINGABETASTE" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Sie k”nnen keine neue Partition in einer bereits\n" "vorhandenen Partition erstellen!\n" "\n" @@ -1514,136 +1514,130 @@ MUI_ERROR deDEErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Sie k”nnen unpartitionierten Speicher nicht l”schen!\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Keine Diskette in Laufwerk A: gefunden.", "EINGABETASTE = Fortsetzen" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Das Tastaturlayout konnte nicht aktualisiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Die Registrierungseintr„ge der Anzeigeeinstellungen\n" "konnten nicht aktualisiert werden.", "EINGABETASTER = Computer neu starten" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Es konnte keine Hive-Datei importiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Die Registrierungsdateien konnten nicht gefunden werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Die Zweige in der Registrierung konnten nicht erstellt werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Die Registrierung konnte nicht initialisiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Das CAB-Archiv besitzt keine gltige INF-Datei.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Das CAB-Archiv wurde nicht gefunden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Das CAB-Archiv enth„lt kein Setup-Skript.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Die Liste mit den zu kopierenden Dateien\n" "konnte nicht gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Die Installationspfade konnten nicht erstellt werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_TXTSETUP_SECTION, - "Der Abschnitt 'Ordner' konnte in\n" - "TXTSETUP.SIF nicht gefunden werden.\n", - "EINGABETASTE = Computer neu starten" - }, - { - //ERROR_CABINET_SECTION, - "Der Abschnitt 'Ordner' konnte\n" - "im im CAB-Archiv nicht gefunden werden.\n", - "EINGABETASTE = Computer neu starten" - }, - { - //ERROR_CREATE_INSTALL_DIR - "Setup konnte den Installationspfad nicht erstellen.", - "EINGABETASTE = Computer neu starten" - }, - { - //ERROR_FIND_SETUPDATA, - "Setup konnte die 'SetupData'-Sektion in\n" + // ERROR_TXTSETUP_SECTION, + "Setup konnte die '%S'-Sektion in\n" "TXTSETUP.SIF nicht finden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_WRITE_PTABLE, + // ERROR_CABINET_SECTION, + "Setup konnte die '%S'-Sektion im\n" + "CAB-Archiv nicht finden.\n", + "EINGABETASTE = Computer neu starten" + }, + { + // ERROR_CREATE_INSTALL_DIR + "Setup konnte den Installationspfad nicht erstellen.", + "EINGABETASTE = Computer neu starten" + }, + { + // ERROR_WRITE_PTABLE, "Die Partitionstabellen konnten nicht geschrieben werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Es konnte kein Codepage-Eintrag hinzugefgt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Die Systemsprache konnte nicht eingestellt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Die Tastaturlayouts konnten nicht in die Registrierung\n" "eingetragen werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Der geografische Standort konnte nicht eingestellt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Unzul„ssiger Verzeichnisname.\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Die gew„hlten Partition ist nicht groá genug, um ReactOS zu installieren.\n" "Die Installationspartition muss mindestens %lu MB groá sein.\n" "\n" @@ -1651,20 +1645,20 @@ MUI_ERROR deDEErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Sie k”nnen keine weitere prim„re oder erweiterte Partition in\n" "der Partitionstabelle erstellen, weil die Tabelle voll ist.\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Sie k”nnen nur eine erweiterte Partition auf jeder Festplatte anlegen.\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING deDEStrings[] = "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, "EINGABETASTE = Computer neu starten"}, - {STRING_TXTSETUPFAILED, - "Der Abschnitt '%S'in TXTSETUP.SIF\nkonnte nicht gefunden werden.\n"}, {STRING_COPYING, " Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 131b9636ba3..11da4ef39d1 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1454,7 +1454,7 @@ MUI_ERROR elGRErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "’¦ ReactOS ›œ¤ œš¡˜«˜©«áŸž¡œ §¢ã¨àª ©«¦¤\n" "¬§¦¢¦š ©«ã ©˜ª. €¤ ˜§¦®à¨ã©œ«œ ˜§æ «ž¤ „š¡˜«á©«˜©ž «é¨˜, Ÿ˜ §¨â§œ  ¤˜\n" "¥˜¤˜«¨â¥œ«œ «ž¤ „š¡˜«á©«˜©ž š ˜ ¤˜ œš¡˜«˜©«ã©œ« «¦ ReactOS.\n" @@ -1464,62 +1464,62 @@ MUI_ERROR elGRErrorEntries[] = "F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ™¨œ  ¡á§¦ ¦¤ ©¡¢ž¨æ ›å©¡¦.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  «¦ ˜¨®œå¦ TXTSETUP.SIF.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "† œš¡˜«á©«©ž ™¨ã¡œ ⤘ ¡˜«œ©«¨˜£â¤¦ ˜¨®œå¦ TXTSETUP.SIF.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "† „š¡˜«á©«˜©ž ™¨ã¡œ £ ˜ £ž âš¡¬¨ž ¬§¦š¨˜­ã ©«¦ TXTSETUP.SIF.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  « ª §¢ž¨¦­¦¨åœª «¦¬ ›å©¡¦¬ ©¬©«ã£˜«¦ª.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  «ž ¢å©«˜ «ç§à¤ ¬§¦¢¦š ©«ã.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  «ž ¢å©«˜ «ç§à¤ œ£­á¤ ©žª.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  «ž ¢å©«˜ «ç§à¤ §¢ž¡«¨¦¢¦šå¦¬.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ­¦¨«é©œ  «ž ¢å©«˜ › ˜«á¥œà¤ §¢ž¡«¨¦¢¦šå¦¬.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "† œš¡˜«á©«˜©ž ™¨ã¡œ æ«  «¦¬¢á® ©«¦¤ ⤘ª ©¡¢ž¨æª ›å©¡¦ª §œ¨ â®œ  ⤘ £ž ©¬£™˜«æ\n" "partition table §¦¬ ›œ £§¦¨œå ¤˜ œ¢œš®Ÿœå ©à©«á!\n" "\n" @@ -1530,7 +1530,7 @@ MUI_ERROR elGRErrorEntries[] = "F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "ƒœ £§¦¨œå«œ ¤˜ ›ž£ ¦¬¨šã©œ«œ ⤘ Partition £â©˜ ©œ\n" "⤘ ᢢ¦ ¬§á¨®¦¤ Partition!\n" "\n" @@ -1538,146 +1538,140 @@ MUI_ERROR elGRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "ƒœ £§¦¨œå«œ ¤˜ › ˜š¨á¯œ«œ ⤘¤ £ž › ˜£¦¨­à£â¤¦ ®é¨¦ ›å©¡¦¬!\n" "\n" " * ˜«ã©«œ ¦§¦ ¦›ã§¦«œ §¢ã¡«¨¦ š ˜ ¤˜ ©¬¤œ®å©œ«œ.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "ƒœ¤ ¬§á¨®œ  › ©¡â«˜ ©«¦ A:.", "ENTER = ‘¬¤â®œ ˜" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "† „š¡˜«á©˜©ž ˜§â«¬®œ ¤˜ ˜¤˜¤œé©œ  « ª ¨¬Ÿ£å©œ ª š ˜ «ž › á«˜¥ž §¢ž¡«¨¦¢¦šå¦¬.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ˜¤˜¤œé©œ  « ª ¨¬Ÿ£å©œ ª £ž«¨é¦¬ š ˜ «ž¤ œ£­á¤ ©ž.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ­¦¨«é©œ  ⤘ hive ˜¨®œå¦.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "† œš¡˜«á©˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «˜ ˜¨®œå˜ ›œ›¦£â¤à¤ «¦¬ £ž«¨é¦¬.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ›ž£ ¦¬¨šã©œ  «˜ registry hives.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ˜¨® ¡¦§¦ ã©œ  «¦ £ž«¨é¦.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "’¦ cabinet ›œ¤ ⮜  âš¡¬¨¦ ˜¨®œå¦ inf.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "’¦ cabinet ›œ ™¨âŸž¡œ.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "’¦ cabinet ›œ¤ ⮜  ¡˜¤â¤˜ ©¡¨ §« œš¡˜«á©«˜©žª.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ˜¤¦å¥œ  «ž¤ ¦¬¨á ˜¨®œåठ§¨¦ª ˜¤« š¨˜­ã.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ›ž£ ¦¬¨šã©œ  «¦¬ª ¡˜«˜¢æš¦¬ª œš¡˜«á©«˜©žª.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_TXTSETUP_SECTION, - "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ '%S'\n" "©«¦ TXTSETUP.SIF.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CABINET_SECTION, - "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'Directories'\n" + // ERROR_CABINET_SECTION, + "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ '%S'\n" "©«¦ cabinet.\n", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ›ž£ ¦¬¨šã©œ  «¦¤ ¡˜«á¢¦š¦ œš¡˜«á©«˜©žª.", "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_FIND_SETUPDATA, - "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'SetupData'\n" - "©«¦ TXTSETUP.SIF.\n", - "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ š¨á¯œ  «˜ partition tables.\n" "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ §¨¦©Ÿâ©œ  « ª › ˜«á¥œ ª §¢ž¡«¨¦¢¦šåठ©«¦ £ž«¨é¦.\n" "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1841,8 +1835,6 @@ MUI_STRING elGRStrings[] = "F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜"}, {STRING_REBOOTCOMPUTER, "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " €¤« š¨á­œ«˜  «¦ ˜¨®œå¦: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index d526d6d70d2..dc030656ca3 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1431,7 +1431,7 @@ MUI_ERROR enUSErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1441,62 +1441,62 @@ MUI_ERROR enUSErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR enUSErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1515,133 +1515,127 @@ MUI_ERROR enUSErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1649,20 +1643,20 @@ MUI_ERROR enUSErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1824,8 +1818,6 @@ MUI_STRING enUSStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 55857836ad7..dca719b51bc 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1433,7 +1433,7 @@ MUI_ERROR esESErrorEntries[] = "Completado correctamente\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS no est  completamente instalado en su\n" "equipo. Si cierra ahora el Instalador, necesitar \n" "ejecutarlo otra vez para instalar ReactOS.\n" @@ -1443,62 +1443,62 @@ MUI_ERROR esESErrorEntries[] = "F3 = Salir INTRO = Continuar" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "El instalador no pudo encontrar un disco duro.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "El instalador no pudo encontrar su unidad fuente.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "El instalador fall¢ al cargar el archivo TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "El instalador encontr¢ un archivo TXTSETUP.SIF corrupto.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "El instalador encontr¢ una firma incorrecta en TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "El instalador no pudo recibir informaci¢n del disco del sistema.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "El instalador fall¢ al instalar el c¢digo de inicio FAT en la partici¢n del sistema.", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "El instalador fall¢ al cargar la lista de tipos de equipos.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "El instalador fall¢ al cargar la lista de resoluciones de pantalla.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "El instalador fall¢ al cargar la lista de teclados.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "El instalador fall¢ al cargar la lista de distribuciones de teclado.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "­El instalador encontr¢ que al menos un disco duro contiene una tabla\n" "de partici¢n incompatible que no puede ser manejada correctamente!\n" "\n" @@ -1509,7 +1509,7 @@ MUI_ERROR esESErrorEntries[] = "F3 = Salir INTRO = Continuar" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "­No puede crear una nueva partici¢n dentro\n" "de una partici¢n existente!\n" "\n" @@ -1517,133 +1517,127 @@ MUI_ERROR esESErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "­No se puede borrar un espacio de disco sin particionar!\n" "\n" " * Presione cualquier tecla para continuar.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "El instalador fall¢ al instalar el c¢digo de inicio FAT en la partici¢n del sistema.", "INTRO = Reiniciar el equipo" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No hay disco en la unidad A:.", "INTRO = Continuar" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "El instalador fall¢ al actualizar la configuraci¢n de distribuci¢n de teclado.", "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "El instalador fall¢ al actualizar la configuraci¢n de la pantalla.", "INTRO = Reiniciar el equipo" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "El instalador fall¢ al importar un archivo de la estructura.", "INTRO = Reiniciar el equipo" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "El instalador fall¢ al buscar los archivos de datos registrados.", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "El instalador fall¢ al crear el registro de la estructura.", "INTRO = Reiniciar el equipo" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "El instalador fall¢ al configurar el registro de inicio.", "INTRO = Reiniciar el equipo" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet no tiene un archivo inf v lido.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet no encontrado.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet no tiene ning£n script de instalaci¢n.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "El instalador fall¢ al abrir la lista de archivos a copiar.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "El instalador no puede crear los directorios de instalaci¢n.", "INTRO = Reiniciar el equipo" }, { - //ERROR_TXTSETUP_SECTION, - "El instalador fall¢ al buscar la secci¢n 'Directorios'\n" + // ERROR_TXTSETUP_SECTION, + "El instalador fall¢ al buscar la secci¢n '%S'\n" "en TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_SECTION, - "El instalador fall¢ al buscar la secci¢n 'Directorios'\n" + // ERROR_CABINET_SECTION, + "El instalador fall¢ al buscar la secci¢n '%S'\n" "en el cabinet.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "El instalador no puede crear el directorio de instalaci¢n.", "INTRO = Reiniciar el equipo" }, { - //ERROR_FIND_SETUPDATA, - "El instalador fall¢ al buscar la secci¢n 'SetupData'\n" - "en TXTSETUP.SIF.\n", - "INTRO = Reiniciar el equipo" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "El instalador fall¢ al escribir la tabla de particiones.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "El instalador fall¢ al a¤adir el c¢digo de p ginas al registro.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "El instalador no pudo configurar el idioma del sistema.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "El instalador no ha podido agregar los layouts de teclado al registro.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "El instalador no ha podido configurar el ID geogr fico.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nombre de carpeta no v lido.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "La partici¢n selecionada no es lo suficientemente grande como para.\n" "instalar ReactOS. Se necesita una partici¢n de al menos %lu MB.\n" "\n" @@ -1651,20 +1645,20 @@ MUI_ERROR esESErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "No es posible a¤adir una partici¢n primaria o extendida en la\n" "tabla de partici¢n de este disco, ya que est  completamente llena.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "No es posible crear m s de una partici¢n extendida por disco.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "El instalador es incapaz de formatear la partici¢n:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING esESStrings[] = "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER, "INTRO = Reiniciar el equipo"}, - {STRING_TXTSETUPFAILED, - "El instalador fall¢ al buscar la secci¢n\nen TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index e4f6bfeb4f3..d18d609d34b 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1431,7 +1431,7 @@ MUI_ERROR etEEErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS ei ole t„ielikult paigaldatud.\n" "Kui paigaldamine praegu katkestada, siis tuleb\n" "ReactOSi paigaldamiseks paigaldusprogramm uuesti k„ivitada.\n" @@ -1441,62 +1441,62 @@ MUI_ERROR etEEErrorEntries[] = "F3 = V„lju ENTER = J„tka" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Kävaketast ei leitud.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Paigaldusprogramm ei leidnud ketast, millelt see k„ivitati.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "TXTSETUP.SIF faili ei ännestunud laadida.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "TXTSETUP.SIF on vigane.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "TXTSETUP.SIF faili signatuur on vigane.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Ssteemiketta parameetreid ei ännestunud lugeda.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Ssteemikettale ei ännestunud kirjutada FAT alglaadimiskoodi.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Arvutitpide nimekirja ei ännestunud laadida.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Monitoride nimekirja ei ännestunud laadida.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Klaviatuuri tpide nimekirja ei ännestunud laadida.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Klaviatuuriasetuste nimekirja ei ännestunud laadida.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Leiti v„hemalt ks kävaketas, millel on hildamatu partitsioonitabel,\n" "millega ei saanud korralikult mber k„ia!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR etEEErrorEntries[] = "F3 = V„lju ENTER = J„tka" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Uut partitsioonitabelit ei saa juba olemasoleva\n" "partitsiooni sisse tekitada!\n" "\n" @@ -1515,130 +1515,125 @@ MUI_ERROR etEEErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Partitsioneerimata kettaruumi ei saa kustutada!\n" "\n" " * Vajuta suvalist klahvi, et j„tkata.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Ssteemikettale ei ännestunud paigaldada FAT alglaadimiskoodi.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Draivis A: ei ole flopiketast.", "ENTER = J„tka" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Klaviatuuriasetuse seadistust ei ännestunud uuendada.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Monitori seadistust registris ei ännestunud uuendada.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Tarufaili ei ännestunud importida.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Registri andmete faile ei leitud.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Registri tarusid ei ännestunud luua.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Registrit ei ännestunud luua.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kapifailis ei olnud p„devaid inf faile.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kapifaili ei leitud.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kapifailis puudub paigaldusskript.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Kopeeritavate failide nimekirja ei ännestunud avada.\n", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Paigalduskaustu ei ännestunud luua.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_TXTSETUP_SECTION, - "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", + // ERROR_TXTSETUP_SECTION, + "TXTSETUP.SIF failist ei leitud '%S' sektsiooni.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CABINET_SECTION, - "Kapifailist ei leitud 'Directories' sektsiooni.", + // ERROR_CABINET_SECTION, + "Kapifailist ei leitud '%S' sektsiooni.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Paigalduskausta ei ännestunud luua.", "ENTER = Taask„ivita arvuti" }, { - //ERROR_FIND_SETUPDATA, - "TXTSETUP.SIF failist ei leitud 'SetupData' sektsiooni", - "ENTER = Taask„ivita arvuti" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Partitsioonitabeleid ei ännestunud kirjutada.\n" "ENTER = Taask„ivita arvuti" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Kooditabelit ei ännestunud registrisse lisada.\n" "ENTER = Taask„ivita arvuti" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Ssteemilokaati ei ännestunud sedistada.\n" "ENTER = Taask„ivita arvuti" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Klaviatuuriasetusi ei ännestunud registrisse lisada.\n" "ENTER = Taask„ivita arvuti" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Geograafilist asukohta ei ännestunud seadistada.\n" "ENTER = Taask„ivita arvuti" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1646,20 +1641,20 @@ MUI_ERROR etEEErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1823,8 +1818,6 @@ MUI_STRING etEEStrings[] = "F3 = V„lju ENTER = J„tka"}, {STRING_REBOOTCOMPUTER, "ENTER = Taask„ivita arvuti"}, - {STRING_TXTSETUPFAILED, - "TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"}, {STRING_COPYING, " Kopeerimine: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index dfaaf3ace1c..64014bf1603 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1448,7 +1448,7 @@ MUI_ERROR frFRErrorEntries[] = "SuccŠs\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS n'est pas complŠtement install‚ sur votre\n" "ordinateur. Si vous quittez Setup maintenant, vous devrez\n" "lancer Setup de nouveau pour installer ReactOS.\n" @@ -1458,62 +1458,62 @@ MUI_ERROR frFRErrorEntries[] = "F3 = Quitter ENTRE = Continuer" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup n'a pu trouver un disque dur.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup n'a pu trouver son lecteur source.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup n'a pas r‚ussi … charger le fichier TXTSETUP.SIF.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup a trouv‚ un fichier TXTSETUP.SIF corrompu.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup a trouv‚ une signature invalide dans TXTSETUP.SIF.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup n'a pu r‚cup‚rer les informations du disque systŠme.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Echec de l'installation du code de d‚marrage FAT sur la partition systŠme.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup n'a pu charger la liste de type d'ordinateurs.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup n'a pu charger la liste de r‚glages des ‚crans.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup n'a pu charger la liste de types de claviers.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup n'a pu charger la liste de dispositions de claviers.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup a d‚tect‚ qu'au moins un disque dur contient une table\n" "de partition incompatible qui ne peut ˆtre prise en compte!\n" "\n" @@ -1524,7 +1524,7 @@ MUI_ERROR frFRErrorEntries[] = "F3 = Quitter ENTRE = Continuer" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Vous ne pouvez cr‚er une nouvelle Partition … l'int‚rieur\n" "d'une Partition d‚j… existante!\n" "\n" @@ -1532,133 +1532,127 @@ MUI_ERROR frFRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Vous ne pouvez supprimer de l'espace disque non partitionn‚!\n" "\n" " * Appuyer sur une touche pour continuer.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Echec de l'installation du code de d‚marrage FAT sur la partition systŠme.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Pas de disque dans le lecteur A:.", "ENTRE = Continuer" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup n'a pu mettre … jour les r‚glages de disposition du clavier.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup n'a pu mettre … jour les r‚glages de l'‚cran.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup n'a pu importer un fichier ruche.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup n'a pu trouver les fichiers de la base de registres.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup n'a pu cr‚er les ruches de la base de registres.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup n'a pu initialiser la base de registres.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Le Cabinet n'a pas de fichier inf valide.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet non trouv‚.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet n'a pas de script de setup.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup n'a pu ouvrir la file d'attente de copie de fichiers.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup n'a pu cr‚er les r‚pertoires d'installation.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_TXTSETUP_SECTION, - "Setup n'a pu trouver la section 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "Setup n'a pu trouver la section '%S'\n" "dans TXTSETUP.SIF.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CABINET_SECTION, - "Setup n'a pu trouver la section 'Directories\n" + // ERROR_CABINET_SECTION, + "Setup n'a pu trouver la section '%S\n" "dans le cabinet.\n", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup n'a pu cr‚er le r‚pertoire d'installation.", "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_FIND_SETUPDATA, - "Setup n'a pu trouver la section 'SetupData'\n" - "dans TXTSETUP.SIF.\n", - "ENTRE = Red‚marrer l'ordinateur" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup n'a pu ‚crire les tables de partition.\n" "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup n'a pu ajouter la page de codes … la base de registres.\n" "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup n'a pu changer la langue systŠme.\n" "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup n'a pas pu ajouter les dispositions de clavier au registre.\n" "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup n'a pas pu d‚finir la geo id.\n" "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nom de r‚pertoire invalide.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1666,20 +1660,20 @@ MUI_ERROR frFRErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Impossible de cr‚er une nouvelle partition primaire ou ‚tendue\n" "sur ce disque parce que sa table de partition est pleine.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Impossible de cr‚er plus d'une partition ‚tendue par disque.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1841,8 +1835,6 @@ MUI_STRING frFRStrings[] = "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER, "ENTRE = Red‚marrer l'ordinateur"}, - {STRING_TXTSETUPFAILED, - "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 7318eb50b23..868ab1dc38c 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1430,7 +1430,7 @@ MUI_ERROR heILErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR heILErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR heILErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1514,133 +1514,127 @@ MUI_ERROR heILErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1648,20 +1642,20 @@ MUI_ERROR heILErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1824,8 +1818,6 @@ MUI_STRING heILStrings[] = "F3 = ˆŒ „š—„ ENTER = „Ž™Š"}, {STRING_REBOOTCOMPUTER, "ENTER = „”’Œ އƒ™ €š „އ™"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Ž’š‰— —…•: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 004e1a888a2..4a2621706b1 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1436,7 +1436,7 @@ MUI_ERROR itITErrorEntries[] = "Successo\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS non \x8A stato installato completamente nel \n" "vostro computer. Se esce adesso, dovr\x85 eseguire il \n" "Setup nuovamente per installare ReactOS.\n" @@ -1446,62 +1446,62 @@ MUI_ERROR itITErrorEntries[] = "F3 = Uscire INVIO = Continuare" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup non ha trovato un disco fisso.\n", "INVIO = Riavviare il computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup non ha trovato l'unit\x85 di origine.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup non ha potuto caricare il file TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup ha trovato un file TXTSETUP.SIF corrotto.\n", "INVIO = Riavviare il computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup ha trovato una firma invalida in TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup non ha potuto recuperare le informazioni dell'unit\x85 di sistema.\n", "INVIO = Riavviare il computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Impossibile installare il bootcode FAT nella partizione di sistema.", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup non ha potuto caricare l'elenco di tipi di computer.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup non ha potuto caricare l'elenco di tipi di schermo.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup non ha potuto caricare l'elenco di tipi di tastiera.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup non ha potuto caricare l'elenco delle nazionalit\x85 di tastiera.\n", "INVIO = Riavviare il computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup ha trovato che almeno un disco fisso contiene una tabella delle\n" "partizioni incompatibile che non pu\x95 essere gestita correttamente!\n" "\n" @@ -1512,7 +1512,7 @@ MUI_ERROR itITErrorEntries[] = "F3 = Uscire INVIO = Continuare" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Non si pu\x95 creare una nuova partizione all'interno\n" "di una partizione gi\x85 esistente!\n" "\n" @@ -1520,133 +1520,127 @@ MUI_ERROR itITErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Non si pu\x95 cancellare spazio in un disco non partizionato!\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Impossibile installare il bootcode FAT nella partizione di sistema.", "INVIO = Riavviare il computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Non c'\x8A un disco nell'unit\x85 A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup non ha potuto aggiornare la nazionalit\x85 della tastiera.", "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup non ha potuto aggiornare la configurazione di registro dello schermo.", "INVIO = Riavviare il computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup non ha potuto importare un file hive.", "INVIO = Riavviare il computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup non ha potuto trovare i file di dati del registro.", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup non ha potuto creare gli hive del registro.", "INVIO = Riavviare il computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup non ha potuto inizializzare il registro.", "INVIO = Riavviare il computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Il Cabinet non ha un file inf valido.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet non trovato.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Il Cabinet non ha uno script di setup.\n", "INVIO = Riavviare il computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup non ha potuto aprire la coda di copia di file.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup non ha potuto creare le cartelle d'installazione.", "INVIO = Riavviare il computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup non ha potuto trovare le sezioni 'Cartelle'\n" + // ERROR_TXTSETUP_SECTION, + "Setup non ha potuto trovare le sezioni '%S'\n" "in TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_SECTION, - "Setup non ha potuto trovare le sezioni 'Cartelle'\n" + // ERROR_CABINET_SECTION, + "Setup non ha potuto trovare le sezioni '%S'\n" "nel cabinet.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup non ha potuto creare la cartella d'installazione.", "INVIO = Riavviare il computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup non ha trovato la sezione 'SetupData'\n" - "in TXTSETUP.SIF.\n", - "INVIO = Riavviare il computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup non ha potuto scrivere le tabelle delle partizioni.\n" "INVIO = Riavviare il computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup non ha potuto aggiungere la codepage al registro.\n" "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup non ha potuto impostare la regionalizzazione del sistema.\n" "INVIO = Riavviare il computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Impossibile aggiungere le nazionalit\x85 di tastiera al registro.\n" "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup non ha potuto impostare l'id geografico.\n" "INVIO = Riavviare il computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nome della cartella non valido.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Spazio nella partizione insufficiente per installare ReactOS.\n" "La partizione deve avere una dimensione di almeno %lu MB.\n" "\n" @@ -1654,20 +1648,20 @@ MUI_ERROR itITErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Non \x8A possibile creare una partizione primaria o secondaria nella\n" "tabella delle partizioni del disco perch\x8A questa \x8A piena.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Impossibile creare pi\x97 di una partizione primaria per disco.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup non \x8A riuscito a formattare la partizione:\n" " %S\n" "\n" @@ -1829,8 +1823,6 @@ MUI_STRING itITStrings[] = "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, " Copia di: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 6446e7a93ab..8c3098c941e 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1431,7 +1431,7 @@ MUI_ERROR jaJPErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS Ê ºÝËß­°ÀÆ ¶Ý¾ÞÝÆ ²Ý½Ä°Ù\n" "»ÚϾݡ ¾¯Ä±¯Ìߦ Á­³¼ ½Ù ÊÞ±²¤ ReactOS ¦ ²Ý½Ä°Ù ½ÙÆÊ ¾¯Ä±¯Ìߦ\n" "Ó³²ÁÄÞ ¼Þ¯º³ ½Ù ËÂÖ³¶Þ ±ØÏ½¡\n" @@ -1441,62 +1441,62 @@ MUI_ERROR jaJPErrorEntries[] = "F3 = Á­³¼ ENTER = ¿Þ¯º³" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "¾¯Ä±¯ÌßÊ Ê°ÄÞÃÞ¨½¸¦ ¹Ý¼­Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "¾¯Ä±¯ÌßÊ ¿°½ ÄÞײÌÞ¦ ¹Ý¼­Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "¾¯Ä±¯ÌßÊ Ì§²Ù TXTSETUP.SIF É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "¾¯Ä±¯ÌßÊ TXTSETUP.SIF ¶Þ Ê¿Ý ¼Ã²Ù ºÄ¦ ¹Ý¼­Â ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "¾¯Ä±¯ÌßÊ TXTSETUP.SIF É Ñº³Å ¼®Ò²¦ ¹Ý¼­Â ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "¾¯Ä±¯ÌßÊ ¼½ÃÑ ÄÞײÌÞÉ ¼Þ®³Î³¦ ¼ÐÄØ ÃÞ·Ï¾Ý ÃÞ¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "¾¯Ä±¯ÌßÊ ¼½ÃÑ Ê߰è¼®Ý ¼Þ®³ÍÉ FAT Ìްĺ°ÄÞÉ ²Ý½Ä°ÙÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "¾¯Ä±¯ÌßÊ ºÝËß­°ÀÉ ¼­Ù² ؽÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É ¾¯Ã² ؽÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞÉ ¼­Ù² ؽÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä ؽÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "¾¯Ä±¯ÌßÊ ½¸Å¸ÄÓ 1ÂÉ Ê°ÄÞÃÞ¨½¸¶Þ ÷¾ÂÆ ±Â¶´Å² ºÞ¶Ý¾²É Ų\n" "Ê߰è¼®Ý ðÌÞÙ¦ Ì¸Ñ ºÄ¦ ¹Ý¼­Â ¼Ï¼À!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR jaJPErrorEntries[] = "F3 = Á­³¼ ENTER = ¿Þ¯º³" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "±À×¼² Ê߰輮ݦ ½ÃÞÆ ¿Ý»Þ²½Ù\n" "Ê߰è¼®ÝÉ Å²ÌÞÆ »¸¾² ½ÙºÄÊ Ã޷ϾÝ!\n" "\n" @@ -1515,133 +1515,127 @@ MUI_ERROR jaJPErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "ÐÌÞÝ¶Â É ÃÞ¨½¸ ½Íß°½ ¦ »¸¼Þ® ½ÙºÄÊ Ã޷ϾÝ!\n" "\n" " * ¿Þ¯º³ ½ÙÆÊ ÅÆ¶ ·°¦ µ¼Ã ¸ÀÞ»²¡", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "¾¯Ä±¯ÌßÊ ¼½ÃÑ Ê߰è¼®Ý ¼Þ®³ÍÉ FAT ÌÞ°Ä Úº°ÄÞ É ²Ý½Ä°ÙÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "ÄÞײÌÞ A: Æ ÃÞ¨½¸¶Þ ±ØÏ¾Ý¡", "ENTER = ¿Þ¯º³" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä É ¾¯Ã²É º³ÆÝÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É Ú¼Þ½ÄØ ¾¯Ã²É º³¼ÝÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "¾¯Ä±¯ÌßÊ Ê²ÌÞ Ì§²ÙÉ ²ÝÎß°ÄÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ ÃÞ°À ̧²ÙÉ ¹Ý¼­ÂÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ ʲÌÞÉ »¸¾²Æ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÉ ¼®·¶Æ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "·¬ËÞÈ¯ÄÆ Ѻ³Å inf ̧²Ù¶Þ ̸ÏÚà ²Ï½¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "·¬ËÞÈ¯Ä¶Þ Ð¶ØÏ¾Ý¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "·¬ËÞȯÄÅ²Æ ¾¯Ä±¯Ìß ½¸ØÌßÄ¶Þ Ð¶ØÏ¾Ý¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "¾¯Ä±¯ÌßÊ ºËß° ̧²Ù ·­°É µ°ÌßÝÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_TXTSETUP_SECTION, - "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" + // ERROR_TXTSETUP_SECTION, + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É '%S' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" "¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CABINET_SECTION, - "¾¯Ä±¯ÌßÊ ·¬ËÞȯÄÅ²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" + // ERROR_CABINET_SECTION, + "¾¯Ä±¯ÌßÊ ·¬ËÞȯÄÅ²É '%S' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" "¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_FIND_SETUPDATA, - "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'SetupData' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" - "¼¯Êß² ¼Ï¼À¡\n", - "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "¾¯Ä±¯ÌßÊ Ê߰è¼®Ý ðÌÞÙÉ ¶·ºÐÆ ¼¯Êß² ¼Ï¼À¡\n" "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÍÉ º°ÄÞÍß°¼ÞÉ Â²¶Æ ¼¯Êß² ¼Ï¼À¡\n" "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "¾¯Ä±¯ÌßÊ ¼½ÃÑ Û¹°Ù¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÍÉ ·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶Æ ¼¯Êß² ¼Ï¼À¡\n" "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "¾¯Ä±¯ÌßÊ geo id ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1649,20 +1643,20 @@ MUI_ERROR jaJPErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING jaJPStrings[] = "F3 = Á­³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"}, - {STRING_TXTSETUPFAILED, - "¾¯Ä±¯ÌßÊ TXTSETUP.SIF É '%S' ¾¸¼®ÝÉ ¹Ý¼­ÂÆ\n¼¯Êß² ¼Ï¼À¡\n"}, {STRING_COPYING, " ºËß° Á­³É ̧²Ù: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index b729e4ebadf..6094090ec23 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1439,7 +1439,7 @@ MUI_ERROR ltLTErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1449,62 +1449,62 @@ MUI_ERROR ltLTErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1515,7 +1515,7 @@ MUI_ERROR ltLTErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1523,133 +1523,127 @@ MUI_ERROR ltLTErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1657,20 +1651,20 @@ MUI_ERROR ltLTErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING ltLTStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index d9cd9b9dde9..abfed391f0b 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1330,7 +1330,7 @@ MUI_ERROR msMYErrorEntries[] = "Berjaya\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS tidak benar-benar dipasang pada\n" "komputer anda. Jika anda berhenti persediaan sekarang, anda akan perlu\n" "untuk menjalankan persediaan untuk memasang ReactOS lagi.\n" @@ -1340,62 +1340,62 @@ MUI_ERROR msMYErrorEntries[] = "F3 = Keluar ENTER = Teruskan" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Persediaan tidak dapat mencari cakera keras.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Persediaan tidak dapat mencari sumber cakera.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Persediaan gagal untuk memuatkan fail TXTSETUP.SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Persediaan mendapati TXTSETUP.SIF yang rosak.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Persediaan ditemui untuk tandatangan tidak sah dalam TXTSETUP.SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Persediaan tidak dapat mendapatkan semula maklumat sistem cakera.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Persediaan gagal memasang bootcode FAT pada partition sistem.", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Persediaan gagal untuk memuatkan senarai jenis komputer.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Persediaan gagal untuk memuatkan pengesetan paparan senarai.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Persediaan gagal untuk memuatkan senarai jenis papan kekunci.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Persediaan gagal untuk memuatkan senarai susun atur papan kekunci.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Persediaan mendapati bahawa sekurang-kurangnya satu cakera keras mengandungi\n" "jadual partition yang sesuai untuk yang tidak boleh dikendalikan dengan betul!\n" "\n" @@ -1406,7 +1406,7 @@ MUI_ERROR msMYErrorEntries[] = "F3 = Keluar ENTER = Teruskan" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Anda tidak boleh mencipta satu partition baru\n" "dalam partition yang telah sedia ada!\n" "\n" @@ -1414,133 +1414,127 @@ MUI_ERROR msMYErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Anda tidak boleh menghapuskan ruang cakera yang tiada partition!\n" "\n" " * Tekan sebarang kunci untuk meneruskan.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Persediaan gagal memasang bootcode FAT pada partition sistem.", "ENTER = Memulakan semula komputer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Tiada cakera dalam cakera A:.", "ENTER = Teruskan" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Persediaan gagal mengemaskini seting susun atur papan kekunci.", "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Persediaan gagal mengemaskini daftaran seting paparan.", "ENTER = Memulakan semula komputer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Persediaan gagal untuk mengimport fail gatal.", "ENTER = Memulakan semula komputer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Persediaan gagal untuk mencari pendaftaran fail data.", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Persediaan gagal mencipta gatal daftaran.", "ENTER = Memulakan semula komputer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Persediaan gagal untuk diawalkan daftaran.", "ENTER = Memulakan semula komputer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kabinet mempunyai fail inf tidak sah.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kabinet tidak dijumpai.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kabinet mempunyai skrip tiada persediaan.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Persediaan gagal membuka baris gilir fail salinan.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Persediaan tidak dapat mencipta direktori pasang.", "ENTER = Memulakan semula komputer" }, { - //ERROR_TXTSETUP_SECTION, - "Persediaan gagal untuk mencari bahagian 'Direktori'\n" + // ERROR_TXTSETUP_SECTION, + "Persediaan gagal untuk mencari bahagian '%S'\n" "dalam TXTSETUP. SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_SECTION, - "Persediaan gagal menemui bahagian 'Direktori'\n" + // ERROR_CABINET_SECTION, + "Persediaan gagal menemui bahagian '%S'\n" "dalam kabinet.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Persediaan tidak dapat mencipta direktori pasang.", "ENTER = Memulakan semula komputer" }, { - //ERROR_FIND_SETUPDATA, - "Persediaan gagal untuk mencari bahagian 'SetupData'\n" - "dalam TXTSETUP.SIF.\n", - "ENTER = Memulakan semula komputer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Persediaan gagal menulis jadual partition.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Persediaan gagal untuk menambah codepage ke daftaran.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Persediaan tidak dapat menyediakan penempatan sistem.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Persediaan gagal untuk menambah susun atur papan kekunci daftaran.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Persediaan tidak dapat disetkan geo id.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nama direktori tidak sah.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Partition yang dipilih adalah tidak cukup besar untuk memasang ReactOS.\n" "Partition yang pasang hendaklah mempunyai saiz sekurang-kurangnya %lu MB.\n" "\n" @@ -1548,14 +1542,14 @@ MUI_ERROR msMYErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Anda tidak boleh mencipta satu partition baru utama atau yang dilanjutkan\n" "dalam jadual partition cakera ini kerana jadual partition telah penuh.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Anda tidak boleh mencipta lebih daripada satu petak lanjutan setiap cakera.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." @@ -1712,8 +1706,6 @@ MUI_STRING msMYStrings[] = "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, "ENTER = Memulakan semuala komputer"}, - {STRING_TXTSETUPFAILED, - "Persediaan yang gagal menemui bahagian '%S'\ndalam TXTSETUP.SIF.\n"}, {STRING_COPYING, " Menyalin fail: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 322644dcdf9..2a987623061 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1452,7 +1452,7 @@ MUI_ERROR nlNLErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is niet geheel ge\x8Bnstalleerd op uw\n" "computer. Als u Setup nu afsluit moet u\n" "Setup opnieuw starten om ReactOS te installeren.\n" @@ -1462,62 +1462,62 @@ MUI_ERROR nlNLErrorEntries[] = "F3 = Afsluiten ENTER = Doorgaan" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup kan geen vaste schijf vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup kan zijn station met bronbestanden niet vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup kan het bestand TXTSETUP.SIF niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup heeft een ongeldig TXTSETUP.SIF gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup heeft een ongeldige signatuur in TXTSETUP.SIF gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup kan de stationsinformatie niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup kan de FAT bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup kan de computertype-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup kan de beeldscherminstellingen-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup kan de toetsenbordtype-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup kan de toetsenbordindeling-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup ontdekte dat ten minste \x82\x82n vaste schijf een niet compatibele\n" "partitietabel bevat dat niet goed wordt ondersteund!\n" "\n" @@ -1529,7 +1529,7 @@ MUI_ERROR nlNLErrorEntries[] = "F3 = Afsluiten ENTER = Doorgaan" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "U kunt geen nieuwe partitie aanmaken binnen\n" "een reeds bestaande partitie!\n" "\n" @@ -1537,39 +1537,39 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" "\n" " * Druk op een willekeurige toets om door te gaan.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup kan de FAT bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Geen diskette in station A:.", "ENTER = Doorgaan" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup kan de toetsenbordindeling instellingen niet bijwerken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup kan de beeldscherminstellingen niet bijwerken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup kan een registerbestand niet importeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY /* This is about the hives, no? */ @@ -1577,96 +1577,90 @@ MUI_ERROR nlNLErrorEntries[] = "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup kan de registerbestanden niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup kan het register niet initialiseren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet bevat geen geldig .inf bestand.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet bestand niet gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet bestand heeft geen setup script.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup kan de lijst met te kopi\x89ren bestanden niet vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup kan de installatiemappen niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_TXTSETUP_SECTION, - "Setup kan de 'Directories' sectie niet vinden\n" + // ERROR_TXTSETUP_SECTION, + "Setup kan de '%S' sectie niet vinden\n" "in TXTSETUP.SIF.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_SECTION, - "Setup kan de 'Directories' sectie niet vinden\n" + // ERROR_CABINET_SECTION, + "Setup kan de '%S' sectie niet vinden\n" "in het cabinet bestand.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup kan de installatiemap niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_FIND_SETUPDATA, - "Setup kan de 'SetupData' sectie niet vinden\n" - "in TXTSETUP.SIF.\n", - "ENTER = Computer opnieuw opstarten" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup kan de partitietabellen niet schrijven.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup kan de codepagina niet toevoegen aan het register.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup kan de systeemtaal niet instellen.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup kan de toetsenbordindelingen niet toevoegen aan het register.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup kan de geografische positie niet instellen.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1674,20 +1668,20 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1851,8 +1845,6 @@ MUI_STRING nlNLStrings[] = "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, "ENTER = Computer opnieuw opstarten"}, - {STRING_TXTSETUPFAILED, - "Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopi\x89ren bestand: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index fc487024e7c..6c43d3b3680 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1439,7 +1439,7 @@ MUI_ERROR plPLErrorEntries[] = "Sukces\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nie zostaˆ w peˆni zainstalowany na twoim\n" "komputerze. Je˜li wyjdziesz teraz, trzeba b©dzie\n" "ponownie uruchomi† instalator, by zainstalowa† ReactOS.\n" @@ -1449,62 +1449,62 @@ MUI_ERROR plPLErrorEntries[] = "F3 = Wyj˜cie ENTER = Kontynuacja" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Instalator nie znalazˆ ¾adnego dysku twardego.\n", "ENTER = Restart komputera" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Instalator nie znalazˆ nap©du «r¢dˆowego.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Instalator nie m¢gˆ zaˆadowa† pliku TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Instalator znalazˆ uszkodzony plik TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Instalator znalazˆ nieprawidˆowy wpis w TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Instalator nie m¢gˆ odczyta† informacji o nap©dzie.\n", "ENTER = Restart komputera" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Nieudane zapisanie FAT bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Instalator nie m¢gˆ zaˆadowa† listy typ¢w komputera.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Instalator nie m¢gˆ zaˆadowa† listy ustawieä ekranu.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Instalator nie m¢gˆ zaˆadowa† listy typ¢w klawiatury.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Instalator nie m¢gˆ zaˆadowa† listy ukˆad¢w klawiatury.\n", "ENTER = Restart komputera" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Instalator wykryˆ, ¾e co najmniej jeden dysk twardy zawiera niekompatybiln¥ \n" "tablic© partycji, kt¢ra nie b©dzie poprawnie obsˆugiwana!\n" "\n" @@ -1515,7 +1515,7 @@ MUI_ERROR plPLErrorEntries[] = "F3 = Wyj˜cie ENTER = Kontynuacja" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Nie mo¾esz stworzy† nowej partycji w miejscu ju¾\n" "istniej¥cej!\n" "\n" @@ -1523,133 +1523,127 @@ MUI_ERROR plPLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Nie mo¾esz usun¥† pustej przestrzeni, gdzie nie ma ¾adnej partycji!\n" "\n" " * Naci˜nij dowolny klawisz, aby kontynuowa†.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Nieudana instalacja FAT bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Brak dyskietki w nap©dzie A:.", "ENTER = Kontynuacja" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Instalator nie m¢gˆ zmieni† ukˆadu klawiatury.", "ENTER = Restart komputera" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Instalator nie m¢gˆ zmieni† ustawieä ekranu w rejestrze.", "ENTER = Restart komputera" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Instalator nie byˆ w stanie zaimportowa† pliku gaˆ©zi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Instalator nie byˆ w stanie znale«† plik¢w z danymi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Instalator nie m¢gˆ stworzy† gaˆ©zi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Instalator nie byˆ w stanie ustawi† inicjalizacji rejestru.", "ENTER = Restart komputera" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet nie zawiera prawidˆowego pliku inf.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet nie zostaˆ znaleziony.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet nie zawiera skryptu instalacji.\n", "ENTER = Restart komputera" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Instalator nie byˆ w stanie otworzy† kolejki kopiowania pliku.\n", "ENTER = Restart komputera" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Instalator nie m¢gˆ stworzy† katalog¢w.", "ENTER = Restart komputera" }, { - //ERROR_TXTSETUP_SECTION, - "Instalator nie byˆ w stanie znale«† sekcji 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "Instalator nie byˆ w stanie znale«† sekcji '%S'\n" "w pliku TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_SECTION, - "Instalator nie byˆ w stanie znale«† sekcji 'Directories'\n" + // ERROR_CABINET_SECTION, + "Instalator nie byˆ w stanie znale«† sekcji '%S'\n" "w pliku cabinet.\n", "ENTER = Restart komputera" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Instalator nie m¢gˆ stworzy† katalogu instalacji.", "ENTER = Restart komputera" }, { - //ERROR_FIND_SETUPDATA, - "Instalator nie byˆ w stanie znale«† sekcji 'SetupData'\n" - "w pliku TXTSETUP.SIF.\n", - "ENTER = Restart komputera" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Instalator nie m¢gˆ zapisa† zmian w tablicy partycji.\n" "ENTER = Restart komputera" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Instalator nie m¢gˆ doda† strony kodowania do rejestru.\n" "ENTER = Restart komputera" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Instalator nie m¢gˆ ustawi† wersji j©zykowej.\n" "ENTER = Restart komputera" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Instalator nie m¢gˆ doda† ukˆad¢w klawiatury do rejestru.\n" "ENTER = Restart komputera" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Instalator nie m¢gˆ ustawi† lokalizacji geograficznej.\n" "ENTER = Restart komputera" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nieprawidˆowa nazwa katalogu.\n" "\n" " * Naci˜nij dowolny klawisz, aby kontynuowa†." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Wybrana partycja nie jest wystarczaj¥co du¾a, aby zainstalowa† ReactOS.\n" "Instalacyjna partycja musi mie† rozmiar co najmniej %lu MB.\n" "\n" @@ -1657,20 +1651,20 @@ MUI_ERROR plPLErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Nie mo¾na utworzy† na tym dysku partycji podstawowej lub\n" // FIXME "rozszerzonej, poniewa¾ tabela partycji jest pe©na.\n" "\n" " * Naci˜nij dowolny klawisz, aby kontynuowa†." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Nie mo¾esz utworzy† wi©cej ni¾ jednej partycji rozszerzonej na dysku.\n" "\n" " * Naci˜nij dowolny klawisz, aby kontynuowa†." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Instalator nie m¢gˆ sformatowa† partycji:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING plPLStrings[] = "F3 = Wyj˜cie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, - {STRING_TXTSETUPFAILED, - "Instalator nie byˆ w stanie odnale«† sekcji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 9139c1337f1..dc0c9d60f5c 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1461,7 +1461,7 @@ MUI_ERROR ptBRErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "O ReactOS nÆo est  completamente instalado no computador.\n" "Se vocˆ sair da instala‡Æo agora, precisar  executa-la\n" "novamente para instalar o ReactOS.\n" @@ -1471,62 +1471,62 @@ MUI_ERROR ptBRErrorEntries[] = "F3=Sair ENTER=Continuar" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "NÆo foi poss¡vel localizar um disco r¡digo.\n", "ENTER=Reiniciar" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "NÆo foi poss¡vel localizar a unidade de origem.\n", "ENTER=Reiniciar" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "NÆo foi poss¡vel carregar o arquivo TXTSETUP.SIF.\n", "ENTER=Reiniciar" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "O arquivos TXTSETUP.SIF est  corrompido.\n", "ENTER=Reiniciar" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "O arquivo TXTSETUP.SIF est  com a assinatura incorreta.\n", "ENTER=Reiniciar" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "NÆo foi poss¡vel obter as informa‡äes sobre o disco do sistema.\n", "ENTER=Reiniciar" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Erro ao escrever o c¢digo de inicializa‡Æo na parti‡Æo do sistema.\n", "ENTER=Reiniciar" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "NÆo foi poss¡vel carregar a lista de tipos de computadores.\n", "ENTER=Reiniciar" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "NÆo foi poss¡vel carregar a lista de tipos de v¡deo.\n", "ENTER=Reiniciar" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "NÆo foi poss¡vel carregar a lista de tipos de teclado.\n", "ENTER=Reiniciar" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "NÆo foi poss¡vel carregar a lista de leiautes de teclado.\n", "ENTER=Reiniciar" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "O instalador encontrou uma tabela de parti‡Æo incompat¡vel\n" "que nÆo pode ser utilizada corretamente!\n" "\n" @@ -1537,7 +1537,7 @@ MUI_ERROR ptBRErrorEntries[] = "F3=Sair ENTER=Continuar" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Vocˆ nÆo pode criar uma parti‡Æo dentro de\n" "outra parti‡Æo j  existente!\n" "\n" @@ -1545,133 +1545,127 @@ MUI_ERROR ptBRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Vocˆ nÆo pode excluir um espa‡o nÆo-particionado!\n" "\n" " * Pressione qualquer tecla para continuar.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Erro ao instalar o c¢digo de inicializa‡Æo na parti‡Æo do sistema.", "ENTER=Reiniciar" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "NÆo h  disco na unidade A:.", "ENTER=Continuar" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "NÆo foi poss¡vel atualizar a configura‡Æo de leiaute de teclado.", "ENTER=Reiniciar" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "NÆo foi poss¡vel atualizar a configura‡Æo de v¡deo.", "ENTER=Reiniciar" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "NÆo foi poss¡vel importar o arquivo de estrutura.", "ENTER=Reiniciar" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "NÆo foi poss¡vel encontrar os arquivos do registro.", "ENTER=Reiniciar" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "NÆo foi poss¡vel criar as estruturas do registro.", "ENTER=Reiniciar" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "NÆo foi poss¡vel inicializar o registro.", "ENTER=Reiniciar" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "O arquivo cab nÆo cont‚m um arquivo inf v lido.\n", "ENTER=Reiniciar" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "NÆo foi poss¡vel econtrar o arquivo cab.\n", "ENTER=Reiniciar" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "O arquivo cab nÆo cont‚m um script de instala‡Æo.\n", "ENTER=Reiniciar" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "NÆo foi poss¡vel abrir a lista de arquivos para c¢pia.\n", "ENTER=Reiniciar" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "NÆo foi poss¡vel criar os diret¢rios de instala‡Æo.", "ENTER=Reiniciar" }, { - //ERROR_TXTSETUP_SECTION, - "NÆo foi poss¡vel encontrar a se‡Æo 'Directories' no\n" + // ERROR_TXTSETUP_SECTION, + "NÆo foi poss¡vel encontrar a se‡Æo '%S' no\n" "arquivo TXTSETUP.SIF.\n", "ENTER=Reiniciar" }, { - //ERROR_CABINET_SECTION, - "NÆo foi poss¡vel encontrar a se‡Æo 'Directories' no\n" + // ERROR_CABINET_SECTION, + "NÆo foi poss¡vel encontrar a se‡Æo '%S' no\n" "arquivo cab.\n", "ENTER=Reiniciar" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "NÆo foi poss¡vel criar o diret¢rio de instala‡Æo.", "ENTER=Reiniciar" }, { - //ERROR_FIND_SETUPDATA, - "NÆo foi poss¡vel encontrar a se‡Æo 'SetupData' no\n" - "arquivo TXTSETUP.SIF.\n", - "ENTER=Reiniciar" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "NÆo foi poss¡vel escrever a tabela de parti‡äes.\n" "ENTER=Reiniciar" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "NÆo foi poss¡vel adicionar o c¢digo de localidade no registro.\n" "ENTER=Reiniciar" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "NÆo foi poss¡vel configurar o idioma do sistema.\n" "ENTER=Reiniciar" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "NÆo foi poss¡vel adicionar o leiaute do teclado no registro.\n" "ENTER=Reiniciar" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "NÆo foi poss¡vel configurar a identifica‡Æo geogr fica.\n" "ENTER=Reiniciar" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1679,20 +1673,20 @@ MUI_ERROR ptBRErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1856,8 +1850,6 @@ MUI_STRING ptBRStrings[] = "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER, "ENTER=Reiniciar"}, - {STRING_TXTSETUPFAILED, - "NÆo foi poss¡vel econtrar a se‡Æo '%S' no\narquivo TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copiando arquivo: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 9ce336dbe31..956bd553918 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1462,7 +1462,7 @@ MUI_ERROR roROErrorEntries[] = "Succes\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nu a fost instalat în totalitate în calculator.\n" "Dacã abandonaþi instalarea acum, altã datã, pentru a\n" "instala ReactOS, va fi nevoie sã repetaþi toþi paºii.\n" @@ -1472,68 +1472,68 @@ MUI_ERROR roROErrorEntries[] = "F3 = Ieºire ENTER = Continuare" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Eºec la identificarea unitãþilor interne de stocare.", "ENTER = Repornire calculator" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Eºec la accesarea unitatãþii de instalare.", "ENTER = Repornire calculator" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Eºec la încãrcarea fiºierul TXTSETUP.SIF.", "ENTER = Repornire calculator" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Fiºieul TXTSETUP.SIF a fos gãsit deteriorat.", "ENTER = Repornire calculator" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Fiºierul TXTSETUP.SIF conþine o semnãturã nevalidã.", "ENTER = Repornire calculator" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Eºec la obþinerea de informaþii despre\n" "dispozitivele din calculator.\n", "ENTER = Repornire calculator" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Eºec la instalarea codului FAT de iniþializare\n" "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Eºec la încãrcarea listei cu arhitecturi de\n" "calcul disponibile.", "ENTER = Repornire calculator" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Eºec la încãrcarea listei cu parametri de\n" "afiºare pentru ecran.", "ENTER = Repornire calculator" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Eºec la încãrcarea listei cu tipuri\n" "disponibile de tastaturã.", "ENTER = Repornire calculator" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Eºec la încãrcarea listei de configuraþii\n" "ale tastaturii.", "ENTER = Repornire calculator" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "A fost gãsitã cel puþin un disc cu tabelã nerecunoscutã\n" "de partiþii, care nu poate fi gestionatã corespunzãtor!\n" "\n" @@ -1545,7 +1545,7 @@ MUI_ERROR roROErrorEntries[] = "F3 = Ieºire ENTER = Continuare" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "O partiþie nouã nu poate fi creatã în interiorul\n" "unei partiþii existente!\n" "\n" @@ -1553,7 +1553,7 @@ MUI_ERROR roROErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Aþi încercat ºtergerea de spaþiu nepartiþionat,\n" "însã doar spaþiul partiþionat poate fi ºters!\n" "\n" @@ -1561,133 +1561,127 @@ MUI_ERROR roROErrorEntries[] = NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Eºec la instalarea codului FAT de iniþializare\n" "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Nu existã discuri flexibile în unitatea A:", "ENTER = Continuare" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Eºec la actualizarea configuraþiei de tastaturã.", "ENTER = Repornire calculator" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Eºec la actualizarea registrului cu\n" "parametrii grafici ai ecranului!", "ENTER = Repornire calculator" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Eºec la importarea registrului.", "ENTER = Repornire calculator" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Eºec la localizarea fiºierelor\n" "cu datele registrului.", "ENTER = Repornire calculator" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Eºec la crearea registrului.", "ENTER = Repornire calculator" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Eºec la iniþializarea registrului.", "ENTER = Repornire calculator" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Fiºierul cabinet nu conþine nici\n" "un fiºier valid de tip inf.", "ENTER = Repornire calculator" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Eºec la localizarea fiºierului cabinet.\n", "ENTER = Repornire calculator" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Fiºierul cabinet nu conþine nici\n" "un script de instalare.", "ENTER = Repornire calculator" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Eºec la accesarea listei cu\n" "fiºiere pentru copiere.", "ENTER = Repornire calculator" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Eºec la crearea directoarelor de instalare.", "ENTER = Repornire calculator" }, { - //ERROR_TXTSETUP_SECTION, - "Eºec la identificarea secþiunii de\n" - "directoare în fiºierul TXTSETUP.SIF.", + // ERROR_TXTSETUP_SECTION, + "Eºec la identificarea secþiunii\n" + "'%S' în fiºierul TXTSETUP.SIF.", "ENTER = Repornire calculator" }, { - //ERROR_CABINET_SECTION, - "Eºec la identificarea secþiunii de\n" - "directoare în fiºierul cabinet.", + // ERROR_CABINET_SECTION, + "Eºec la identificarea secþiunii\n" + "'%S' în fiºierul cabinet.", "ENTER = Repornire calculator" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Eºec la crearea directorului de instalare.", "ENTER = Repornire calculator" }, { - //ERROR_FIND_SETUPDATA, - "Eºec la localizarea secþiunii pentru date\n" - "de instalare din fiºierul TXTSETUP.SIF.", - "ENTER = Repornire calculator" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Eºec la scrierea tabelelor de partiþii.\n", "ENTER = Repornire calculator" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Eºec la includerea paginãrii în registru.\n", "ENTER = Repornire calculator" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Eºec la instituirea sistemului de localizare.\n", "ENTER = Repornire calculator" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Eºec la includerea în registru a configuraþiei\n" "de tastaturã.", "ENTER = Repornire calculator" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Eºec la instituirea de geo id.", "ENTER = Repornire calculator" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Numele de director este nevalid.\n" "\n" " * Tastaþi pentru a continua." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Partiþia selectatã este prea micã pentru a instala ReactOS.\n" "Partiþia de instalare trebuie sã aibã cel puþin %lu Mocteþi.\n" "\n" @@ -1695,20 +1689,20 @@ MUI_ERROR roROErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Nu poate fi creatã o nouã partiþie primarã sau extinsã în tabela\n" "de partiþii a acestui disc deoarece tabela de partiþii e plinã.\n" "\n" " * Tastaþi pentru a continua." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Nu poate fi creatã mai mult de o partiþie extinsã pe un disc.\n" "\n" " * Tastaþi pentru a continua." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Eºec la formatarea partiþiei:\n" " %S\n" "\n" @@ -1870,8 +1864,6 @@ MUI_STRING roROStrings[] = "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, "ENTER = Repornire calculator"}, - {STRING_TXTSETUPFAILED, - "Nu s-a reuºit gãsirea sesiunii\n'%S' în TXTSETUP.SIF.\n"}, {STRING_COPYING, " Fiºierul curent: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index f256b47b537..04b3f7a67fb 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1430,7 +1430,7 @@ MUI_ERROR ruRUErrorEntries[] = "“ᯥ譮\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS ­¥ ¡ë« ¯®«­®áâìî ãáâ ­®¢«¥­ ­  ¢ è\n" "ª®¬¯ìîâ¥à. …᫨ ¢ë ¢ë©¤¨â¥ ¨§ ãáâ ­®¢ª¨ ᥩç á,\n" "â® ¢ ¬ ­ã¦­® § ¯ãáâ¨âì ¯à®£à ¬¬ã ãáâ ­®¢ª¨ á­®¢ ,\n" @@ -1440,62 +1440,62 @@ MUI_ERROR ruRUErrorEntries[] = "F3 = ‚ë室 ENTER = த®«¦¨âì" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "¥ 㤠«®áì ­ ©â¨ ¦¥á⪨© ¤¨áª.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "¥ 㤠«®áì ­ ©â¨ ãáâ ­®¢®ç­ë© ¤¨áª.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "¥ 㤠«®áì § £à㧨âì ä ©« TXTSETUP.SIF.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "” ©« TXTSETUP.SIF ¯®¢à¥¦¤¥­.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Ž¡­ à㦥­  ­¥ª®àà¥ªâ­ ï ¯®¤¯¨áì ¢ TXTSETUP.SIF.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "¥ 㤠«®áì ¯®«ãç¨âì ¨­ä®à¬ æ¨î ® á¨á⥬­®¬ ¤¨áª¥.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "¥ 㤠«®áì ãáâ ­®¢¨âì § £àã§ç¨ª FAT ­  á¨á⥬­ë© à §¤¥«.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "¥ 㤠«®áì § £à㧨âì ᯨ᮪ ⨯®¢ ª®¬¯ìîâ¥à .\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "¥ 㤠«®áì § £à㧨âì ᯨ᮪ ०¨¬®¢ íªà ­ .\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "¥ 㤠«®áì § £à㧨âì ᯨ᮪ ⨯®¢ ª« ¢¨ âãàë.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "¥ 㤠«®áì § £à㧨âì ᯨ᮪ à áª« ¤®ª ª« ¢¨ âãàë.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, " ©¤¥­ ¯® ªà ©­¥© ¬¥à¥ ®¤¨­ ¦¥á⪨© ¤¨áª, ª®â®àë© á®¤¥à¦¨â à §¤¥«\n" "­¥¯®¤¤¥à¦¨¢ ¥¬ë© ReactOS!\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR ruRUErrorEntries[] = "F3 = ‚ë室 ENTER = த®«¦¨âì" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "‚ë ­¥ ¬®¦¥â¥ á®§¤ âì ­®¢ë© à §¤¥« ¤¨áª  ¢\n" "㦥 áãé¥áâ¢ãî饬 à §¤¥«¥!\n" "\n" @@ -1514,133 +1514,127 @@ MUI_ERROR ruRUErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "‚ë ­¥ ¬®¦¥â¥ 㤠«¨âì ­¥à §¤¥«¥­­®¥ ¤¨áª®¢®¥ ¯à®áâà ­á⢮!\n" "\n" " *  ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥­¨ï.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "¥ 㤠«®áì ãáâ ­®¢¨âì § £àã§ç¨ª FAT ­  á¨á⥬­ë© à §¤¥«.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "¥â ¤¨áª  ¢ ¤¨áª®¢®¤¥ A:.", "ENTER = த®«¦¨âì" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "¥ 㤠«®áì ®¡­®¢¨âì ¯ à ¬¥âàë à áª« ¤ª¨ ª« ¢¨ âãàë.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "¥ 㤠«®áì ®¡­®¢¨âì ¯ à ¬¥âàë íªà ­  ¢ ॥áâà¥.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "¥ 㤠«®áì ¨¬¯®àâ¨à®¢ âì ä ©«ë ªãá⮢ ॥áâà .", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "¥ 㤠«®áì ­ ©â¨ ä ©«ë á¨á⥬­®£® ॥áâà .", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "¥ 㤠«®áì á®§¤ âì ªãáâë á¨á⥬­®£® ॥áâà .", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "¥ 㤠«®áì ¨­¨æ¨ «¨§¨à®¢ âì á¨á⥬­ë© ॥áâà.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet ­¥ ¯®«ã稫 ª®à४â­ë© inf-ä ©«.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet ­¥ ­ ©¤¥­.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet ­¥ ᬮ£ ­ ©â¨ ãáâ ­®¢®ç­ë© áªà¨¯â.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "¥ 㤠«®áì ®âªàëâì ®ç¥à¥¤ì ª®¯¨à®¢ ­¨ï ä ©«®¢.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "¥ 㤠«®áì á®§¤ âì ãáâ ­®¢®ç­ë¥ ¤¨à¥ªâ®à¨¨.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_TXTSETUP_SECTION, - "¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "¥ 㤠«®áì ­ ©â¨ ᥪæ¨î '%S'\n" "¢ ä ©«¥ TXTSETUP.SIF.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CABINET_SECTION, - "¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'Directories'\n" + // ERROR_CABINET_SECTION, + "¥ 㤠«®áì ­ ©â¨ ᥪæ¨î '%S'\n" "¢ cabinet.\n", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "¥ 㤠«®áì á®§¤ âì ¤¨à¥ªâ®à¨î ¤«ï ãáâ ­®¢ª¨.", "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_FIND_SETUPDATA, - "¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'SetupData'\n" - "¢ ä ©«¥ TXTSETUP.SIF.\n", - "ENTER = ¥à¥§ £à㧪 " - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "¥ 㤠«®áì § ¯¨á âì â ¡«¨æã à §¤¥«®¢.\n" "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "¥ 㤠«®áì ¤®¡ ¢¨âì ¯ à ¬¥âàë ª®¤¨à®¢ª¨ ¢ ॥áâà.\n" "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "¥ 㤠«®áì ãáâ ­®¢¨âì ï§ëª á¨á⥬ë.\n" "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "¥ 㤠«®áì ¤®¡ ¢¨âì à áª« ¤ªã ª« ¢¨ âãàë ¢ ॥áâà.\n" "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "¥ 㤠«®áì ãáâ ­®¢¨âì geo id.\n" "ENTER = ¥à¥§ £à㧪 " }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "¥¢¥à­®¥ ­ §¢ ­¨¥ ¤¨à¥ªâ®à¨¨.\n" "\n" " *  ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥­¨ï." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "‚ë¡à ­­ë© à §¤¥« ᫨誮¬ ¬ « ¤«ï ãáâ ­®¢ª¨ ReactOS.\n" "“áâ ­®¢®ç­ë© à §¤¥« ¤®«¦¥­ ¨¬¥âì ¯® ªà ©­¥© ¬¥à¥ %lu MB ¯à®áâà ­á⢠.\n" "\n" @@ -1648,20 +1642,20 @@ MUI_ERROR ruRUErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "‚ë ­¥ ¬®¦¥â¥ á®§¤ âì ¯¥à¢¨ç­ë© ¨«¨ à áè¨à¥­­ë© à §¤¥« ¢ â ¡«¨æ¥\n" "à §¤¥«®¢ ¤¨áª , ¯®â®¬ã çâ® ®­  § ¯®«­¥­ .\n" "\n" " *  ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥­¨ï." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "‚ë ­¥ ¬®¦¥â¥ á®§¤ âì ¡®«ìè¥ ®¤­®£® à áè¨à¥­­®£® à §¤¥«  ­  ¤¨áª.\n" "\n" " *  ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥­¨ï." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "¥ 㤠«®áì ä®à¬ â¨à®¢ âì à §¤¥«:\n" " %S\n" "\n" @@ -1823,8 +1817,6 @@ MUI_STRING ruRUStrings[] = "F3 = ‚ë室 ENTER = த®«¦¨âì"}, {STRING_REBOOTCOMPUTER, "ENTER = ¥à¥§ £à㧪 "}, - {STRING_TXTSETUPFAILED, - "ணࠬ¬  ãáâ ­®¢ª¨ ­¥ ᬮ£«  ­ ©â¨ ᥪæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, " Š®¯¨à®¢ ­¨¥ ä ©« : %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index e3754eb015a..0215001ab82 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1437,7 +1437,7 @@ MUI_ERROR skSKErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "Syst‚m ReactOS nie je kompletne nainçtalovanì na Vaçom\n" "poŸ¡taŸi. Ak teraz preruç¡te inçtal ciu, budete musieœ\n" "spustiœ Inçtal tor znova, aby sa syst‚m ReactOS nainçtaloval.\n" @@ -1447,63 +1447,63 @@ MUI_ERROR skSKErrorEntries[] = "F3 = SkonŸiœ ENTER = PokraŸovaœ" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Inçtal toru sa nepodarilo n jsœ pevnì disk.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Inçtal toru sa nepodarilo n jsœ jej zdrojov£ mechaniku.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Inçtal tor zlyhal pri nahr van¡ s£boru TXTSETUP.SIF.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Inçtal tor naçiel poçkodenì s£bor TXTSETUP.SIF.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybnì (neplatnì) podpis (znak, znaŸka, çifra) "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Inçtal tor nemohol z¡skaœ inform cie o syst‚movìch diskoch.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Inçtal toru sa nepodarilo nainçtalovaœ zav dzac¡ k¢d s£borov‚ho\n" "syst‚mu FAT na syst‚mov£ part¡ciu.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Inçtal tor zlyhal pri nahr van¡ zoznamu typov poŸ¡taŸov.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Inçtal tor zlyhal pri nahr van¡ zoznamu nastaven¡ monitora.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Inçtal tor zlyhal pri nahr van¡ zoznamu typov kl vesn¡c.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Inçtal tor zlyhal pri nahr van¡ zoznamu rozlo§enia kl vesn¡c.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, // "Inçtal tor zistil, §e najmenej jeden pevnì disk obsahuje nekompatibiln£\n" "Inçtal tor naçiel najmenej na jednom pevnom disku nekompatibiln£\n" "tabu–ku oblast¡, s ktorou sa ned  spr vne zaobch dzaœ!\n" @@ -1515,7 +1515,7 @@ MUI_ERROR skSKErrorEntries[] = "F3 = SkonŸiœ ENTER = PokraŸovaœ" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Nem“§ete vytvoriœ nov£ oblasœ\n" "vo vn£tri u§ existuj£cej oblasti!\n" "\n" @@ -1523,134 +1523,128 @@ MUI_ERROR skSKErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Nem“§ete odstr niœ miesto na disku, ktor‚ nie je oblasœou!\n" "\n" " * PokraŸujte stlaŸen¡m –ubovo–n‚ho kl vesu.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Inçtal toru sa nepodarilo nainçtalovaœ zav dzac¡ k¢d s£borov‚ho\n" "syst‚mu FAT na syst‚mov£ part¡ciu.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "V mechanike A: nie je disketa.", "ENTER = PokraŸovaœ" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Inçtal tor zlyhal pri aktualiz cii nastaven¡ rozlo§enia kl vesnice.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to set the initialize the registry.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Inçtal tor nemohol vytvoriœ inçtalaŸn‚ adres re.", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reçtart poŸ¡taŸa" - }, - { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reçtart poŸ¡taŸa" - }, - { - //ERROR_CREATE_INSTALL_DIR - "Inçtal tor nemohol vytvoriœ inçtalaŸnì adres r.", //could not = nemohol - "ENTER = Reçtart poŸ¡taŸa" - }, - { - //ERROR_FIND_SETUPDATA, - "Inçtal tor zlyhal pri h–adan¡ sekcie 'SetupData'\n" + // ERROR_TXTSETUP_SECTION, + "Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\n" "v s£bore TXTSETUP.SIF.\n", "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_WRITE_PTABLE, + // ERROR_CABINET_SECTION, + "Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\n" + "v s£bore cabinet.\n", + "ENTER = Reçtart poŸ¡taŸa" + }, + { + // ERROR_CREATE_INSTALL_DIR + "Inçtal tor nemohol vytvoriœ inçtalaŸnì adres r.", //could not = nemohol + "ENTER = Reçtart poŸ¡taŸa" + }, + { + // ERROR_WRITE_PTABLE, "Inçtal tor zlyhal pri z pise do tabuliek oblast¡.\n" "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Inçtal tor zlyhal pri prid van¡ k¢dovej str nky do registrov.\n" "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n" "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Inçtal tor nemohol nastaviœ geo id.\n" "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1658,20 +1652,20 @@ MUI_ERROR skSKErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1835,8 +1829,6 @@ MUI_STRING skSKStrings[] = "F3 = SkonŸiœ ENTER = PokraŸovaœ"}, {STRING_REBOOTCOMPUTER, "ENTER = Reçtart poŸ¡taŸa"}, - {STRING_TXTSETUPFAILED, - "Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 6cfa8812661..414bf2bdb76 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1435,7 +1435,7 @@ MUI_ERROR sqALErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nuk ‰shte instaluar plotesisht ne kompjuterin\n" "tuaj. N‰se dilni nga instalimi tani, ju do t‰ duhet t‰\n" "rifilloni instalimin e ReactOS p‰rs‰ri.\n" @@ -1445,62 +1445,62 @@ MUI_ERROR sqALErrorEntries[] = "F3 = Dil ENTER = Vazhdo" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Instalimi nuk mund t‰ gjej nj‰ harddisk.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Instalimi nuk mund t‰ gjej burimin e t‰ dh‰nave/drive.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Instalimi d‰shtoj p‰r t‰ ngarkuar dokumentin TXTSETUP.SIF.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Instalimi zbuloj nj‰ dokument t‰ korruptuar TXTSETUP.SIF.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Instalimi zbuloj nj‰ firm‰ t‰ pavleshm‰ ne TXTSETUP.SIF.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Instalimi nuk gjeti informacionet n‰ drive'rin e systemit.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Instalimi deshtoj n‰ instalimin e FAT bootcode n‰ particionin e sistemit.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Instalimi d‰shtoj n‰ ngarkimin e list‰s s‰ kompjuterit.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Instalimi d‰shtoj n‰ ngarkimin e list‰s s‰ konfigurimit t‰ ekranit.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Instalimi d‰shtoj n‰ ngarkimin e list‰s s‰ tipit t‰ p‰rzgjsdhjes t‰ tastier‰s.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Instalimi d‰shtoj n‰ ngarkimin e list‰s s‰ tipit t‰ p‰rzgjedhjes t‰ tastier‰s.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Instalimi zbuloi q‰ t‰ pakten nj‰ harddisk p‰rmban nj‰ mosp‰rputhshmeri\n" "n‰ tabel‰n e particionit q‰ nuk mund t‰ trajtohet tamam!\n" "\n" @@ -1511,7 +1511,7 @@ MUI_ERROR sqALErrorEntries[] = "F3 = Dil ENTER = Vazhdo" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Tani ju mund t‰ krijoni nj‰ particion brenda\n" "nj‰ particioni ekzistues!\n" "\n" @@ -1519,91 +1519,91 @@ MUI_ERROR sqALErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Ju nuk mund t‰ fshini hap‰sir‰ n‰ disk jasht particioneve!\n" "\n" " * Shtypni nj‰ tast cfar‰do p‰r t‰ vazhduar.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Instalimi d‰shtoj n‰ instalimin e FAT bootcode n‰ particionin e sistemit.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Ska disk n‰ drive A:.", "ENTER = Vazhdo" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Instalimi d‰shtoj n‰ ngarkimin e list‰s s‰ tipit tv p‰rzgjsdhjes t‰ tastier‰s.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Instalimi d‰shtoi p‰r t‰ rinovuar konfigurimet e regjistrit.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Instalimi d‰shtoi n‰ importimin e skedes koshere.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Instalimi d‰shtoi p‰r t‰ gjetur dokumentat e regjistrit t‰ t‰ dh‰nave.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Instalimi d‰shtoi p‰r t krijuar rgjistrin e koshere.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Instalimi d‰shtoi n‰ nisjen e regjistrit.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kabineti nuk ka t‰ vlefshme dokumentin inf.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kabineti nuk u gj‰nd.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kabineti ska asnj‰ skript konfigurimi.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Installimi d‰shtoi rradh‰n e kopjimit t‰ dokumentave.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Instalimi nuk mund t‰ krijoj‰ skedat p‰r instalim.", "ENTER = Ristarto kompjuterin" }, { - //ERROR_TXTSETUP_SECTION, - "Instalimi d‰shtoi p‰r t‰ gjetur seksionin e 'sked‰s'\n" + // ERROR_TXTSETUP_SECTION, + "Instalimi d‰shtoi p‰r t‰ gjetur '%S' seksionin\n" "ne TXTSETUP.SIF.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CABINET_SECTION, - "Instalimi d‰shtoi p‰r t‰ gjetur seksionin e 'sked‰s'\n" + // ERROR_CABINET_SECTION, + "Instalimi d‰shtoi p‰r t‰ gjetur '%S' seksionin\n" "ne kabinet.\n", "ENTER = Ristarto kompjuterin" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Instalimi nuk mund t‰ krijoj‰ skedat p‰r instalim.", "‰NT‰R = Ristarto kompjuterin" }, @@ -1614,38 +1614,38 @@ MUI_ERROR sqALErrorEntries[] = "ENTER = Ristarto kompjuterin" }, { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Instalimi d‰shtoi p‰r t‰ shkruar tabelen e particionit.\n" "ENTER = Ristarto kompjuterin" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Instalimi d‰shtoi p‰r t‰ shtuar codepage n‰ regjister.\n" "ENTER = Ristarto kompjuterin" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Instalimi nuk mund t‰ v‰ndosi v‰ndnoshjen n‰ sistem.\n" "ENTER = Ristarto kompjuterin" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Instalimi d‰shtoi p‰r t‰ shtuar zgj‰dhjen e tastier‰s n‰ regjister.\n" "ENTER = Ristarto kompjuterin" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Instalimi nuk mund t‰ vendosni id geo.\n" "ENTER = Ristarto kompjuterin" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1653,20 +1653,20 @@ MUI_ERROR sqALErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1830,8 +1830,6 @@ MUI_STRING sqALStrings[] = "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, "ENTER = Ristarto kompjuterin"}, - {STRING_TXTSETUPFAILED, - "Instalimi d‰shtoj p‰r t‰ gjetur '%S' sectorin\nne TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopjo dokumentat: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 03d001126cd..1d3588a8fa5 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1437,7 +1437,7 @@ MUI_ERROR svSEErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS installerades inte fullst„ndigt p† din\n" "dator. Om du avslutar Setup nu, kommer du att beh”va\n" "k”ra Setup igen f”r att installera ReactOS.\n" @@ -1447,62 +1447,62 @@ MUI_ERROR svSEErrorEntries[] = "F3 = Avsluta ENTER = Forts„tta" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup kunde inte hitta n†gon h†rddisk.\n", "ENTER = Starta om datorn" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup kunde inte hitta sin k„lldisk.\n", "ENTER = Starta om datorn" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup misslyckades att l„sa in filen TXTSETUP.SIF.\n", "ENTER = Starta om datorn" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup fann en korrupt TXTSETUP.SIF.\n", "ENTER = Starta om datorn" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup hittade en ogiltig signatur i TXTSETUP.SIF.\n", "ENTER = Starta om datorn" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup kunde inte l„sa in informationen om systemenheten.\n", "ENTER = Starta om datorn" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup misslyckades installera FAT bootkod p† systempartitionen.", "ENTER = Starta om datorn" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup misslyckades att l„sa datortypslistan.\n", "ENTER = Starta om datorn" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup misslyckades att l„sa in sk„rminst„llningslistan.\n", "ENTER = Starta om datorn" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup misslyckades att l„sa in tangentbordstypslistan.\n", "ENTER = Starta om datorn" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup misslyckades att l„sa in tangentbordslayoutslistan.\n", "ENTER = Starta om datorn" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup fann att minst en h†rdisk inneh†ller en partitionstabell\n" "inte „r kompatibel och inte kan hanteras korrekt!\n" "\n" @@ -1513,7 +1513,7 @@ MUI_ERROR svSEErrorEntries[] = "F3 = Avsluta ENTER = Forts„tt" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Du kan inte skapa en partition inuti\n" "en redat befintlig partition!\n" "\n" @@ -1521,133 +1521,127 @@ MUI_ERROR svSEErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Du kan inte ta bort opartitionerrat diskutrymme!\n" "\n" " * Tryck valfri tangent f”r att forts„tta.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup misslyckades att installera FAT bootkoden p† systempartitionen.", "ENTER = Starta om datorn" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Ingen disk i enhet A:.", "ENTER = Forts„tt" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup misslyckades att updatera inst„llninarna f”r tangentbordslayout.", "ENTER = Starta om datorn" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup misslyckades att uppdatera sk„rmregisterinst„llningen.", "ENTER = Starta om datorn" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup misslyckades att improterea en registerdatafil.", "ENTER = Starta om datorn" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup misslyckades att hitta registerdatafilerna.", "ENTER = Starta om datorn" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup misslyckades att skapa registerdatafilerna.", "ENTER = Starta om datorn" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup misslyckades att initialisera registret.", "ENTER = Starta om datorn" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kabinettet has inen giltig inf fil.\n", "ENTER = Starta om datorn" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kabinettet hittades inte.\n", "ENTER = Starta om datorn" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kabinettet har inget installationsskript.\n", "ENTER = Starta om datorn" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup misslyckades att ”ppna filkopierningsk”n.\n", "ENTER = Starta om datorn" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup kunnde inte skapa installationsmapparna.", "ENTER = Starta om datorn" }, { - //ERROR_TXTSETUP_SECTION, - "Setup misslyckades att hitta 'Directories' sektionen\n" + // ERROR_TXTSETUP_SECTION, + "Setup misslyckades att hitta '%S' sektionen\n" "i TXTSETUP.SIF.\n", "ENTER = Starta om datorn" }, { - //ERROR_CABINET_SECTION, - "Setup misslyckades att hitta 'Directories' sektionen\n" + // ERROR_CABINET_SECTION, + "Setup misslyckades att hitta '%S' sektionen\n" "i kabinettet.\n", "ENTER = Starta om datorn" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup kunnde inte skapa installationsmappen.", "ENTER = Starta om datorn" }, { - //ERROR_FIND_SETUPDATA, - "Setup misslyckades att hitta 'SetupData' sektionen\n" - "i TXTSETUP.SIF.\n", - "ENTER = Starta om datorn" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup misslyckades att skriva partitionstabellen.\n" "ENTER = Starta om datorn" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup misslyckades att l„gga till vald codepage till registret.\n" "ENTER = Starta om datorn" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup kunnde inte st„lla in 'system locale'.\n" "ENTER = Starta om datorn" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup misslyckades att l„gga till tangentbordslayouten till registret.\n" "ENTER = Starta om datorn" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup kunde inte stalla int 'geo id'.\n" "ENTER = Starta om datorn" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1655,20 +1649,20 @@ MUI_ERROR svSEErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING svSEStrings[] = "F3 = Avsluta ENTER = Forts„tt"}, {STRING_REBOOTCOMPUTER, "ENTER = Starta om datorn"}, - {STRING_TXTSETUPFAILED, - "Setup misslyckades att hitta '%S' sektionen\ni TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopierar fil: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 4708de45715..924a676ea82 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1409,7 +1409,7 @@ MUI_ERROR trTRErrorEntries[] = "BaŸarl\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS, bilgisayara tmyle kurulmad. E§er Ÿimdi\n" "Kur'dan ‡karsanz ReactOS'u kurmak i‡in Kur'u\n" "yeniden ‡alŸtrmaya gereksinim duyacaksnz.\n" @@ -1419,62 +1419,62 @@ MUI_ERROR trTRErrorEntries[] = "F3 = €k GiriŸ = Srdr" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Kur, bir sƒbit disk bulamad.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Kur, kaynak srcy bulamad.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Kur, TXTSETUP.SIF kt§n yklemede baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Kur, bozuk bir TXTSETUP.SIF buldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Kur, TXTSETUP.SIF'ta ge‡ersiz bir im buldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Kur, dizge src bilgisini alamad.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Kur, dizge b”lmne FAT ”n ykleme kodunu kuramad.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Kur, bilgisayar tr dizelgesini yklemede baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Kur, g”rnt ayarlar dizelgesini yklemede baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Kur, d§me takm tr dizelgesini yklemede baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Kur, d§me takm dzeni dizelgesini yklemede baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Kur, dzgn y”netilemeyen bir uyumsuz b”lm tablosu i‡eren en az\n" "bir sƒbit disk buldu!\n" "\n" @@ -1485,7 +1485,7 @@ MUI_ERROR trTRErrorEntries[] = "F3 = €k GiriŸ = Srdr" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "™neden var olan bir b”lmn i‡ine yeni\n" "bir b”lm oluŸturamazsnz!\n" "\n" @@ -1493,133 +1493,127 @@ MUI_ERROR trTRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "B”lmlenmemiŸ disk boŸlu§unu silemezsiniz!\n" "\n" " * Srdrmek i‡in bir d§meye basnz.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Kur, dizge b”lm zerinde FAT ”n ykleme kodunu kurmada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "A: srcsnde disk yok.", "GiriŸ = Srdr" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Kur, d§me takm dzeni ayarlarn ŸimdikileŸtirmede baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Kur, g”rnt de§er ayarlarn ŸimdikileŸtirmede baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Kur, bir y§n kt§ almada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Kur, de§er veri ktklerini bulmada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Kur, de§er y§nlarn oluŸturmada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Kur, De§er Defteri'ni baŸlatmada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Dolabn ge‡erli yaplandrma kt§ yok.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Dolap bulunamad.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Dolabn kurulum beti§i yok.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Kur, ktk ‡o§altma kuyru§unu a‡mada baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Kur, kurulum dizinlerini oluŸturmada baŸarsz oldu.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_TXTSETUP_SECTION, - "Kur, TXTSETUP.SIF'de ""Directories"" b”lmn\n" + // ERROR_TXTSETUP_SECTION, + "Kur, TXTSETUP.SIF'de '%S' b”lmn\n" "bulmada baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CABINET_SECTION, - "Kur, dolapta ""Directories"" b”lmn\n" + // ERROR_CABINET_SECTION, + "Kur, dolapta '%S' b”lmn\n" "bulmada baŸarsz oldu.\n", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Kur, kurulum dizinini oluŸturamad.", "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_FIND_SETUPDATA, - "Kur, TXTSETUP.SIF'de ""SetupData"" b”lmn\n" - "bulmada baŸarsz oldu.\n", - "GiriŸ = Bilgisayar Yeniden BaŸlat" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Kur, b”lm tablolar yazmada baŸarsz oldu.\n" "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Kur, De§er Defteri'ne kod sayfas eklemede baŸarsz oldu.\n" "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Kur, dizge yerli ayƒrn yapamad.\n" "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Kur, De§er Defteri'ne d§me takm dzenleri eklemede baŸarsz oldu.\n" "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Kur, co§rƒfŒ kimli§i ayarlayamad.\n" "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Ge‡ersiz dizin ad.\n" "\n" " * Srdrmek i‡in bir d§meye basnz." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Se‡ili b”lm ReactOS'u kurmak i‡in yetecek ”l‡de byk de§il.\n" "Kurulum b”lm en az %lu MB bykl§nde olmal.\n" "\n" @@ -1627,20 +1621,20 @@ MUI_ERROR trTRErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "B”lm tablosu dolu oldu§undan dolay bu diskin b”lm tablosunda yeni bir ana b”lm\n" "ya da yeni bir geniŸletilmiŸ b”lm oluŸturamazsnz.\n" "\n" " * Srdrmek i‡in bir d§meye basnz." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Bir diskte birden ‡ok geniŸletilmiŸ b”lm oluŸturamazsnz.\n" "\n" " * Srdrmek i‡in bir d§meye basnz." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Kur, b”lm bi‡imlendiremez::\n" " %S\n" "\n" @@ -1802,8 +1796,6 @@ MUI_STRING trTRStrings[] = "F3 = €k GiriŸ = Srdr"}, {STRING_REBOOTCOMPUTER, "GiriŸ = Bilgisayar Yeniden BaŸlat"}, - {STRING_TXTSETUPFAILED, - "Kur, TXTSETUP.SIF'de ""%S"" b”lmn\nbulmada baŸarsz oldu.\n"}, {STRING_COPYING, " Ktk ‡o§altlyor: %S..."}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index bed8c91d0ea..891be611ce5 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1436,7 +1436,7 @@ MUI_ERROR ukUAErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS ­¥ ¡ã¢ ¯®¢­iáâî ¢áâ ­®¢«¥­¨© ­  ‚ è\n" "ª®¬¯'îâ¥à. Ÿªé® ¢¨ ¢¨©¤¥â¥ § ¢áâ ­®¢«î¢ ç  § à §,\n" "â® ‚ ¬ ¡ã¤¥ ­¥®¡åi¤­® § ¯ãáâ¨â¨ ¯à®£à ¬ã ¢áâ ­®¢«¥­­ï\n" @@ -1447,62 +1447,62 @@ MUI_ERROR ukUAErrorEntries[] = "F3 = ‚¨©â¨ ENTER = த®¢¦¨â¨" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "¥ ¢¤ «®áì §­ ©â¨ ¦®àá⪨© ¤¨áª.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "¥ ¢¤ «®áì §­ ©â¨ ãáâ ­®¢®ç­¨© ¤¨áª.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "¥ ¢¤ «®áì § ¢ ­â ¦¨â¨ ä ©« TXTSETUP.SIF.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "” ©« TXTSETUP.SIF ¯®èª®¤¦¥­¨©.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "‚¨ï¢«¥­® ­¥ª®à¥ªâ­¨© ¯i¤¯¨á ¢ TXTSETUP.SIF.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "¥ ¢¤ «®áì ®âਬ â¨ ¤ ­i ¯à® á¨á⥬­¨© ¤¨áª.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ § ¢ ­â ¦ã¢ «ì­¨© ª®¤ FAT ­  á¨â¥¬­¨© à®§¤i«.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "¥ ¢¤ «®áì § ¢ ­â ¦¨â¨ ᯨ᮪ ⨯i¢ ª®¬¯'îâ¥à .\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "¥ ¢¤ «®áì § ¢ ­â ¦¨â¨ ᯨ᮪ ०¨¬i¢ ¥ªà ­ã.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "¥ ¢¤ «®áì § ¢ ­â ¦¨â¨ ᯨ᮪ ⨯i¢ ª« ¢i âãà¨.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "¥ ¢¤ «®áì § ¢ ­â ¦¨â¨ ᯨ᮪ à®§ª« ¤®ª ª« ¢i âãà¨.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "‡­ ©¤¥­® ïª ¬i­i¬ã¬ ®¤¨­ ¦®àá⪨© ¤¨áª, é® ¬iáâ¨âì à®§¤i«,\n" "直© ­¥ ¯i¤âਬãóâìáï ReactOS!\n" "\n" @@ -1513,7 +1513,7 @@ MUI_ERROR ukUAErrorEntries[] = "F3 = ‚¨©â¨ ENTER = த®¢¦¨â¨" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "‚¨ ­¥ ¬®¦¥â¥ á⢮à¨â¨ ­®¢¨© à®§¤i« ­ \n" "¢¦¥ iá­ãî箬ã à®§¤i«i!\n" "\n" @@ -1521,133 +1521,127 @@ MUI_ERROR ukUAErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "¥ ¬®¦­  ¢¨¤ «¨â¨ ­¥à®§¬i祭㠮¡« áâì ­  ¤¨áªã!\n" "\n" " *  â¨á­iâì ¡ã¤ì-ïªã ª« ¢ièã 鮡 ¯à®¤®¢¦¨â¨.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ § ¢ ­â ¦ã¢ «ì­¨© ª®¤ FAT ­  á¨â¥¬­¨© à®§¤i«.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "‚i¤áãâ­ï ¤¨áª¥â  ¢ ¤¨áª®¢®¤i A:.", "ENTER = த®¢¦¨â¨" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "¥ ¢¤ «®áì ®­®¢¨â¨ ¯ à ¬¥âਠ஧ª« ¤ª¨ ª« ¢i âãà¨.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "¥ ¢¤ «®áì ®­®¢¨â¨ ¯ à ¬¥âਠ¥ªà ­ã ¢ à¥óáâài.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "¥ ¢¤ «®áì i¬¯®àâ㢠⨠䠩« ªãéi¢ à¥óáâàã.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "¥ ¢¤ «®áì §­ ©â¨ ä ©«¨ ¤ ­¨å à¥óáâàã.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "¥ ¢¤ «®áì á⢮à¨â¨ ªãéi à¥óáâàã.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "¥ ¢¤ «®áì i­iæi «i§ã¢ â¨ à¥óáâà.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet ¬ ó ­¥ª®à¥ªâ­¨© inf-ä ©«.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet ­¥ §­ ©¤¥­®.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet ­¥ ¬ ó ãáâ ­®¢®ç­®£® áæ¥­ àiî.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "¥ ¢¤ «®áì ¢i¤ªà¨â¨ ç¥à£ã ª®¯i­­ï ä ©«i¢.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "¥ ¢¤ «®áì á⢮à¨â¨ ¤¨à¥ªâ®àiõ ¤«ï ¢áâ ­®¢«¥­­ï.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_TXTSETUP_SECTION, - "¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "¥ ¢¤ «®áì §­ ©â¨ ᥪæiî '%S'\n" "¢ ä ©«i TXTSETUP.SIF.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CABINET_SECTION, - "¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'Directories'\n" + // ERROR_CABINET_SECTION, + "¥ ¢¤ «®áì §­ ©â¨ ᥪæiî '%S'\n" "¢ cabinet.\n", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "¥ ¢¤ «®áì á⢮à¨â¨ ¤¨à¥ªâ®àiî ¤«ï ¢áâ ­®¢«­­ï.", "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_FIND_SETUPDATA, - "¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'SetupData'\n" - "¢ ä ©«i TXTSETUP.SIF.\n", - "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "¥ ¢¤ «®áì § ¯¨á â¨ â ¡«¨æi à®§¤i«i¢.\n" "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "¥ ¢¤ «®áì ¤®¤ â¨ ¯ à ¬¥âਠª®¤ã¢ ­­ï ¢ à¥óáâà.\n" "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ «®ª «ì á¨á⥬¨.\n" "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "¥ ¢¤ «®áì ¤®¤ â¨ à®§ª« ¤ª¨ ª« ¢i âãਠ¤® à¥óáâàã.\n" "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ geo id.\n" "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1655,20 +1649,20 @@ MUI_ERROR ukUAErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING ukUAStrings[] = "F3 = ‚¨©â¨ ENTER = த®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"}, - {STRING_TXTSETUPFAILED, - "‚áâ ­®¢«î¢ ç ­¥ §¬i£ §­ ©â¨ ᥪæiî '%S' \n¢ ä ©«i TXTSETUP.SIF.\n"}, {STRING_COPYING, " Š®¯i­­ï: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index 5d073072444..f1b392ef854 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -175,15 +175,14 @@ MUIDisplayPage( } VOID -MUIDisplayError( +MUIDisplayErrorV( IN ULONG ErrorNum, OUT PINPUT_RECORD Ir, IN ULONG WaitEvent, - ...) + IN va_list args) { - const MUI_ERROR * entry; + const MUI_ERROR* entry; CHAR Buffer[2048]; - va_list ap; if (ErrorNum >= ERROR_LAST_ERROR_CODE) { @@ -191,7 +190,6 @@ MUIDisplayError( "Press ENTER to continue", Ir, POPUP_WAIT_ENTER); - return; } @@ -205,9 +203,7 @@ MUIDisplayError( return; } - va_start(ap, WaitEvent); - vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); - va_end(ap); + vsprintf(Buffer, entry[ErrorNum].ErrorText, args); PopupError(Buffer, entry[ErrorNum].ErrorStatus, @@ -215,6 +211,21 @@ MUIDisplayError( WaitEvent); } +VOID +__cdecl +MUIDisplayError( + IN ULONG ErrorNum, + OUT PINPUT_RECORD Ir, + IN ULONG WaitEvent, + ...) +{ + va_list arg_ptr; + + va_start(arg_ptr, WaitEvent); + MUIDisplayErrorV(ErrorNum, Ir, WaitEvent, arg_ptr); + va_end(arg_ptr); +} + LPSTR MUIGetString( ULONG Number) diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 45daec3c79a..cefe017558d 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -50,6 +50,14 @@ MUIClearPage( ULONG PageNumber); VOID +MUIDisplayErrorV( + IN ULONG ErrorNum, + OUT PINPUT_RECORD Ir, + IN ULONG WaitEvent, + IN va_list args); + +VOID +__cdecl MUIDisplayError( ULONG ErrorNum, PINPUT_RECORD Ir, @@ -83,7 +91,6 @@ MUIGetString( #define STRING_CONTINUE 12 #define STRING_QUITCONTINUE 13 #define STRING_REBOOTCOMPUTER 14 -#define STRING_TXTSETUPFAILED 15 #define STRING_COPYING 16 #define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 99ea1c8d6bd..51ad13e782c 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3499,9 +3499,7 @@ AddSectionToCopyQueueCab(HINF InfFile, /* Search for the SectionName section */ if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) { - CHAR Buffer[128]; - sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); - PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName); return FALSE; } @@ -3593,9 +3591,7 @@ AddSectionToCopyQueue(HINF InfFile, /* Search for the SectionName section */ if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) { - CHAR Buffer[128]; - sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); - PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName); return FALSE; } @@ -3759,13 +3755,9 @@ PrepareCopyPageInfFile(HINF InfFile, if (!SetupFindFirstLineW(InfFile, L"Directories", NULL, &DirContext)) { if (SourceCabinet) - { - MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER); - } + MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories"); else - { - MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER); - } + MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories"); return FALSE; }