Sync with trunk revision 64099.

svn path=/branches/condrv_restructure/; revision=64100

base/applications/calc/CMakeLists.txt

@@ -13,8 +13,12 @@ list(APPEND SOURCE
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
-if(MSVC)
+
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    target_link_libraries(calc mingwex)
+elseif(MSVC)
     add_importlibs(calc ntdll)
 endif()
+
 add_pch(calc calc.h SOURCE)
 add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all)

base/applications/calc/lang/tr-TR.rc

@@ -415,7 +415,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ruhsatıyla yayımlanan bir özgür yazılımdır.\r\n\r\nGNU GPL ruhsatının bir kopyasını buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL ruhsatının bir çevirisini buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ruhsatıyla yayımlanan bir özgür yazılımdır.\r\n\r\nGNU GPL ruhsatının bir kopyasını şuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL ruhsatının bir çevirisini şuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Yanlışlık"
     IDS_QUICKHELP "Hızlı Yardım"
 END

base/applications/cmdutils/doskey/doskey.rc

@@ -34,6 +34,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif

base/applications/cmdutils/doskey/lang/ru-RU.rc

@@ -0,0 +1,26 @@
+/* Russian translation by Kudratov Olimjon ([email protected]) */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Редактирование и повторный вызов команд ReactOS; создание макросов DOSKey.\n\
+\n\
+DOSKEY [/REINSTALL] [/LISTSIZE=размер] [/MACROS[:ALL | :модуль]]\n\
+  [/HISTORY] [/INSERT | /OVERSTRIKE] [/EXENAME=модуль] [/MACROFILE=файл]\n\
+  [макрос=[текст]]\n\n\
+  /REINSTALL          Установка новой копии DOSKey.\n\
+  /LISTSIZE=размер    Размер буфера журнала команд.\n\
+  /MACROS             Вывод всех макросов DOSKey.\n\
+  /MACROS:ALL         Вывод всех макросов DOSKey для всех исполняемых\n\
+                      модулей, содержащих макросы DOSKey.\n\
+  /MACROS:модуль      Вывод всех макросов DOSKey для указанного модуля.\n\
+  /HISTORY            Вывод всех команд, хранящихся в памяти.\n\
+  /INSERT             Включение режима вставки.\n\
+  /OVERSTRIKE         Включение режима замены.\n\
+  /EXENAME=модуль     Исполняемый модуль.\n\
+  /MACROFILE=файл     Файл макросов, который следует установить.\n\
+  макрос              Имя нового макроса.\n\
+  текст               Команды, которые следует включить в макрос."
+    IDS_INVALID_MACRO_DEF "Неверный макрос: %s\n"
+END

base/applications/cmdutils/find/lang/ru-RU.rc

@@ -2,12 +2,15 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "FIND: Поиск текстовой строки в одном или нескольких файлах.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""строка"" [ файл... ]\n\
-    /C  Вывод только общего числа строк, содержащих заданную строку.\n\
-    /I  Поиск без учета регистра символов.\n\
-    /N  Вывод номеров отображаемых строк (начиная с 1).\n\
-    /V  Вывод всех строк, НЕ содержащих заданную строку."
+    IDS_USAGE "Поиск текстовой строки в одном или нескольких файлах.\n\n\
+FIND [/V] [/C] [/N] [/I] ""строка"" [[диск:][путь]имя_файла[ ...]]\n\
+  /V         Вывод всех строк, НЕ содержащих заданную строку.\n\
+  /C         Вывод только общего числа строк, содержащих заданную строку.\n\
+  /N         Вывод номеров отображаемых строк.\n\
+  /I         Поиск без учета регистра символов.\n\
+  ""строка""   Искомая строка.\n\
+  [диск:][путь]имя_файла\n\
+             Один или несколько файлов, в которых выполняется поиск."
     IDS_NO_SUCH_FILE "FIND: %s: Файл не существует.\n"
     IDS_CANNOT_OPEN "FIND: %s: Невозможно открыть файл.\n"
 END

base/applications/cmdutils/help/lang/ru-RU.rc

@@ -7,7 +7,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n."
+    IDS_NO_ENTRY "Данная команда не поддерживается. Воспользуйтесь параметром ""%s /?""\n."
 END
 
 STRINGTABLE
@@ -20,55 +20,53 @@ HELP [command]\n\n\
   команда /?     Выводит подробную информацию о команде\n\n\
 ?        Список всех доступных команд без описания.\n\
 ALIAS    Вывод, установка или удаление псевдонимов.\n\
-ATTRIB   Вывод и изменение атрибутов файлов.\n\
+ATTRIB   Отображение и изменение атрибутов файлов.\n\
 BEEP     Звуковой сигнал.\n\
 CALL     Вызов одного пакетного файла из другого.\n\
-CD       Вывод имени либо смена текущего каталога.\n\
-CHCP     Вывод или смена текущего номера кодовой страницы.\n\
+CD       Вывод имени либо смена текущей папки.\n\
+CHCP     Вывод либо установка активной кодовой страницы.\n\
 CHOICE   Ждет, пока пользователь не выберет один из указанных в списке символов.\n\
 CLS      Очистка экрана.\n\
-CMD      Запуск новой копии интерпретатора команд.\n\
-COLOR    Установка цветов по умолчанию для текста и фона.\n\
+CMD      Запуск еще одного интерпретатора командных строк ReactOS.\n\
+COLOR    Установка цветов переднего плана и фона, используемых по умолчанию.\n\
 COPY     Копирование одного или нескольких файлов в другое место.\n\
-DATE     Вывод или изменение даты.\n\
+DATE     Вывод либо установка текущей даты.\n\
 DELETE   Удаление одного или нескольких файлов.\n\
-DIR      Вывод списка файлов и подкаталогов каталога.\n\
+DIR      Вывод списка файлов и подпапок из указанной папки.\n\
 ECHO     Вывод сообщений и переключение режима отображения команд на экране.\n\
 ERASE    Удаление одного или нескольких файлов.\n\
-EXIT     Завершает интерпретатор команд.\n\
-FOR      Запускает указанную команду для каждого файла из набора файлов.\n\
+EXIT     Завершение работы программы CMD.EXE (интерпретатора командных строк).\n\
+FOR      Запуск указанной команды для каждого из файлов в наборе.\n\
 FREE     (Свободное) дисковое пространство.\n\
-GOTO     Передача управления содержащей метку строке пакетного файла\n\
-HELP     Предоставляет справочную информацию о командах ReactOS.\n\
+GOTO     Передача управления в отмеченную строку пакетного файла.\n\
+HELP     Выводит справочную информацию о командах ReactOS.\n\
 HISTORY  Список запущенных команд\n\
 IF       Оператор условного выполнения команд в пакетном файле.\n\
-LABEL    Создание, изменение и удаление меток тома.\n\
-MD       Создание каталога.\n\
-MKDIR    Создание каталога.\n\
-MKLINK   Creates a filesystem link object.\n\
-MOVE     Перемещение файлов и переименование файлов и каталогов\n\
-PATH     Вывод или задание пути поиска исполняемых файлов.\n\
-PAUSE    Приостановка выполнения пакетного файла.\n\
-POPD     Восттанавливает предыдущее значение текущей директории сохраненное командой\n\
-         PUSHD.\n\
-PROMPT   Изменение приглашения командной строки.\n\
-PUSHD    Сохраняет текущую директорию, а потом меняет ее.\n\
-RD       Удаление каталога.\n\
-REM      Записывает комментарии (замечения) в пакетных файлах.\n\
-REN      Переименование одного или нескольких файлов или каталогов.\n\
-RENAME   Переименование одного или нескольких файлов или каталогов.\n\
-RMDIR    Удаление каталога.\n\
+LABEL    Создание, изменение и удаление меток тома для дисков.\n\
+MD       Создание папки.\n\
+MKDIR    Создание папки.\n\
+MKLINK   Cоздание символических и жестких ссылок.\n\
+MOVE     Перемещение одного или нескольких файлов из одной папки в другую.\n\
+PATH     Отображает или устанавливает путь поиска исполняемых файлов.\n\
+PAUSE    Приостанавливает выполнение пакетного файла и выводит сообщение.\n\
+POPD     Восстанавливает предыдущее значение активной папки,\n\
+         сохраненное с помощью команды PUSHD.\n\
+PROMPT   Изменяет приглашение в командной строке ReactOS.\n\
+PUSHD    Сохраняет значение активной папки и переходит к другой папке.\n\
+RD       Удаляет папку.\n\
+REM      Помещает комментарии в пакетные файлы.\n\
+REN      Переименовывает файлы или папки.\n\
+RENAME   Переименовывает файлы или папки.\n\
+RMDIR    Удаление папки.\n\
 SCREEN   Перемещение курсора и вывод текста.\n\
-SET      Вывод, задание и удаление переменных среды.\n\
-SHIFT    Изменение содержимого (сдвиг) подставляемых параметров для пакетного файла\n"
-    IDS_HELP2 "START    Открывает отдельное окно для запуска указанных команд или программ.\n\
-         Выполняет команду.\n\
-TIME     Вывод или изменение времени.\n\
+SET      Показывает, устанавливает и удаляет переменные среды ReactOS.\n\
+SHIFT    Изменение положения (сдвиг) подставляемых параметров для пакетного файла.\n"
+    IDS_HELP2 "START    Выполнение программы или команды в отдельном окне.\n\
+TIME     Вывод и установка системного времени.\n\
 TIMER    Секундомер.\n\
-TITLE    Изменение заголовка окна командной строки.\n\
-TYPE     Вывод содержимого одного или нескольких текстовых файлов.\n\
-VER      Вывод версии ОС.\n\
-VERIFY   Включение или отключение режима проверки правильности записи файлов\n\
-         на диск.\n\
-VOL      Выводит метку тома и серийный номер.\n"
+TITLE    Назначение заголовка окна для текущего сеанса интерпретатора\n\командных строк CMD.EXE.\n\
+TYPE     Вывод на экран содержимого текстовых файлов.\n\
+VER      Вывод сведений о версии ReactOS.\n\
+VERIFY   ВУстановка режима проверки правильности записи файлов на диск.\n\
+VOL      Вывод метки и серийного номера тома для диска.\n"
 END

base/applications/cmdutils/hostname/hostname.rc

@@ -33,6 +33,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif

base/applications/cmdutils/hostname/lang/ru-RU.rc

@@ -0,0 +1,8 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Печать имени текущего узла.\n\nhostname"
+    IDS_NOSET "hostname -s не поддерживается."
+    IDS_ERROR "Ошибка Win32"
+END

base/applications/cmdutils/more/lang/ru-RU.rc

@@ -11,11 +11,11 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
     IDS_USAGE "Показывать данные постранично заполняя экран.\n\n\
-  MORE < [Том:][Путь]Имя файла\n\
-  Command | MORE \n\
-  MORE [Том:][Путь]Имя файла\n\n\
-  [Том:][Путь]Имя Файла    Имя файла содержимое которого будет отображено.\n\
-  Command\t\t     Команда, результат работы которой требуется выводить на экран.\n\n\
+  MORE < [диск:][путь]имя_файла\n\
+  имя_команды | MORE \n\
+  MORE [диск:][путь]имя_файла\n\n\
+  [диск:][путь]имя_файла    Файл, отображаемый по фрагментам.\n\
+  имя_команды             Команда, вывод которой отображается на экране.\n\n\
   При запросе  ""-- Продолжить --"" вы можете нажать любую клавишу для отображения следующего экрана.\n"
     IDS_CONTINUE " -- Продолжить (100%) -- "
     IDS_FILE_ACCESS "Нет доступа к файлу %s."

base/applications/cmdutils/reg/lang/ru-RU.rc

@@ -3,9 +3,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
     STRING_USAGE "Использование программы:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n"
-    STRING_ADD_USAGE "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <разделитель>] [/d данные] [/f]\n"
-    STRING_DELETE_USAGE "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n"
+    STRING_ADD_USAGE "REG ADD <имя_раздела> [/v <имя_параметра> | /ve] [/t <тип>] [/s <разделитель>] [/d <данные>] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE <имя_раздела> [/v <имя_параметра> | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY <имя_раздела> [/v [имя_параметра] | /ve] [/s]\n"
     STRING_SUCCESS "Операция успешно завершена\n"
     STRING_INVALID_KEY "Ошибка: неправильное имя ключа\n"
     STRING_INVALID_CMDLINE "Ошибка: неправильные параметры командной строки\n"

base/applications/cmdutils/taskkill/lang/ru-RU.rc

@@ -0,0 +1,19 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_USAGE "TASKKILL [/F] [/IM <образ> | /PID <процесс>]\n"
+    STRING_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n"
+    STRING_INVALID_PARAM "Error: Invalid command line parameter specified.\n"
+    STRING_MISSING_OPTION "Error: One of options /im or /pid must be specified.\n"
+    STRING_MISSING_PARAM "Error: Option %1 expects a command line parameter.\n"
+    STRING_MUTUAL_EXCLUSIVE "Error: Options /im and /pid are mutually exclusive.\n"
+    STRING_CLOSE_PID_SEARCH "Close message sent to top-level windows of process with PID %1!u!.\n"
+    STRING_CLOSE_PROC_SRCH "Close message sent to top-level windows of process ""%1"" with PID %2!u!.\n"
+    STRING_TERM_PID_SEARCH "Process with PID %1!u! was forcibly terminated.\n"
+    STRING_TERM_PROC_SEARCH "Process ""%1"" with PID %2!u! was forcibly terminated.\n"
+    STRING_SEARCH_FAILED "Error: Could not find process ""%1"".\n"
+    STRING_ENUM_FAILED "Error: Unable to enumerate the process list.\n"
+    STRING_TERMINATE_FAILED "Error: Unable to terminate process ""%1"".\n"
+    STRING_SELF_TERMINATION "Error: Process self-termination is not permitted.\n"
+END

base/applications/cmdutils/taskkill/taskkill.rc

@@ -39,6 +39,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGAUGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif

base/applications/cmdutils/wmic/lang/ru-RU.rc

@@ -0,0 +1,8 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CMDLINE_NOT_SUPPORTED "Ошибка: коммандная строка не поддерживается\n"
+    STRING_ALIAS_NOT_FOUND "Ошибка: псевдоним не найден\n"
+    STRING_INVALID_QUERY "Ошибка: неврный запрос\n"
+END

base/applications/cmdutils/wmic/wmic.rc

@@ -37,6 +37,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif

base/applications/cmdutils/xcopy/lang/Ru.rc

@@ -6,7 +6,7 @@ BEGIN
 подробного описания.\n"
     STRING_INVPARM "Недопустимый параметр '%1' - попробуйте 'xcopy /?' для получения подробного\n\
 описания.\n"
-    STRING_PAUSE "Нажмите клавишу <Enter>, чтобы начать копирование.\n"
+    STRING_PAUSE "Нажмите на клавишу <Enter>, чтобы начать копирование.\n"
     STRING_SIMCOPY "%1!d! файл(ов) было бы скопировано.\n"
     STRING_COPY "%1!d! файл(ов) скопировано.\n"
     STRING_QISDIR "'%1' является файлом или папкой?\n\
@@ -22,35 +22,36 @@ BEGIN
     STRING_FILE_CHAR "F"
     STRING_DIR_CHAR "D"
     STRING_HELP
-"XCOPY - Копирует файлы и деревья папок\n\
+"Копирование файлов и структур каталогов.\n\
 \n\
 Синтаксис:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
-Где:\n\
 \n\
-[/I]  Если конечная папка отсутствует и копируется более одного файла,\n\
-      то предполагается папка в качестве места назначения.\n\
-[/S]  Копирует папки и подпапки.\n\
-[/E]  Копирует папки и подпапки, включая пустые.\n\
-[/Q]  Не отображает имена копируемых файлов.\n\
-[/F]  Отображает полные имена исходных и конечных файлов.\n\
-[/L]  Выводит список файлов, которые будут скопированы.\n\
-[/W]  Запрашивает подтверждение перед началом копирования.\n\
-[/T]  Создает структуру папок, но не копирует файлы.\n\
-[/Y]  Подавляет запрос на подтверждение перезаписи файлов.\n\
-[/-Y] Запрашивает подтверждение на перезапись файлов.\n\
-[/P]  Запрашивает подтверждение для каждого копируемого файла.\n\
-[/N]  Использует короткие имена файлов при копировании.\n\
-[/U]  Копирует только те файлы, которые уже существуют в конечной папке.\n\
-[/R]  Перезаписывает файлы, доступные только для чтения.\n\
-[/H]  Копирует скрытые и системные файлы.\n\
-[/C]  Продолжает работу, даже если произошла ошибка.\n\
-[/A]  Копирует только те файлы, для которых установлен атрибут ""архивный"".\n\
-[/M]  Копирует только те файлы, для которых установлен атрибут ""архивный"",\n\
+  источник       Копируемые файлы.\n\
+  целевой_объект  Расположение или имена новых файлов.\n\
+/I  Если целевой объект не существует и копируется несколько\n\
+    файлов, считается, что целевой объект задает каталог.\n\
+/S  Копирование только не пустых каталогов с подкаталогами.\n\
+/E  Копирование каталогов с подкаталогами, включая пустые.\n\
+/Q  Запрет вывода имен копируемых файлов.\n\
+/F  Вывод полных имен исходных и целевых файлов.\n\
+/L  Вывод имен копируемых файлов.\n\
+/W  Вывод запроса на нажатие клавиши перед копированием.\n\
+/T  Создание структуры каталогов без копирования файлов.\n\
+/Y  Подавление запроса подтверждения на перезапись существующего целевого файла.\n\
+/-Y Запрос подтверждения на перезапись существующего целевого файла.\n\
+/P  Вывод запросов перед созданием каждого нового файла.\n\
+/N  Использование коротких имен при копировании.\n\
+/U  Копирование только файлов, уже имеющихся в целевом каталоге.\n\
+/R  Перезапись файлов, предназначенных только для чтения.\n\
+/H  Копирование, среди прочих, скрытых и системных файлов.\n\
+/C  Продолжение копирования вне зависимости от наличия ошибок.\n\
+/A  Копирует только те файлы, для которых установлен атрибут ""архивный"".\n\
+/M  Копирует только те файлы, для которых установлен атрибут ""архивный"",\n\
       при этом атрибут удаляется.\n\
-[/D | /D:m-d-y] Копирует только новые файлы или те, которые были изменены\n\
-                после указанной даты. Если дата не указана, копирует только\n\
-                те файлы, которые новее в исходной папке.\n"
+/D | /D:m-d-y Копирование файлов, измененных не ранее указанной даты.\n\
+              Если дата не указана, заменяются только конечные файлы,\n\
+              более старые, чем исходные.\n"
 END

base/applications/dxdiag/lang/tr-TR.rc

@@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bu araç, dizgenizdeki yüklü ReactX bileşenleri ve sürücüleri üzerine ayrıntılı bilgi raporlar.", -1, 10, 10, 443, 17
-    LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa sırayla tüm bölümlere gitmek için aşağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", -1, 10, 30, 443, 25
+    LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa diziyle tüm bölümlere gitmek için aşağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", -1, 10, 30, 443, 25
     GROUPBOX "Dizge Bilgisi", -1, 10, 55, 443, 130, SS_RIGHT
     LTEXT "Geçerli Zaman:", -1, 70, 70, 80, 10, SS_RIGHT
     LTEXT "Bilgisayar Adı:", -1, 70, 80, 80, 10, SS_RIGHT

base/applications/findstr/lang/ru-RU.rc

@@ -2,12 +2,12 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "FIND: Поиск текстовой строки в одном или нескольких файлах.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""строка"" [ файл... ]\n\
+    IDS_USAGE "FINDSTR: Поиск строк в файлах.\n\n\
+  FINDSTR [/V] [/C] [/N] [/I] ""строка"" [[диск:][путь]имя_файла[ ...]]\n\
+    /V  Вывод всех строк, НЕ содержащих заданную строку.\n\
     /C  Вывод только общего числа строк, содержащих заданную строку.\n\
-    /I  Поиск без учета регистра символов.\n\
-    /N  Вывод номеров отображаемых строк (начиная с 1).\n\
-    /V  Вывод всех строк, НЕ содержащих заданную строку."
-    IDS_NO_SUCH_FILE "FIND: %s: Файл не существует.\n"
-    IDS_CANNOT_OPEN "FIND: %s: Невозможно открыть файл.\n"
+    /N  Вывод номеров отображаемых строк.\n\
+    /I  Поиск без учета регистра символов."
+    IDS_NO_SUCH_FILE "FINDSTR: %s: Файл не существует.\n"
+    IDS_CANNOT_OPEN "FINDSTR: %s: Невозможно открыть файл.\n"
 END

base/applications/games/winmine/lang/ru-RU.rc

@@ -16,9 +16,9 @@ BEGIN
         MENUITEM "&Вопросительные знаки", IDM_MARKQ
         MENUITEM SEPARATOR
         MENUITEM "Нови&чок", IDM_BEGINNER
-        MENUITEM "&Мастер", IDM_ADVANCED
+        MENUITEM "&Любитель", IDM_ADVANCED
         MENUITEM "&Эксперт", IDM_EXPERT
-        MENUITEM "Нестандартные &параметры", IDM_CUSTOM
+        MENUITEM "Особые...", IDM_CUSTOM
         MENUITEM SEPARATOR
         MENUITEM "&Закрыть\tAlt+X", IDM_EXIT
     END
@@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Лучшее время", -1, 10, 10, 140, 45
     LTEXT "Новичок", -1, 20, 20, 40, 8
-    LTEXT "Мастер", -1, 20, 30, 40, 8
+    LTEXT "Любитель", -1, 20, 30, 40, 8
     LTEXT "Эксперт", -1, 20, 40, 40, 8
     LTEXT "999", IDC_TIME1, 70, 20, 15, 8
     LTEXT "999", IDC_TIME2, 70, 30, 15, 8
@@ -57,17 +57,17 @@ BEGIN
     DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15
 END
 
-DLG_CUSTOM DIALOGEX 0, 0, 140, 100
+DLG_CUSTOM DIALOGEX 0, 0, 130, 85
 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Нестандартные параметры"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "По вертикали", -1, 5, 5, 70, 10
-    LTEXT "По горизонтали", -1, 5, 35, 70, 10
-    LTEXT "Число мин", -1, 5, 65, 70, 10
-    EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER
-    EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER
-    EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER
-    DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15
-    PUSHBUTTON "Отмена", IDCANCEL, 80, 50, 50, 15
+    LTEXT "Высота:", -1, 8, 22, 28, 10
+    LTEXT "Ширина:", -1, 8, 37, 29, 10
+    LTEXT "Число мин:", -1, 8, 52, 40, 10
+    EDITTEXT IDC_EDITROWS, 50, 20, 25, 12, ES_NUMBER
+    EDITTEXT IDC_EDITCOLS, 50, 35, 25, 12, ES_NUMBER
+    EDITTEXT IDC_EDITMINES, 50, 50, 25, 12, ES_NUMBER
+    DEFPUSHBUTTON "OK", IDOK, 84, 20, 40, 16
+    PUSHBUTTON "Отмена", IDCANCEL, 84, 46, 40, 16
 END

base/applications/mplay32/lang/bg-BG.rc

@@ -8,11 +8,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Файл"
     BEGIN
-        MENUITEM "&Отваряне...", IDM_OPEN_FILE
-        MENUITEM "&Затваряне", IDM_CLOSE_FILE
+        MENUITEM "&Отваряне...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Затваряне\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "Из&ход", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -25,6 +36,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Всички поддържани (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -37,6 +57,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Търсене напред"
     IDS_APPTITLE "Мултимедийният възпроизводител на РеактОС"
     IDS_PLAY "Възпроизвеждане"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/cs-CZ.rc

@@ -1,6 +1,6 @@
 /* FILE:       base/applications/mplay32/lang/cs-CZ.rc
  * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2009-08-03
+ * UPDATED:    2014-08-31
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -9,16 +9,27 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Soubor"
     BEGIN
-        MENUITEM "&Otevřít...", IDM_OPEN_FILE
-        MENUITEM "&Zavřít", IDM_CLOSE_FILE
+        MENUITEM "&Otevřít...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Zavřít\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Ukončit", IDM_EXIT
     END
-    POPUP "&Device"
+    POPUP "&Přehrát"
     BEGIN
-        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM "Přehrát/&Pozastavit\tCtrl+P", IDC_PLAY
+        MENUITEM "Za&stavit\tCtrl+S", IDC_STOP
         MENUITEM SEPARATOR
-        MENUITEM "&Volume Control", IDM_VOLUMECTL
+        MENUITEM "Opakova&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&Zobrazit"
+    BEGIN
+        MENUITEM "Reži&m s jedním oknem", IDM_SWITCHVIEW
+    END
+    POPUP "&Zařízení"
+    BEGIN
+        MENUITEM "&Vlastnosti", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "Ovládání &hlasitosti", IDM_VOLUMECTL
     END
     POPUP "&Nápověda"
     BEGIN
@@ -26,6 +37,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Všechny podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -38,6 +58,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Přeskočit vpřed"
     IDS_APPTITLE "ReactOS Přehrávač multimédií"
     IDS_PLAY "Přehrát"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
-    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
+    IDS_DEFAULTMCIERRMSG "Pro tuto chybu není dostupný žádný popis."
+    IDS_UNKNOWNFILEEXT "Nelze určit typ zařízení z dané přípony souboru."
 END

base/applications/mplay32/lang/de-DE.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Datei"
     BEGIN
-        MENUITEM "Ö&ffnen...", IDM_OPEN_FILE
-        MENUITEM "Sch&ließen", IDM_CLOSE_FILE
+        MENUITEM "Ö&ffnen...\tStrg+O", IDM_OPEN_FILE
+        MENUITEM "Sch&ließen\tStrg+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Beenden", IDM_EXIT
     END
+    POPUP "&Wiedergabe"
+    BEGIN
+        MENUITEM "Wiedergabe/&Pause\tStrg+P", IDC_PLAY
+        MENUITEM "St&opp\tStrg+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "W&iederholen\tStrg+T", IDM_REPEAT
+    END
+    POPUP "&Ansicht"
+    BEGIN
+        MENUITEM "Einzelfenster-&Modus", IDM_SWITCHVIEW
+    END
     POPUP "&Gerät"
     BEGIN
         MENUITEM "&Eigenschaften", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Alle unterstützten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Weiter"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Abspielen"
-    IDS_DEFAULTMCIERRMSG "Für diesen Fehler steht keine Beschreibung zur Verfügung"
+    IDS_DEFAULTMCIERRMSG "Für diesen Fehler steht keine Beschreibung zur Verfügung."
     IDS_UNKNOWNFILEEXT "Kann keinen Gerätetyp aus der angegebenen Dateinamenerweiterung ermitteln."
 END

base/applications/mplay32/lang/en-US.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Open...", IDM_OPEN_FILE
-        MENUITEM "&Close", IDM_CLOSE_FILE
+        MENUITEM "&Open...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Close\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Exit", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "All Supported (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Skip Forward"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/es-ES.rc

@@ -4,16 +4,27 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Archivo"
     BEGIN
-        MENUITEM "&Abrir...", IDM_OPEN_FILE
-        MENUITEM "&Cerrar", IDM_CLOSE_FILE
+        MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Cerrar\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Salir", IDM_EXIT
     END
-    POPUP "&Device"
+    POPUP "&Reproducir"
     BEGIN
-        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM "Reproducir/&Pausa\tCtrl+P", IDC_PLAY
+        MENUITEM "&Detener\tCtrl+S", IDC_STOP
         MENUITEM SEPARATOR
-        MENUITEM "&Volume Control", IDM_VOLUMECTL
+        MENUITEM "Repe&tir\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&Vista"
+    BEGIN
+        MENUITEM "&Modo Ventana Única", IDM_SWITCHVIEW
+    END
+    POPUP "&Dispositivo"
+    BEGIN
+        MENUITEM "&Propiedades", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "Control de &Volumen", IDM_VOLUMECTL
     END
     POPUP "Ay&uda"
     BEGIN
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Todos los ficheros soportados (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Marca siguiente"
     IDS_APPTITLE "Reproductor Multimedia de ReactOS"
     IDS_PLAY "Reproducir"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
-    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
+    IDS_DEFAULTMCIERRMSG "No hay una descripción disponible para este error."
+    IDS_UNKNOWNFILEEXT "No se puede determinar el tipo de dispositivo a partir de la extensión del fichero."
 END

base/applications/mplay32/lang/fr-FR.rc

@@ -4,16 +4,27 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Fichier"
     BEGIN
-        MENUITEM "&Ouvrir...", IDM_OPEN_FILE
-        MENUITEM "&Fermer", IDM_CLOSE_FILE
+        MENUITEM "&Ouvrir...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Fermer\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
-    POPUP "&Device"
+    POPUP "&Lecture"
     BEGIN
-        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM "Lecture/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
         MENUITEM SEPARATOR
-        MENUITEM "&Volume Control", IDM_VOLUMECTL
+        MENUITEM "Répé&ter\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
+    POPUP "Périp&hérique"
+    BEGIN
+        MENUITEM "&Propriétés", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "Contrôle du &volume", IDM_VOLUMECTL
     END
     POPUP "&Aide"
     BEGIN
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Tous les types supportés (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Suivant"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Lire"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/he-IL.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&קובץ"
     BEGIN
-        MENUITEM "&פתח...", IDM_OPEN_FILE
-        MENUITEM "&סגור", IDM_CLOSE_FILE
+        MENUITEM "&פתח...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&סגור\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&יציאה", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "כל הקבצים הנתמכים (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "דלג קדימה"
     IDS_APPTITLE "נגן המולטימדיה של ReactOS"
     IDS_PLAY "נגן"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/it-IT.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Apri...", IDM_OPEN_FILE
-        MENUITEM "&Chiudi", IDM_CLOSE_FILE
+        MENUITEM "&Apri...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Chiudi\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Esci", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Tutti i tipi supportati (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Successivo"
     IDS_APPTITLE "Riproduttore multimediale ReactOS"
     IDS_PLAY "Riproduci"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/ja-JP.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "ファイル(&F)"
     BEGIN
-        MENUITEM "開く(&O)...", IDM_OPEN_FILE
-        MENUITEM "閉じる(&C)", IDM_CLOSE_FILE
+        MENUITEM "開く(&O)...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "閉じる(&C)\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "終了(&E)", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "すべてのサポートされたファイル (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "前へスキップ"
     IDS_APPTITLE "ReactOS マルチメディア プレーヤー"
     IDS_PLAY "再生"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/nl-NL.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Bestand"
     BEGIN
-        MENUITEM "&Openen...", IDM_OPEN_FILE
-        MENUITEM "&Sluiten", IDM_CLOSE_FILE
+        MENUITEM "&Openen...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Sluiten\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Afsluiten", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Mediabestanden (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Volgende"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/no-NO.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Fil"
     BEGIN
-        MENUITEM "&Åpne...", IDM_OPEN_FILE
-        MENUITEM "&Lukk", IDM_CLOSE_FILE
+        MENUITEM "&Åpne...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Lukk\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Avslutt", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Alle kompaktible filer  (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -33,6 +53,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Spole fremover"
     IDS_APPTITLE "ReactOS Multimedia avspiller"
     IDS_PLAY "Spill"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/pl-PL.rc

@@ -10,25 +10,45 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
-    POPUP "&Plik"
+    POPUP "Pli&k"
     BEGIN
-        MENUITEM "&Otwórz...", IDM_OPEN_FILE
-        MENUITEM "&Zamknij", IDM_CLOSE_FILE
+        MENUITEM "&Otwórz...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Zamknij\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
-        MENUITEM "&Wyjdź", IDM_EXIT
+        MENUITEM "Za&kończ", IDM_EXIT
+    END
+    POPUP "&Graj"
+    BEGIN
+        MENUITEM "Play/&Pauza\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Pow&tarzaj\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&Widok"
+    BEGIN
+        MENUITEM "Tryb po&jedynczego okna", IDM_SWITCHVIEW
     END
     POPUP "&Urządzenie"
     BEGIN
-        MENUITEM "&Właściwości", IDM_DEVPROPS
+        MENUITEM "Właś&ciwości", IDM_DEVPROPS
         MENUITEM SEPARATOR
         MENUITEM "&Regulacja głośności", IDM_VOLUMECTL
     END
-    POPUP "&Pomoc"
+    POPUP "Pomo&c"
     BEGIN
         MENUITEM "&O programie...", IDM_ABOUT
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Wszystkie formaty (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -41,6 +61,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Przeskocz do przodu"
     IDS_APPTITLE "Odtwarzacz multimedialny ReactOS"
     IDS_PLAY "Odtwórz"
-    IDS_DEFAULTMCIERRMSG "Brak dostępnego opisu dla tego błędu"
+    IDS_DEFAULTMCIERRMSG "Brak dostępnego opisu dla tego błędu."
     IDS_UNKNOWNFILEEXT "Nie można określić typu urządzenia z podanego rozszerzenia pliku."
 END

base/applications/mplay32/lang/pt-BR.rc

@@ -6,11 +6,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Arquivo"
     BEGIN
-        MENUITEM "&Abrir...", IDM_OPEN_FILE
-        MENUITEM "&Fechar", IDM_CLOSE_FILE
+        MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Fechar\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Sair", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -23,6 +34,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Todos os formatos (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -35,6 +55,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Pular Próxima"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Executar"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/ro-RO.rc

@@ -10,11 +10,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Fișier"
     BEGIN
-        MENUITEM "&Deschidere…", IDM_OPEN_FILE
-        MENUITEM "Î&nchide", IDM_CLOSE_FILE
+        MENUITEM "&Deschidere…\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "Î&nchide\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Dispozitiv"
     BEGIN
         MENUITEM "&Proprietăți…", IDM_DEVPROPS
@@ -27,6 +38,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Toate admisibile (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -39,6 +59,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Salt la următor"
     IDS_APPTITLE "Lector multimedia"
     IDS_PLAY "Lecturare"
-    IDS_DEFAULTMCIERRMSG "Nu există descriere pentru această eroare"
+    IDS_DEFAULTMCIERRMSG "Nu există descriere pentru această eroare."
     IDS_UNKNOWNFILEEXT "Nu se poate determina tipul dispozitivului din extensia fișierului."
 END

base/applications/mplay32/lang/ru-RU.rc

@@ -4,11 +4,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Файл"
     BEGIN
-        MENUITEM "&Открыть...", IDM_OPEN_FILE
-        MENUITEM "&Закрыть", IDM_CLOSE_FILE
+        MENUITEM "&Открыть...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Закрыть\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Выход", IDM_EXIT
     END
+    POPUP "&Воспроизведение"
+    BEGIN
+        MENUITEM "Воспроизведение/&Пауза\tCtrl+P", IDC_PLAY
+        MENUITEM "&Остановить\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "&Повтор\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&Отображение"
+    BEGIN
+        MENUITEM "Одно-оконный &режим", IDM_SWITCHVIEW
+    END
     POPUP "&Устройство"
     BEGIN
         MENUITEM "&Свойства", IDM_DEVPROPS
@@ -21,6 +32,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Все поддерживаемые (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"

base/applications/mplay32/lang/sk-SK.rc

@@ -9,11 +9,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Súbor"
     BEGIN
-        MENUITEM "&Otvoriť...", IDM_OPEN_FILE
-        MENUITEM "&Zavrieť", IDM_CLOSE_FILE
+        MENUITEM "&Otvoriť...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Zavrieť\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "S&končiť", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -26,6 +37,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Všetky podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -38,6 +58,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Preskočiť dopredu"
     IDS_APPTITLE "Multimediálny prehrávač systému ReactOS"
     IDS_PLAY "Prehrať"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/sq-AL.rc

@@ -8,11 +8,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Skeda"
     BEGIN
-        MENUITEM "&Hape...", IDM_OPEN_FILE
-        MENUITEM "&Mbylle", IDM_CLOSE_FILE
+        MENUITEM "&Hape...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Mbylle\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Dil", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -25,6 +36,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Të gjith suportimet (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -37,6 +57,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Kalo para"
     IDS_APPTITLE "Programi muzikor i ReactOS"
     IDS_PLAY "Fillo"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/sv-SE.rc

@@ -11,11 +11,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Arkiv"
     BEGIN
-        MENUITEM "&Öppna...", IDM_OPEN_FILE
-        MENUITEM "&Stäng", IDM_CLOSE_FILE
+        MENUITEM "&Öppna...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Stäng\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -28,6 +39,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Alla kompaktibla filer  (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -40,6 +60,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Spola fremåt"
     IDS_APPTITLE "ReactOS Multimediaspelare"
     IDS_PLAY "Play"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/tr-TR.rc

@@ -6,11 +6,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Kütük"
     BEGIN
-        MENUITEM "&Aç...", IDM_OPEN_FILE
-        MENUITEM "&Kapat", IDM_CLOSE_FILE
+        MENUITEM "&Aç...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Kapat\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış", IDM_EXIT
     END
+    POPUP "&Oynat"
+    BEGIN
+        MENUITEM "&Oynat ya da Duraklat\tCtrl+P", IDC_PLAY
+        MENUITEM "&Durdur\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "&Yinele\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&Görünüm"
+    BEGIN
+        MENUITEM "&Ayrı Pencere Kipi", IDM_SWITCHVIEW
+    END
     POPUP "&Aygıt"
     BEGIN
         MENUITEM "&Husûsiyetler", IDM_DEVPROPS
@@ -23,12 +34,21 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Desteklenen Kütükler (*.wav, *.cda, *.mid, *.midi, *.avi)\0*.wav;*.cda;*.mid;*.midi;*.avi\0"
     IDS_TOOLTIP_PLAY "Çal"
     IDS_TOOLTIP_STOP "Durdur"
-    IDS_TOOLTIP_EJECT "Çıkar"
+    IDS_TOOLTIP_EJECT "Çıkart"
     IDS_TOOLTIP_BACKWARD "Bir Öncekine Geç"
     IDS_TOOLTIP_SEEKBACK "Geri Sar"
     IDS_TOOLTIP_SEEKFORW "İleri Sar"

base/applications/mplay32/lang/uk-UA.rc

@@ -12,11 +12,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Файл"
     BEGIN
-        MENUITEM "&Відкрити...", IDM_OPEN_FILE
-        MENUITEM "&Закрити", IDM_CLOSE_FILE
+        MENUITEM "&Відкрити...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "&Закрити\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Вихід", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -29,6 +40,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "Всі підтримувані (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -41,6 +61,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "Вперед"
     IDS_APPTITLE "Програвач ReactOS"
     IDS_PLAY "Відтворити"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/zh-CN.rc

@@ -6,11 +6,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "文件(&F)"
     BEGIN
-        MENUITEM "打开... (&O)", IDM_OPEN_FILE
-        MENUITEM "关闭(&C)", IDM_CLOSE_FILE
+        MENUITEM "打开... (&O)\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "关闭(&C)\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "退出(&E)", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -23,6 +34,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "所有支持的格式 (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -35,6 +55,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "向前跳过"
     IDS_APPTITLE "ReactOS 多媒体播放器"
     IDS_PLAY "播放"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/lang/zh-TW.rc

@@ -12,11 +12,22 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "檔案(&F)"
     BEGIN
-        MENUITEM "開啟(&O)...", IDM_OPEN_FILE
-        MENUITEM "關閉(&C)", IDM_CLOSE_FILE
+        MENUITEM "開啟(&O)...\tCtrl+O", IDM_OPEN_FILE
+        MENUITEM "關閉(&C)\tCtrl+W", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "結束(&E)", IDM_EXIT
     END
+    POPUP "&Play"
+    BEGIN
+        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
+        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+    END
     POPUP "&Device"
     BEGIN
         MENUITEM "&Properties", IDM_DEVPROPS
@@ -29,6 +40,15 @@ BEGIN
     END
 END
 
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^O", IDM_OPEN_FILE
+    "^W", IDM_CLOSE_FILE
+    "^P", IDC_PLAY
+    "^S", IDC_STOP
+    "^T", IDM_REPEAT
+END
+
 STRINGTABLE
 BEGIN
     IDS_ALL_TYPES_FILTER "所有支援格式 (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
@@ -41,6 +61,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "快轉"
     IDS_APPTITLE "ReactOS 多媒體播放器"
     IDS_PLAY "播放"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error."
     IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
 END

base/applications/mplay32/mplay32.c

@@ -18,7 +18,10 @@ TCHAR szPrevFile[MAX_PATH] = _T("\0");
 WORD wDeviceId;
 BOOL bIsOpened = FALSE;
 BOOL bIsPaused = FALSE;
+BOOL bRepeat = FALSE;
+BOOL bIsSingleWindow = FALSE;
 UINT MaxFilePos = 0;
+RECT PrevWindowPos;
 
 
 /* ToolBar Buttons */
@@ -34,9 +37,11 @@ static const TBBUTTON Buttons[] =
     {TBICON_FORWARD,   IDC_FORWARD,  TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}
 };
 
-void EnableMenuItems(void)
+void EnableMenuItems(HWND hwnd)
 {
     MCI_GENERIC_PARMS mciGeneric;
+    MCI_DGV_RECT_PARMS mciVideoRect;
+    MCI_DGV_WINDOW_PARMSW mciVideoWindow; 
     DWORD dwError;
 
     EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED);
@@ -46,12 +51,56 @@ void EnableMenuItems(void)
     {
         EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED);
     }
+
+    mciVideoWindow.hWnd = hwnd;
+
+    dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); 
+    if (!dwError)
+    {
+        dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect);
+        if (!dwError)
+        {
+            EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED);
+        }
+    }
 }
 
 void DisableMenuItems(void)
 {
     EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_GRAYED);
     EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_GRAYED);
+}
+
+void ResizeClientArea(HWND hwnd, int nWidth, int nHeight)
+{
+    RECT rcClientRect;
+    RECT rcWindowRect;
+    POINT ptDifference;
+
+    GetClientRect(hwnd, &rcClientRect);
+    GetWindowRect(hwnd, &rcWindowRect);
+    ptDifference.x = (rcWindowRect.right - rcWindowRect.left) - rcClientRect.right;
+    ptDifference.y = (rcWindowRect.bottom - rcWindowRect.top) - rcClientRect.bottom;
+    MoveWindow(hwnd, rcWindowRect.left, rcWindowRect.top, nWidth + ptDifference.x, nHeight + ptDifference.y, TRUE);
+}
+
+static VOID
+ShowLastWin32Error(HWND hwnd)
+{
+    LPTSTR lpMessageBuffer;
+    DWORD dwError = GetLastError();
+
+    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                      NULL,
+                      dwError,
+                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                      (LPTSTR)&lpMessageBuffer,
+                      0, NULL) != 0)
+    {
+        MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR);
+        if (lpMessageBuffer) LocalFree(lpMessageBuffer);
+    }
 }
 
 static VOID
@@ -60,10 +109,9 @@ SetImageList(HWND hwnd)
     HIMAGELIST hImageList;
 
     hImageList = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR24, 1, 1);
-
     if (!hImageList)
     {
-        MessageBox(hwnd, _T("ImageList it is not created!"), NULL, MB_OK);
+        ShowLastWin32Error(hwnd);
         return;
     }
 
@@ -106,7 +154,7 @@ ShowMCIError(HWND hwnd, DWORD dwError)
 {
     TCHAR szErrorMessage[256];
     TCHAR szTempMessage[300];
-    
+
     if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)) == FALSE)
     {
         LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR));
@@ -138,7 +186,7 @@ InitControls(HWND hwnd)
                                NULL);
     if (!hTrackBar)
     {
-        MessageBox(hwnd, _T("TrackBar it is not created!"), NULL, MB_OK);
+        ShowLastWin32Error(hwnd);
         return;
     }
 
@@ -158,7 +206,7 @@ InitControls(HWND hwnd)
                               NULL);
     if (!hToolBar)
     {
-        MessageBox(hwnd, _T("ToolBar it is not created!"), NULL, MB_OK);
+        ShowLastWin32Error(hwnd);
         return;
     }
 
@@ -194,13 +242,84 @@ IsSupportedFileExtension(LPTSTR lpFileName, LPTSTR lpDeviceName, LPDWORD dwSize)
 
             return TRUE;
         }
-        
+
         RegCloseKey(hKey);
     }
 
     return FALSE;
 }
 
+static VOID
+SwitchViewMode(HWND hwnd)
+{
+    MCIERROR mciError;
+    MCI_DGV_RECT_PARMS mciVideoRect;
+    MCI_DGV_WINDOW_PARMSW mciVideoWindow; 
+    RECT rcToolbarRect;
+    RECT rcTempRect;
+
+    mciVideoWindow.hWnd = hwnd;
+
+    mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); 
+    if (mciError)
+    {
+        return;
+    }
+
+    mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect);
+    if (mciError)
+    {
+        return;
+    }
+
+    if (!bIsSingleWindow)
+    {
+        GetWindowRect(hwnd, &PrevWindowPos);
+
+        SetParent(hTrackBar, hToolBar);
+
+        mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&mciVideoRect);
+        if (mciError)
+        {
+            ShowMCIError(hwnd, mciError);
+            return;
+        }
+
+        GetWindowRect(hToolBar, &rcToolbarRect);         
+        ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top));
+
+        mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); 
+        if (mciError)
+        {
+            ShowMCIError(hwnd, mciError);
+            return;
+        }
+
+        GetWindowRect(hToolBar, &rcTempRect);
+        MoveWindow(hTrackBar, 180, 0, rcTempRect.right - rcTempRect.left - 180, 25, TRUE);
+
+        CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_CHECKED);
+        bIsSingleWindow = TRUE;
+    }
+    else
+    {
+        bIsSingleWindow = FALSE;
+        CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_UNCHECKED);
+
+        mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT;
+        mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow);
+        if (mciError)
+        {
+            ShowMCIError(hwnd, mciError);
+            return;
+        }
+
+        SetParent(hTrackBar, hwnd);
+
+        MoveWindow(hwnd, PrevWindowPos.left, PrevWindowPos.top, PrevWindowPos.right - PrevWindowPos.left, PrevWindowPos.bottom - PrevWindowPos.top, TRUE);
+    }
+}
+
 static DWORD
 CloseMciDevice(VOID)
 {
@@ -283,7 +402,7 @@ OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName)
     bIsOpened = TRUE;
     _tcscpy(szPrevFile, lpFileName);
 
-    EnableMenuItems();
+    EnableMenuItems(hwnd);
 
     return 0;
 }
@@ -295,6 +414,12 @@ StopPlayback(HWND hwnd)
     {
         SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1);
         KillTimer(hwnd, IDT_PLAYTIMER);
+
+        if (bIsSingleWindow)
+        {
+            SwitchViewMode(hwnd);
+        }
+
         CloseMciDevice();
     }
 }
@@ -421,6 +546,7 @@ VOID CALLBACK
 PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
 {
     MCI_STATUS_PARMS mciStatus;
+    MCI_PLAY_PARMS mciPlay;
     DWORD dwPos;
 
     if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER);
@@ -431,7 +557,16 @@ PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
 
     if((UINT)dwPos >= MaxFilePos)
     {
-        StopPlayback(hwnd);
+        if (!bRepeat)
+        {
+            StopPlayback(hwnd);
+        }
+        else
+        {
+            mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
+            mciPlay.dwCallback = (DWORD_PTR)hwnd;
+            mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay);
+        }
     }
     else
     {
@@ -477,6 +612,11 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
         return;
     }
 
+    if (bIsOpened)
+    {
+        StopPlayback(hwnd);
+    }
+
     mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName);
     if (mciError != 0)
     {
@@ -537,15 +677,17 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
     switch (Message)
     {
         case WM_CREATE:
+        {
             InitControls(hwnd);
             hMainMenu = GetMenu(hwnd);
             break;
+        }
 
         case WM_DROPFILES:
         {
             HDROP drophandle;
             TCHAR droppedfile[MAX_PATH];
-            
+
             drophandle = (HDROP)wParam;
             DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(TCHAR));
             DragFinish(drophandle);
@@ -568,25 +710,25 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                     {
                         case IDC_PLAY:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PLAY);
-                        break;
+                            break;
                         case IDC_STOP:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_STOP);
-                        break;
+                            break;
                         case IDC_EJECT:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EJECT);
-                        break;
+                            break;
                         case IDC_BACKWARD:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_BACKWARD);
-                        break;
+                            break;
                         case IDC_SEEKBACK:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKBACK);
-                        break;
+                            break;
                         case IDC_SEEKFORW:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKFORW);
-                        break;
+                            break;
                         case IDC_FORWARD:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_FORWARD);
-                        break;
+                            break;
                     }
                     break;
                 }
@@ -598,12 +740,14 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
         {
             LPRECT pRect = (LPRECT)lParam;
 
-            if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH)
-                pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH;
-
-            if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT)
-                pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT;
+            if (!bIsSingleWindow)
+            {
+                if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH)
+                    pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH;
 
+                if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT)
+                    pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT;
+            }
             return TRUE;
         }
 
@@ -611,14 +755,33 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
         {
             RECT Rect;
             UINT Size;
+            RECT ToolbarRect;
+            MCI_DGV_PUT_PARMS mciPut;
 
             if (hToolBar && hTrackBar)
             {
                 SendMessage(hToolBar, TB_AUTOSIZE, 0, 0);
                 SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&Rect);
 
-                Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
-                MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE);
+                if (!bIsSingleWindow)
+                {
+                    Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
+                    MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE);
+                }
+                else
+                {
+                    MoveWindow(hTrackBar, 180, 0, LOWORD(lParam) - 180, 25, TRUE);
+
+                    GetClientRect(hwnd, &Rect);
+                    GetClientRect(hToolBar, &ToolbarRect);
+
+                    mciPut.rc.top = 0;
+                    mciPut.rc.left = 0;
+                    mciPut.rc.right = Rect.right;
+                    mciPut.rc.bottom = Rect.bottom - (ToolbarRect.bottom - ToolbarRect.top) - 2;
+
+                    mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD)&mciPut);
+                }
             }
             return 0L;
         }
@@ -640,10 +803,21 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
         }
         break;
 
+        case WM_NCLBUTTONDBLCLK:
+        {
+            if (wParam == HTCAPTION)
+            {
+                SwitchViewMode(hwnd);
+            }
+        }
+        break;
+
         case WM_COMMAND:
+        {
             switch (LOWORD(wParam))
             {
                 case IDC_PLAY:
+                {
                     if (bIsOpened)
                     {
                         if (bIsPaused)
@@ -659,6 +833,7 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                             PlayFile(hwnd, NULL);
                     }
                     break;
+                }
 
                 case IDC_STOP:
                     StopPlayback(hwnd);
@@ -690,26 +865,47 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                     _tcscpy(szPrevFile, _T("\0"));
                     break;
 
+                case IDM_REPEAT:
+                {
+                    if (!bRepeat)
+                    {
+                        CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_CHECKED);
+                        bRepeat = TRUE;
+                    }
+                    else
+                    {
+                        CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_UNCHECKED);
+                        bRepeat = FALSE;
+                    }
+                    break;
+                }
+
+                case IDM_SWITCHVIEW:
+                    SwitchViewMode(hwnd);
+                    break;
+
                 case IDM_DEVPROPS:
                     ShowDeviceProperties(hwnd);
                     break;
-                
+
                 case IDM_VOLUMECTL:
                     ShellExecute(hwnd, NULL, _T("SNDVOL32.EXE"), NULL, NULL, SW_SHOWNORMAL);
                     break;
 
                 case IDM_ABOUT:
-        {
+                {
                     HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
                     ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
-            DeleteObject(mplayIcon);
+                    DeleteObject(mplayIcon);
                     break;
-        }
+                }
+
                 case IDM_EXIT:
                     PostMessage(hwnd, WM_CLOSE, 0, 0);
                     return 0;
             }
             break;
+        }
 
         case WM_DESTROY:
             StopPlayback(hwnd);
@@ -728,6 +924,7 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
     HWND hwnd;
     MSG msg;
     DWORD dwError;
+    HANDLE hAccel;
 
     hInstance = hInst;
 
@@ -743,7 +940,11 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
     WndClass.hbrBackground     = (HBRUSH)(COLOR_BTNFACE + 1);
     WndClass.lpszMenuName      = MAKEINTRESOURCE(IDR_MAINMENU);
 
-    RegisterClassEx(&WndClass);
+    if (!RegisterClassEx(&WndClass))
+    {
+        ShowLastWin32Error(NULL);
+        return 0;
+    }
 
     hwnd = CreateWindow(szClassName,
                         szAppTitle,
@@ -756,6 +957,13 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
                         NULL,
                         hInstance,
                         NULL);
+    if (!hwnd)
+    {
+        ShowLastWin32Error(NULL);
+        return 0;
+    }
+
+    hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS));
 
     DragAcceptFiles(hwnd, TRUE);
 
@@ -776,9 +984,14 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
     /* Message Loop */
     while (GetMessage(&msg, NULL, 0, 0))
     {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        if (!TranslateAccelerator(hwnd, hAccel, &msg))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
     }
 
-    return 0;
+    DestroyAcceleratorTable(hAccel);
+
+    return (INT)msg.wParam;
 }

base/applications/mplay32/resource.h

@@ -30,6 +30,9 @@
 /* Menu */
 #define IDR_MAINMENU 500
 
+/* Accelerators */
+#define ID_ACCELERATORS 800
+
 /* Menu items */
 #define IDM_OPEN_FILE  1000
 #define IDM_CLOSE_FILE 1001
@@ -37,6 +40,8 @@
 #define IDM_ABOUT      1003
 #define IDM_VOLUMECTL  1004
 #define IDM_DEVPROPS   1005
+#define IDM_REPEAT     1006
+#define IDM_SWITCHVIEW 1007
 
 /* ToolBar Icons */
 #define TBICON_PLAY     0

base/applications/mscutils/eventvwr/eventvwr.c

@@ -33,6 +33,7 @@
 #include <winreg.h>
 #include <commctrl.h>
 #include <commdlg.h>
+#include <strsafe.h>
 
 #include "resource.h"
 
@@ -41,12 +42,10 @@
     #define _CRT_SECURE_NO_DEPRECATE /* all deprecated unsafe string functions */
 #endif
 
-static const LPWSTR EVENT_SOURCE_APPLICATION = L"Application";
-static const LPWSTR EVENT_SOURCE_SECURITY    = L"Security";
-static const LPWSTR EVENT_SOURCE_SYSTEM      = L"System";
 static const WCHAR szWindowClass[]           = L"EVENTVWR"; /* the main window class name*/
+static const WCHAR EVENTLOG_BASE_KEY[]       = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\";
 
-//MessageFile message buffer size
+// MessageFile message buffer size
 #define EVENT_MESSAGE_EVENTTEXT_BUFFER  1024*10
 #define EVENT_MESSAGE_FILE_BUFFER       1024*10
 #define EVENT_DLL_SEPARATOR             L";"
@@ -73,6 +72,9 @@ OPENFILENAMEW sfn;
 LPWSTR lpSourceLogName = NULL;
 LPWSTR lpComputerName  = NULL;
 
+DWORD dwNumLogs = 0;
+WCHAR **LogNames;
+
 /* Forward declarations of functions included in this code module: */
 ATOM MyRegisterClass(HINSTANCE hInstance);
 BOOL InitInstance(HINSTANCE, int);
@@ -201,7 +203,7 @@ BOOL
 GetEventMessageFileDLL(IN LPCWSTR lpLogName,
                        IN LPCWSTR SourceName,
                        IN LPCWSTR EntryName,
-                       OUT LPWSTR ExpandedName)
+                       OUT PWCHAR ExpandedName)
 {
     DWORD dwSize;
     BYTE szModuleName[MAX_PATH];
@@ -210,8 +212,8 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName,
     HKEY hSourceKey = NULL;
     BOOL bReturn = FALSE;
 
-    wcscpy(szKeyName, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\");
-    wcscat(szKeyName, lpLogName);
+    StringCbCopyW(szKeyName, sizeof(szKeyName), L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\");
+    StringCbCatW(szKeyName, sizeof(szKeyName), lpLogName);
 
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                      szKeyName,
@@ -260,7 +262,7 @@ BOOL
 GetEventCategory(IN LPCWSTR KeyName,
                  IN LPCWSTR SourceName,
                  IN EVENTLOGRECORD *pevlr,
-                 OUT LPWSTR CategoryName)
+                 OUT PWCHAR CategoryName)
 {
     HANDLE hLibrary = NULL;
     WCHAR szMessageDLL[MAX_PATH];
@@ -286,7 +288,7 @@ GetEventCategory(IN LPCWSTR KeyName,
                 TrimNulls(lpMsgBuf);
 
                 /* Copy the category name */
-                wcscpy(CategoryName, lpMsgBuf);
+                StringCchCopyW(CategoryName, MAX_PATH, lpMsgBuf);
             }
             else
             {
@@ -314,7 +316,7 @@ BOOL
 GetEventMessage(IN LPCWSTR KeyName,
                 IN LPCWSTR SourceName,
                 IN EVENTLOGRECORD *pevlr,
-                OUT LPWSTR EventText)
+                OUT PWCHAR EventText)
 {
     DWORD i;
     HANDLE hLibrary = NULL;
@@ -393,7 +395,7 @@ GetEventMessage(IN LPCWSTR KeyName,
                         TrimNulls((LPWSTR)lpMsgBuf);
 
                         /* Copy the event text */
-                        wcscpy(EventText ,lpMsgBuf);
+                        StringCchCopyW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, lpMsgBuf);
                     }
                 }
 
@@ -404,7 +406,7 @@ GetEventMessage(IN LPCWSTR KeyName,
         if (!bDone)
         {
             LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING);
-            swprintf(EventText, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName);
+            StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName);
         }
 
         free(szArguments);
@@ -414,7 +416,7 @@ GetEventMessage(IN LPCWSTR KeyName,
     }
 
     LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING);
-    swprintf(EventText, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName);
+    StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName);
 
     return FALSE;
 }
@@ -422,7 +424,7 @@ GetEventMessage(IN LPCWSTR KeyName,
 
 VOID
 GetEventType(IN WORD dwEventType,
-             OUT LPWSTR eventTypeText)
+             OUT PWCHAR eventTypeText)
 {
     switch (dwEventType)
     {
@@ -452,7 +454,7 @@ GetEventType(IN WORD dwEventType,
 
 BOOL
 GetEventUserName(EVENTLOGRECORD *pelr,
-                 OUT LPWSTR pszUser)
+                 OUT PWCHAR pszUser)
 {
     PSID lpSid;
     WCHAR szName[1024];
@@ -475,7 +477,7 @@ GetEventUserName(EVENTLOGRECORD *pelr,
                              &cbDomain,
                              &peUse))
         {
-            wcscpy(pszUser, szName);
+            StringCchCopyW(pszUser, MAX_PATH, szName);
             return TRUE;
         }
     }
@@ -522,23 +524,24 @@ QueryEventMessages(LPWSTR lpMachineName,
     HANDLE hEventLog;
     EVENTLOGRECORD *pevlr;
     DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength;
+    size_t cchRemaining;
     LPWSTR lpSourceName;
     LPWSTR lpComputerName;
     LPSTR lpData;
     BOOL bResult = TRUE; /* Read succeeded. */
-    int i;
 
     WCHAR szWindowTitle[MAX_PATH];
     WCHAR szStatusText[MAX_PATH];
     WCHAR szLocalDate[MAX_PATH];
     WCHAR szLocalTime[MAX_PATH];
     WCHAR szEventID[MAX_PATH];
-    WCHAR szEventTypeText[MAX_PATH];
+    WCHAR szEventTypeText[MAX_LOADSTRING];
     WCHAR szCategoryID[MAX_PATH];
     WCHAR szUsername[MAX_PATH];
     WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER];
     WCHAR szCategory[MAX_PATH];
     WCHAR szData[MAX_PATH];
+    PWCHAR lpTitleTemplateEnd;
 
     SYSTEMTIME time;
     LVITEMW lviEventItem;
@@ -648,8 +651,8 @@ QueryEventMessages(LPWSTR lpMachineName,
             GetEventType(pevlr->EventType, szEventTypeText);
             GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory);
 
-            swprintf(szEventID, L"%u", (pevlr->EventID & 0xFFFF));
-            swprintf(szCategoryID, L"%u", pevlr->EventCategory);
+            StringCbPrintfW(szEventID, sizeof(szEventID), L"%u", (pevlr->EventID & 0xFFFF));
+            StringCbPrintfW(szCategoryID, sizeof(szCategoryID), L"%u", pevlr->EventCategory);
 
             lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM;
             lviEventItem.iItem = 0;
@@ -712,16 +715,20 @@ QueryEventMessages(LPWSTR lpMachineName,
     // All events loaded
     EndDialog(hwndDlg, 0);
 
-
-    i = swprintf(szWindowTitle, szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */
+    StringCchPrintfExW(szWindowTitle,
+                       sizeof(szWindowTitle) / sizeof(WCHAR),
+                       &lpTitleTemplateEnd,
+                       &cchRemaining,
+                       0,
+                       szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */
     /* lpComputerName can be NULL here if no records was read */
-    dwMaxLength = sizeof(szWindowTitle) / sizeof(WCHAR) - i;
-    if(!lpComputerName)
-        GetComputerNameW(szWindowTitle+i, &dwMaxLength);
+    dwMaxLength = cchRemaining;
+    if (!lpComputerName)
+        GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength);
     else
-        _snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName);
+        StringCchCopyW(lpTitleTemplateEnd, dwMaxLength, lpComputerName);
 
-    swprintf(szStatusText, szStatusBarTemplate, lpLogName, dwTotalRecords);
+    StringCbPrintfW(szStatusText, sizeof(szStatusText), szStatusBarTemplate, lpLogName, dwTotalRecords);
 
     // Update the status bar
     SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText);
@@ -838,19 +845,6 @@ Refresh(VOID)
 }
 
 
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    This function and its usage are only necessary if you want this code
-//    to be compatible with Win32 systems prior to the 'RegisterClassEx'
-//    function that was added to Windows 95. It is important to call this function
-//    so that the application will get 'well formed' small icons associated
-//    with it.
-//
 ATOM
 MyRegisterClass(HINSTANCE hInstance)
 {
@@ -874,16 +868,190 @@ MyRegisterClass(HINSTANCE hInstance)
 }
 
 
-//
-//   FUNCTION: InitInstance(HINSTANCE, int)
-//
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
-//
+VOID
+GetDisplayNameFile(IN LPCWSTR lpLogName,
+                   OUT PWCHAR lpModuleName)
+{
+    HKEY hKey;
+    WCHAR *KeyPath;
+    WCHAR szModuleName[MAX_PATH];
+    DWORD cbData;
+    DWORD cbKeyPath;
+
+    cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR);
+    KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath);
+    if (!KeyPath)
+    {
+        return;
+    }
+
+    StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY);
+    StringCbCatW(KeyPath, cbKeyPath, lpLogName);
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        HeapFree(GetProcessHeap(), 0, KeyPath);
+        return;
+    }
+
+    cbData = sizeof(szModuleName);
+    if (RegQueryValueExW(hKey, L"DisplayNameFile", NULL, NULL, (LPBYTE)szModuleName, &cbData) == ERROR_SUCCESS)
+    {
+        ExpandEnvironmentStringsW(szModuleName, lpModuleName, MAX_PATH);
+    }
+
+    RegCloseKey(hKey);
+    HeapFree(GetProcessHeap(), 0, KeyPath);
+}
+
+
+DWORD
+GetDisplayNameID(IN LPCWSTR lpLogName)
+{
+    HKEY hKey;
+    WCHAR *KeyPath;
+    DWORD dwMessageID = 0;
+    DWORD cbData;
+    DWORD cbKeyPath;
+
+    cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR);
+    KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath);
+    if (!KeyPath)
+    {
+        return 0;
+    }
+
+    StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY);
+    StringCbCatW(KeyPath, cbKeyPath, lpLogName);
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        HeapFree(GetProcessHeap(), 0, KeyPath);
+        return 0;
+    }
+
+    cbData = sizeof(dwMessageID);
+    RegQueryValueExW(hKey, L"DisplayNameID", NULL, NULL, (LPBYTE)&dwMessageID, &cbData);
+
+    RegCloseKey(hKey);
+    HeapFree(GetProcessHeap(), 0, KeyPath);
+
+    return dwMessageID;
+}
+
+
+VOID
+BuildLogList(void)
+{
+    HKEY hKey;
+    DWORD lpcName;
+    DWORD dwIndex;
+    DWORD dwMessageID;
+    DWORD dwMaxKeyLength;
+    WCHAR szModuleName[MAX_PATH];
+    LPWSTR lpDisplayName;
+    HANDLE hLibrary = NULL;
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        return;
+    }
+
+    if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwNumLogs, &dwMaxKeyLength, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+
+    if (!dwNumLogs)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+
+    LogNames = HeapAlloc(GetProcessHeap(), 0, (dwNumLogs + 1) * sizeof(WCHAR*));
+
+    if (!LogNames)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+
+    for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++)
+    {
+        LogNames[dwIndex] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((dwMaxKeyLength + 1) * sizeof(WCHAR)));
+
+        if (LogNames[dwIndex] != NULL)
+        {
+            lpcName = dwMaxKeyLength + 1;
+
+            if (RegEnumKeyExW(hKey, dwIndex, LogNames[dwIndex], &lpcName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
+            {
+                lpDisplayName = NULL;
+
+                ZeroMemory(szModuleName, sizeof(szModuleName));
+                GetDisplayNameFile(LogNames[dwIndex], szModuleName);
+                dwMessageID = GetDisplayNameID(LogNames[dwIndex]);
+
+                hLibrary = LoadLibraryExW(szModuleName, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
+                if (hLibrary != NULL)
+                {
+                    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, hLibrary, dwMessageID, 0, (LPWSTR)&lpDisplayName, 0, NULL);
+                    FreeLibrary(hLibrary);
+                }
+
+                if (lpDisplayName)
+                {
+                    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName);
+                }
+                else
+                {
+                    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]);
+                }
+
+                LocalFree(lpDisplayName);
+            }
+        }
+    }
+
+    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
+
+    RegCloseKey(hKey);
+
+    return;
+}
+
+
+VOID
+FreeLogList(void)
+{
+    DWORD dwIndex;
+
+    if (!LogNames)
+    {
+        return;
+    }
+
+    for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++)
+    {
+        if (LogNames[dwIndex])
+        {
+            HeapFree(GetProcessHeap(), 0, LogNames[dwIndex]);
+        }
+
+        DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex, MF_BYCOMMAND);
+    }
+
+    DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex + 1, MF_BYCOMMAND);
+
+    HeapFree(GetProcessHeap(), 0, LogNames);
+
+    dwNumLogs = 0;
+
+    return;
+}
+
+
 BOOL
 InitInstance(HINSTANCE hInstance,
              int nCmdShow)
@@ -1042,23 +1210,16 @@ InitInstance(HINSTANCE hInstance,
     ShowWindow(hwndMainWindow, nCmdShow);
     UpdateWindow(hwndMainWindow);
 
-    QueryEventMessages(lpComputerName,            // Use the local computer.
-                       EVENT_SOURCE_APPLICATION); // The event log category
+    BuildLogList();
+
+    QueryEventMessages(lpComputerName, LogNames[0]);
+
+    CheckMenuRadioItem(GetMenu(hwndMainWindow), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, ID_FIRST_LOG, MF_BYCOMMAND);
 
     return TRUE;
 }
 
 
-//
-//  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
-//
-//  PURPOSE:  Processes messages for the main window.
-//
-//  WM_COMMAND	- process the application menu
-//  WM_PAINT	- Paint the main window
-//  WM_DESTROY	- post a quit message and return
-//
-//
 LRESULT CALLBACK
 WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -1069,11 +1230,6 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     {
         case WM_CREATE:
             hMainMenu = GetMenu(hWnd);
-            CheckMenuRadioItem(GetMenu(hWnd),
-                               ID_LOG_APPLICATION,
-                               ID_LOG_SYSTEM,
-                               ID_LOG_APPLICATION,
-                               MF_BYCOMMAND);
             break;
 
         case WM_NOTIFY:
@@ -1099,44 +1255,21 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         case WM_COMMAND:
             // Parse the menu selections:
+
+            if ((LOWORD(wParam) >= ID_FIRST_LOG) && (LOWORD(wParam) <= ID_FIRST_LOG + dwNumLogs))
+            {
+                if (LogNames[LOWORD(wParam) - ID_FIRST_LOG])
+                {
+                    if (QueryEventMessages(lpComputerName, LogNames[LOWORD(wParam) - ID_FIRST_LOG]))
+                    {
+                        CheckMenuRadioItem(GetMenu(hWnd), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, LOWORD(wParam), MF_BYCOMMAND);
+                    }
+                }
+            }
+            else
+
             switch (LOWORD(wParam))
             {
-                case ID_LOG_APPLICATION:
-                    if (QueryEventMessages(lpComputerName,            // Use the local computer.
-                                           EVENT_SOURCE_APPLICATION)) // The event log category
-                    {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_APPLICATION,
-                                           MF_BYCOMMAND);
-                    }
-                    break;
-
-                case ID_LOG_SECURITY:
-                    if (QueryEventMessages(lpComputerName,         // Use the local computer.
-                                           EVENT_SOURCE_SECURITY)) // The event log category
-                    {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_SECURITY,
-                                           MF_BYCOMMAND);
-                    }
-                    break;
-
-                case ID_LOG_SYSTEM:
-                    if (QueryEventMessages(lpComputerName,       // Use the local computer.
-                                           EVENT_SOURCE_SYSTEM)) // The event log category
-                    {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_SYSTEM,
-                                           MF_BYCOMMAND);
-                    }
-                    break;
-
                 case ID_SAVE_PROTOCOL:
                     SaveProtocol();
                     break;
@@ -1191,6 +1324,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
         case WM_DESTROY:
             FreeRecords();
+            FreeLogList();
             PostQuitMessage(0);
             break;
 

base/applications/mscutils/eventvwr/lang/bg-BG.rc

@@ -4,10 +4,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Дневник"
     BEGIN
-        MENUITEM "&Приложение", ID_LOG_APPLICATION
-        MENUITEM "&Сигурност", ID_LOG_SECURITY
-        MENUITEM "&Уредба", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/cs-CZ.rc

@@ -4,10 +4,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Protokol"
     BEGIN
-        MENUITEM "&Aplikace", ID_LOG_APPLICATION
-        MENUITEM "&Zabezpečení", ID_LOG_SECURITY
-        MENUITEM "&Systém", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Uložit &Protokol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Odstranit události", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/de-DE.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Protokoll"
     BEGIN
-        MENUITEM "&Anwendung", ID_LOG_APPLICATION
-        MENUITEM "&Sicherheit", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Alle E&reignisse löschen", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/el-GR.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Εφαρμογή", ID_LOG_APPLICATION
-        MENUITEM "&Ασφάλεια", ID_LOG_SECURITY
-        MENUITEM "&Σύστημα", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/en-US.rc

@@ -12,10 +12,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Security", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/es-ES.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Aplicación", ID_LOG_APPLICATION
-        MENUITEM "&Seguridad", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/fr-FR.rc

@@ -6,13 +6,9 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "Journa&l"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Sécurité", ID_LOG_SECURITY
-        MENUITEM "&Système", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Effacer tous &les événements", ID_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Quitter", IDM_EXIT
     END
@@ -48,10 +44,10 @@ END
 
 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER
-CAPTION "Patientez.."
+CAPTION "Patientez..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CTEXT "Chargement des journaux d'événements. Veuillez patienter ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
+    CTEXT "Chargement des journaux d'événements. Veuillez patienter...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282
@@ -65,27 +61,27 @@ BEGIN
     PUSHBUTTON "Suiva&nt", IDNEXT, 144, 258, 50, 14
     PUSHBUTTON "Aide", IDHELP, 210, 258, 50, 14
     EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY
-    LTEXT "&Description:", IDC_STATIC, 15, 70, 39, 8
-    LTEXT "Date:", IDC_STATIC, 14, 14, 36, 8
+    LTEXT "&Description :", IDC_STATIC, 14, 70, 45, 8
+    LTEXT "Date :", IDC_STATIC, 14, 14, 40, 8
     EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Heure :", IDC_STATIC, 14, 27, 36, 8
+    LTEXT "Heure :", IDC_STATIC, 14, 27, 40, 8
     EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Utilisateur :", IDC_STATIC, 14, 41, 36, 8
+    LTEXT "&Utilisateur :", IDC_STATIC, 14, 41, 40, 8
     EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Ordinateur :", IDC_STATIC, 14, 54, 36, 8
+    LTEXT "Ordinateur :", IDC_STATIC, 14, 54, 40, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Événement :", IDC_STATIC, 133, 15, 36, 8
+    LTEXT "Événement :", IDC_STATIC, 133, 15, 42, 8
     EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Source:", IDC_STATIC, 133, 28, 36, 8
+    LTEXT "Source :", IDC_STATIC, 133, 28, 42, 8
     EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8
+    LTEXT "Type :", IDC_STATIC, 133, 42, 42, 8
     EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Catégorie :", IDC_STATIC, 133, 55, 36, 8
+    LTEXT "Catégorie :", IDC_STATIC, 133, 55, 42, 8
     EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY
-    LTEXT "Données", IDC_STATIC, 14, 194, 20, 8
-    CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8
-    CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8
+    LTEXT "Données :", IDC_STATIC, 14, 194, 35, 8
+    CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 50, 194, 34, 8
+    CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 88, 194, 33, 8
 END
 
 STRINGTABLE
@@ -93,7 +89,7 @@ BEGIN
     IDS_APP_TITLE "Visionneuse d'événements"
     IDS_APP_TITLE_EX "%s - %s Log on \\\\"
     IDS_STATUS_MSG "%s has %lu event(s)"
-    IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant."
+    IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant."
     IDS_EVENTLOG_ERROR_TYPE "Erreur"
     IDS_EVENTLOG_WARNING_TYPE "Avertissement"
     IDS_EVENTLOG_INFORMATION_TYPE "Informations"

base/applications/mscutils/eventvwr/lang/he-IL.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "מציג האירועים (מקומי)"
     BEGIN
-        MENUITEM "יישום", ID_LOG_APPLICATION
-        MENUITEM "אבטחה", ID_LOG_SECURITY
-        MENUITEM "מערכת", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/it-IT.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Applicazioni", ID_LOG_APPLICATION
-        MENUITEM "&Sicurezza", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/ja-JP.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "ログ(&L)"
     BEGIN
-        MENUITEM "アプリケーション(&A)", ID_LOG_APPLICATION
-        MENUITEM "セキュリティ(&S)", ID_LOG_SECURITY
-        MENUITEM "システム(&S)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/ko-KR.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "로그(&L)"
     BEGIN
-        MENUITEM "애플리케이션(&A)", ID_LOG_APPLICATION
-        MENUITEM "보안(&S)", ID_LOG_SECURITY
-        MENUITEM "시스템(&S)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/no-NO.rc

@@ -4,10 +4,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "&Applikasjon", ID_LOG_APPLICATION
-        MENUITEM "&Sikkerhet", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/pl-PL.rc

@@ -8,10 +8,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Logi"
     BEGIN
-        MENUITEM "&Aplikacja", ID_LOG_APPLICATION
-        MENUITEM "&Zabezpieczenia", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Zapisz &protokół...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "W&yczyść wszystkie zdarzenia", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/pt-BR.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Registro"
     BEGIN
-        MENUITEM "&Aplicativo", ID_LOG_APPLICATION
-        MENUITEM "S&egurança", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/ro-RO.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "J&urnal"
     BEGIN
-        MENUITEM "&Aplicație", ID_LOG_APPLICATION
-        MENUITEM "Se&curitate", ID_LOG_SECURITY
-        MENUITEM "&Sistem", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Păstrare p&rotocol…", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Înlăt&ură toate evenimentele", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/ru-RU.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Логи"
     BEGIN
-        MENUITEM "&Приложений", ID_LOG_APPLICATION
-        MENUITEM "&Безопасности", ID_LOG_SECURITY
-        MENUITEM "&Системы", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/sk-SK.rc

@@ -9,10 +9,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Záznam"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Security", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/sq-AL.rc

@@ -12,10 +12,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Aplikacion", ID_LOG_APPLICATION
-        MENUITEM "&Siguri", ID_LOG_SECURITY
-        MENUITEM "&Sistemi", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/sv-SE.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "&Applikation", ID_LOG_APPLICATION
-        MENUITEM "&Säkerhet", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/tr-TR.rc

@@ -12,10 +12,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Kayıt"
     BEGIN
-        MENUITEM "&Uygulama", ID_LOG_APPLICATION
-        MENUITEM "&Güvenlik", ID_LOG_SECURITY
-        MENUITEM "&Dizge", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "&Protokolü Kaydet...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Tüm Olayları Sil", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/uk-UA.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "&Звіт"
     BEGIN
-        MENUITEM "&Програма", ID_LOG_APPLICATION
-        MENUITEM "&Захист", ID_LOG_SECURITY
-        MENUITEM "&Система", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/lang/zh-CN.rc

@@ -6,10 +6,6 @@ IDC_EVENTVWR MENU
 BEGIN
     POPUP "日志(&L)"
     BEGIN
-        MENUITEM "应用程序日志(&A)", ID_LOG_APPLICATION
-        MENUITEM "安全日志(&S)", ID_LOG_SECURITY
-        MENUITEM "系统日志(&Y)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED

base/applications/mscutils/eventvwr/resource.h

@@ -35,19 +35,18 @@
 #define IDC_WORDRADIO           1013
 #define IDC_EVENTDATAEDIT       1014
 
-#define ID_LOG_APPLICATION 32771
-#define ID_LOG_SECURITY    32772
-#define ID_LOG_SYSTEM      32773
-#define ID_HELP_HELP       32775
-#define ID_HELP            32776
-#define ID_OPTIONS         32777
-#define ID_VIEW            32778
-#define IDM_HELP           32779
-#define ID_VIEW_REFRESH    32780
-#define ID_REFRESH         32781
-#define IDM_REFRESH        32782
-#define ID_CLEAR_EVENTS    32783
-#define ID_SAVE_PROTOCOL   32784
+#define ID_HELP_HELP       32771
+#define ID_HELP            32772
+#define ID_OPTIONS         32773
+#define ID_VIEW            32774
+#define IDM_HELP           32775
+#define ID_VIEW_REFRESH    32776
+#define ID_REFRESH         32777
+#define IDM_REFRESH        32778
+#define ID_CLEAR_EVENTS    32779
+#define ID_SAVE_PROTOCOL   32780
+
+#define ID_FIRST_LOG       45000
 
 /* String IDs */
 #define IDS_APP_TITLE                 103

base/applications/mscutils/servman/lang/tr-TR.rc

@@ -114,7 +114,7 @@ BEGIN
     CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW |
             WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES |
             TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
-    LTEXT "Birtakım hizmetler, başka hizmetlere, dizge sürücülerine ve yükleme sıra öbeklerine bağımlıdır. Eğer bir dizge bileşeni, durdurulmuşsa ya da düzgün çalışmıyorsa bağımlı hizmetler etkilenebilir.", IDC_STATIC, 8, 7, 238, 26
+    LTEXT "Birtakım hizmetler, başka hizmetlere, dizge sürücülerine ve yükleme dizisi öbeklerine bağımlıdır. Eğer bir dizge bileşeni, durdurulmuşsa ya da düzgün çalışmıyorsa bağımlı hizmetler etkilenebilir.", IDC_STATIC, 8, 7, 238, 26
     LTEXT "Bu hizmet aşağıdaki bileşenlere bağımlıdır:", IDC_STATIC, 8, 57, 236, 9
     LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
 END
@@ -241,7 +241,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_HELP_OPTIONS "OLUŞTURMA SEÇENEKLERİ:\r\nÖNEMLİ: Seçenek adı, eşittir imini kapsar.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (Ön tanımlı = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (Ön tanımlı = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (Ön tanımlı = normal)\r\n group= <Yükleme sırası öbeği>\r\n tag= <yes|no>\r\n depend= <Bağımlılıklar (Ters bölü çizgisiyle birbirinden ayrılmalıdır.)>\r\n obj= <Hesap adı|Nesne adı>\r\n       (Ön tanımlı = LocalSystem)\r\n password= <Şifre>\r\n"
+    IDS_HELP_OPTIONS "OLUŞTURMA SEÇENEKLERİ:\r\nÖNEMLİ: Seçenek adı, eşittir imini kapsar.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (Ön tanımlı = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (Ön tanımlı = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (Ön tanımlı = normal)\r\n group= <Yükleme dizisi öbeği>\r\n tag= <yes|no>\r\n depend= <Bağımlılıklar (Ters bölü çizgisiyle birbirinden ayrılmalıdır.)>\r\n obj= <Hesap adı|Nesne adı>\r\n       (Ön tanımlı = LocalSystem)\r\n password= <Şifre>\r\n"
 END
 
 /* Hints */

base/applications/network/ping/lang/ru-RU.rc

@@ -0,0 +1,35 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "\nИспользование: ping [-t] [-n <число>] [-l <размер>] [-w <тайм-аут>] конечный_узел\n\n\
+Параметры:\n\
+    -t             Проверка связи с указанным узлом до прекращения.\n\
+                   Для прекращения нажмите CTRL+C.\n\
+    -n <число>       Число отправляемых запросов эха.\n\
+    -l <размер>        Размер буфера отправки.\n\
+    -w <тайм-аут>     Тайм-аут для каждого ответа (в миллисекундах)\n\n\0"
+
+    IDS_PING_WITH_BYTES "\nPinging %1 [%2] with %3!d! bytes of data:\n\n\0"
+    IDS_PING_STATISTICS "\nСтатистика Ping для %1:\n\0"
+    IDS_PACKETS_SENT_RECEIVED_LOST "    Пакетов: отправлено = %1!d!, получено = %2!d!, потеряно = %3!d! (%4!d!%% потерь),\n\0"
+    IDS_APPROXIMATE_ROUND_TRIP "Приблизительное время приема-передачи в мс:\n\0"
+    IDS_MIN_MAX_AVERAGE "    Минимальное = %1, Максимальное = %2, Среднее = %3\n\0"
+    IDS_NOT_ENOUGH_RESOURCES "Not enough free resources available.\n\0"
+    IDS_UNKNOWN_HOST "Unknown host %1.\n\0"
+    IDS_SETSOCKOPT_FAILED "setsockopt failed (%1!d!).\n\0"
+    IDS_COULD_NOT_CREATE_SOCKET "Could not create socket (#%1!d!).\n\0"
+    IDS_COULD_NOT_INIT_WINSOCK "Could not initialize winsock dll.\n\0"
+    IDS_DEST_MUST_BE_SPECIFIED "Необходимо указать адрес IP.\n\0"
+    IDS_BAD_PARAMETER "Bad parameter %1.\n\0"
+    IDS_BAD_OPTION_FORMAT "Bad option format %1.\n\0"
+    IDS_BAD_OPTION "Bad option %1.\n\0"
+    IDS_BAD_VALUE_OPTION_L "Недопустимое значение параметра -l, допустимый диапазон с 0 по %1!d!.\n\0"
+    IDS_REPLY_FROM "Ответ от %1: число байт=%2!d! время%3%4 TTL=%5!d!\n\0"
+    IDS_DEST_UNREACHABLE "Destination host unreachable.\n\0"
+    IDS_COULD_NOT_TRANSMIT "Could not transmit data (%1!d!).\n\0"
+    IDS_COULD_NOT_RECV "Could not receive data (%1!d!).\n\0"
+    IDS_REQUEST_TIMEOUT "Превышен интервал ожидания для запроса.\n\0"
+    IDS_MS "мсек\0"
+    IDS_1MS "1мсек\0"
+END

base/applications/network/ping/ping.rc

@@ -35,6 +35,9 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif

base/applications/rapps/lang/ru-RU.rc

@@ -18,7 +18,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Обновить", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Update Da&tabase", ID_RESETDB
+        MENUITEM "Обновить &базу данных", ID_RESETDB
     END
     POPUP "Справка"
     BEGIN
@@ -48,7 +48,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Обновить", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Update Da&tabase", ID_RESETDB
+        MENUITEM "Обновить &базу данных", ID_RESETDB
     END
 END
 

base/applications/rapps/rapps/abyss.txt

@@ -41,7 +41,7 @@ Size = 2,1 Mo
 [Section.041f]
 Name = Abyss Umûmî Ağ Sunucusu X1
 Licence = Ücretsiz
-Description = Abyss Umûmî Ağ Sunucusu, bilgisayarınızda Umûmî Ağ sitelerinizin barındırılmasına olanak sağlar. Umûmî Ağ uygulayım biliminin bir geniş yelpâzesinin yanı sıra güvenli SSL/TLS bağlantılarını (HTTPS) destekler. Ayrıca MySQL, SQLite, MS SQL Server, MS Access, ve Oracle gibi veri tabanlarıyla desteklenebilen gelişmiş PHP, Perl, Python, ASP, ASP.NET ve Rails üzerinde Ruby Umûmî Ağ uygulamalarını çalıştırabilir.
+Description = Abyss Umûmî Ağ Sunucusu, bilgisayarınızda Umûmî Ağ sitelerinizin barındırılmasına olanak sağlar. Umûmî Ağ uygulayım biliminin bir geniş yelpâzesiyle birlikte güvenli SSL/TLS bağlantılarını (HTTPS) destekler. Ayrıca MySQL, SQLite, MS SQL Server, MS Access, ve Oracle gibi veri tabanlarıyla desteklenebilen gelişmiş PHP, Perl, Python, ASP, ASP.NET ve Rails üzerinde Ruby Umûmî Ağ uygulamalarını çalıştırabilir.
 Size = 2,1 MB
 
 [Section.0422]

base/applications/rapps/rapps/ants.txt

@@ -30,5 +30,5 @@ Size = 632 ko
 [Section.041f]
 Version = Yok
 Licence = Ücretsiz
-Description = Bir kartlarla izlem oyunu. Kendi kurganınızı yapınız ve rakip kaleyi yıkmaya çalışınız. Kurmak için bir ZIP çıkarma izlencesi gerekir.
+Description = Bir kartlarla izlem oyunu. Kendi kurganınızı yapınız ve rakip kaleyi yıkmaya çalışınız. Kurmak için bir ZIP çıkartma izlencesi gerekir.
 Size = 632 KB

base/applications/rapps/rapps/dvdwritenow.txt

@@ -33,5 +33,5 @@ URLSite = http://dwn.alter.org.ua/ru/
 
 [Section.041f]
 Licence = Ücretsiz
-Description = Ücretsiz bir doğrudan CD/DVD kaydedici yazılımı. Kurulduktan sonra CD/DVD RW'lerinizi, USB Flash veyâ çıkarılabilir sâbit disk sürücüleri olarak kullanabilirsiniz. Bununla birlikte UDF kütük dizgesiyle kaydedilmiş CD/DVD RW'lere yazabilirsiniz. Ayrıca Microsoft DVD−ROM'ları, Ahead InCD ile kaydedilmiş RW diskleri gibi başka yazılımlarla oluşturulmuş UDF diskleri okuyabilirsiniz. Kurmak için bir ZIP çıkarma izlencesi gerekir.
+Description = Ücretsiz bir doğrudan CD/DVD kaydedici yazılımı. Kurulduktan sonra CD/DVD RW'lerinizi, USB Flash veyâ çıkarılabilir sâbit disk sürücüleri olarak kullanabilirsiniz. Bununla birlikte UDF kütük dizgesiyle kaydedilmiş CD/DVD RW'lere yazabilirsiniz. Ayrıca Microsoft DVD−ROM'ları, Ahead InCD ile kaydedilmiş RW diskleri gibi başka yazılımlarla oluşturulmuş UDF diskleri okuyabilirsiniz. Kurmak için bir ZIP çıkartma izlencesi gerekir.
 Size = 1,2 MB

base/applications/rapps/rapps/libreoffice.txt

@@ -36,7 +36,7 @@ Description = O suită office completă, cu surse deschise. Reprezintă o bifurc
 Size = 209,36 Mo
 
 [Section.041f]
-Description = Güçlü ve açık kaynak bir büro takımı. OpenOffice'ten çatallanılmıştır.
+Description = Güçlü ve açık kaynak bir ofis paketi. OpenOffice'ten çatallanılmıştır.
 Size = 209,36 MB
 
 [Section.0422]

base/applications/rapps/rapps/openoffice.txt

@@ -54,7 +54,7 @@ Size = 136,79 Mo
 URLSite = http://www.openoffice.org/ro/
 
 [Section.041f]
-Description = Bir açık kaynak büro takımı.
+Description = Bir açık kaynak ofis paketi.
 Size = 124,36 MB
 URLSite = http://www.openoffice.org/tr/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/tr/Apache_OpenOffice_4.1.0_Win_x86_install_tr.exe

base/applications/rapps/rapps/openoffice2.4.txt

@@ -57,7 +57,7 @@ Size = 113 Mo
 URLSite = http://www.openoffice.org/ro/
 
 [Section.041f]
-Description = Bir açık kaynak büro takımı.
+Description = Bir açık kaynak ofis paketi.
 URLSite = http://www.openoffice.org/tr/
 
 [Section.0422]

base/applications/rapps/rapps/reshack.txt

@@ -29,5 +29,5 @@ Size = 730 ko
 
 [Section.041f]
 Licence = Ücretsiz
-Description = Resoure Hacker, 32 ve 64 bitlik Windows çaılştırılabilirlerindeki ve kaynak kütüklerindeki (*.res) kaynakları görüntülemek, değiştirmek, yeniden adlandırmak, eklemek, silmek ve çıkarmak için ücretsiz bir araçtır.
+Description = Resoure Hacker, 32 ve 64 bitlik Windows çaılştırılabilirlerindeki ve kaynak kütüklerindeki (*.res) kaynakları görüntülemek, değiştirmek, yeniden adlandırmak, eklemek, silmek ve çıkartmak için ücretsiz bir araçtır.
 Size = 730 KB

base/applications/rapps/rapps/rocks.txt

@@ -28,5 +28,5 @@ Size = 2,42 Mo
 
 [Section.041f]
 Licence = GPL 2. sürüm
-Description = "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga/PC), "Sokoban" (PC) gelenekleri içinde; UNIX, Mac OS X, Windows ve DOS için atari oyun salonu türünde oyun. Kurmak için bir ZIP çıkarma izlencesi gerekir.
+Description = "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga/PC), "Sokoban" (PC) gelenekleri içinde; UNIX, Mac OS X, Windows ve DOS için atari oyun salonu türünde oyun. Kurmak için bir ZIP çıkartma izlencesi gerekir.
 Size = 2,42 MB

base/applications/rapps/rapps/rosbe.txt

@@ -39,7 +39,7 @@ Description = Permite compilarea surselor ReactOS. Pentru instrucțiuni, consult
 Size = 28,3 Mo
 
 [Section.041f]
-Name = ReactOS Derleme Ortamı
+Name = ReactOS Yapma Ortamı
 Description = ReactOS Kaynak Kodları'nı derlemenize olanak sağlar. Daha çok açıklama için ReactOS Wiki'ye bakınız.
 Size = 28,3 MB
 

base/applications/rapps/rapps/rosbeamd64.txt

@@ -39,7 +39,7 @@ Description = Permite compilarea surselor ReactOS pentru AMD64. Pentru instrucț
 Size = 15,83 Mo
 
 [Section.041f]
-Name = ReactOS Derleme Ortamı AMD64 Eklentisi
+Name = ReactOS Yapma Ortamı AMD64 Eklentisi
 Description = ReactOS AMD64 Kaynak Kodları'nı derlemenize olanak sağlar. Daha çok açıklama için ReactOS Wiki'ye bakınız.
 Size = 15,83 MB
 

base/applications/rapps/rapps/rosbearm.txt

@@ -39,7 +39,7 @@ Description = Permite compilarea surselor ReactOS pentru ARM. Pentru instrucțiu
 Size = 11,15 Mo
 
 [Section.041f]
-Name = ReactOS Derleme Ortamı ARM Eklentisi
+Name = ReactOS Yapma Ortamı ARM Eklentisi
 Description = ReactOS ARM Kaynak Kodları'nı derlemenize olanak sağlar. Daha çok açıklama için ReactOS Wiki'ye bakınız.
 Size = 11,15 MB
 

base/applications/regedit/clb/lang/tr-TR.rc

@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "Dikeçli Dizelge Kutusu Biçimleri", -1, 6, 7, 158, 71
    CHECKBOX "&Ölçünlü", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    CHECKBOX "&Hudut", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&Sırala", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "&Diz", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    CHECKBOX "&Bildir", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&Dikey Kaydırma Çubuğu", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "D&ikey Kaydırma Çubuğu", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    CHECKBOX "&Çoklu Seçim", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED
    CHECKBOX "&Genişletilmiş Seçim", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED
    CHECKBOX "&Açılan Başlıklar", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    CHECKBOX "&Esnek Dikeçler", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    GROUPBOX "Başlıca Biçimler", -1, 6, 80, 158, 34
    CHECKBOX "Gö&rünür", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "Ed&ilgin", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "Edi&lgin", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    CHECKBOX "Öbe&kleme", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "Sek&me Durağı", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "&Sekme Durağı", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    PUSHBUTTON "Tamam", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    PUSHBUTTON "İptal", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP
    CHECKBOX "Ka&ydırmayı Etkinleştir", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

base/applications/regedit/lang/tr-TR.rc

@@ -317,7 +317,7 @@ BEGIN
     IDS_WARNING "Uyarı"
     IDS_BAD_KEY "Dizin sorgulanamıyor: %s"
     IDS_BAD_VALUE "Değer sorgulanamıyor: %s"
-    IDS_UNSUPPORTED_TYPE "Bu türdeki dizinler değiştirilemiyor: %ld"
+    IDS_UNSUPPORTED_TYPE "Şu türdeki dizinler değiştirilemiyor: %ld"
     IDS_TOO_BIG_VALUE "Değer çok büyük: %ld"
     IDS_MULTI_SZ_EMPTY_STRING "REG_MULTI_SZ veri türü boş dizgi içeremez.\nBoş dizgiler dizelgeden silinmiştir."
     IDS_QUERY_DELETE_KEY_ONE "Bu dizini silmek istediğinizden emin misiniz?"
@@ -406,7 +406,7 @@ STRINGTABLE
 BEGIN
     IDS_BUSNUMBER "Veri Yolu Numarası"
     IDS_INTERFACE "Arayüz"
-    IDS_DMA_CHANNEL "Kanal"
+    IDS_DMA_CHANNEL "Yol"
     IDS_DMA_PORT "Giriş"
     IDS_INTERRUPT_VECTOR "Yöney"
     IDS_INTERRUPT_LEVEL "Düzey"
@@ -440,8 +440,8 @@ BEGIN
     IDS_BUS_INTERNAL "İç"
     IDS_BUS_ISA "ISA"
     IDS_BUS_EISA "EISA"
-    IDS_BUS_MICROCHANNEL "MikroKanal"
-    IDS_BUS_TURBOCHANNEL "TurboKanal"
+    IDS_BUS_MICROCHANNEL "Micro Channel"
+    IDS_BUS_TURBOCHANNEL "TURBOChannel"
     IDS_BUS_PCIBUS "PCI"
     IDS_BUS_VMEBUS "VME"
     IDS_BUS_NUBUS "Nu Veri Yolu"

base/applications/shutdown/lang/ru-RU.rc

@@ -35,38 +35,39 @@ BEGIN
 Использование: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
        [/m \\\\<компьютер>][/t xxx][/d [p|u:]xx:yy [/c ""комментарий""]]\n\
 \n\
-    Без аргументов или /?    Показывает эту справку.\n\
-    /i      Показать диалог удаленного выключения. Этот параметр должен\n\
-            указываться первым.\n\
-    /l      Выход из системы. (не совместим с параметрами /m или /d.\n\
-    /s      Выключить комьпьютер.\n\
-    /r      Перезагрузить компьютер.\n\
-    /g      Перезагрузить компьютер и перезапустить все зарегистрированные\n\
-            приложения.\
-    /a      Отменить отложенное выключение. Может использоваться только в\n\
+    Без аргументов или /?    Отображение справки.\n\
+    /i      Отображение графического интерфейса пользователя.\n\
+            Этот параметр должен указываться первым.\n\
+    /l      Завершение сеанса. Этот параметр нельзя использовать с\n\
+            параметрами /m или /d.\n\
+    /s      Завершение работы компьютера.\n\
+    /r      Завершение работы и перезагрузка компьютера.\n\
+    /g      Завершение работы и перезагрузка компьютера. После перезапуска\n\
+            системы, запуск всех зарегистрированных приложений..\
+    /a      Отмена завершения работы системы. Может использоваться только в\n\
             течение периода ожидания выключения.\
-    /p      Выключить локальный компьютер без всяких задержек или \n\
-            предупреждений. Может использоваться с параметрами /d или /f.\n\
-    /h      Перевести локальный компьютер в режим гибернации (""спящий \n\
-            режим""). Может использоваться с параметром /f.\n\
-    /e      Задокументировать причину неожиданного выключения компьютера.\n\
-    /m \\\\<компьютер>  Удаленный компьютер, на котором выполняется действие.\n\
+    /p      Немедленное отключение локального компьютера без предупреждения.\n\
+            Можно использовать с параметрами /d и /f.\n\
+    /h      Переключение локального компьютера в режим гибернации.\n\
+            Можно использовать с параметром /f.\n\
+    /e      Указание причины непредвиденного завершения работы компьютера.\n\
+    /m \\\\<компьютер>  Указание конечного компьютера.\n\
             (UNC/IP адрес).\n\
-    /t xxx  Устанавливает время ожидания до xxx сек. до завершения работы.\n\
-            Допустимые значения лежат в отрезке от 0 до 315360000 (10 лет),\n\
+    /t xxx  Задание задержки в xxx секунд перед завершением работы\n\
+            компьютера. Допустимые значения от 0 сек. до 315360000 сек.\n\
             По умолчанию значение равно 30.\n\
-    /c ""комментарий""  Описание причины выключения или перезагрузки.\n\
-            Не более 512 знаков.\n\
-    /f      Принудительное завершение открытых приложений без предварительного\n\
-            уведомления. Если не указаны дополнительные параметры, то этот\n\
+    /c ""комментарий""  Комментарий с причиной перезапуска или завершения работы.\n\
+            Наибольшая длина - 512 знаков.\n\
+    /f      Принудительное закрытие запущенных приложений без предупреждения\n\
+            пользователей. Если не указаны дополнительные параметры, то этот\n\
             параметр также приведет к выходу из системы.\n\
-    /d [p|u:]xx:yy  Задает код причины выключения или перезагрузки.\n\
-            p - показывает, что выключение или перезагрузка запланирована.\n\
-            u - показывает, что причина определена пользователем.\n\
-            Если не указаны p или u, то выключение или перезагрузка системы не\n\
-            запланирована.\
-            xx - основной код причины (1 - 255).\n\
-            yy - дополнительный код причины (1 - 65535).\n"
+    /d [p|u:]xx:yy  Необходимо указать причину для перезагрузки или выключения.\n\
+            ""p"" означает запланированную перезагрузку или завершение работы.\n\
+            ""u"" означает, что причина определяется пользователем.\n\
+            Если не задано ни ""p"", ни ""u"", перезагрузка или завершение работы\n\
+            запланирована.\n\
+            xx является основным номером причины (1 - 255).\n\
+            yy является вспомогательным номером причины (1 - 65535).\n"
 
     IDS_ERROR_SHUTDOWN_REBOOT "ОШИБКА: Нельзя одновременно выключить и перезагрузить компьютер.\n"
     IDS_ERROR_TIMEOUT "ОШИБКА: Время ожидания %u находится за границами диапазона (0-315360000).\n"
@@ -74,7 +75,7 @@ BEGIN
     IDS_ERROR_LOGOFF "ОШИБКА: Невозможно совершить выход из системы.\n"
     IDS_ERROR_SHUTDOWN "ОШИБКА: Невозможно выключить систему.\n"
     IDS_ERROR_RESTART "ОШИБКА: Невозможно перезагрузить систему.\n"
-    IDS_ERROR_MAX_COMMENT_LENGTH "ОШИБКА: Длина коментария превысила максимальную длину сообщения.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH "ОШИБКА: Длина комментария превысила максимальную длину сообщения.\n"
     IDS_ERROR_HIBERNATE "ОШИБКА: Невозможно отправить систему в режим гибернации (""спящий режим"").\n"
     IDS_ERROR_HIBERNATE_LOCAL "ОШИБКА: Спящий режим нельзя запустить на удаленном компьютере.\n"
     IDS_ERROR_HIBERNATE_ENABLED "ОШИБКА: Спящий режим не включен.\n"

base/applications/sndrec32/lang/tr-TR.rc

@@ -27,7 +27,7 @@ BEGIN
         MENUITEM "&Aç...", ID_FILE_OPEN
         MENUITEM "&Kaydet", ID_FILE_SAVE, GRAYED
         MENUITEM "Ay&rı Kaydet...", ID_FILE_SAVEAS, GRAYED
-        MENUITEM "&Eski Durumuna Döndür...", ID_FILE_RESTORE, GRAYED
+        MENUITEM "Y&eniden Yükle...", ID_FILE_RESTORE, GRAYED
         MENUITEM "&Husûsiyetler", ID_FILE_PROPERTIES
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış", ID_FILE_EXIT

base/applications/taskmgr/CMakeLists.txt

@@ -8,16 +8,17 @@ list(APPEND SOURCE
     debug.c
     endproc.c
     graph.c
+    graphctl.c
     optnmenu.c
     perfdata.c
     perfpage.c
     priority.c
-    procpage.c
     proclist.c
+    procpage.c
     run.c
-    trayicon.c
+    shutdown.c
     taskmgr.c
-    graphctl.c
+    trayicon.c
     precomp.h)
 
 add_executable(taskmgr ${SOURCE} taskmgr.rc)

base/applications/taskmgr/applpage.c

@@ -184,21 +184,21 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         InvalidateRect(hApplicationPageListCtrl, NULL, TRUE);
 
         GetClientRect(hApplicationPageEndTaskButton, &rc);
-        MapWindowPoints(hApplicationPageEndTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) );
+        MapWindowPoints(hApplicationPageEndTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT));
         cx = rc.left + nXDifference;
         cy = rc.top + nYDifference;
         SetWindowPos(hApplicationPageEndTaskButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
         InvalidateRect(hApplicationPageEndTaskButton, NULL, TRUE);
 
         GetClientRect(hApplicationPageSwitchToButton, &rc);
-        MapWindowPoints(hApplicationPageSwitchToButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) );
+        MapWindowPoints(hApplicationPageSwitchToButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT));
         cx = rc.left + nXDifference;
         cy = rc.top + nYDifference;
         SetWindowPos(hApplicationPageSwitchToButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
         InvalidateRect(hApplicationPageSwitchToButton, NULL, TRUE);
 
         GetClientRect(hApplicationPageNewTaskButton, &rc);
-        MapWindowPoints(hApplicationPageNewTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) );
+        MapWindowPoints(hApplicationPageNewTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT));
         cx = rc.left + nXDifference;
         cy = rc.top + nYDifference;
         SetWindowPos(hApplicationPageNewTaskButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
@@ -332,12 +332,10 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam)
     WCHAR   szText[260];
     BOOL    bLargeIcon;
     BOOL    bHung = FALSE;
-    HICON*  xhIcon = (HICON*)&hIcon;
 
     typedef int (FAR __stdcall *IsHungAppWindowProc)(HWND);
     IsHungAppWindowProc IsHungAppWindow;
 
-
     /* Skip our window */
     if (hWnd == hMainWnd)
         return TRUE;
@@ -357,20 +355,21 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam)
     }
 
     noApps = FALSE;
+
     /* Get the icon for this window */
     hIcon = NULL;
-    SendMessageTimeoutW(hWnd, WM_GETICON,bLargeIcon ? ICON_BIG /*1*/ : ICON_SMALL /*0*/, 0, 0, 1000, (PDWORD_PTR)xhIcon);
-
+    SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_BIG : ICON_SMALL, 0, 0, 1000, (PDWORD_PTR)&hIcon);
     if (!hIcon)
     {
+        /* We failed, try to retrieve other icons... */
         hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM);
         if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON);
-        if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)xhIcon);
-        if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL /*0*/ : ICON_BIG /*1*/, 0, 0, 1000, (PDWORD_PTR)xhIcon);
-    }
+        if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
+        if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL : ICON_BIG, 0, 0, 1000, (PDWORD_PTR)&hIcon);
 
-    if (!hIcon)
-        hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM));
+        /* If we still do not have any icon, load the default one */
+        if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM));
+    }
 
     bHung = FALSE;
 
@@ -555,11 +554,11 @@ void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam)
             {
                 if (pAPLI->bHung)
                 {
-                    LoadStringW( GetModuleHandleW(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0]));
+                    LoadStringW( GetModuleHandleW(NULL), IDS_NOT_RESPONDING , szMsg, sizeof(szMsg) / sizeof(szMsg[0]));
                 }
                 else
                 {
-                    LoadStringW( GetModuleHandleW(NULL), IDS_Running, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0]));
+                    LoadStringW( GetModuleHandleW(NULL), IDS_RUNNING, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0]));
                 }
                 wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax);
             }

base/applications/taskmgr/lang/bg-BG.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "На&дипляне", ID_WINDOWS_CASCADE
         MENUITEM "Изваждане &отпред ", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "Помо&щ"
     BEGIN
         MENUITEM "Съдържание на помо&щта за задачния управител", ID_HELP_TOPICS
@@ -424,6 +436,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Заета памет: %dK / %dK"
     IDS_STATUS_CPUUSAGE "Заетост на ЦПУ: %3d%%"
     IDS_STATUS_PROCESSES "Действия: %d"
-    IDS_Not_Responding "Не отговаря"
-    IDS_Running "Работи"
+    IDS_NOT_RESPONDING "Не отговаря"
+    IDS_RUNNING "Работи"
 END

base/applications/taskmgr/lang/cs-CZ.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE
         MENUITEM "&Přenést do popředí", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Vy&pnout"
+    BEGIN
+        MENUITEM "Režim &spánku",              ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernace",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Vypnout",                   ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restartovat",               ID_SHUTDOWN_REBOOT
+        MENUITEM "&Odhlásit uživatele %s",     ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Přepnout uživatele\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "&Zamknout počítač\tWin+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "O&dpojit se",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "Vy&jmout počítač",           ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Nápověda"
     BEGIN
         MENUITEM "&Nápověda pro správce úloh", ID_HELP_TOPICS
@@ -160,7 +172,7 @@ BEGIN
             LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177
     PUSHBUTTON "&Ukončit proces", IDC_ENDPROCESS, 171, 189, 69, 14
     CONTROL "&Zobrazit procesy všech uživatelů", IDC_SHOWALLPROCESSES, "Button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 120, 10
+            BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 153, 10
 END
 
 /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */
@@ -194,7 +206,7 @@ BEGIN
              ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "Celkem", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
     LTEXT "Dostupná", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
-    LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8
     EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
              ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
@@ -202,8 +214,8 @@ BEGIN
     EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
              ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "Celkem", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
-    LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 137, 184, 42, 8
-    LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8
+    LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 137, 184, 80, 8
+    LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8
     EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
              ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
@@ -424,6 +436,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Využití paměti: %dK / %dK"
     IDS_STATUS_CPUUSAGE "Využití CPU: %3d%%"
     IDS_STATUS_PROCESSES "Procesy: %d"
-    IDS_Not_Responding "Neodpovídá"
-    IDS_Running "Běží"
+    IDS_NOT_RESPONDING "Neodpovídá"
+    IDS_RUNNING "Běží"
 END

base/applications/taskmgr/lang/da-DK.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "&Cascade", ID_WINDOWS_CASCADE
         MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Hjælp"
     BEGIN
         MENUITEM "Opgavestyring &Hjælpe Emner", ID_HELP_TOPICS
@@ -424,6 +436,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
-    IDS_Not_Responding "Not Responding"
-    IDS_Running "Running"
+    IDS_NOT_RESPONDING "Not Responding"
+    IDS_RUNNING "Running"
 END

base/applications/taskmgr/lang/de-DE.rc

@@ -8,14 +8,14 @@ BEGIN
     BEGIN
         MENUITEM "&Neuer Task (Ausführen...)", ID_FILE_NEW
         MENUITEM SEPARATOR
-        MENUITEM "&Beenden",  ID_FILE_EXIT
+        MENUITEM "&Beenden", ID_FILE_EXIT
     END
     POPUP "&Optionen"
     BEGIN
         MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP, CHECKED
         MENUITEM "&Nach Programmstart minimieren", ID_OPTIONS_MINIMIZEONUSE, CHECKED
         MENUITEM "&Ausblenden, wenn minimiert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&16-bit Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "&16-Bit-Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED
     END
     POPUP "&Ansicht"
     BEGIN
@@ -39,7 +39,7 @@ BEGIN
         END
         MENUITEM "K&ernel-Zeiten anzeigen", ID_VIEW_SHOWKERNELTIMES
     END
-    POPUP "F&enster"
+    POPUP "&Fenster"
     BEGIN
         MENUITEM "&Untereinander", ID_WINDOWS_TILEHORIZONTALLY
         MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY
@@ -48,9 +48,21 @@ BEGIN
         MENUITEM "Übe&rlappend", ID_WINDOWS_CASCADE
         MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "&Herunterfahren"
+    BEGIN
+        MENUITEM "&Standby", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Ruhezustand", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Ausschalten", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Neu starten", ID_SHUTDOWN_REBOOT
+        MENUITEM "%s ab&melden", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Benutzer wechseln\tWindows-Taste+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "&Computer sperren\tWindows-Taste+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Trennen", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "C&omputer abdocken", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&?"
     BEGIN
-        MENUITEM "&Hilfethemen", ID_HELP_TOPICS
+        MENUITEM "&Hilfethemen\tF1", ID_HELP_TOPICS
         MENUITEM SEPARATOR
         MENUITEM "Inf&o", ID_HELP_ABOUT
     END
@@ -73,7 +85,7 @@ BEGIN
         MENUITEM "&Neuer Task (Ausführen...)", ID_FILE_NEW
         MENUITEM SEPARATOR
         MENUITEM "&Große Symbole", ID_VIEW_LARGE
-        MENUITEM "K&leine Symbole", ID_VIEW_SMALL
+        MENUITEM "&Kleine Symbole", ID_VIEW_SMALL
         MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED
     END
 END
@@ -89,7 +101,7 @@ BEGIN
         MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY
         MENUITEM "&Minimieren", ID_WINDOWS_MINIMIZE
         MENUITEM "Ma&ximieren", ID_WINDOWS_MAXIMIZE
-        MENUITEM "Übe&rlappend", ID_WINDOWS_CASCADE
+        MENUITEM "Ü&berlappend", ID_WINDOWS_CASCADE
         MENUITEM SEPARATOR
         MENUITEM "&Task beenden", ID_APPLICATION_PAGE_ENDTASK
         MENUITEM "&Zu Prozess wechseln", ID_APPLICATION_PAGE_GOTOPROCESS
@@ -101,9 +113,9 @@ BEGIN
     POPUP "DUMMY"
     BEGIN
         MENUITEM "&Wiederherstellen", ID_RESTORE
-        MENUITEM "&Schließen", ID_FILE_EXIT
+        MENUITEM "S&chließen", ID_FILE_EXIT
         MENUITEM SEPARATOR
-        MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP
+        MENUITEM "Immer im &Vordergrund", ID_OPTIONS_ALWAYSONTOP
     END
 END
 
@@ -115,7 +127,7 @@ BEGIN
         MENUITEM "Pr&ozessstruktur beenden", ID_PROCESS_PAGE_ENDPROCESSTREE
         MENUITEM "&Debuggen", ID_PROCESS_PAGE_DEBUG
         MENUITEM SEPARATOR
-        POPUP "Pr&iorität festlegen"
+        POPUP "P&riorität festlegen"
         BEGIN
             MENUITEM "&Echtzeit", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
             MENUITEM "&Hoch", ID_PROCESS_PAGE_SETPRIORITY_HIGH
@@ -387,9 +399,9 @@ BEGIN
     IDS_TAB_PAGEFAULT "Seitenfehler"
     IDS_TAB_PFDELTA "Maximale Seitenfehler"
     IDS_TAB_VMSIZE "Virtuelle Arbeitsspeichergröße"
-    IDS_TAB_PAGEDPOOL "Paged Pool"
-    IDS_TAB_NPPOOL "NP Pool"
-    IDS_TAB_BASEPRI "Basispri"
+    IDS_TAB_PAGEDPOOL "Ausgelagerter Pool"
+    IDS_TAB_NPPOOL "Nichtausgelagerter Pool"
+    IDS_TAB_BASEPRI "Basispriorität"
     IDS_TAB_HANDLES "Handleanzahl"
     IDS_TAB_THREADS "Threadanzahl"
     IDS_TAB_USERPBJECTS "Benutzer-Objekte"
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%"
     IDS_STATUS_PROCESSES "Prozesse: %d"
-    IDS_Not_Responding "Keine Rückmeldung"
-    IDS_Running "Wird ausgeführt"
+    IDS_NOT_RESPONDING "Keine Rückmeldung"
+    IDS_RUNNING "Wird ausgeführt"
 END

base/applications/taskmgr/lang/el-GR.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "&Cascade", ID_WINDOWS_CASCADE
         MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Βοήθεια"
     BEGIN
         MENUITEM "Θέματα &Βοήθειας του Διαχειριστή Διεργασιών", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
-    IDS_Not_Responding "Not Responding"
-    IDS_Running "Running"
+    IDS_NOT_RESPONDING "Not Responding"
+    IDS_RUNNING "Running"
 END

base/applications/taskmgr/lang/en-US.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "&Cascade", ID_WINDOWS_CASCADE
         MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Help"
     BEGIN
         MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS
@@ -422,6 +434,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
-    IDS_Not_Responding "Not Responding"
-    IDS_Running "Running"
+    IDS_NOT_RESPONDING "Not Responding"
+    IDS_RUNNING "Running"
 END

base/applications/taskmgr/lang/es-ES.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "&Cascada", ID_WINDOWS_CASCADE
         MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "A&yuda"
     BEGIN
         MENUITEM "&Temas de Ayuda del Administrador de Tareas", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Uso Memoria: %dK / %dK"
     IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%"
     IDS_STATUS_PROCESSES "Procesos: %d"
-    IDS_Not_Responding "No Responde"
-    IDS_Running "Funcionando"
+    IDS_NOT_RESPONDING "No Responde"
+    IDS_RUNNING "Funcionando"
 END

base/applications/taskmgr/lang/fr-FR.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "&Cascade", ID_WINDOWS_CASCADE
         MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Aide"
     BEGIN
         MENUITEM "&Rubriques d'aide du Gestionnaire des tâches", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Fichier d'échange utilisé : %dK / %dK"
     IDS_STATUS_CPUUSAGE "UC utilisée : %3d%%"
     IDS_STATUS_PROCESSES "Processus : %d"
-    IDS_Not_Responding "Ne répond pas"
-    IDS_Running "En cours d'exécution"
+    IDS_NOT_RESPONDING "Ne répond pas"
+    IDS_RUNNING "En cours d'exécution"
 END

base/applications/taskmgr/lang/he-IL.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "מדורג", ID_WINDOWS_CASCADE
         MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&עזרה"
     BEGIN
         MENUITEM "&נושאי עזרה של מנהל המשימות", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES "Processes: %d"
-    IDS_Not_Responding "Not Responding"
-    IDS_Running "Running"
+    IDS_NOT_RESPONDING "Not Responding"
+    IDS_RUNNING "Running"
 END

base/applications/taskmgr/lang/hu-HU.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "&Lépcsõzetes rendezés", ID_WINDOWS_CASCADE
         MENUITEM "&Elõtérbe helyezés", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Súgó"
     BEGIN
         MENUITEM "&Témakörök", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Mem használat: %dK / %dK"
     IDS_STATUS_CPUUSAGE "CPU használat: %3d%%"
     IDS_STATUS_PROCESSES "Folyamatok: %d"
-    IDS_Not_Responding "Nem válaszol"
-    IDS_Running "Fut"
+    IDS_NOT_RESPONDING "Nem válaszol"
+    IDS_RUNNING "Fut"
 END

base/applications/taskmgr/lang/id-ID.rc

@@ -48,6 +48,18 @@ BEGIN
         MENUITEM "&Cascade", ID_WINDOWS_CASCADE
         MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Help"
     BEGIN
         MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS
@@ -426,6 +438,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Pemakaian Mem: %dK / %dK"
     IDS_STATUS_CPUUSAGE "Pemakaian CPU: %3d%%"
     IDS_STATUS_PROCESSES "Proses: %d"
-    IDS_Not_Responding "Tidak Merespon"
-    IDS_Running "Berjalan"
+    IDS_NOT_RESPONDING "Tidak Merespon"
+    IDS_RUNNING "Berjalan"
 END

base/applications/taskmgr/lang/it-IT.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "&Sovrapponi", ID_WINDOWS_CASCADE
         MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "&Aiuto"
     BEGIN
         MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS
@@ -424,6 +436,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK"
     IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%"
     IDS_STATUS_PROCESSES "Processi: %d"
-    IDS_Not_Responding "Non risponde"
-    IDS_Running "In esecuzione"
+    IDS_NOT_RESPONDING "Non risponde"
+    IDS_RUNNING "In esecuzione"
 END

base/applications/taskmgr/lang/ja-JP.rc

@@ -46,6 +46,18 @@ BEGIN
         MENUITEM "重ねて表示(&C)", ID_WINDOWS_CASCADE
         MENUITEM "手前に表示(&B)", ID_WINDOWS_BRINGTOFRONT
     END
+    POPUP "Sh&ut Down"
+    BEGIN
+        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+    END
     POPUP "ヘルプ(&H)"
     BEGIN
         MENUITEM "トピックの検索(&H)", ID_HELP_TOPICS
@@ -424,6 +436,6 @@ BEGIN
     IDS_STATUS_MEMUSAGE "メモリ使用量: %dKB / %dKB"
     IDS_STATUS_CPUUSAGE "CPU 使用率: %3d%%"
     IDS_STATUS_PROCESSES "プロセス: %d"
-    IDS_Not_Responding "応答なし"
-    IDS_Running "実行中"
+    IDS_NOT_RESPONDING "応答なし"
+    IDS_RUNNING "実行中"
 END