Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 70702: Add missing newline!
by ekohl＠svn.reactos.org 08 Feb '16

08 Feb '16

Author: ekohl Date: Mon Feb 8 14:51:52 2016 New Revision: 70702 URL: http://svn.reactos.org/svn/reactos?rev=70702&view=rev Log: Add missing newline! Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Feb 8 14:51:52 2016 @@ -134,4 +134,4 @@ IDS_PARTITION_NAME "Name" IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" -END +END

1 0

[ekohl] 70701: [REACTOS] Add columns and column titles to the partition listview.
by ekohl＠svn.reactos.org 08 Feb '16

08 Feb '16

Author: ekohl Date: Mon Feb 8 14:41:09 2016 New Revision: 70701 URL: http://svn.reactos.org/svn/reactos?rev=70701&view=rev Log: [REACTOS] Add columns and column titles to the partition listview. Modified: trunk/reactos/base/setup/reactos/drivepage.c trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/ms-MY.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sq-AL.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/lang/zh-TW.rc trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/drivepage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/drivepa… ============================================================================== --- trunk/reactos/base/setup/reactos/drivepage.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/drivepage.c [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -30,6 +30,12 @@ /* GLOBALS ******************************************************************/ +#define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) +static const int default_column_widths[MAX_LIST_COLUMNS] = {200, 150, 150}; +static const int column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT}; + +/* FUNCTIONS ****************************************************************/ + static INT_PTR CALLBACK MoreOptDlgProc(HWND hwndDlg, UINT uMsg, @@ -102,6 +108,37 @@ } return FALSE; } + + +static +BOOL +CreateListViewColumns( + HINSTANCE hInstance, + HWND hWndListView) +{ + WCHAR szText[50]; + int index; + LVCOLUMN lvC; + + /* Create columns. */ + lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + lvC.pszText = szText; + + /* Load the column labels from the resource file. */ + for (index = 0; index < MAX_LIST_COLUMNS; index++) + { + lvC.iSubItem = index; + lvC.cx = default_column_widths[index]; + lvC.fmt = column_alignment[index]; + + LoadStringW(hInstance, IDS_LIST_COLUMN_FIRST + index, szText, 50); + + if (ListView_InsertColumn(hWndListView, index, &lvC) == -1) + return FALSE; + } + return TRUE; +} + INT_PTR CALLBACK @@ -129,6 +166,9 @@ /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); + + CreateListViewColumns(pSetupData->hInstance, + GetDlgItem(hwndDlg, IDC_PARTITION)); #if 1 h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -134,3 +134,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "Instalace systÃ©mu ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue" IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "InstalaciÃ³n de ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOSi paigaldamine" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "Installation de ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "××ª×§× ×ª ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "Installazione di ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ms… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'\nPersediaan tidak dapat meneruskan" IDS_CAPTION "ReactOS Persediaan" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS installering" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -138,3 +138,10 @@ IDS_NO_TXTSETUP_SIF "Nie moÅ¼na znaleÅºÄ 'txtsetup.sif'\nInstalator nie moÅ¼e kontynuowaÄ." IDS_CAPTION "Instalator ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "InstalaÃ§Ã£o do ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -137,3 +137,10 @@ IDS_NO_TXTSETUP_SIF "Nu se poate gÄsi âtxtsetup.sifâ\nInstalarea nu se poate continua." IDS_CAPTION "Asistentul de instalare ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð» 'txtsetup.sif'\nÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾." IDS_CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -133,3 +133,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sq… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF """txtsetup.sif"" bulunamÄ±yor.\nKur sÃ¼rdÃ¼remiyor." IDS_CAPTION "ReactOS Kur" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -136,3 +136,10 @@ IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." IDS_CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -128,3 +128,10 @@ IDS_NO_TXTSETUP_SIF "æ æ³æ¾å° 'txtsetup.sif'\nå®è£ç¨åºæ æ³ç»§ç»ã" IDS_CAPTION "ReactOS å®è£" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -130,3 +130,10 @@ IDS_NO_TXTSETUP_SIF "ç¡æ³æ¾å° 'txtsetup.sif'\nå®è£ç¨å¼ç¡æ³ç¹¼çºã" IDS_CAPTION "ReactOS å®è£" END + +STRINGTABLE +BEGIN + IDS_PARTITION_NAME "Name" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_TYPE "Type" +END Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Mon Feb 8 14:41:09 2016 @@ -72,3 +72,11 @@ #define IDS_SUMMARYSUBTITLE 5051 #define IDS_NO_TXTSETUP_SIF 5053 #define IDS_CAPTION 5054 + + +#define IDS_PARTITION_NAME 5200 +#define IDS_PARTITION_SIZE 5201 +#define IDS_PARTITION_TYPE 5202 + +#define IDS_LIST_COLUMN_FIRST IDS_PARTITION_NAME +#define IDS_LIST_COLUMN_LAST IDS_PARTITION_TYPE

1 0

[ekohl] 70700: [REACTOS] Remove remaining groupboxes from wizard pages.
by ekohl＠svn.reactos.org 07 Feb '16

07 Feb '16

Author: ekohl Date: Sun Feb 7 21:06:31 2016 New Revision: 70700 URL: http://svn.reactos.org/svn/reactos?rev=70700&view=rev Log: [REACTOS] Remove remaining groupboxes from wizard pages. Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/ms-MY.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sq-AL.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/lang/zh-TW.rc trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "Ð¡Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ±Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð·Ð° ÑÐ»Ð°Ð³Ð°Ð½ÐµÑÐ¾", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ âÐÐ°Ð¿ÑÐµÐ´â Ð·Ð° Ð·Ð° Ð½Ð°ÑÐ°Ð»Ð¾ Ð½Ð° ÑÐ»Ð°Ð³Ð°Ð½ÐµÑÐ¾.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ âÐÐ°Ð¿ÑÐµÐ´â Ð·Ð° Ð·Ð° Ð½Ð°ÑÐ°Ð»Ð¾ Ð½Ð° ÑÐ»Ð°Ð³Ð°Ð½ÐµÑÐ¾.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Ð¡Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "ÐÐ°Ð²ÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ°ÑÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ¾Ð²ÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÑÐ²Ð°ÑÐ° ÑÑÐµÐ¿ÐµÐ½ Ð½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡.", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐÑÑÐ²Ð°ÑÐ° ÑÑÐµÐ¿ÐµÐ½ Ð¾Ñ Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ Ð¿ÑÐ¸ÐºÐ»ÑÑÐ¸ ÑÑÐ¿ÐµÑÐ½Ð¾.", IDC_STATIC, 20, 50, 277, 10 LTEXT "ÐÐ¾Ð³Ð°ÑÐ¾ Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ âÐÑÐ°Ð¹â, ÐºÐ¾Ð¼Ð¿ÑÑÑÑÑÑ Ð²Ð¸ ÑÐµ ÑÐµ Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½Ðµ.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -91,8 +91,7 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ShrnutÃ instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÄnÃ proces.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÄnÃ proces.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -100,7 +99,6 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Akce instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Instalace souborÅ¯...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -111,7 +109,6 @@ CAPTION "DokonÄenÃ instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "DokonÄenÃ prvnÃ ÄÃ¡sti instalace systÃ©mu ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "PrvnÃ ÄÃ¡st instalace systÃ©mu ReactOS byla ÃºspÄÅ¡nÄ dokonÄena.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Po klepnutÃ na DokonÄit bude poÄÃtaÄ restartovÃ¡n.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,7 +85,7 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -93,7 +93,6 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN -// CONTROL "Installationsaktion", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Installation der Dateien...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -104,7 +103,6 @@ CAPTION "VervollstÃ¤ndige ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN -// CONTROL "AbschlieÃen der ersten Stufe der ReactOS-Installation", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "ÎÎ»Î¿ÎºÎ»Î·ÏÏÎ½ÎµÏÎ±Î¹ Î· ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÎÎ»Î¿ÎºÎ»Î·ÏÏÎ½ÎµÏÎ±Î¹ ÏÎ¿ ÏÏÏÏÎ¿ ÏÏÎ¬Î´Î¹Î¿ ÏÎ·Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÎÎ»Î¿ÎºÎ»Î·ÏÏÏÎ±ÏÎµ ÎµÏÎ¹ÏÏÏÏÏ ÏÎ¿ ÏÏÏÏÎ¿ ÏÏÎ¬Î´Î¹Î¿ ÏÎ·Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "ÎÏÎ±Î½ ÏÎ±ÏÎ®ÏÎµÏÎµ ÎÎ»Î¿ÎºÎ»Î®ÏÏÏÎ·, Î¸Î± Î³Î¯Î½ÎµÎ¹ ÎµÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,7 +85,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 128, 277, 8 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 128, 303, 8 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -93,7 +93,6 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN -/* CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 */ LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 7, 120, 303, 8 @@ -104,7 +103,6 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN -/* CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 */ LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "InstalaciÃ³n de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Resumen de la instalaciÃ³n", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Presione Siguiente para comenzar con el proceso de instalaciÃ³n.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Presione Siguiente para comenzar con el proceso de instalaciÃ³n.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "InstalaciÃ³n de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Instalando", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Instalando archivos...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "Completando la instalaciÃ³n de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completada la primera parte de la instalaciÃ³n de ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "La primera parte de la instalaciÃ³n de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Cuando presione Finalizar, su equipo serÃ¡ reiniciado.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Paigaldamise kokkuvÃµte", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Vajuta JÃ¤rgmine, et paigaldamist alustada.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Vajuta JÃ¤rgmine, et paigaldamist alustada.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "ReactOSi paigaldamise lÃµpetamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOSi paigaldamise esimese jÃ¤rgu lÃµpetamine", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ReactOSi paigaldamise esimene jÃ¤rk on edukalt lÃµpetatud.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Vajuta LÃµpeta, et arvuti taaskÃ¤ivitada.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "××ª×§× ×ª ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "×¡×××× ×××ª×§× ×", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "×××¥ ×¢× ××× ××× ×××ª××× ××ª×××× ×××ª×§× ×.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "×××¥ ×¢× ××× ××× ×××ª××× ××ª×××× ×××ª×§× ×.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "××ª×§× ×ª ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "×¤×¢×××ª ×××ª×§× ×", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "××©×××ª ××ª×§× ×ª ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installazione in sintesi", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Azione di installazione", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "File da installare...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "Completamento della installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completamento della prima fase della installazione di ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "La prima fase Ã¨ stata completata in modo regolare.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Quando verrÃ premuto fine il computer si riavvierÃ .", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ms… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Pemasangan ringkasan", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Klik Seterusnya untuk memulakan proses pemasangan.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Klik Seterusnya untuk memulakan proses pemasangan.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Persediaan tindakan", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Memasang fail...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "Melengkapkan persediaan ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Melengkapkan tahap pertama persediaan ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Anda telah berjaya melengkapkan tahap pertama persediaan ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Apabila anda klik Selesai, komputer akan dimulakan semula.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installasjon oppsumering", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Trykk pÃ¥ Neste for Ã¥ starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Trykk pÃ¥ Neste for Ã¥ starte installasjon prosessen.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installasjon handling", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Installer filer...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "FullfÃ¸rer ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "FullfÃ¸rer fÃ¸rste steget av ReactOS installering", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Du har nÃ¥ fullfÃ¸rt fÃ¸rste steget av ReactOS installering.", IDC_STATIC, 20, 50, 277, 10 LTEXT "NÃ¥r du trykker FullfÃ¸rt, vil din datamaskin starte pÃ¥ nytt.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -95,8 +95,7 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Podsumowanie instalacji", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Kliknij Dalej, aby rozpoczÄÄ proces instalacji.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Kliknij Dalej, aby rozpoczÄÄ proces instalacji.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -104,7 +103,6 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Instalacja", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Instalacja plikÃ³w...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -115,7 +113,6 @@ CAPTION "KoÅczenie instalacji ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "KoÅczenie pierwszego etapu instalacji ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Pierwszy etap instalacji ReactOS zostaÅ pomyÅlnie zakoÅczony.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Po klikniÄciu na ZakoÅcz ten komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "InstalaÃ§Ã£o do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "SumÃ¡rio de instalaÃ§Ã£o", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Clique em PrÃ³ximo para iniciar o processo de instalaÃ§Ã£o.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Clique em PrÃ³ximo para iniciar o processo de instalaÃ§Ã£o.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "InstalaÃ§Ã£o do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Atividade da instalaÃ§Ã£o", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Instalar arquivos...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "teste.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "Finalizando InstalaÃ§Ã£o do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Finalizando primeira etapa de InstalaÃ§Ã£o do ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "A primeira etapa de InstalaÃ§Ã£o do ReactOS foi efetuada com sucesso.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -94,7 +94,6 @@ CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Sumar", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ApÄsaÈi âÃnainteâ pentru a continua procesul de instalare.", IDC_STATIC, 10, 180, 277, 20 END @@ -103,7 +102,6 @@ CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "AcÈiune de instalare", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Se instaleazÄ fiÈiereleâ¦", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -114,7 +112,6 @@ CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Finalizarea primei etape", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "AÈi dus la bun sfÃ¢rÈit prima etapÄ de instalare a ReactOS", IDC_STATIC, 20, 50, 277, 10 LTEXT "CÃ¢nd veÈi apÄsa âSfÃ¢rÈitâ, calculatorul va reporni.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ÐÐ»Ñ Ð½Ð°ÑÐ°Ð»Ð° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð»ÐµÐµ"".", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐÐ»Ñ Ð½Ð°ÑÐ°Ð»Ð° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð»ÐµÐµ"".", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ°", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð²...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐ²Ð¾Ð³Ð¾ ÑÑÐ°Ð¿Ð° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐÐµÑÐ²ÑÐ¹ ÑÑÐ°Ð¿ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ReactOS Ð·Ð°ÐºÐ¾Ð½ÑÐµÐ½.", IDC_STATIC, 20, 50, 277, 10 LTEXT "ÐÐ¾ÑÐ»Ðµ Ð½Ð°Ð¶Ð°ÑÐ¸Ñ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð±ÑÐ´ÐµÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ¶ÐµÐ½.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -90,8 +90,7 @@ CAPTION "InÅ¡talÃ¡cia systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Zhrnutie inÅ¡talÃ¡cie", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "KliknutÃm na tlaÄidlo Äalej spustÃte inÅ¡talaÄnÃ½ proces.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "KliknutÃm na tlaÄidlo Äalej spustÃte inÅ¡talaÄnÃ½ proces.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -99,7 +98,6 @@ CAPTION "InÅ¡talÃ¡cia systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -110,7 +108,6 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "KliknutÃm na tlaÄidlo DokonÄiÅ¥ reÅ¡tartujete poÄÃtaÄ.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sq… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Permbajtja e instalimit", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Kliko vazhdo pÃ«r tÃ« filluar instalimin.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Kliko vazhdo pÃ«r tÃ« filluar instalimin.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Veprimi i instalimit", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Instalimi i dokumentave...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "Kompletimi i instalimit te ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Kompletimi i fazes sÃ« parÃ« tÃ« instalimit ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Ju keni kompletuar me sukses fazÃ«n e parÃ« tÃ« instalimit tÃ« ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Kur te klikoni mbarim, kompjuteri juaj do riniset.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Kurulum Ãzeti", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "Kurulumu iÅlemini baÅlatmak iÃ§in Ä°leri'ye tÄ±klayÄ±nÄ±z.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Kurulumu iÅlemini baÅlatmak iÃ§in Ä°leri'ye tÄ±klayÄ±nÄ±z.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Kurulum Ä°Ålemi", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "KÃ¼tÃ¼kler yÃ¼kleniyor...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "sÄ±nama.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "ReactOS Kurulumunun Bitirilmesi" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Kurulumunun Ä°lk AÅamasÄ± Bitmesi", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ReactOS kurulumunun ilk aÅamasÄ±nÄ± baÅarÄ±yla bitirdiniz.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Bitir'e tÄ±kladÄ±ÄÄ±nÄ±zda bilgisayarÄ±nÄ±z yeniden baÅlatÄ±lacaktÄ±r.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -93,8 +93,7 @@ CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ÐÐ»Ñ Ð¿Ð¾ÑÐ°ÑÐºÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐÐ°Ð»Ñ.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐÐ»Ñ Ð¿Ð¾ÑÐ°ÑÐºÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐÐ°Ð»Ñ.", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -102,7 +101,6 @@ CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ¸ÐºÐ¾Ð½ÑÑÑÑÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ²...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -113,7 +111,6 @@ CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¿ÐµÑÑÐ¾Ð³Ð¾ ÐµÑÐ°Ð¿Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐÐµÑÑÐ¸Ð¹ ÐµÑÐ°Ð¿ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾.", IDC_STATIC, 20, 50, 277, 10 LTEXT "ÐÑÑÐ»Ñ Ð½Ð°ÑÐ¸ÑÐºÐ°Ð½Ð½Ñ ÐºÐ»Ð°Ð²ÑÑÑ ÐÐ°Ð²ÐµÑÑÐ¸ÑÐ¸ Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð±ÑÐ´Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -85,8 +85,7 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "å®è£æ¦è¦", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ç¹å»ä¸ä¸æ¥å¼å§å®è£è¿ç¨ã", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ç¹å»ä¸ä¸æ¥å¼å§å®è£è¿ç¨ã", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -94,7 +93,6 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "å®è£å¨ä½", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "å®è£æä»¶...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -105,7 +103,6 @@ CAPTION "ReactOS å®è£å®æ" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "ReactOS ç¬¬ä¸é¶æ®µå®è£å®æ", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "æ¨æåå®æ ReactOS ç¬¬ä¸é¶æ®µå®è£è¿ç¨ã", IDC_STATIC, 20, 50, 277, 10 LTEXT "ç¹å»å®æåï¼æ¨ççµèå°ä¼éæ°å¯å¨ã", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -87,8 +87,7 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "å®è£æ¦è¦", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "é»é¸ä¸ä¸æ¥éå§å®è£éç¨ã", IDC_STATIC, 10, 180, 277, 20 + LTEXT "é»é¸ä¸ä¸æ¥éå§å®è£éç¨ã", IDC_STATIC, 7, 180, 303, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -96,7 +95,6 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "å®è£åä½", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "å®è£æªæ¡...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -107,7 +105,6 @@ CAPTION "ReactOS å®è£å®æ" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "ReactOS ç¬¬ä¸éæ®µå®è£å®æ", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "æ¨æåå®æ ReactOS ç¬¬ä¸éæ®µå®è£éç¨ã", IDC_STATIC, 20, 50, 277, 10 LTEXT "é»é¸å®æå¾ï¼æ¨çé»è¦å°æéæ°ååã", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Sun Feb 7 21:06:31 2016 @@ -41,9 +41,7 @@ #define IDC_PROCESSPROGRESS 2033 #define IDD_RESTARTPAGE 2034 -#define IDC_FINISHTITLE 2037 #define IDC_RESTART_PROGRESS 2038 -#define IDC_ACTION 2041 #define IDC_PARTMOREOPTS 2042 #define IDD_BOOTOPTIONS 2043

1 0

[ekohl] 70699: [USETUP] Danish translation for usetup. Patch by Lars Rasmussen. CORE-10812 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 07 Feb '16

07 Feb '16

Author: ekohl Date: Sun Feb 7 20:24:18 2016 New Revision: 70699 URL: http://svn.reactos.org/svn/reactos?rev=70699&view=rev Log: [USETUP] Danish translation for usetup. Patch by Lars Rasmussen. CORE-10812 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Sun Feb 7 20:24:18 2016 @@ -3,6 +3,1851 @@ MUI_LAYOUTS daDKLayouts[] = { { L"0406", L"00000406" }, - { L"0409", L"00000409" }, { NULL, NULL } }; + +static MUI_ENTRY daDKLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Valg af sprog", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Vlg det sprog du nsker der skal bruges under installationen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Og tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Dette vil ogs blive standardsproget p det endelige system.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Velkommen til ReactOS installationen", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "Denne del af installationen vil kopiere ReactOS opreativsystemet", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "til din computer og klargre den til anden del af installationsprocessen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Tryk p ENTER for at installere ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Tryk p R reparere eller opdatere ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Tryk p L for at f vist ReactOS licensbetingelser og vilkr.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Tryk p F3 for at afslutte uden at installere ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "For at f mere infomation om ReactOS, g ind p:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = Fortst R = Reparer L = Licens F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS installationen er i en tilelig udviklingsfase. Derfor", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "understtter den ikke alle funtionerne i et fult brugbart", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "installationsprogram.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Der er flgende begrndsninger:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Installationen understtter kun FAT-filsystmet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Tjek af filsystem er endnu ikke implementeret.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 Tryk p ENTER for at installere ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Tryk p F3 for at afslutte uden at installere ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licensbetingelser:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "ReactOS systemet er licenseret under betingelserne beskrevet i", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU GPL. Noget kode er fra andre kompatible licenser", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "s som X11 eller BSD og GNU GPL licenserne.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "Alt software som er en del af ReactOS systemet er", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "derfor udgivet under GNU GPL licensen og den oprindelige", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "licens er ligeledes vedligeholdt.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Denne software bliver IKKE leveret med garanti eller begrndsninger af", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "brugen heraf. Dog kun i det udstrk international og lokal lov tillader.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "ReactOS dkker kun distribution til tredjeparter", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "Hvis du af en eller anden grund ikke har modtaget en kopi", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "af GNU General Public Licensen sammen med ReactOS, besg siden", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 22, + "Garanti:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "Dette er gratis software; se kildekoen for betingelser for kopiering.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "Der er absolut IGNEN geranti; ikke engang for SALGSBARHEDEN eller", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "om ReactOS KAN BRUGES TIL NOGET BESTEMT.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Tilbage", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Listen her under viser de nuvrende enhedsindstillinger.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Computer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Skrm:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Tastatur:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Tastaturlayout:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Accepter:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Accepter disse enhedsindstillinger", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "Du kan ndre i hardwareindstillingerne ved at trykke p OP", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "eller NED for at vlge et element. Derefer tryk p ENTER", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + "for at vlge andre indstillinger.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "Nr alle indstillingerne er korrekte, vlg", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "\"Accepter disse enhedsindstillinger\" og tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS installationen er i en tilelig udviklingsfase. Derfor", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "understtter den ikke alle funtionerne i et fult brugbart", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "installationsprogram.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Funktionerne til reperation er endnu ikke blevet implementeret.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Tryk p U for opdatere OS'et.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Tryk p R for at starte gendannelskonsollen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Tryk p ESC for at vende tilbage til hovedskrmen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Tryk p ENTER for at genstart din computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Hovedskrm U = Opdater R = Gendan ENTER = Genstart", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY daDKComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du vil ndre hvilken type computer der skal installeres.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Tryk p OP eller NED for at vlge den nskede type computer.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Tryk p ESC for at vende tilbage til det forrige skrmbillede", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " uden at ndre computertypen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Systemet tjekker i jeblikket om alt er blevet kopieret til din disk", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Dette tager et jeblik", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "Nr det er udfrt genstarter din computer automatisk.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Fjerner midlertidige filer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS er ikke blevet helt installeret", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Fjern eventuelle disketter fra drev A: og", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "alle CD-ROMmer fra CD-Drev.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Tryk p ENTER for at genstarte din computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Vent...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du vil ndre hvilken skrm der skal installeres.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Tryk p OP eller NED for at vlge den nskede skrm.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Tryk p ESC for at vende tilbage til det forrige skrmbillede", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " uden at ndre skrmen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "De grundlggende komponenter i ReactOS blev installeret med success.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Fjern eventuelle disketter fra drev A: og", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "alle CD-ROMmer fra CD-Drev.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Tryk p ENTER for at genstarte din computer.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Tryk p ENTER for at genstarte din comouter.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Genstart", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Installationen kan ikke installere opstartslseren p", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "din computers hardisk", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "St en formateret diskette i drev A: og", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "tryk p ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY daDKSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Listen her under viser eksisterende partitioner og ubrugt", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "diskplads til nye partitioner.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Tryk p OP eller NED for at vlge et element i listen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Tryk p ENTER for at installere ReactOS til den valgte patition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Tryk p P for at lave en ny primr partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Tryk p E for at lave en ny udviddet partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Tryk p L for at lave en ny logisk partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Tryk p D for at slette en eksisterende partition.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Vent...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du har bedt installationen om at slette systempartitionen.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Systempartitioner kan indeholde programmer til diagnosdisering, hardware,", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "oprativsystem (s som ReactOS) eller styreprogrammer til hardware.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Slet kun systempartitioner hvis du er sikker p at der ikke er sdanne", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "progammer p partitionen, hvis du er sikker p at du vil slette dem.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "Hvis du sletter partitionen, kan du mske ikke starte din computer", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "fra din harddisk fr at du har gennemfrt installatonen af ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Tryk p ENTER for at slette systempartitionen. Du vil blive bedt", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " om at bekrfte sletningen af partitionen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Tryk p ESC for at vende tilbage til forrige skrmbillede.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " Partitionen vil ikke blive slettet.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + + +static MUI_ENTRY daDKFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Formater partition", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Installationen vil nu formatere partitionen.", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "Tryk p ENTER for at fortstte.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY daDKInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Installationen vil installere filer p den valgte partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "Vlg den mappe hvor du nsker ReactOS skal installeres:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "For at ndre den forslede mappe, tryk p TILABE for at slette", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "det der str og derefter skriv den mappe du nsker", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "ReactOS skal installeres til.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Vent mens ReactOS installationen kopiere filer til din", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "ReactOS-installationsmappe.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "Dette kan tage flerere minutter at udfre.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Vent... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Installatione af opstartslser", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Installer opstartslseren p harddisken (MBR og VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Installer opstarslsteren p harddisken (kun VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Installer opstartlseren p en diskette.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Spring installation af opstartlseren over.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du vil ndre hvilken type tastatur der skal installeres.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Tryk p OP eller NED for at vlge den nskede type tastatur.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Tryk p ESC for at vende tilbage til det forrige skrmbillede", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " uden at ndre tastaturtypen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du vil ndre hvilket tastaturlayout der skal bruges som standard.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Tryk p OP eller NED for at vlge det nskede tastaturlayout.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Tryk derefter p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Tryk p ESC for at vende tilbage til det forrige skrmbillede", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " uden at ndre tastaturlayoutet.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY daDKPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Installationen gr din computer klar til at kopiere ReactOS filerne. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Opbygger listen med filer der skal kopieres...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY daDKSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Vlg et filsystem fra listen her under:", + 0 + }, + { + 8, + 19, + "\x07 Tryk p OP eller NED for at vlge et filsystem.", + 0 + }, + { + 8, + 21, + "\x07 Tryk p ENTER for at formatere partitionen som valgte filsystem.", + 0 + }, + { + 8, + 23, + "\x07 Tryk p ESC for at vlge en anden partition.", + 0 + }, + { + 0, + 0, + "ENTER = Fortst ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Du har valgt at slette partitionen", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Tryk p D for at slette partitionen.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "ADVARSELL Alle data p partitionen vil g tabt!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Tryk p ESC for at annulere.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Slet partition ESC = Annuller F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY daDKRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Installationen opdatere systemkonfigurationen. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Laver registreringsdatabasen...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR daDKErrorEntries[] = +{ + { + // NOT_AN_ERROR + "Success\n" + }, + { + //ERROR_NOT_INSTALLED + "ReactOS er endnu ikke frdiginstalleret p\n" + "din computer. Hvis du afslutter installationen nu skal\n" + "du krer installationen igen for at installere ReactOS.\n" + "\n" + " \x07 Tryk p ENTER for at fortstte installationen.\n" + " \x07 Tryk p F3 afslutte installationen.", + "F3 = Afslut ENTER = Fortst" + }, + { + //ERROR_NO_HDD + "Installationen kunne ikke finde en harddisk.\n", + "ENTER = Genstart" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Installationen kunne ikke finde dets kildedrev.\n", + "ENTER = Genstart" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Installationen kunne ikke indlst TXTSETUP.SIF.\n", + "ENTER = Genstart" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Installationen fasdt en delagt TXTSETUP.SIF.\n", + "ENTER = Genstart" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Installationen fandt en ubrugbar signatur i TXTSETUP.SIF.\n", + "ENTER = Genstart" + }, + { + //ERROR_DRIVE_INFORMATION + "Installationen kunne ikke hente information fra registreringsdatabasen.\n", + "ENTER = Genstart" + }, + { + //ERROR_WRITE_BOOT, + "Installationen kunne ikke installere FAT-startkode p systempartitionen.", + "ENTER = Genstart" + }, + { + //ERROR_LOAD_COMPUTER, + "Installationen kunne ikke indlse listen over computertyper.\n", + "ENTER = Genstart" + }, + { + //ERROR_LOAD_DISPLAY, + "Installationen kunne ikke indlste listen over skrmindstillinger.\n", + "ENTER = Genstart" + }, + { + //ERROR_LOAD_KEYBOARD, + "Installationen kunne ikke indlse listen over tastaturtyper.\n", + "ENTER = Genstart" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Installationen kunne ikke indlse listen over tastaturlayouts.\n", + "ENTER = Genstart" + }, + { + //ERROR_WARN_PARTITION, + "Installationen fandt ud af at midst en harddisk indeholder en\n" + "indkompatibel partitionstabel og kan ikke hndteeres korrekt!\n" + "\n" + "Oprettelse eller sletning af partitionen kan delgge partiotnstabellen.\n" + "\n" + " \x07 Tryk p F3 for at afslutte installationen.\n" + " \x07 Tryk p ENTER for at fortstte.", + "F3 = Afslut ENTER = Fortst" + }, + { + //ERROR_NEW_PARTITION, + "Du kan ikke lave en partitionstabel\n" + "inde i en allerede eksisterende partition!\n" + "\n" + " * Tryk p en vilkrligtast for at fortstte.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Du kan ikke slette upartitionernet diskplads!\n" + "\n" + " * Tryk p en vilkrligtast for at fortstte.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Installationen kunne ikke installere FAT-startkode p systempartitionen.", + "ENTER = Genstart" + }, + { + //ERROR_NO_FLOPPY, + "Der er ingen diskette i drev A:.", + "ENTER = Fortst" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Installationen kunne ikke opdatere indstillingene for tastaturlayout.", + "ENTER = Genstart" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Installationen kunne ikke opdatere indstillingerne for skrmregistrereing", + "ENTER = Genstart" + }, + { + //ERROR_IMPORT_HIVE, + "Installationen kunne ikke importere registreringsdatabasen.", + "ENTER = Genstart" + }, + { + //ERROR_FIND_REGISTRY + "Installationen kunne ikke finde filerne til registreringsdatabasen.", + "ENTER = Genstart" + }, + { + //ERROR_CREATE_HIVE, + "Installationen kunne ikke lave registreringsdatabasen.", + "ENTER = Genstart" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Installationen kunne ikke indle registreringsdatabasen.", + "ENTER = Genstart" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet-filen indeholder ingen brugbar inf-fil.\n", + "ENTER = Genstart" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet-filen blev ikke fundet.\n", + "ENTER = Genstart" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet-filen har ingen installationsscript.\n", + "ENTER = Genstart" + }, + { + //ERROR_COPY_QUEUE, + "Installationen kunne ikke bne filkopieringsken.\n", + "ENTER = Genstart" + }, + { + //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" + "i TXTSETUP.SIF.\n", + "ENTER = Genstart" + }, + { + //ERROR_WRITE_PTABLE, + "Installationen kunne ikke skrive partitionstabllerne.\n" + "ENTER = Genstart" + }, + { + //ERROR_ADDING_CODEPAGE, + "Installationen kunne ikke tilfje en tegntabel til registreringsdatabasen.\n" + "ENTER = Genstart" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Installationen kunne ikke stte systemsproget.\n" + "ENTER = Genstart" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Installationen kunne ikke tilfje tastaturlayouts til registrereingsdatabasen.\n" + "ENTER = Genstart" + }, + { + //ERROR_UPDATE_GEOID, + "Installationen kunne ikke stte geo id'et.\n" + "ENTER = Genstart" + }, + { + //ERROR_DIRECTORY_NAME, + "Ubrugligt mappenavn.\n" + "\n" + " * Tryk p en vilkrligtast for at fortstte." + }, + { + //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" + "\n" + " * Tryk p en vilkrligtast for at fortstte.", + NULL + }, + { + //ERROR_PARTITION_TABLE_FULL, + "Du kan ikke lave en ny primr eller udviddet partition i\n" + "partitionstabellen p denne disk da den er fuld..\n" + "\n" + " * Tryk p en vilkrligtast for at fortstte." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "Du kan ikke lave mere end en udviddet partition per disk.\n" + "\n" + " * Tryk p en vilkrligtast for at fortstte." + }, + { + //ERROR_FORMATTING_PARTITION, + "Installationen kan ikke formatere partitionen:\n" + " %S\n" + "\n" + "ENTER = Genstart" + }, + { + NULL, + NULL + } +}; + +MUI_PAGE daDKPages[] = +{ + { + LANGUAGE_PAGE, + daDKLanguagePageEntries + }, + { + START_PAGE, + daDKWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + daDKIntroPageEntries + }, + { + LICENSE_PAGE, + daDKLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + daDKDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + daDKRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + daDKComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + daDKDisplayPageEntries + }, + { + FLUSH_PAGE, + daDKFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + daDKSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + daDKConfirmDeletePartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + daDKSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + daDKFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + daDKDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + daDKInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + daDKPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + daDKFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + daDKKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + daDKBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + daDKLayoutSettingsEntries + }, + { + QUIT_PAGE, + daDKQuitPageEntries + }, + { + SUCCESS_PAGE, + daDKSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + daDKBootPageEntries + }, + { + REGISTRY_PAGE, + daDKRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING daDKStrings[] = +{ + {STRING_PLEASEWAIT, + " Vent..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = installer P = Lav primr E = Lav udviddet F3 = Afslut"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = installer L = Lav logisk partition F3 = Afslut"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = installer D = Slet partition F3 = Afslut"}, + {STRING_DELETEPARTITION, + " D = Slet partition F3 = Afslut"}, + {STRING_PARTITIONSIZE, + "Strrelse p den nye partition:"}, + {STRING_CHOOSENEWPARTITION, + "Du har valge at lave en ny primr partition p"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "Du har valgt at lave en ny udviddet partition p"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "Du har valge at lave en ny logisk partition p"}, + {STRING_HDDSIZE, + "Indtast strrelsen p den nye partition i megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Lav partition ESC = Annuller F3 = Afslut"}, + {STRING_PARTFORMAT, + "Denne partition vil blive formateret som det nste."}, + {STRING_NONFORMATTEDPART, + "Du har valgt at installere ReactOS til en ny eller uformateret partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "Systempartitionen er endnu ikke blevet formateret."}, + {STRING_NONFORMATTEDOTHERPART, + "Den nye partition er endnu ikke blevet formateret."}, + {STRING_INSTALLONPART, + "Installationen installere ReactOS p partitionen"}, + {STRING_CHECKINGPART, + "Installationen tjekker den valgte partition."}, + {STRING_QUITCONTINUE, + "F3 = Afslut ENTER = Fortst"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Genstart"}, + {STRING_TXTSETUPFAILED, + "Installationen kunne ikke finde '%S'-sektionen\ni TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " Kopiere filen: %S"}, + {STRING_SETUPCOPYINGFILES, + "Installationen kopiere filer..."}, + {STRING_REGHIVEUPDATE, + " Opdatere registreringsdatabasen..."}, + {STRING_IMPORTFILE, + " Importere %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Opdatere indstillinger for registrering af skrm..."}, + {STRING_LOCALESETTINGSUPDATE, + " Opdatere indstillinger for sprog..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Opdatere indstillinger for tastaturlauout..."}, + {STRING_CODEPAGEINFOUPDATE, + " Tilfjrer tegntabelsinfomation til registrerinsdatabasen..."}, + {STRING_DONE, + " Udfrt..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Genstart"}, + {STRING_CONSOLEFAIL1, + "Kunne ikke bne konsollen\r\n\r\n"}, + {STRING_CONSOLEFAIL2, + "Dette skykdes ofte at du bruger et USB-tastatur\r\n"}, + {STRING_CONSOLEFAIL3, + "USB-tastatuere er endnu ikke fuldt understttet\r\n"}, + {STRING_FORMATTINGDISK, + "Installationen formatere din disk"}, + {STRING_CHECKINGDISK, + "Installationen tjekker din disk"}, + {STRING_FORMATDISK1, + " Formater partitionen som %S-filesystemet (hurtigformatering) "}, + {STRING_FORMATDISK2, + " Formater partitionen som %S-filesystemet "}, + {STRING_KEEPFORMAT, + " Behold nuvrende filsystem (ingen ndringer) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "p %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %wZ."}, + {STRING_HDDINFOUNK3, + "p %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "p harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c %c %stype %-3u%s %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Installationen har lavet en ny partition p"}, + {STRING_UNPSPACE, + " %sUpartitioneret plads%s %6lu %s"}, + {STRING_MAXSIZE, + "MB (maks %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Udviddet partition"}, + {STRING_UNFORMATTED, + "Ny (uformateret)"}, + {STRING_FORMATUNUSED, + "Ubrugt"}, + {STRING_FORMATUNKNOWN, + "Ukendt"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "Tilfjer tastaturlayouts"}, + {0, 0} +}; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sun Feb 7 20:24:18 2016 @@ -520,7 +520,7 @@ {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", daDKPages, daDKErrorEntries, daDKStrings, LatinFonts, daDKLayouts }, #endif #ifdef LANGUAGE_DV_MV {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts },

1 0

[ekohl] 70698: [WLANSVC] Add the version information for the WLAN Service. Patch by Lee Schroeder. CORE-10836 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 07 Feb '16

07 Feb '16

Author: ekohl Date: Sun Feb 7 20:08:08 2016 New Revision: 70698 URL: http://svn.reactos.org/svn/reactos?rev=70698&view=rev Log: [WLANSVC] Add the version information for the WLAN Service. Patch by Lee Schroeder. CORE-10836 #resolve #comment Thanks a lot! Added: trunk/reactos/base/services/wlansvc/wlansvc.rc (with props) Modified: trunk/reactos/base/services/wlansvc/CMakeLists.txt Modified: trunk/reactos/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/CMak… ============================================================================== --- trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Sun Feb 7 20:08:08 2016 @@ -8,7 +8,7 @@ precomp.h ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_s.c) -add_executable(wlansvc ${SOURCE}) +add_executable(wlansvc ${SOURCE} wlansvc.rc) if(NOT MSVC) target_link_libraries(wlansvc ${PSEH_LIB}) Added: trunk/reactos/base/services/wlansvc/wlansvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.rc (added) +++ trunk/reactos/base/services/wlansvc/wlansvc.rc [iso-8859-1] Sun Feb 7 20:08:08 2016 @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Wireless LAN Service" +#define REACTOS_STR_INTERNAL_NAME "wlansvc" +#define REACTOS_STR_ORIGINAL_FILENAME "wlansvc.exe" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/wlansvc/wlansvc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 70697: [KERNEL32] - Hide STATUS_SXS_INVALID_ACTCTXDATA_FORMAT in BasepProbeForDllManifest and fake a manifest not found status instead. Windows's RtlCreateActivationContext will always ret...
by tfaber＠svn.reactos.org 07 Feb '16

07 Feb '16

Author: tfaber Date: Sun Feb 7 09:38:47 2016 New Revision: 70697 URL: http://svn.reactos.org/svn/reactos?rev=70697&view=rev Log: [KERNEL32] - Hide STATUS_SXS_INVALID_ACTCTXDATA_FORMAT in BasepProbeForDllManifest and fake a manifest not found status instead. Windows's RtlCreateActivationContext will always return this code since we call it with a completely invalid structure. Should fix boot on VMware-Hybrid testbot. CORE-10843 Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Sun Feb 7 09:38:47 2016 @@ -170,6 +170,18 @@ /* Store activation context pointer if it was created successfully */ if (NT_SUCCESS(Status)) *ActCtx = Result; + + /* CORE-10843: Windows always returns this since we pass the wrong struct */ + if (Status == STATUS_SXS_INVALID_ACTCTXDATA_FORMAT) + { + /* Fake "Manifest not found" so the load doesn't fail */ + static int Once; + if (Once++) + { + DPRINT1("HACK: Passed invalid ACTIVATION_CONTEXT_DATA!\n"); + } + Status = STATUS_RESOURCE_DATA_NOT_FOUND; + } } return Status;

1 0

[tfaber] 70696: [LWIP] - Don't use the already over-used LWIP_TAG for lookaside list allocations
by tfaber＠svn.reactos.org 06 Feb '16

06 Feb '16

Author: tfaber Date: Sat Feb 6 22:11:03 2016 New Revision: 70696 URL: http://svn.reactos.org/svn/reactos?rev=70696&view=rev Log: [LWIP] - Don't use the already over-used LWIP_TAG for lookaside list allocations Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/sys_arch.c Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Sat Feb 6 22:11:03 2016 @@ -7,7 +7,9 @@ #include "tcpip.h" #ifndef LWIP_TAG - #define LWIP_TAG 'PIwl' + #define LWIP_TAG 'PIwl' + #define LWIP_MESSAGE_TAG 'sMwl' + #define LWIP_QUEUE_TAG 'uQwl' #endif typedef struct tcp_pcb* PTCP_PCB; Modified: trunk/reactos/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/sys_a… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] Sat Feb 6 22:11:03 2016 @@ -321,7 +321,7 @@ NULL, 0, sizeof(struct lwip_callback_msg), - LWIP_TAG, + LWIP_MESSAGE_TAG, 0); ExInitializeNPagedLookasideList(&QueueEntryLookasideList, @@ -329,7 +329,7 @@ NULL, 0, sizeof(QUEUE_ENTRY), - LWIP_TAG, + LWIP_QUEUE_TAG, 0); }

1 0

[hbelusca] 70695: [FREELDR] - Whitespace fixes only in the disk code. - Fix the name of the EXT2 FS driver. - Move I/O initialization after Mm init so that we can properly read disk data into the c...
by hbelusca＠svn.reactos.org 05 Feb '16

05 Feb '16

Author: hbelusca Date: Fri Feb 5 23:47:35 2016 New Revision: 70695 URL: http://svn.reactos.org/svn/reactos?rev=70695&view=rev Log: [FREELDR] - Whitespace fixes only in the disk code. - Fix the name of the EXT2 FS driver. - Move I/O initialization after Mm init so that we can properly read disk data into the correct buffers if needed (and I will need that). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/lib/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Fri Feb 5 23:47:35 2016 @@ -69,16 +69,16 @@ { REGS RegsIn; REGS RegsOut; - ULONG RetryCount; + ULONG RetryCount; PI386_DISK_ADDRESS_PACKET Packet = (PI386_DISK_ADDRESS_PACKET)(BIOSCALLBUFFER); TRACE("PcDiskReadLogicalSectorsLBA() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", DriveNumber, SectorNumber, SectorCount, Buffer); ASSERT(((ULONG_PTR)Buffer) <= 0xFFFFF); // BIOS int 0x13, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ - RegsIn.b.ah = 0x42; // Subfunction 42h - RegsIn.b.dl = DriveNumber; // Drive number in DL (0 - floppy, 0x80 - harddisk) - RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> disk address packet + RegsIn.b.ah = 0x42; // Subfunction 42h + RegsIn.b.dl = DriveNumber; // Drive number in DL (0 - floppy, 0x80 - harddisk) + RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> disk address packet RegsIn.w.si = BIOSCALLBUFOFFSET; // Setup disk address packet @@ -115,11 +115,10 @@ { return TRUE; } - // If it failed the do the next retry + // If it failed then do the next retry else { PcDiskResetController(DriveNumber); - continue; } } Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Fri Feb 5 23:47:35 2016 @@ -27,10 +27,11 @@ PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *ActivePartition) { - ULONG BootablePartitionCount = 0; - MASTER_BOOT_RECORD MasterBootRecord; + ULONG BootablePartitionCount = 0; + MASTER_BOOT_RECORD MasterBootRecord; *ActivePartition = 0; + // Read master boot record if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) { @@ -134,7 +135,7 @@ ExtendedPartitionOffset = ExtendedPartitionTableEntry.SectorCountBeforePartition; } // Read the partition boot record - if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord)) + if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord)) { return FALSE; } @@ -199,7 +200,7 @@ BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord) { - ULONG Index; + ULONG Index; // Read master boot record if (!MachDiskReadLogicalSectors(DriveNumber, LogicalSectorNumber, 1, DiskReadBuffer)) @@ -207,7 +208,6 @@ return FALSE; } RtlCopyMemory(BootRecord, DiskReadBuffer, sizeof(MASTER_BOOT_RECORD)); - TRACE("Dumping partition table for drive 0x%x:\n", DriveNumber); TRACE("Boot record logical start sector = %d\n", LogicalSectorNumber); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri Feb 5 23:47:35 2016 @@ -29,16 +29,16 @@ VOID __cdecl BootMain(IN PCCH CmdLine) { CmdLineParse(CmdLine); - MachInit(CmdLine); - FsInit(); /* Debugger pre-initialization */ DebugInit(FALSE); TRACE("BootMain() called.\n"); + MachInit(CmdLine); + /* Check if the CPU is new enough */ - FrLdrCheckCpuCompatiblity(); + FrLdrCheckCpuCompatiblity(); // FIXME: Should be done inside MachInit! /* UI pre-initialization */ if (!UiInitialize(FALSE)) @@ -47,11 +47,15 @@ goto Quit; } + /* Initialize memory manager */ if (!MmInitializeMemoryManager()) { UiMessageBoxCritical("Unable to initialize memory manager."); goto Quit; } + + /* Initialize I/O subsystem */ + FsInit(); RunLoader(); Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/f… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/fs/ext2.c [iso-8859-1] Fri Feb 5 23:47:35 2016 @@ -1294,7 +1294,7 @@ Ext2Open, Ext2Read, Ext2Seek, - L"ext2", + L"ext2fs", }; const DEVVTBL* Ext2Mount(ULONG DeviceId)

1 0

[hbelusca] 70694: Order of definitions is still important!
by hbelusca＠svn.reactos.org 05 Feb '16

05 Feb '16

Author: hbelusca Date: Fri Feb 5 21:15:25 2016 New Revision: 70694 URL: http://svn.reactos.org/svn/reactos?rev=70694&view=rev Log: Order of definitions is still important! Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Fri Feb 5 21:15:25 2016 @@ -65,6 +65,34 @@ VOID NTAPI HalpInitBusHandler(VOID); #endif +typedef struct +{ + PVOID NonCachedExtension; + + ULONG BusNum; + ULONG MaxTargedIds; + + ULONG InterruptFlags; + + /* SRB extension stuff */ + ULONG SrbExtensionSize; + PVOID SrbExtensionBuffer; + + IO_SCSI_CAPABILITIES PortCapabilities; + + PHW_INITIALIZE HwInitialize; + PHW_STARTIO HwStartIo; + PHW_INTERRUPT HwInterrupt; + PHW_RESET_BUS HwResetBus; + + /* DMA related stuff */ + PADAPTER_OBJECT AdapterObject; + + ULONG CommonBufferLength; + + PVOID MiniPortDeviceExtension; +} SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; + typedef struct tagDISKCONTEXT { /* Device ID */ @@ -79,34 +107,6 @@ ULONGLONG SectorCount; ULONGLONG SectorNumber; } DISKCONTEXT; - -typedef struct -{ - PVOID NonCachedExtension; - - ULONG BusNum; - ULONG MaxTargedIds; - - ULONG InterruptFlags; - - /* SRB extension stuff */ - ULONG SrbExtensionSize; - PVOID SrbExtensionBuffer; - - IO_SCSI_CAPABILITIES PortCapabilities; - - PHW_INITIALIZE HwInitialize; - PHW_STARTIO HwStartIo; - PHW_INTERRUPT HwInterrupt; - PHW_RESET_BUS HwResetBus; - - /* DMA related stuff */ - PADAPTER_OBJECT AdapterObject; - - ULONG CommonBufferLength; - - PVOID MiniPortDeviceExtension; -} SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; PSCSI_PORT_DEVICE_EXTENSION ScsiDeviceExtensions[SCSI_MAXIMUM_BUSES];

1 0

[hbelusca] 70693: [FREELDR]: Add source file header to scsiport.c; move structure definitions together.
by hbelusca＠svn.reactos.org 05 Feb '16

05 Feb '16

Author: hbelusca Date: Fri Feb 5 21:12:53 2016 New Revision: 70693 URL: http://svn.reactos.org/svn/reactos?rev=70693&view=rev Log: [FREELDR]: Add source file header to scsiport.c; move structure definitions together. Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Fri Feb 5 21:12:53 2016 @@ -1,3 +1,13 @@ +/* + * PROJECT: ReactOS Boot Loader (FreeLDR) + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/disk/scsiport.c + * PURPOSE: Interface for SCSI Emulation + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + #include <freeldr.h> #define _SCSIPORT_ @@ -48,96 +58,12 @@ DBG_DEFAULT_CHANNEL(SCSIPORT); +/* GLOBALS ********************************************************************/ + #ifdef _M_IX86 VOID NTAPI HalpInitializePciStubs(VOID); VOID NTAPI HalpInitBusHandler(VOID); #endif - -typedef struct -{ - PVOID NonCachedExtension; - - ULONG BusNum; - ULONG MaxTargedIds; - - ULONG InterruptFlags; - - /* SRB extension stuff */ - ULONG SrbExtensionSize; - PVOID SrbExtensionBuffer; - - IO_SCSI_CAPABILITIES PortCapabilities; - - PHW_INITIALIZE HwInitialize; - PHW_STARTIO HwStartIo; - PHW_INTERRUPT HwInterrupt; - PHW_RESET_BUS HwResetBus; - - /* DMA related stuff */ - PADAPTER_OBJECT AdapterObject; - - ULONG CommonBufferLength; - - PVOID MiniPortDeviceExtension; -} SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; - -PSCSI_PORT_DEVICE_EXTENSION ScsiDeviceExtensions[SCSI_MAXIMUM_BUSES]; - -ULONG -ntohl( - IN ULONG Value) -{ - FOUR_BYTE Dest; - PFOUR_BYTE Source = (PFOUR_BYTE)&Value; - - Dest.Byte0 = Source->Byte3; - Dest.Byte1 = Source->Byte2; - Dest.Byte2 = Source->Byte1; - Dest.Byte3 = Source->Byte0; - - return Dest.AsULong; -} - -static -BOOLEAN -SpiSendSynchronousSrb( - IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb) -{ - BOOLEAN ret; - - ASSERT(!(Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE)); - - /* HACK: handle lack of interrupts */ - while (!(DeviceExtension->InterruptFlags & SCSI_PORT_NEXT_REQUEST_READY)) - { - KeStallExecutionProcessor(100 * 1000); - DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); - } - - DeviceExtension->InterruptFlags &= ~SCSI_PORT_NEXT_REQUEST_READY; - Srb->SrbFlags |= SRB_FLAGS_IS_ACTIVE; - - if (!DeviceExtension->HwStartIo( - DeviceExtension->MiniPortDeviceExtension, - Srb)) - { - ExFreePool(Srb); - return FALSE; - } - - /* HACK: handle lack of interrupts */ - while (Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE) - { - KeStallExecutionProcessor(100 * 1000); - DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); - } - - ret = SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS; - ExFreePool(Srb); - - return ret; -} typedef struct tagDISKCONTEXT { @@ -153,6 +79,94 @@ ULONGLONG SectorCount; ULONGLONG SectorNumber; } DISKCONTEXT; + +typedef struct +{ + PVOID NonCachedExtension; + + ULONG BusNum; + ULONG MaxTargedIds; + + ULONG InterruptFlags; + + /* SRB extension stuff */ + ULONG SrbExtensionSize; + PVOID SrbExtensionBuffer; + + IO_SCSI_CAPABILITIES PortCapabilities; + + PHW_INITIALIZE HwInitialize; + PHW_STARTIO HwStartIo; + PHW_INTERRUPT HwInterrupt; + PHW_RESET_BUS HwResetBus; + + /* DMA related stuff */ + PADAPTER_OBJECT AdapterObject; + + ULONG CommonBufferLength; + + PVOID MiniPortDeviceExtension; +} SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; + +PSCSI_PORT_DEVICE_EXTENSION ScsiDeviceExtensions[SCSI_MAXIMUM_BUSES]; + +/* FUNCTIONS ******************************************************************/ + +ULONG +ntohl( + IN ULONG Value) +{ + FOUR_BYTE Dest; + PFOUR_BYTE Source = (PFOUR_BYTE)&Value; + + Dest.Byte0 = Source->Byte3; + Dest.Byte1 = Source->Byte2; + Dest.Byte2 = Source->Byte1; + Dest.Byte3 = Source->Byte0; + + return Dest.AsULong; +} + +static +BOOLEAN +SpiSendSynchronousSrb( + IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, + IN PSCSI_REQUEST_BLOCK Srb) +{ + BOOLEAN ret; + + ASSERT(!(Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE)); + + /* HACK: handle lack of interrupts */ + while (!(DeviceExtension->InterruptFlags & SCSI_PORT_NEXT_REQUEST_READY)) + { + KeStallExecutionProcessor(100 * 1000); + DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); + } + + DeviceExtension->InterruptFlags &= ~SCSI_PORT_NEXT_REQUEST_READY; + Srb->SrbFlags |= SRB_FLAGS_IS_ACTIVE; + + if (!DeviceExtension->HwStartIo( + DeviceExtension->MiniPortDeviceExtension, + Srb)) + { + ExFreePool(Srb); + return FALSE; + } + + /* HACK: handle lack of interrupts */ + while (Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE) + { + KeStallExecutionProcessor(100 * 1000); + DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); + } + + ret = SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS; + ExFreePool(Srb); + + return ret; +} static ARC_STATUS DiskClose(ULONG FileId) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs