diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt
index 0c0c9977947..7f31e513b4f 100644
--- a/base/system/diskpart/CMakeLists.txt
+++ b/base/system/diskpart/CMakeLists.txt
@@ -55,4 +55,5 @@ if(MSVC)
 endif()
 
 add_pch(diskpart diskpart.h SOURCE)
+add_message_headers(UNICODE diskpart_msg.mc)
 add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all)
diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c
index 388cb8a45af..9182a7a46ab 100644
--- a/base/system/diskpart/detail.c
+++ b/base/system/diskpart/detail.c
@@ -186,7 +186,7 @@ DetailPartition(
     }
 
     if (bVolumeFound == FALSE)
-        ConPuts(StdOut, L"\nThere is no volume associated with this partition.\n");
+        ConResPuts(StdOut, IDS_DETAIL_NO_VOLUME);
 
     ConPuts(StdOut, L"\n");
 
@@ -241,7 +241,7 @@ DetailVolume(
     }
 
     if (bDiskFound == FALSE)
-        ConPuts(StdOut, L"\nThere are no disks attached to this volume.\n");
+        ConResPuts(StdOut, IDS_DETAIL_NO_DISKS);
 
     /* TODO: Print more volume details */
 
diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
index c4a4c2fad9e..e3b4c247861 100644
--- a/base/system/diskpart/diskpart.h
+++ b/base/system/diskpart/diskpart.h
@@ -57,7 +57,7 @@ typedef struct _COMMAND
     PWSTR cmd3;
     BOOL (*func)(INT, WCHAR**);
     INT help;
-    INT help_detail;
+    DWORD help_detail;
 } COMMAND, *PCOMMAND;
 
 extern COMMAND cmds[];
@@ -392,6 +392,9 @@ RoundingDivide(
     _In_ ULONGLONG Dividend,
     _In_ ULONGLONG Divisor);
 
+VOID
+PrintMessageString(
+    _In_ DWORD dwMessage);
 
 /* offline.c */
 BOOL offline_main(INT argc, LPWSTR *argv);
diff --git a/base/system/diskpart/diskpart.rc b/base/system/diskpart/diskpart.rc
index a1df42efce4..f0d1dd71690 100644
--- a/base/system/diskpart/diskpart.rc
+++ b/base/system/diskpart/diskpart.rc
@@ -8,6 +8,8 @@
 #define REACTOS_STR_ORIGINAL_COPYRIGHT "(C) 2011 Lee Schroeder"
 #include <reactos/version.rc>
 
+#include <diskpart_msg.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc
new file mode 100644
index 00000000000..669998227fd
--- /dev/null
+++ b/base/system/diskpart/diskpart_msg.mc
@@ -0,0 +1,1736 @@
+
+MessageIdTypedef=DWORD
+
+SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS
+               Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
+               Warning=0x2:STATUS_SEVERITY_WARNING
+               Error=0x3:STATUS_SEVERITY_ERROR
+              )
+
+FacilityNames=(System=0x0:FACILITY_SYSTEM
+              )
+
+LanguageNames=(English=0x409:MSG00409
+               Polish=0x415:MSG00415
+               Portugese=0x816:MSG00416
+               Romanian=0x418:MSG00418
+               Russian=0x419:MSG00419
+               Albanian=0x41C:MSG0041C
+               Turkish=0x41F:MSG0041F
+               Chinese=0x804:MSG00804
+               Taiwanese=0x404:MSG00404
+              )
+
+
+MessageId=10000
+SymbolicName=MSG_COMMAND_ACTIVE
+Severity=Informational
+Facility=System
+Language=English
+<Add ACTIVE command help text here>
+.
+Language=Polish
+<Add ACTIVE command help text here>
+.
+Language=Portugese
+<Add ACTIVE command help text here>
+.
+Language=Romanian
+<Add ACTIVE command help text here>
+.
+Language=Russian
+<Add ACTIVE command help text here>
+.
+Language=Albanian
+<Add ACTIVE command help text here>
+.
+Language=Turkish
+<Add ACTIVE command help text here>
+.
+Language=Chinese
+<Add ACTIVE command help text here>
+.
+Language=Taiwanese
+<Add ACTIVE command help text here>
+.
+
+
+MessageId=10001
+SymbolicName=MSG_COMMAND_ADD
+Severity=Informational
+Facility=System
+Language=English
+<Add ADD command help text here>
+.
+Language=Polish
+<Add ADD command help text here>
+.
+Language=Portugese
+<Add ADD command help text here>
+.
+Language=Romanian
+<Add ADD command help text here>
+.
+Language=Russian
+<Add ADD command help text here>
+.
+Language=Albanian
+<Add ADD command help text here>
+.
+Language=Turkish
+<Add ADD command help text here>
+.
+Language=Chinese
+<Add ADD command help text here>
+.
+Language=Taiwanese
+<Add ADD command help text here>
+.
+
+
+MessageId=10002
+SymbolicName=MSG_COMMAND_ASSIGN
+Severity=Informational
+Facility=System
+Language=English
+<Add ASSIGN command help text here>
+.
+Language=Polish
+<Add ASSIGN command help text here>
+.
+Language=Portugese
+<Add ASSIGN command help text here>
+.
+Language=Romanian
+<Add ASSIGN command help text here>
+.
+Language=Russian
+<Add ASSIGN command help text here>
+.
+Language=Albanian
+<Add ASSIGN command help text here>
+.
+Language=Turkish
+<Add ASSIGN command help text here>
+.
+Language=Chinese
+<Add ASSIGN command help text here>
+.
+Language=Taiwanese
+<Add ASSIGN command help text here>
+.
+
+
+MessageId=10003
+SymbolicName=MSG_COMMAND_ATTACH
+Severity=Informational
+Facility=System
+Language=English
+<Add ATTACH command help text here>
+.
+Language=Polish
+<Add ATTACH command help text here>
+.
+Language=Portugese
+<Add ATTACH command help text here>
+.
+Language=Romanian
+<Add ATTACH command help text here>
+.
+Language=Russian
+<Add ATTACH command help text here>
+.
+Language=Albanian
+<Add ATTACH command help text here>
+.
+Language=Turkish
+<Add ATTACH command help text here>
+.
+Language=Chinese
+<Add ATTACH command help text here>
+.
+Language=Taiwanese
+<Add ATTACH command help text here>
+.
+
+
+MessageId=10004
+SymbolicName=MSG_COMMAND_ATTRIBUTES
+Severity=Informational
+Facility=System
+Language=English
+<Add ATTRIBUTES command help text here>
+.
+Language=Polish
+<Add ATTRIBUTES command help text here>
+.
+Language=Portugese
+<Add ATTRIBUTES command help text here>
+.
+Language=Romanian
+<Add ATTRIBUTES command help text here>
+.
+Language=Russian
+<Add ATTRIBUTES command help text here>
+.
+Language=Albanian
+<Add ATTRIBUTES command help text here>
+.
+Language=Turkish
+<Add ATTRIBUTES command help text here>
+.
+Language=Chinese
+<Add ATTRIBUTES command help text here>
+.
+Language=Taiwanese
+<Add ATTRIBUTES command help text here>
+.
+
+
+MessageId=10005
+SymbolicName=MSG_COMMAND_AUTOMOUNT
+Severity=Informational
+Facility=System
+Language=English
+<Add AUTOMOUNT command help text here>
+.
+Language=Polish
+<Add AUTOMOUNT command help text here>
+.
+Language=Portugese
+<Add AUTOMOUNT command help text here>
+.
+Language=Romanian
+<Add AUTOMOUNT command help text here>
+.
+Language=Russian
+<Add AUTOMOUNT command help text here>
+.
+Language=Albanian
+<Add AUTOMOUNT command help text here>
+.
+Language=Turkish
+<Add AUTOMOUNT command help text here>
+.
+Language=Chinese
+<Add AUTOMOUNT command help text here>
+.
+Language=Taiwanese
+<Add AUTOMOUNT command help text here>
+.
+
+
+
+MessageId=10006
+SymbolicName=MSG_COMMAND_BREAK
+Severity=Informational
+Facility=System
+Language=English
+<Add BREAK command help text here>
+.
+Language=Polish
+<Add BREAK command help text here>
+.
+Language=Portugese
+<Add BREAK command help text here>
+.
+Language=Romanian
+<Add BREAK command help text here>
+.
+Language=Russian
+<Add BREAK command help text here>
+.
+Language=Albanian
+<Add BREAK command help text here>
+.
+Language=Turkish
+<Add BREAK command help text here>
+.
+Language=Chinese
+<Add BREAK command help text here>
+.
+Language=Taiwanese
+<Add BREAK command help text here>
+.
+
+
+MessageId=10007
+SymbolicName=MSG_COMMAND_CLEAN
+Severity=Informational
+Facility=System
+Language=English
+<Add CLEAN command help text here>
+.
+Language=Polish
+<Add CLEAN command help text here>
+.
+Language=Portugese
+<Add CLEAN command help text here>
+.
+Language=Romanian
+<Add CLEAN command help text here>
+.
+Language=Russian
+<Add CLEAN command help text here>
+.
+Language=Albanian
+<Add CLEAN command help text here>
+.
+Language=Turkish
+<Add CLEAN command help text here>
+.
+Language=Chinese
+<Add CLEAN command help text here>
+.
+Language=Taiwanese
+<Add CLEAN command help text here>
+.
+
+
+MessageId=10008
+SymbolicName=MSG_COMMAND_COMPACT
+Severity=Informational
+Facility=System
+Language=English
+<Add COMPACT command help text here>
+.
+Language=Polish
+<Add COMPACT command help text here>
+.
+Language=Portugese
+<Add COMPACT command help text here>
+.
+Language=Romanian
+<Add COMPACT command help text here>
+.
+Language=Russian
+<Add COMPACT command help text here>
+.
+Language=Albanian
+<Add COMPACT command help text here>
+.
+Language=Turkish
+<Add COMPACT command help text here>
+.
+Language=Chinese
+<Add COMPACT command help text here>
+.
+Language=Taiwanese
+<Add COMPACT command help text here>
+.
+
+
+MessageId=10010
+SymbolicName=MSG_COMMAND_CONVERT
+Severity=Informational
+Facility=System
+Language=English
+<Add CONVERT command help text here>
+.
+Language=Polish
+<Add CONVERT command help text here>
+.
+Language=Portugese
+<Add CONVERT command help text here>
+.
+Language=Romanian
+<Add CONVERT command help text here>
+.
+Language=Russian
+<Add CONVERT command help text here>
+.
+Language=Albanian
+<Add CONVERT command help text here>
+.
+Language=Turkish
+<Add CONVERT command help text here>
+.
+Language=Chinese
+<Add CONVERT command help text here>
+.
+Language=Taiwanese
+<Add CONVERT command help text here>
+.
+
+
+MessageId=10011
+SymbolicName=MSG_COMMAND_CREATE_PARTITION_EFI
+Severity=Informational
+Facility=System
+Language=English
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Polish
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Portugese
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Romanian
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Russian
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Albanian
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Turkish
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Chinese
+<Add CREATE PARTITION EFI command help text here>
+.
+Language=Taiwanese
+<Add CREATE PARTITION EFI command help text here>
+.
+
+
+MessageId=10012
+SymbolicName=MSG_COMMAND_CREATE_PARTITION_EXTENDED
+Severity=Informational
+Facility=System
+Language=English
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Polish
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Portugese
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Romanian
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Russian
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Albanian
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Turkish
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Chinese
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+Language=Taiwanese
+<Add CREATE PARTITION EXTENDED command help text here>
+.
+
+
+MessageId=10013
+SymbolicName=MSG_COMMAND_CREATE_PARTITION_LOGICAL
+Severity=Informational
+Facility=System
+Language=English
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Polish
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Portugese
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Romanian
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Russian
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Albanian
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Turkish
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Chinese
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+Language=Taiwanese
+<Add CREATE PARTITION LOGICAL command help text here>
+.
+
+
+MessageId=10014
+SymbolicName=MSG_COMMAND_CREATE_PARTITION_MSR
+Severity=Informational
+Facility=System
+Language=English
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Polish
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Portugese
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Romanian
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Russian
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Albanian
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Turkish
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Chinese
+<Add CREATE PARTITION MSR command help text here>
+.
+Language=Taiwanese
+<Add CREATE PARTITION MSR command help text here>
+.
+
+
+MessageId=10015
+SymbolicName=MSG_COMMAND_CREATE_PARTITION_PRIMARY
+Severity=Informational
+Facility=System
+Language=English
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Polish
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Portugese
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Romanian
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Russian
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Albanian
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Turkish
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Chinese
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+Language=Taiwanese
+<Add CREATE PARTITION PRIMARY command help text here>
+.
+
+
+MessageId=10016
+SymbolicName=MSG_COMMAND_DELETE_DISK
+Severity=Informational
+Facility=System
+Language=English
+<Add DELETE DISK command help text here>
+.
+Language=Polish
+<Add DELETE DISK command help text here>
+.
+Language=Portugese
+<Add DELETE DISK command help text here>
+.
+Language=Romanian
+<Add DELETE DISK command help text here>
+.
+Language=Russian
+<Add DELETE DISK command help text here>
+.
+Language=Albanian
+<Add DELETE DISK command help text here>
+.
+Language=Turkish
+<Add DELETE DISK command help text here>
+.
+Language=Chinese
+<Add DELETE DISK command help text here>
+.
+Language=Taiwanese
+<Add DELETE DISK command help text here>
+.
+
+
+MessageId=10017
+SymbolicName=MSG_COMMAND_DELETE_PARTITION
+Severity=Informational
+Facility=System
+Language=English
+<Add DELETE PARTITION command help text here>
+.
+Language=Polish
+<Add DELETE PARTITION command help text here>
+.
+Language=Portugese
+<Add DELETE PARTITION command help text here>
+.
+Language=Romanian
+<Add DELETE PARTITION command help text here>
+.
+Language=Russian
+<Add DELETE PARTITION command help text here>
+.
+Language=Albanian
+<Add DELETE PARTITION command help text here>
+.
+Language=Turkish
+<Add DELETE PARTITION command help text here>
+.
+Language=Chinese
+<Add DELETE PARTITION command help text here>
+.
+Language=Taiwanese
+<Add DELETE PARTITION command help text here>
+.
+
+
+MessageId=10018
+SymbolicName=MSG_COMMAND_DELETE_VOLUME
+Severity=Informational
+Facility=System
+Language=English
+<Add DELETE VOLUME command help text here>
+.
+Language=Polish
+<Add DELETE VOLUME command help text here>
+.
+Language=Portugese
+<Add DELETE VOLUME command help text here>
+.
+Language=Romanian
+<Add DELETE VOLUME command help text here>
+.
+Language=Russian
+<Add DELETE VOLUME command help text here>
+.
+Language=Albanian
+<Add DELETE VOLUME command help text here>
+.
+Language=Turkish
+<Add DELETE VOLUME command help text here>
+.
+Language=Chinese
+<Add DELETE VOLUME command help text here>
+.
+Language=Taiwanese
+<Add DELETE VOLUME command help text here>
+.
+
+
+MessageId=10019
+SymbolicName=MSG_COMMAND_DETAIL_DISK
+Severity=Informational
+Facility=System
+Language=English
+<Add DETAIL DISK command help text here>
+.
+Language=Polish
+<Add DETAIL DISK command help text here>
+.
+Language=Portugese
+<Add DETAIL DISK command help text here>
+.
+Language=Romanian
+<Add DETAIL DISK command help text here>
+.
+Language=Russian
+<Add DETAIL DISK command help text here>
+.
+Language=Albanian
+<Add DETAIL DISK command help text here>
+.
+Language=Turkish
+<Add DETAIL DISK command help text here>
+.
+Language=Chinese
+<Add DETAIL DISK command help text here>
+.
+Language=Taiwanese
+<Add DETAIL DISK command help text here>
+.
+
+MessageId=10020
+SymbolicName=MSG_COMMAND_DETAIL_PARTITION
+Severity=Informational
+Facility=System
+Language=English
+<Add DETAIL PARTITION command help text here>
+.
+Language=Polish
+<Add DETAIL PARTITION command help text here>
+.
+Language=Portugese
+<Add DETAIL PARTITION command help text here>
+.
+Language=Romanian
+<Add DETAIL PARTITION command help text here>
+.
+Language=Russian
+<Add DETAIL PARTITION command help text here>
+.
+Language=Albanian
+<Add DETAIL PARTITION command help text here>
+.
+Language=Turkish
+<Add DETAIL PARTITION command help text here>
+.
+Language=Chinese
+<Add DETAIL PARTITION command help text here>
+.
+Language=Taiwanese
+<Add DETAIL PARTITION command help text here>
+.
+
+MessageId=10021
+SymbolicName=MSG_COMMAND_DETAIL_VOLUME
+Severity=Informational
+Facility=System
+Language=English
+<Add DETAIL VOLUME command help text here>
+.
+Language=Polish
+<Add DETAIL VOLUME command help text here>
+.
+Language=Portugese
+<Add DETAIL VOLUME command help text here>
+.
+Language=Romanian
+<Add DETAIL VOLUME command help text here>
+.
+Language=Russian
+<Add DETAIL VOLUME command help text here>
+.
+Language=Albanian
+<Add DETAIL VOLUME command help text here>
+.
+Language=Turkish
+<Add DETAIL VOLUME command help text here>
+.
+Language=Chinese
+<Add DETAIL VOLUME command help text here>
+.
+Language=Taiwanese
+<Add DETAIL VOLUME command help text here>
+.
+
+
+MessageId=10022
+SymbolicName=MSG_COMMAND_DETACH
+Severity=Informational
+Facility=System
+Language=English
+<Add DETACH command help text here>
+.
+Language=Polish
+<Add DETACH command help text here>
+.
+Language=Portugese
+<Add DETACH command help text here>
+.
+Language=Romanian
+<Add DETACH command help text here>
+.
+Language=Russian
+<Add DETACH command help text here>
+.
+Language=Albanian
+<Add DETACH command help text here>
+.
+Language=Turkish
+<Add DETACH command help text here>
+.
+Language=Chinese
+<Add DETACH command help text here>
+.
+Language=Taiwanese
+<Add DETACH command help text here>
+.
+
+
+MessageId=10023
+SymbolicName=MSG_COMMAND_EXIT
+Severity=Informational
+Facility=System
+Language=English
+<Add EXIT command help text here>
+.
+Language=Polish
+<Add EXIT command help text here>
+.
+Language=Portugese
+<Add EXIT command help text here>
+.
+Language=Romanian
+<Add EXIT command help text here>
+.
+Language=Russian
+<Add EXIT command help text here>
+.
+Language=Albanian
+<Add EXIT command help text here>
+.
+Language=Turkish
+<Add EXIT command help text here>
+.
+Language=Chinese
+<Add EXIT command help text here>
+.
+Language=Taiwanese
+<Add EXIT command help text here>
+.
+
+
+MessageId=10024
+SymbolicName=MSG_COMMAND_EXPAND
+Severity=Informational
+Facility=System
+Language=English
+<Add EXPAND command help text here>
+.
+Language=Polish
+<Add EXPAND command help text here>
+.
+Language=Portugese
+<Add EXPAND command help text here>
+.
+Language=Romanian
+<Add EXPAND command help text here>
+.
+Language=Russian
+<Add EXPAND command help text here>
+.
+Language=Albanian
+<Add EXPAND command help text here>
+.
+Language=Turkish
+<Add EXPAND command help text here>
+.
+Language=Chinese
+<Add EXPAND command help text here>
+.
+Language=Taiwanese
+<Add EXPAND command help text here>
+.
+
+
+MessageId=10025
+SymbolicName=MSG_COMMAND_EXTEND
+Severity=Informational
+Facility=System
+Language=English
+<Add EXTEND command help text here>
+.
+Language=Polish
+<Add EXTEND command help text here>
+.
+Language=Portugese
+<Add EXTEND command help text here>
+.
+Language=Romanian
+<Add EXTEND command help text here>
+.
+Language=Russian
+<Add EXTEND command help text here>
+.
+Language=Albanian
+<Add EXTEND command help text here>
+.
+Language=Turkish
+<Add EXTEND command help text here>
+.
+Language=Chinese
+<Add EXTEND command help text here>
+.
+Language=Taiwanese
+<Add EXTEND command help text here>
+.
+
+
+MessageId=10026
+SymbolicName=MSG_COMMAND_FILESYSTEMS
+Severity=Informational
+Facility=System
+Language=English
+<Add FILESYSTEMS command help text here>
+.
+Language=Polish
+<Add FILESYSTEMS command help text here>
+.
+Language=Portugese
+<Add FILESYSTEMS command help text here>
+.
+Language=Romanian
+<Add FILESYSTEMS command help text here>
+.
+Language=Russian
+<Add FILESYSTEMS command help text here>
+.
+Language=Albanian
+<Add FILESYSTEMS command help text here>
+.
+Language=Turkish
+<Add FILESYSTEMS command help text here>
+.
+Language=Chinese
+<Add FILESYSTEMS command help text here>
+.
+Language=Taiwanese
+<Add FILESYSTEMS command help text here>
+.
+
+
+MessageId=10027
+SymbolicName=MSG_COMMAND_FORMAT
+Severity=Informational
+Facility=System
+Language=English
+<Add FORMAT command help text here>
+.
+Language=Polish
+<Add FORMAT command help text here>
+.
+Language=Portugese
+<Add FORMAT command help text here>
+.
+Language=Romanian
+<Add FORMAT command help text here>
+.
+Language=Russian
+<Add FORMAT command help text here>
+.
+Language=Albanian
+<Add FORMAT command help text here>
+.
+Language=Turkish
+<Add FORMAT command help text here>
+.
+Language=Chinese
+<Add FORMAT command help text here>
+.
+Language=Taiwanese
+<Add FORMAT command help text here>
+.
+
+
+MessageId=10028
+SymbolicName=MSG_COMMAND_GPT
+Severity=Informational
+Facility=System
+Language=English
+<Add GPT command help text here>
+.
+Language=Polish
+<Add GPT command help text here>
+.
+Language=Portugese
+<Add GPT command help text here>
+.
+Language=Romanian
+<Add GPT command help text here>
+.
+Language=Russian
+<Add GPT command help text here>
+.
+Language=Albanian
+<Add GPT command help text here>
+.
+Language=Turkish
+<Add GPT command help text here>
+.
+Language=Chinese
+<Add GPT command help text here>
+.
+Language=Taiwanese
+<Add GPT command help text here>
+.
+
+
+MessageId=10029
+SymbolicName=MSG_COMMAND_HELP
+Severity=Informational
+Facility=System
+Language=English
+<Add HELP command help text here>
+.
+Language=Polish
+<Add HELP command help text here>
+.
+Language=Portugese
+<Add HELP command help text here>
+.
+Language=Romanian
+<Add HELP command help text here>
+.
+Language=Russian
+<Add HELP command help text here>
+.
+Language=Albanian
+<Add HELP command help text here>
+.
+Language=Turkish
+<Add HELP command help text here>
+.
+Language=Chinese
+<Add HELP command help text here>
+.
+Language=Taiwanese
+<Add HELP command help text here>
+.
+
+
+MessageId=10030
+SymbolicName=MSG_COMMAND_IMPORT
+Severity=Informational
+Facility=System
+Language=English
+<Add IMPORT command help text here>
+.
+Language=Polish
+<Add IMPORT command help text here>
+.
+Language=Portugese
+<Add IMPORT command help text here>
+.
+Language=Romanian
+<Add IMPORT command help text here>
+.
+Language=Russian
+<Add IMPORT command help text here>
+.
+Language=Albanian
+<Add IMPORT command help text here>
+.
+Language=Turkish
+<Add IMPORT command help text here>
+.
+Language=Chinese
+<Add IMPORT command help text here>
+.
+Language=Taiwanese
+<Add IMPORT command help text here>
+.
+
+
+MessageId=10031
+SymbolicName=MSG_COMMAND_INACTIVE
+Severity=Informational
+Facility=System
+Language=English
+<Add INACTIVE command help text here>
+.
+Language=Polish
+<Add INACTIVE command help text here>
+.
+Language=Portugese
+<Add INACTIVE command help text here>
+.
+Language=Romanian
+<Add INACTIVE command help text here>
+.
+Language=Russian
+<Add INACTIVE command help text here>
+.
+Language=Albanian
+<Add INACTIVE command help text here>
+.
+Language=Turkish
+<Add INACTIVE command help text here>
+.
+Language=Chinese
+<Add INACTIVE command help text here>
+.
+Language=Taiwanese
+<Add INACTIVE command help text here>
+.
+
+
+MessageId=10032
+SymbolicName=MSG_COMMAND_LIST_DISK
+Severity=Informational
+Facility=System
+Language=English
+<Add LIST DISK command help text here>
+.
+Language=Polish
+<Add LIST DISK command help text here>
+.
+Language=Portugese
+<Add LIST DISK command help text here>
+.
+Language=Romanian
+<Add LIST DISK command help text here>
+.
+Language=Russian
+<Add LIST DISK command help text here>
+.
+Language=Albanian
+<Add LIST DISK command help text here>
+.
+Language=Turkish
+<Add LIST DISK command help text here>
+.
+Language=Chinese
+<Add LIST DISK command help text here>
+.
+Language=Taiwanese
+<Add LIST DISK command help text here>
+.
+
+MessageId=10033
+SymbolicName=MSG_COMMAND_LIST_PARTITION
+Severity=Informational
+Facility=System
+Language=English
+<Add LIST PARTITION command help text here>
+.
+Language=Polish
+<Add LIST PARTITION command help text here>
+.
+Language=Portugese
+<Add LIST PARTITION command help text here>
+.
+Language=Romanian
+<Add LIST PARTITION command help text here>
+.
+Language=Russian
+<Add LIST PARTITION command help text here>
+.
+Language=Albanian
+<Add LIST PARTITION command help text here>
+.
+Language=Turkish
+<Add LIST PARTITION command help text here>
+.
+Language=Chinese
+<Add LIST PARTITION command help text here>
+.
+Language=Taiwanese
+<Add LIST PARTITION command help text here>
+.
+
+
+MessageId=10034
+SymbolicName=MSG_COMMAND_LIST_VOLUME
+Severity=Informational
+Facility=System
+Language=English
+<Add LIST VOLUME command help text here>
+.
+Language=Polish
+<Add LIST VOLUME command help text here>
+.
+Language=Portugese
+<Add LIST VOLUME command help text here>
+.
+Language=Romanian
+<Add LIST VOLUME command help text here>
+.
+Language=Russian
+<Add LIST VOLUME command help text here>
+.
+Language=Albanian
+<Add LIST VOLUME command help text here>
+.
+Language=Turkish
+<Add LIST VOLUME command help text here>
+.
+Language=Chinese
+<Add LIST VOLUME command help text here>
+.
+Language=Taiwanese
+<Add LIST VOLUME command help text here>
+.
+
+
+MessageId=10035
+SymbolicName=MSG_COMMAND_LIST_VDISK
+Severity=Informational
+Facility=System
+Language=English
+<Add LIST VDISK command help text here>
+.
+Language=Polish
+<Add LIST VDISK command help text here>
+.
+Language=Portugese
+<Add LIST VDISK command help text here>
+.
+Language=Romanian
+<Add LIST VDISK command help text here>
+.
+Language=Russian
+<Add LIST VDISK command help text here>
+.
+Language=Albanian
+<Add LIST VDISK command help text here>
+.
+Language=Turkish
+<Add LIST VDISK command help text here>
+.
+Language=Chinese
+<Add LIST VDISK command help text here>
+.
+Language=Taiwanese
+<Add LIST VDISK command help text here>
+.
+
+
+MessageId=10036
+SymbolicName=MSG_COMMAND_MERGE
+Severity=Informational
+Facility=System
+Language=English
+<Add MERGE command help text here>
+.
+Language=Polish
+<Add MERGE command help text here>
+.
+Language=Portugese
+<Add MERGE command help text here>
+.
+Language=Romanian
+<Add MERGE command help text here>
+.
+Language=Russian
+<Add MERGE command help text here>
+.
+Language=Albanian
+<Add MERGE command help text here>
+.
+Language=Turkish
+<Add MERGE command help text here>
+.
+Language=Chinese
+<Add MERGE command help text here>
+.
+Language=Taiwanese
+<Add MERGE command help text here>
+.
+
+
+MessageId=10037
+SymbolicName=MSG_COMMAND_OFFLINE
+Severity=Informational
+Facility=System
+Language=English
+<Add OFFLINE command help text here>
+.
+Language=Polish
+<Add OFFLINE command help text here>
+.
+Language=Portugese
+<Add OFFLINE command help text here>
+.
+Language=Romanian
+<Add OFFLINE command help text here>
+.
+Language=Russian
+<Add OFFLINE command help text here>
+.
+Language=Albanian
+<Add OFFLINE command help text here>
+.
+Language=Turkish
+<Add OFFLINE command help text here>
+.
+Language=Chinese
+<Add OFFLINE command help text here>
+.
+Language=Taiwanese
+<Add OFFLINE command help text here>
+.
+
+
+MessageId=10038
+SymbolicName=MSG_COMMAND_ONLINE
+Severity=Informational
+Facility=System
+Language=English
+<Add ONLINE command help text here>
+.
+Language=Polish
+<Add ONLINE command help text here>
+.
+Language=Portugese
+<Add ONLINE command help text here>
+.
+Language=Romanian
+<Add ONLINE command help text here>
+.
+Language=Russian
+<Add ONLINE command help text here>
+.
+Language=Albanian
+<Add ONLINE command help text here>
+.
+Language=Turkish
+<Add ONLINE command help text here>
+.
+Language=Chinese
+<Add ONLINE command help text here>
+.
+Language=Taiwanese
+<Add ONLINE command help text here>
+.
+
+
+MessageId=10039
+SymbolicName=MSG_COMMAND_RECOVER
+Severity=Informational
+Facility=System
+Language=English
+<Add RECOVER command help text here>
+.
+Language=Polish
+<Add RECOVER command help text here>
+.
+Language=Portugese
+<Add RECOVER command help text here>
+.
+Language=Romanian
+<Add RECOVER command help text here>
+.
+Language=Russian
+<Add RECOVER command help text here>
+.
+Language=Albanian
+<Add RECOVER command help text here>
+.
+Language=Turkish
+<Add RECOVER command help text here>
+.
+Language=Chinese
+<Add RECOVER command help text here>
+.
+Language=Taiwanese
+<Add RECOVER command help text here>
+.
+
+
+MessageId=10040
+SymbolicName=MSG_COMMAND_REM
+Severity=Informational
+Facility=System
+Language=English
+<Add REM command help text here>
+.
+Language=Polish
+<Add REM command help text here>
+.
+Language=Portugese
+<Add REM command help text here>
+.
+Language=Romanian
+<Add REM command help text here>
+.
+Language=Russian
+<Add REM command help text here>
+.
+Language=Albanian
+<Add REM command help text here>
+.
+Language=Turkish
+<Add REM command help text here>
+.
+Language=Chinese
+<Add REM command help text here>
+.
+Language=Taiwanese
+<Add REM command help text here>
+.
+
+
+MessageId=10041
+SymbolicName=MSG_COMMAND_REMOVE
+Severity=Informational
+Facility=System
+Language=English
+<Add REMOVE command help text here>
+.
+Language=Polish
+<Add REMOVE command help text here>
+.
+Language=Portugese
+<Add REMOVE command help text here>
+.
+Language=Romanian
+<Add REMOVE command help text here>
+.
+Language=Russian
+<Add REMOVE command help text here>
+.
+Language=Albanian
+<Add REMOVE command help text here>
+.
+Language=Turkish
+<Add REMOVE command help text here>
+.
+Language=Chinese
+<Add REMOVE command help text here>
+.
+Language=Taiwanese
+<Add REMOVE command help text here>
+.
+
+
+MessageId=10042
+SymbolicName=MSG_COMMAND_REPAIR
+Severity=Informational
+Facility=System
+Language=English
+<Add REPAIR command help text here>
+.
+Language=Polish
+<Add REPAIR command help text here>
+.
+Language=Portugese
+<Add REPAIR command help text here>
+.
+Language=Romanian
+<Add REPAIR command help text here>
+.
+Language=Russian
+<Add REPAIR command help text here>
+.
+Language=Albanian
+<Add REPAIR command help text here>
+.
+Language=Turkish
+<Add REPAIR command help text here>
+.
+Language=Chinese
+<Add REPAIR command help text here>
+.
+Language=Taiwanese
+<Add REPAIR command help text here>
+.
+
+
+MessageId=10043
+SymbolicName=MSG_COMMAND_RESCAN
+Severity=Informational
+Facility=System
+Language=English
+<Add RESCAN command help text here>
+.
+Language=Polish
+<Add RESCAN command help text here>
+.
+Language=Portugese
+<Add RESCAN command help text here>
+.
+Language=Romanian
+<Add RESCAN command help text here>
+.
+Language=Russian
+<Add RESCAN command help text here>
+.
+Language=Albanian
+<Add RESCAN command help text here>
+.
+Language=Turkish
+<Add RESCAN command help text here>
+.
+Language=Chinese
+<Add RESCAN command help text here>
+.
+Language=Taiwanese
+<Add RESCAN command help text here>
+.
+
+
+MessageId=10044
+SymbolicName=MSG_COMMAND_RETAIN
+Severity=Informational
+Facility=System
+Language=English
+<Add RETAIN command help text here>
+.
+Language=Polish
+<Add RETAIN command help text here>
+.
+Language=Portugese
+<Add RETAIN command help text here>
+.
+Language=Romanian
+<Add RETAIN command help text here>
+.
+Language=Russian
+<Add RETAIN command help text here>
+.
+Language=Albanian
+<Add RETAIN command help text here>
+.
+Language=Turkish
+<Add RETAIN command help text here>
+.
+Language=Chinese
+<Add RETAIN command help text here>
+.
+Language=Taiwanese
+<Add RETAIN command help text here>
+.
+
+
+MessageId=10045
+SymbolicName=MSG_COMMAND_SAN
+Severity=Informational
+Facility=System
+Language=English
+<Add SAN command help text here>
+.
+Language=Polish
+<Add SAN command help text here>
+.
+Language=Portugese
+<Add SAN command help text here>
+.
+Language=Romanian
+<Add SAN command help text here>
+.
+Language=Russian
+<Add SAN command help text here>
+.
+Language=Albanian
+<Add SAN command help text here>
+.
+Language=Turkish
+<Add SAN command help text here>
+.
+Language=Chinese
+<Add SAN command help text here>
+.
+Language=Taiwanese
+<Add SAN command help text here>
+.
+
+
+MessageId=10046
+SymbolicName=MSG_COMMAND_SELECT_DISK
+Severity=Informational
+Facility=System
+Language=English
+<Add SELECT DISK command help text here>
+.
+Language=Polish
+<Add SELECT DISK command help text here>
+.
+Language=Portugese
+<Add SELECT DISK command help text here>
+.
+Language=Romanian
+<Add SELECT DISK command help text here>
+.
+Language=Russian
+<Add SELECT DISK command help text here>
+.
+Language=Albanian
+<Add SELECT DISK command help text here>
+.
+Language=Turkish
+<Add SELECT DISK command help text here>
+.
+Language=Chinese
+<Add SELECT DISK command help text here>
+.
+Language=Taiwanese
+<Add SELECT DISK command help text here>
+.
+
+
+MessageId=10047
+SymbolicName=MSG_COMMAND_SELECT_PARTITION
+Severity=Informational
+Facility=System
+Language=English
+<Add SELECT PARTITION command help text here>
+.
+Language=Polish
+<Add SELECT PARTITION command help text here>
+.
+Language=Portugese
+<Add SELECT PARTITION command help text here>
+.
+Language=Romanian
+<Add SELECT PARTITION command help text here>
+.
+Language=Russian
+<Add SELECT PARTITION command help text here>
+.
+Language=Albanian
+<Add SELECT PARTITION command help text here>
+.
+Language=Turkish
+<Add SELECT PARTITION command help text here>
+.
+Language=Chinese
+<Add SELECT PARTITION command help text here>
+.
+Language=Taiwanese
+<Add SELECT PARTITION command help text here>
+.
+
+
+MessageId=10048
+SymbolicName=MSG_COMMAND_SELECT_VOLUME
+Severity=Informational
+Facility=System
+Language=English
+<Add SELECT VOLUME command help text here>
+.
+Language=Polish
+<Add SELECT VOLUME command help text here>
+.
+Language=Portugese
+<Add SELECT VOLUME command help text here>
+.
+Language=Romanian
+<Add SELECT VOLUME command help text here>
+.
+Language=Russian
+<Add SELECT VOLUME command help text here>
+.
+Language=Albanian
+<Add SELECT VOLUME command help text here>
+.
+Language=Turkish
+<Add SELECT VOLUME command help text here>
+.
+Language=Chinese
+<Add SELECT VOLUME command help text here>
+.
+Language=Taiwanese
+<Add SELECT VOLUME command help text here>
+.
+
+
+MessageId=10049
+SymbolicName=MSG_COMMAND_SELECT_VDISK
+Severity=Informational
+Facility=System
+Language=English
+<Add SELECT VDISK command help text here>
+.
+Language=Polish
+<Add SELECT VDISK command help text here>
+.
+Language=Portugese
+<Add SELECT VDISK command help text here>
+.
+Language=Romanian
+<Add SELECT VDISK command help text here>
+.
+Language=Russian
+<Add SELECT VDISK command help text here>
+.
+Language=Albanian
+<Add SELECT VDISK command help text here>
+.
+Language=Turkish
+<Add SELECT VDISK command help text here>
+.
+Language=Chinese
+<Add SELECT VDISK command help text here>
+.
+Language=Taiwanese
+<Add SELECT VDISK command help text here>
+.
+
+
+MessageId=10050
+SymbolicName=MSG_COMMAND_SETID
+Severity=Informational
+Facility=System
+Language=English
+<Add SETID command help text here>
+.
+Language=Polish
+<Add SETID command help text here>
+.
+Language=Portugese
+<Add SETID command help text here>
+.
+Language=Romanian
+<Add SETID command help text here>
+.
+Language=Russian
+<Add SETID command help text here>
+.
+Language=Albanian
+<Add SETID command help text here>
+.
+Language=Turkish
+<Add SETID command help text here>
+.
+Language=Chinese
+<Add SETID command help text here>
+.
+Language=Taiwanese
+<Add SETID command help text here>
+.
+
+
+MessageId=10051
+SymbolicName=MSG_COMMAND_SHRINK
+Severity=Informational
+Facility=System
+Language=English
+<Add SHRINK command help text here>
+.
+Language=Polish
+<Add SHRINK command help text here>
+.
+Language=Portugese
+<Add SHRINK command help text here>
+.
+Language=Romanian
+<Add SHRINK command help text here>
+.
+Language=Russian
+<Add SHRINK command help text here>
+.
+Language=Albanian
+<Add SHRINK command help text here>
+.
+Language=Turkish
+<Add SHRINK command help text here>
+.
+Language=Chinese
+<Add SHRINK command help text here>
+.
+Language=Taiwanese
+<Add SHRINK command help text here>
+.
+
+
+MessageId=10052
+SymbolicName=MSG_COMMAND_UNIQUEID_DISK
+Severity=Informational
+Facility=System
+Language=English
+<Add UNIQUEID DISK command help text here>
+.
+Language=Polish
+<Add UNIQUEID DISK command help text here>
+.
+Language=Portugese
+<Add UNIQUEID DISK command help text here>
+.
+Language=Romanian
+<Add UNIQUEID DISK command help text here>
+.
+Language=Russian
+<Add UNIQUEID DISK command help text here>
+.
+Language=Albanian
+<Add UNIQUEID DISK command help text here>
+.
+Language=Turkish
+<Add UNIQUEID DISK command help text here>
+.
+Language=Chinese
+<Add UNIQUEID DISK command help text here>
+.
+Language=Taiwanese
+<Add UNIQUEID DISK command help text here>
+.
diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c
index d271844d0cf..f2a23960ae0 100644
--- a/base/system/diskpart/help.c
+++ b/base/system/diskpart/help.c
@@ -87,17 +87,17 @@ HelpCommand(
             if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
                 (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) &&
                 (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) &&
-                (cmdptr->help_detail != IDS_NONE))
+                (cmdptr->help_detail != MSG_NONE))
             {
-                ConResPuts(StdOut, cmdptr->help_detail);
+                PrintMessageString(cmdptr->help_detail);
                 bSubCommands = TRUE;
             }
         }
     }
 
-    if ((bSubCommands == FALSE) && (pCommand->help_detail != IDS_NONE))
+    if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE))
     {
-        ConResPuts(StdOut, pCommand->help_detail);
+        PrintMessageString(pCommand->help_detail);
     }
 
     ConPuts(StdOut, L"\n");
diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c
index d2decf537f1..08be9411fdb 100644
--- a/base/system/diskpart/interpreter.c
+++ b/base/system/diskpart/interpreter.c
@@ -8,6 +8,7 @@
  */
 
 #include "diskpart.h"
+#include "diskpart_msg.h"
 
 BOOL exit_main(INT argc, LPWSTR *argv);
 BOOL rem_main(INT argc, LPWSTR *argv);
@@ -15,83 +16,83 @@ BOOL rem_main(INT argc, LPWSTR *argv);
 
 COMMAND cmds[] =
 {
-    {L"ACTIVE",      NULL,         NULL,        active_main,             IDS_HELP_ACTIVE,                    IDS_COMMAND_ACTIVE},
-    {L"ADD",         NULL,         NULL,        add_main,                IDS_HELP_ADD,                       IDS_COMMAND_ADD},
-    {L"ASSIGN",      NULL,         NULL,        assign_main,             IDS_HELP_ASSIGN,                    IDS_COMMAND_ASSIGN},
-    {L"ATTACH",      NULL,         NULL,        attach_main,             IDS_HELP_ATTACH,                    IDS_COMMAND_ATTACH},
-    {L"ATTRIBUTES",  NULL,         NULL,        attributes_main,         IDS_HELP_ATTRIBUTES,                IDS_COMMAND_ATTRIBUTES},
-    {L"AUTOMOUNT",   NULL,         NULL,        automount_main,          IDS_HELP_AUTOMOUNT,                 IDS_COMMAND_AUTOMOUNT},
-    {L"BREAK",       NULL,         NULL,        break_main,              IDS_HELP_BREAK,                     IDS_COMMAND_BREAK},
-    {L"CLEAN",       NULL,         NULL,        clean_main,              IDS_HELP_CLEAN,                     IDS_COMMAND_CLEAN},
-    {L"COMPACT",     NULL,         NULL,        compact_main,            IDS_HELP_COMPACT,                   IDS_COMMAND_COMPACT},
-    {L"CONVERT",     NULL,         NULL,        convert_main,            IDS_HELP_CONVERT,                   IDS_COMMAND_CONVERT},
+    {L"ACTIVE",      NULL,         NULL,        active_main,             IDS_HELP_ACTIVE,                    MSG_COMMAND_ACTIVE},
+    {L"ADD",         NULL,         NULL,        add_main,                IDS_HELP_ADD,                       MSG_COMMAND_ADD},
+    {L"ASSIGN",      NULL,         NULL,        assign_main,             IDS_HELP_ASSIGN,                    MSG_COMMAND_ASSIGN},
+    {L"ATTACH",      NULL,         NULL,        attach_main,             IDS_HELP_ATTACH,                    MSG_COMMAND_ATTACH},
+    {L"ATTRIBUTES",  NULL,         NULL,        attributes_main,         IDS_HELP_ATTRIBUTES,                MSG_COMMAND_ATTRIBUTES},
+    {L"AUTOMOUNT",   NULL,         NULL,        automount_main,          IDS_HELP_AUTOMOUNT,                 MSG_COMMAND_AUTOMOUNT},
+    {L"BREAK",       NULL,         NULL,        break_main,              IDS_HELP_BREAK,                     MSG_COMMAND_BREAK},
+    {L"CLEAN",       NULL,         NULL,        clean_main,              IDS_HELP_CLEAN,                     MSG_COMMAND_CLEAN},
+    {L"COMPACT",     NULL,         NULL,        compact_main,            IDS_HELP_COMPACT,                   MSG_COMMAND_COMPACT},
+    {L"CONVERT",     NULL,         NULL,        convert_main,            IDS_HELP_CONVERT,                   MSG_COMMAND_CONVERT},
 
-    {L"CREATE",      NULL,         NULL,        NULL,                    IDS_HELP_CREATE,                    IDS_NONE},
-    {L"CREATE",      L"PARTITION", NULL,        NULL,                    IDS_HELP_CREATE_PARTITION,          IDS_NONE},
-//    {L"CREATE",      L"PARTITION", L"EFI",      CreateEfiPartition,      IDS_HELP_CREATE_PARTITION_EFI,      IDS_COMMAND_CREATE_PARTITION_EFI},
-    {L"CREATE",      L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, IDS_COMMAND_CREATE_PARTITION_EXTENDED},
-    {L"CREATE",      L"PARTITION", L"LOGICAL",  CreateLogicalPartition,  IDS_HELP_CREATE_PARTITION_LOGICAL,  IDS_COMMAND_CREATE_PARTITION_LOGICAL},
-//    {L"CREATE",      L"PARTITION", L"MSR",      CreateMsrPartition,      IDS_HELP_CREATE_PARTITION_MSR,      IDS_COMMAND_CREATE_PARTITION_MSR},
-    {L"CREATE",      L"PARTITION", L"PRIMARY",  CreatePrimaryPartition,  IDS_HELP_CREATE_PARTITION_PRIMARY,  IDS_COMMAND_CREATE_PARTITION_PRIMARY},
-    {L"CREATE",      L"VOLUME",    NULL,        NULL,                    IDS_HELP_CREATE_VOLUME,             IDS_NONE},
-    {L"CREATE",      L"VDISK",     NULL,        NULL,                    IDS_HELP_CREATE_VDISK,              IDS_NONE},
+    {L"CREATE",      NULL,         NULL,        NULL,                    IDS_HELP_CREATE,                    MSG_NONE},
+    {L"CREATE",      L"PARTITION", NULL,        NULL,                    IDS_HELP_CREATE_PARTITION,          MSG_NONE},
+//    {L"CREATE",      L"PARTITION", L"EFI",      CreateEfiPartition,      IDS_HELP_CREATE_PARTITION_EFI,      MSG_COMMAND_CREATE_PARTITION_EFI},
+    {L"CREATE",      L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, MSG_COMMAND_CREATE_PARTITION_EXTENDED},
+    {L"CREATE",      L"PARTITION", L"LOGICAL",  CreateLogicalPartition,  IDS_HELP_CREATE_PARTITION_LOGICAL,  MSG_COMMAND_CREATE_PARTITION_LOGICAL},
+//    {L"CREATE",      L"PARTITION", L"MSR",      CreateMsrPartition,      IDS_HELP_CREATE_PARTITION_MSR,      MSG_COMMAND_CREATE_PARTITION_MSR},
+    {L"CREATE",      L"PARTITION", L"PRIMARY",  CreatePrimaryPartition,  IDS_HELP_CREATE_PARTITION_PRIMARY,  MSG_COMMAND_CREATE_PARTITION_PRIMARY},
+    {L"CREATE",      L"VOLUME",    NULL,        NULL,                    IDS_HELP_CREATE_VOLUME,             MSG_NONE},
+    {L"CREATE",      L"VDISK",     NULL,        NULL,                    IDS_HELP_CREATE_VDISK,              MSG_NONE},
 
-    {L"DELETE",      NULL,         NULL,        NULL,                    IDS_HELP_DELETE,                    IDS_NONE},
-    {L"DELETE",      L"DISK",      NULL,        DeleteDisk,              IDS_HELP_DELETE_DISK,               IDS_COMMAND_DELETE_DISK},
-    {L"DELETE",      L"PARTITION", NULL,        DeletePartition,         IDS_HELP_DELETE_PARTITION,          IDS_COMMAND_DELETE_PARTITION},
-    {L"DELETE",      L"VOLUME",    NULL,        DeleteVolume,            IDS_HELP_DELETE_VOLUME,             IDS_COMMAND_DELETE_VOLUME},
+    {L"DELETE",      NULL,         NULL,        NULL,                    IDS_HELP_DELETE,                    MSG_NONE},
+    {L"DELETE",      L"DISK",      NULL,        DeleteDisk,              IDS_HELP_DELETE_DISK,               MSG_COMMAND_DELETE_DISK},
+    {L"DELETE",      L"PARTITION", NULL,        DeletePartition,         IDS_HELP_DELETE_PARTITION,          MSG_COMMAND_DELETE_PARTITION},
+    {L"DELETE",      L"VOLUME",    NULL,        DeleteVolume,            IDS_HELP_DELETE_VOLUME,             MSG_COMMAND_DELETE_VOLUME},
 
-    {L"DETACH",      NULL,         NULL,        detach_main,             IDS_HELP_DETACH,                    IDS_COMMAND_DETACH},
+    {L"DETACH",      NULL,         NULL,        detach_main,             IDS_HELP_DETACH,                    MSG_COMMAND_DETACH},
 
-    {L"DETAIL",      NULL,         NULL,        NULL,                    IDS_HELP_DETAIL,                    IDS_NONE},
-    {L"DETAIL",      L"DISK",      NULL,        DetailDisk,              IDS_HELP_DETAIL_DISK,               IDS_COMMAND_DETAIL_DISK},
-    {L"DETAIL",      L"PARTITION", NULL,        DetailPartition,         IDS_HELP_DETAIL_PARTITION,          IDS_COMMAND_DETAIL_PARTITION},
-    {L"DETAIL",      L"VOLUME",    NULL,        DetailVolume,            IDS_HELP_DETAIL_VOLUME,             IDS_COMMAND_DETAIL_VOLUME},
+    {L"DETAIL",      NULL,         NULL,        NULL,                    IDS_HELP_DETAIL,                    MSG_NONE},
+    {L"DETAIL",      L"DISK",      NULL,        DetailDisk,              IDS_HELP_DETAIL_DISK,               MSG_COMMAND_DETAIL_DISK},
+    {L"DETAIL",      L"PARTITION", NULL,        DetailPartition,         IDS_HELP_DETAIL_PARTITION,          MSG_COMMAND_DETAIL_PARTITION},
+    {L"DETAIL",      L"VOLUME",    NULL,        DetailVolume,            IDS_HELP_DETAIL_VOLUME,             MSG_COMMAND_DETAIL_VOLUME},
 
-    {L"DUMP",        NULL,         NULL,        NULL,                    IDS_NONE,                           IDS_NONE},
-    {L"DUMP",        L"DISK",      NULL,        DumpDisk,                IDS_NONE,                           IDS_NONE},
-    {L"DUMP",        L"PARTITION", NULL,        DumpPartition,           IDS_NONE,                           IDS_NONE},
-    {L"EXIT",        NULL,         NULL,        NULL,                    IDS_HELP_EXIT,                      IDS_COMMAND_EXIT},
+    {L"DUMP",        NULL,         NULL,        NULL,                    IDS_NONE,                           MSG_NONE},
+    {L"DUMP",        L"DISK",      NULL,        DumpDisk,                IDS_NONE,                           MSG_NONE},
+    {L"DUMP",        L"PARTITION", NULL,        DumpPartition,           IDS_NONE,                           MSG_NONE},
+    {L"EXIT",        NULL,         NULL,        NULL,                    IDS_HELP_EXIT,                      MSG_COMMAND_EXIT},
 
-    {L"EXPAND",      NULL,         NULL,        expand_main,             IDS_HELP_EXPAND,                    IDS_COMMAND_EXPAND},
-    {L"EXTEND",      NULL,         NULL,        extend_main,             IDS_HELP_EXTEND,                    IDS_COMMAND_EXTEND},
-    {L"FILESYSTEMS", NULL,         NULL,        filesystems_main,        IDS_HELP_FILESYSTEMS,               IDS_COMMAND_FILESYSTEMS},
-    {L"FORMAT",      NULL,         NULL,        format_main,             IDS_HELP_FORMAT,                    IDS_COMMAND_FORMAT},
-    {L"GPT",         NULL,         NULL,        gpt_main,                IDS_HELP_GPT,                       IDS_COMMAND_GPT},
-    {L"HELP",        NULL,         NULL,        help_main,               IDS_HELP_HELP,                      IDS_COMMAND_HELP},
-    {L"IMPORT",      NULL,         NULL,        import_main,             IDS_HELP_IMPORT,                    IDS_COMMAND_IMPORT},
-    {L"INACTIVE",    NULL,         NULL,        inactive_main,           IDS_HELP_INACTIVE,                  IDS_COMMAND_INACTIVE},
+    {L"EXPAND",      NULL,         NULL,        expand_main,             IDS_HELP_EXPAND,                    MSG_COMMAND_EXPAND},
+    {L"EXTEND",      NULL,         NULL,        extend_main,             IDS_HELP_EXTEND,                    MSG_COMMAND_EXTEND},
+    {L"FILESYSTEMS", NULL,         NULL,        filesystems_main,        IDS_HELP_FILESYSTEMS,               MSG_COMMAND_FILESYSTEMS},
+    {L"FORMAT",      NULL,         NULL,        format_main,             IDS_HELP_FORMAT,                    MSG_COMMAND_FORMAT},
+    {L"GPT",         NULL,         NULL,        gpt_main,                IDS_HELP_GPT,                       MSG_COMMAND_GPT},
+    {L"HELP",        NULL,         NULL,        help_main,               IDS_HELP_HELP,                      MSG_COMMAND_HELP},
+    {L"IMPORT",      NULL,         NULL,        import_main,             IDS_HELP_IMPORT,                    MSG_COMMAND_IMPORT},
+    {L"INACTIVE",    NULL,         NULL,        inactive_main,           IDS_HELP_INACTIVE,                  MSG_COMMAND_INACTIVE},
 
-    {L"LIST",        NULL,         NULL,        NULL,                    IDS_HELP_LIST,                      IDS_NONE},
-    {L"LIST",        L"DISK",      NULL,        ListDisk,                IDS_HELP_LIST_DISK,                 IDS_COMMAND_LIST_DISK},
-    {L"LIST",        L"PARTITION", NULL,        ListPartition,           IDS_HELP_LIST_PARTITION,            IDS_COMMAND_LIST_PARTITION},
-    {L"LIST",        L"VOLUME",    NULL,        ListVolume,              IDS_HELP_LIST_VOLUME,               IDS_COMMAND_LIST_VOLUME},
-    {L"LIST",        L"VDISK",     NULL,        ListVirtualDisk,         IDS_HELP_LIST_VDISK,                IDS_COMMAND_LIST_VDISK},
+    {L"LIST",        NULL,         NULL,        NULL,                    IDS_HELP_LIST,                      MSG_NONE},
+    {L"LIST",        L"DISK",      NULL,        ListDisk,                IDS_HELP_LIST_DISK,                 MSG_COMMAND_LIST_DISK},
+    {L"LIST",        L"PARTITION", NULL,        ListPartition,           IDS_HELP_LIST_PARTITION,            MSG_COMMAND_LIST_PARTITION},
+    {L"LIST",        L"VOLUME",    NULL,        ListVolume,              IDS_HELP_LIST_VOLUME,               MSG_COMMAND_LIST_VOLUME},
+    {L"LIST",        L"VDISK",     NULL,        ListVirtualDisk,         IDS_HELP_LIST_VDISK,                MSG_COMMAND_LIST_VDISK},
 
-    {L"MERGE",       NULL,         NULL,        merge_main,              IDS_HELP_MERGE,                     IDS_COMMAND_MERGE},
-    {L"OFFLINE",     NULL,         NULL,        offline_main,            IDS_HELP_OFFLINE,                   IDS_COMMAND_OFFLINE},
-    {L"ONLINE",      NULL,         NULL,        online_main,             IDS_HELP_ONLINE,                    IDS_COMMAND_ONLINE},
-    {L"RECOVER",     NULL,         NULL,        recover_main,            IDS_HELP_RECOVER,                   IDS_COMMAND_RECOVER},
-    {L"REM",         NULL,         NULL,        NULL,                    IDS_HELP_REM,                       IDS_COMMAND_REM},
-    {L"REMOVE",      NULL,         NULL,        remove_main,             IDS_HELP_REMOVE,                    IDS_COMMAND_REMOVE},
-    {L"REPAIR",      NULL,         NULL,        repair_main,             IDS_HELP_REPAIR,                    IDS_COMMAND_REPAIR},
-    {L"RESCAN",      NULL,         NULL,        rescan_main,             IDS_HELP_RESCAN,                    IDS_COMMAND_RESCAN},
-    {L"RETAIN",      NULL,         NULL,        retain_main,             IDS_HELP_RETAIN,                    IDS_COMMAND_RETAIN},
-    {L"SAN",         NULL,         NULL,        san_main,                IDS_HELP_SAN,                       IDS_COMMAND_SAN},
+    {L"MERGE",       NULL,         NULL,        merge_main,              IDS_HELP_MERGE,                     MSG_COMMAND_MERGE},
+    {L"OFFLINE",     NULL,         NULL,        offline_main,            IDS_HELP_OFFLINE,                   MSG_COMMAND_OFFLINE},
+    {L"ONLINE",      NULL,         NULL,        online_main,             IDS_HELP_ONLINE,                    MSG_COMMAND_ONLINE},
+    {L"RECOVER",     NULL,         NULL,        recover_main,            IDS_HELP_RECOVER,                   MSG_COMMAND_RECOVER},
+    {L"REM",         NULL,         NULL,        NULL,                    IDS_HELP_REM,                       MSG_COMMAND_REM},
+    {L"REMOVE",      NULL,         NULL,        remove_main,             IDS_HELP_REMOVE,                    MSG_COMMAND_REMOVE},
+    {L"REPAIR",      NULL,         NULL,        repair_main,             IDS_HELP_REPAIR,                    MSG_COMMAND_REPAIR},
+    {L"RESCAN",      NULL,         NULL,        rescan_main,             IDS_HELP_RESCAN,                    MSG_COMMAND_RESCAN},
+    {L"RETAIN",      NULL,         NULL,        retain_main,             IDS_HELP_RETAIN,                    MSG_COMMAND_RETAIN},
+    {L"SAN",         NULL,         NULL,        san_main,                IDS_HELP_SAN,                       MSG_COMMAND_SAN},
 
-    {L"SELECT",      NULL,         NULL,        NULL,                    IDS_HELP_SELECT,                    IDS_NONE},
-    {L"SELECT",      L"DISK",      NULL,        SelectDisk,              IDS_HELP_SELECT_DISK,               IDS_COMMAND_SELECT_DISK},
-    {L"SELECT",      L"PARTITION", NULL,        SelectPartition,         IDS_HELP_SELECT_PARTITION,          IDS_COMMAND_SELECT_PARTITION},
-    {L"SELECT",      L"VOLUME",    NULL,        SelectVolume,            IDS_HELP_SELECT_VOLUME,             IDS_COMMAND_SELECT_VOLUME},
-//    {L"SELECT",      L"VDISK",     NULL,        SelectVirtualDisk,       IDS_HELP_SELECT_VDISK,              IDS_COMMAND_SELECT_VDISK},
+    {L"SELECT",      NULL,         NULL,        NULL,                    IDS_HELP_SELECT,                    MSG_NONE},
+    {L"SELECT",      L"DISK",      NULL,        SelectDisk,              IDS_HELP_SELECT_DISK,               MSG_COMMAND_SELECT_DISK},
+    {L"SELECT",      L"PARTITION", NULL,        SelectPartition,         IDS_HELP_SELECT_PARTITION,          MSG_COMMAND_SELECT_PARTITION},
+    {L"SELECT",      L"VOLUME",    NULL,        SelectVolume,            IDS_HELP_SELECT_VOLUME,             MSG_COMMAND_SELECT_VOLUME},
+//    {L"SELECT",      L"VDISK",     NULL,        SelectVirtualDisk,       IDS_HELP_SELECT_VDISK,              MSG_COMMAND_SELECT_VDISK},
 
-    {L"SETID",       NULL,         NULL,        setid_main,              IDS_HELP_SETID,                     IDS_COMMAND_SETID},
-    {L"SHRINK",      NULL,         NULL,        shrink_main,             IDS_HELP_SHRINK,                    IDS_COMMAND_SHRINK},
+    {L"SETID",       NULL,         NULL,        setid_main,              IDS_HELP_SETID,                     MSG_COMMAND_SETID},
+    {L"SHRINK",      NULL,         NULL,        shrink_main,             IDS_HELP_SHRINK,                    MSG_COMMAND_SHRINK},
 
-    {L"UNIQUEID",    NULL,         NULL,        NULL,                    IDS_HELP_UNIQUEID,                  IDS_NONE},
-    {L"UNIQUEID",    L"DISK",      NULL,        UniqueIdDisk,            IDS_HELP_UNIQUEID_DISK,             IDS_COMMAND_UNIQUEID_DISK},
+    {L"UNIQUEID",    NULL,         NULL,        NULL,                    IDS_HELP_UNIQUEID,                  MSG_NONE},
+    {L"UNIQUEID",    L"DISK",      NULL,        UniqueIdDisk,            IDS_HELP_UNIQUEID_DISK,             MSG_COMMAND_UNIQUEID_DISK},
 
-    {NULL,           NULL,         NULL,        NULL,                    IDS_NONE,                               IDS_NONE}
+    {NULL,           NULL,         NULL,        NULL,                    IDS_NONE,                           MSG_NONE}
 };
 
 
diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc
index 4eeadf4066a..1554d37cee8 100644
--- a/base/system/diskpart/lang/en-US.rc
+++ b/base/system/diskpart/lang/en-US.rc
@@ -37,6 +37,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 STRINGTABLE
@@ -49,10 +51,10 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Disk ###  Status      Size     Free     Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Partition      Type              Size     Offset\n"
+    IDS_LIST_DISK_FORMAT "%c Disk %-3lu  %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Partition ###  Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
-    IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
+    IDS_LIST_PARTITION_FORMAT "%c Partition %-3lu  %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n"
     IDS_LIST_VOLUME_HEAD "  Volume ###  Ltr  Label        FS     Type        Size     Status   Info\n"
     IDS_LIST_VOLUME_LINE "  ----------  ---  -----------  -----  ----------  -------  -------  --------\n"
@@ -176,248 +178,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Displays or sets the GUID partition table (GPT) identifier\n              or master boot record (MBR) signature of a disk.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc
index 69de3471d20..f392db0f256 100644
--- a/base/system/diskpart/lang/pl-PL.rc
+++ b/base/system/diskpart/lang/pl-PL.rc
@@ -37,6 +37,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Ukryta                : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Aktywna               : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Przesunięcie w bajtach: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 STRINGTABLE
@@ -49,8 +51,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Dysk ###  Stan        Rozmiar  Wolne    Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Partycja       Typ               Rozmiar  Przesunięcie\n"
+    IDS_LIST_DISK_FORMAT "%c Dysk %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Partycja  ###  Typ               Rozmiar  Przesunięcie\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  ------------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partycja    %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n"
@@ -176,248 +178,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Wyświetla lub ustawia identyfikator tabeli partycji GUID (GPT)\n              lub sygnaturę głównego rekordu rozruchowego (MBR).\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc
index 0edee6239c9..b39f2027624 100644
--- a/base/system/diskpart/lang/pt-PT.rc
+++ b/base/system/diskpart/lang/pt-PT.rc
@@ -39,6 +39,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -46,8 +48,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Disco ##  Estado      Tamanho    Livre    Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  ---------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Partição       Tipo     Tamanho    deslocamento\n"
+    IDS_LIST_DISK_FORMAT "%c Disco %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Partição  ###  Tipo     Tamanho    deslocamento\n"
     IDS_LIST_PARTITION_LINE "  -------------  -------  ---------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partição %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n"
@@ -178,248 +180,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Mostra ou define o identificador da tabela de partição GUID (GPT)\n              ou assinatura do master boot recorder (MBR) de um disco.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc
index 7f69919ca93..337dc506afb 100644
--- a/base/system/diskpart/lang/ro-RO.rc
+++ b/base/system/diskpart/lang/ro-RO.rc
@@ -39,6 +39,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -46,8 +48,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Disc ###  Stare       Dimensiune  Liber    Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  ----------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Partiție       Tip               Dim.     Depl.\n"
+    IDS_LIST_DISK_FORMAT "%c Disc %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Partiție ###   Tip               Dim.     Depl.\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partiție  %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n"
@@ -178,248 +180,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Afișează sau instituie identificatorul tabelei GUID a partiției\n              (GPT) sau semnătura de inițializare (MBR) a discului.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc
index 3ecfe9122bf..320aaa12620 100644
--- a/base/system/diskpart/lang/ru-RU.rc
+++ b/base/system/diskpart/lang/ru-RU.rc
@@ -39,6 +39,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -46,8 +48,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Диск ###  Состояние   Размер   Свободно  Дин  GPT\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  --------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Разметка       Тип              Размер    Отступ\n"
+    IDS_LIST_DISK_FORMAT "%c Диск %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Разметка ###   Тип              Размер    Отступ\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n"
@@ -178,248 +180,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Отображение или установка кода таблицы разделов GUID (GPT) или\n              подписи основной загрузочной записи (MBR) диска.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc
index 49e7ea9ff34..d03ea2b3522 100644
--- a/base/system/diskpart/lang/sq-AL.rc
+++ b/base/system/diskpart/lang/sq-AL.rc
@@ -41,6 +41,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -48,8 +50,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Disk ###  Status      Size     Free     Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "  Partition      Type              Size     Offset\n"
+    IDS_LIST_DISK_FORMAT "%c Disk %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Partition ###  Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "%c -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "  Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n"
@@ -180,248 +182,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Shfaq ose vendos tabelen e particionit GUID - (GPT) identifikues\n              ose master boot record (MBR) firmen e një disku.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc
index bb106bccd82..61099db6c2e 100644
--- a/base/system/diskpart/lang/tr-TR.rc
+++ b/base/system/diskpart/lang/tr-TR.rc
@@ -39,6 +39,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -46,8 +48,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  Disk ###    Durum      Boyut     Boş     Dev  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s   %4I64u %-2s  %1s   %1s\n"
-    IDS_LIST_PARTITION_HEAD "      Bölüm              Tür        Boyut    Ofset\n"
+    IDS_LIST_DISK_FORMAT "%c Disk %-3lu   %-10s  %4I64u %-2s   %4I64u %-2s  %1s   %1s\n"
+    IDS_LIST_PARTITION_HEAD "  Bölüm ###          Tür        Boyut    Ofset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu       %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n"
@@ -178,248 +180,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "Bir diskin GUID bölüm tablosu (GPT) tanımlayıcısını ya da üst ön yükleme kaydı (MBR) imini görüntüler ya da ayarlar.\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc
index 1a23e12d8cd..ab86d06dc8e 100644
--- a/base/system/diskpart/lang/zh-CN.rc
+++ b/base/system/diskpart/lang/zh-CN.rc
@@ -46,6 +46,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -53,8 +55,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  磁盘 ###   状态      大小     可用    活动 Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "     分区           类型          大小     偏移量\n"
+    IDS_LIST_DISK_FORMAT "%c 磁盘 %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  分区 ###          类型          大小     偏移量\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n"
@@ -185,248 +187,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "显示或设置 GUID 分区表（GPT）的标识符\n              或主引导记录（MBR）磁盘的签名。\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc
index 6f931d2e0dd..fbdbf64992e 100644
--- a/base/system/diskpart/lang/zh-TW.rc
+++ b/base/system/diskpart/lang/zh-TW.rc
@@ -40,6 +40,8 @@ BEGIN
     IDS_DETAIL_PARTITION_HIDDEN "Hidden        : %s\n"
     IDS_DETAIL_PARTITION_ACTIVE "Active        : %s\n"
     IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n"
+    IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n"
+    IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n"
 END
 
 /* Detail header titles */
@@ -47,8 +49,8 @@ STRINGTABLE
 BEGIN
     IDS_LIST_DISK_HEAD "  磁碟 ###   狀態      大小     可用    Dyn  Gpt\n"
     IDS_LIST_DISK_LINE "  --------  ----------  -------  -------  ---  ---\n"
-    IDS_LIST_DISK_FORMAT "%c %7lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
-    IDS_LIST_PARTITION_HEAD "     分區           類型          大小     偏移量\n"
+    IDS_LIST_DISK_FORMAT "%c 磁碟 %-3lu   %-10s  %4I64u %-2s  %4I64u %-2s   %1s    %1s\n"
+    IDS_LIST_PARTITION_HEAD "  分區 ###       類型          大小     偏移量\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
     IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n"
@@ -179,248 +181,6 @@ BEGIN
     IDS_HELP_UNIQUEID_DISK             "顯示或設定 GUID 分區表 (GPT) 的標識符\n              或主開機記錄 (MBR) 磁碟的簽名。\n"
 END
 
-/* Active help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n"
-END
-
-/* Add help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ADD "<Add ADD command help text here>\n"
-END
-
-/* Assign help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n"
-END
-
-/* Attach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n"
-END
-
-/* Attributes Command Messages */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n"
-END
-
-/* Automount help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n"
-END
-
-/* Break help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_BREAK "<Add BREAK command help text here>\n"
-END
-
-/* Clean help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n"
-END
-
-/* Compact help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n"
-END
-
-/* Convert help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n"
-END
-
-/* Create help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n"
-    IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n"
-    IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n"
-    IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n"
-END
-
-/* Delete help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n"
-    IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n"
-    IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n"
-END
-
-/* Detach help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_DETACH "<Add DETACH command help text here>\n"
-END
-
-/* Exit help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXIT "<Add EXIT command help text here>\n"
-END
-
-/* Expand help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n"
-END
-
-/* Extend help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n"
-END
-
-/* Filesystems help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n"
-END
-
-/* Format help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n"
-END
-
-/* GPT help description */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_GPT "<Add GPT command help text here>\n"
-END
-
-/* Help help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_HELP "<Add HELP command help text here>\n"
-END
-
-/* Import help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n"
-END
-
-/* Inactive help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n"
-END
-
-/* List help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n"
-    IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n"
-    IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n"
-    IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n"
-END
-
-/* Merge help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_MERGE "<Add MERGE command help text here>\n"
-END
-
-/* Offline help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n"
-END
-
-/* Online help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n"
-END
-
-/* Recover help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n"
-END
-
-/* Rem help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REM "<Add REM command help text here>\n"
-END
-
-/* Remove help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n"
-END
-
-/* Repair help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n"
-END
-
-/* Rescan help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n"
-END
-
-/* Retain help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n"
-END
-
-/* San help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SAN "<Add SAN command help text here>\n"
-END
-
-/* Select help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n"
-    IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n"
-    IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n"
-    IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SETID "<Add SETID command help text here>\n"
-END
-
-/* Setid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n"
-END
-
-/* Uniqueid help descriptions */
-STRINGTABLE
-BEGIN
-    IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n"
-END
-
 /* Common Error Messages */
 STRINGTABLE
 BEGIN
diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c
index b46651b670b..b530f6581df 100644
--- a/base/system/diskpart/misc.c
+++ b/base/system/diskpart/misc.c
@@ -78,3 +78,26 @@ RoundingDivide(
 {
     return (Dividend + Divisor / 2) / Divisor;
 }
+
+
+VOID
+PrintMessageString(
+    _In_ DWORD dwMessage)
+{
+    PWSTR pBuffer;
+
+    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE |
+                   FORMAT_MESSAGE_IGNORE_INSERTS,
+                   NULL, //hModuleNetMsg,
+                   dwMessage,
+                   LANG_USER_DEFAULT,
+                   (LPWSTR)&pBuffer,
+                   0,
+                   NULL);
+    if (pBuffer)
+    {
+        ConPuts(StdOut, pBuffer);
+        LocalFree(pBuffer);
+        pBuffer = NULL;
+    }
+}
diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h
index 313e9b6eee5..51a3946af55 100644
--- a/base/system/diskpart/resource.h
+++ b/base/system/diskpart/resource.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #define IDS_NONE -1
+#define MSG_NONE 0
 
 #define IDS_APP_HEADER        0
 #define IDS_APP_USAGE         1
@@ -38,6 +39,9 @@
 #define IDS_DETAIL_PARTITION_ACTIVE    1133
 #define IDS_DETAIL_PARTITION_OFFSET    1134
 
+#define IDS_DETAIL_NO_DISKS            1135
+#define IDS_DETAIL_NO_VOLUME           1136
+
 #define IDS_HELP_FORMAT_STRING         1200
 
 #define IDS_LIST_DISK_HEAD             3300
@@ -148,60 +152,6 @@
 #define IDS_HELP_UNIQUEID                  117
 #define IDS_HELP_UNIQUEID_DISK             118
 
-
-#define IDS_COMMAND_ACTIVE                     1000
-#define IDS_COMMAND_ADD                        1001
-#define IDS_COMMAND_ASSIGN                     1002
-#define IDS_COMMAND_ATTACH                     1003
-#define IDS_COMMAND_ATTRIBUTES                 1004
-#define IDS_COMMAND_AUTOMOUNT                  1005
-#define IDS_COMMAND_BREAK                      1006
-#define IDS_COMMAND_CLEAN                      1007
-#define IDS_COMMAND_COMPACT                    1008
-#define IDS_COMMAND_CONVERT                    1009
-#define IDS_COMMAND_CREATE_PARTITION_EFI       1010
-#define IDS_COMMAND_CREATE_PARTITION_EXTENDED  1011
-#define IDS_COMMAND_CREATE_PARTITION_LOGICAL   1012
-#define IDS_COMMAND_CREATE_PARTITION_MSR       1013
-#define IDS_COMMAND_CREATE_PARTITION_PRIMARY   1014
-#define IDS_COMMAND_DELETE_DISK                1015
-#define IDS_COMMAND_DELETE_PARTITION           1016
-#define IDS_COMMAND_DELETE_VOLUME              1017
-#define IDS_COMMAND_DETACH                     1018
-#define IDS_COMMAND_DETAIL_DISK                1019
-#define IDS_COMMAND_DETAIL_PARTITION           1020
-#define IDS_COMMAND_DETAIL_VOLUME              1021
-#define IDS_COMMAND_EXIT                       1022
-#define IDS_COMMAND_EXPAND                     1023
-#define IDS_COMMAND_EXTEND                     1024
-#define IDS_COMMAND_FILESYSTEMS                1025
-#define IDS_COMMAND_FORMAT                     1026
-#define IDS_COMMAND_GPT                        1027
-#define IDS_COMMAND_HELP                       1028
-#define IDS_COMMAND_IMPORT                     1029
-#define IDS_COMMAND_INACTIVE                   1030
-#define IDS_COMMAND_LIST_DISK                  1031
-#define IDS_COMMAND_LIST_PARTITION             1032
-#define IDS_COMMAND_LIST_VOLUME                1033
-#define IDS_COMMAND_LIST_VDISK                 1034
-#define IDS_COMMAND_MERGE                      1035
-#define IDS_COMMAND_ONLINE                     1036
-#define IDS_COMMAND_OFFLINE                    1037
-#define IDS_COMMAND_RECOVER                    1038
-#define IDS_COMMAND_REM                        1039
-#define IDS_COMMAND_REMOVE                     1040
-#define IDS_COMMAND_REPAIR                     1041
-#define IDS_COMMAND_RESCAN                     1042
-#define IDS_COMMAND_RETAIN                     1043
-#define IDS_COMMAND_SAN                        1044
-#define IDS_COMMAND_SELECT_DISK                1045
-#define IDS_COMMAND_SELECT_PARTITION           1046
-#define IDS_COMMAND_SELECT_VOLUME              1047
-#define IDS_COMMAND_SELECT_VDISK               1048
-#define IDS_COMMAND_SETID                      1049
-#define IDS_COMMAND_SHRINK                     1050
-#define IDS_COMMAND_UNIQUEID_DISK              1051
-
 #define IDS_ERROR_MSG_NO_SCRIPT  2000
 #define IDS_ERROR_MSG_BAD_ARG    2001
 #define IDS_ERROR_INVALID_ARGS   2002