wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Vladimir Pankratov : xcopy: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 085237fd217015f6f12131fc37026769fc5a0dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=085237fd217015f6f12131fc3… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:30:09 2009 +0500 xcopy: Convert the Russian resources to UTF-8. --- programs/xcopy/Ru.rc | 81 ++++++++++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 39 deletions(-) diff --git a/programs/xcopy/Ru.rc b/programs/xcopy/Ru.rc index 3983457..154c999 100644 --- a/programs/xcopy/Ru.rc +++ b/programs/xcopy/Ru.rc @@ -22,26 +22,29 @@ #include "xcopy.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { STRING_INVPARMS, -"�� - �� 'xcopy /?' �� \n\ -�� .\n" +"Недопустимое число параметров - попробуйте 'xcopy /?' для получения\n\ +подробного описания.\n" STRING_INVPARM, -"�� '%s' - �� 'xcopy /?' �� \n\ -��.\n" - STRING_PAUSE, "�� <enter>, �� .\n" - STRING_SIMCOPY, "%d ��(��) �� .\n" - STRING_COPY, "%d ��(��) ��.\n" - STRING_QISDIR, "'%s' �� ?\n" \ - "(F - ��, D - ��)\n" +"Недопустимый параметр '%s' - попробуйте 'xcopy /?' для получения подробного\n\ +описания.\n" + STRING_PAUSE, "Нажмите клавишу <enter>, чтобы начать копирование.\n" + STRING_SIMCOPY, "%d файл(ов) было бы скопировано.\n" + STRING_COPY, "%d файл(ов) скопировано.\n" + STRING_QISDIR, "'%s' является файлом или папкой?\n" \ + "(F - Файл, D - Папка)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"�� %s? (Yes|No|All)\n" - STRING_COPYFAIL, "�� '%s' � '%s' �� : %d\n" - STRING_OPENFAIL, "�� '%s'\n" - STRING_READFAIL, "�� '%s' �� \n" + STRING_OVERWRITE,"Переписать %s? (Yes|No|All)\n" + STRING_COPYFAIL, "При копировании '%s' в '%s' произошла ошибка: %d\n" + STRING_OPENFAIL, "Невозможно открыть '%s'\n" + STRING_READFAIL, "При чтении '%s' произошла ошибка\n" STRING_YES_CHAR, "Y" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -49,35 +52,35 @@ STRINGTABLE STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - �� \n\ +"XCOPY - Копирует файлы и деревья папок\n\ \n\ -��:\n\ +Синтаксис:\n\ XCOPY source [dest] [/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\ \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" +[/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" }

1 0

Vladimir Pankratov : wordpad: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 60dcd6365eb79e2f9717165848c6427cfb99a221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dcd6365eb79e2f971716584… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:45 2009 +0500 wordpad: Convert the Russian resources to UTF-8. --- programs/wordpad/Ru.rc | 223 ++++++++++++++++++++++++------------------------ 1 files changed, 113 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60dcd6365eb79e2f97171…

1 0

Vladimir Pankratov : winedbg: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 0c7b34bdd920be34b7f7448e014e5105896aad74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7b34bdd920be34b7f7448e0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:28:59 2009 +0500 winedbg: Convert the Russian resources to UTF-8. --- programs/winedbg/rsrc_Ru.rc | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc index 622ff7b..281537b 100644 --- a/programs/winedbg/rsrc_Ru.rc +++ b/programs/winedbg/rsrc_Ru.rc @@ -20,36 +20,39 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "&��", ID_DEBUG + MENUITEM "&Отладка", ID_DEBUG END END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Ошибка программы" FONT 8, "Tahoma" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 - LTEXT "� �� %s �� \ - ��. �� .", + LTEXT "В программе %s обнаружена серьёзная ошибка и она должна быть \ + закрыта. Приносим извинения за неудобство.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "�� Wine. \ - �� http://appdb.winehq.org � �� \ - �� .\n\n\ - �� Windows � �� , \ - �� http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 - DEFPUSHBUTTON "��", IDOK, 205, 151, 60, 16, WS_TABSTOP + LTEXT "Ошибка могла быть вызвана проблемой в программе или недоработкой в Wine. \ + Вы можете посетить http://appdb.winehq.org и поискать советы о запуске \ + этой программы.\n\n\ + Если эта проблема не присутствует под Windows и ещё не была зарегистрирована, \ + вы можете сообщить о ней на http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Закрыть", IDOK, 205, 151, 60, 16, WS_TABSTOP END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "�� Wine" - IDS_INVALID_PARAMS "�� - �� " - IDS_UNIDENTIFIED "(��)" + IDS_AUTO_CAPTION "Ошибка Wine" + IDS_INVALID_PARAMS "Внутренние ошибки - получены неверные параметры" + IDS_UNIDENTIFIED "(неопределено)" END

1 0

Vladimir Pankratov : winhlp32: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 664cfe012a9a9779ce01195f044ae9c8641e9882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664cfe012a9a9779ce01195f0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:35 2009 +0500 winhlp32: Convert the Russian resources to UTF-8. --- programs/winhlp32/Ru.rc | 119 ++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index e2e6ef2..165094f 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -20,99 +20,104 @@ #include "winhelp_res.h" +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "&��", MNID_FILE_OPEN + POPUP "&Файл" { + MENUITEM "&Открыть", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&��", MNID_FILE_PRINT - MENUITEM "�� &��...", MNID_FILE_SETUP + MENUITEM "&Печатать", MNID_FILE_PRINT + MENUITEM "Настройка &принтера...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "&��", MNID_FILE_EXIT + MENUITEM "&Выход", MNID_FILE_EXIT } - POPUP "&��" { - MENUITEM "&��...", MNID_EDIT_COPYDLG + POPUP "&Правка" { + MENUITEM "&Копировать...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&��...", MNID_EDIT_ANNOTATE + MENUITEM "&Заметки...", MNID_EDIT_ANNOTATE } - POPUP "&��" { - MENUITEM "&��...", MNID_BKMK_DEFINE + POPUP "&Закладка" { + MENUITEM "&Определить...", MNID_BKMK_DEFINE } - POPUP "&��" { - POPUP "�� " + POPUP "&Настройки" { + POPUP "Видимость окна справки" BEGIN - MENUITEM "�� ", MNID_OPTS_HELP_DEFAULT - MENUITEM "��", MNID_OPTS_HELP_VISIBLE - MENUITEM "�� ", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "По умолчанию", MNID_OPTS_HELP_DEFAULT + MENUITEM "Наверху", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не наверху", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "��", MNID_OPTS_HISTORY - POPUP "��" + MENUITEM "История", MNID_OPTS_HISTORY + POPUP "Шрифт" BEGIN - MENUITEM "��", MNID_OPTS_FONTS_SMALL - MENUITEM "��", MNID_OPTS_FONTS_NORMAL - MENUITEM "��", MNID_OPTS_FONTS_LARGE + MENUITEM "Мелкий", MNID_OPTS_FONTS_SMALL + MENUITEM "Обычный", MNID_OPTS_FONTS_NORMAL + MENUITEM "Крупный", MNID_OPTS_FONTS_LARGE END - MENUITEM "�� ", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Использовать системные цвета", MNID_OPTS_SYSTEM_COLORS } - POPUP "&��" { - MENUITEM "�� &�� ", MNID_HELP_HELPON - MENUITEM "�� &��", MNID_HELP_HELPTOP + POPUP "&Справка" { + MENUITEM "Помощь &по помощи", MNID_HELP_HELPON + MENUITEM "Всегда &сверху", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&��...", MNID_HELP_ABOUT + MENUITEM "&Информация...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&� Wine", MNID_HELP_WINE + MENUITEM "&О Wine", MNID_HELP_WINE #endif } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "��" +CAPTION "Указатель" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "�� WINE" -STID_WHERROR, "��" -STID_WARNING, "��" -STID_INFO, "��" -STID_NOT_IMPLEMENTED, "�� " -STID_HLPFILE_ERROR_s, "�� `%s'" -STID_INDEX, "&��" -STID_CONTENTS, "��" -STID_BACK, "&��" -STID_ALL_FILES, "�� (*.*)" -STID_HELP_FILES_HLP, "�� (*.hlp)" -STID_FILE_NOT_FOUND_s "�� '%s'. �� ?" -STID_NO_RICHEDIT "�� richedit" -STID_PSH_INDEX, "��: " +STID_WINE_HELP, "Справка WINE" +STID_WHERROR, "ОШИБКА" +STID_WARNING, "ВНИМАНИЕ" +STID_INFO, "Информация" +STID_NOT_IMPLEMENTED, "Не реализованно" +STID_HLPFILE_ERROR_s, "Ошибка при чтении файла помощи `%s'" +STID_INDEX, "&Содержание" +STID_CONTENTS, "Начало" +STID_BACK, "&Назад" +STID_ALL_FILES, "Все файлы (*.*)" +STID_HELP_FILES_HLP, "Файлы справки (*.hlp)" +STID_FILE_NOT_FOUND_s "Не могу найти '%s'. Вы хотите найти этот файл самостоятельно?" +STID_NO_RICHEDIT "Не могу найти richedit" +STID_PSH_INDEX, "Содержание: " } -CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "��...", MNID_CTXT_ANNOTATE - MENUITEM "��", MNID_CTXT_COPY - MENUITEM "��...", MNID_CTXT_PRINT - POPUP "��" + MENUITEM "Заметки...", MNID_CTXT_ANNOTATE + MENUITEM "Копировать", MNID_CTXT_COPY + MENUITEM "Печать...", MNID_CTXT_PRINT + POPUP "Шрифт" BEGIN - MENUITEM "��", MNID_CTXT_FONTS_SMALL - MENUITEM "��", MNID_CTXT_FONTS_NORMAL - MENUITEM "��", MNID_CTXT_FONTS_LARGE + MENUITEM "Мелкий", MNID_CTXT_FONTS_SMALL + MENUITEM "Обычный", MNID_CTXT_FONTS_NORMAL + MENUITEM "Крупный", MNID_CTXT_FONTS_LARGE END - POPUP "�� " + POPUP "Видимость окна справки" BEGIN - MENUITEM "�� ", MNID_CTXT_HELP_DEFAULT - MENUITEM "��", MNID_CTXT_HELP_VISIBLE - MENUITEM "�� ", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "По умолчанию", MNID_CTXT_HELP_DEFAULT + MENUITEM "Наверху", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не наверху", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "�� ", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Использовать системные цвета", MNID_CTXT_SYSTEM_COLORS END END

1 0

Vladimir Pankratov : winemine: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 1ae0eba68f6c6926112d408c3916e4e945144ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae0eba68f6c6926112d408c3… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:25 2009 +0500 winemine: Convert the Russian resources to UTF-8. --- programs/winemine/Ru.rc | 49 ++++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/programs/winemine/Ru.rc b/programs/winemine/Ru.rc index e323e24..d990fe5 100644 --- a/programs/winemine/Ru.rc +++ b/programs/winemine/Ru.rc @@ -21,6 +21,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { @@ -31,33 +34,33 @@ STRINGTABLE { MENU_WINEMINE MENU DISCARDABLE { - POPUP "&��" { - MENUITEM "&�� \tF2", IDM_NEW + POPUP "&Игра" { + MENUITEM "&Новая игра\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_MARKQ + MENUITEM "&Вопросительные знаки", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "��&��", IDM_BEGINNER - MENUITEM "&��", IDM_ADVANCED - MENUITEM "&��", IDM_EXPERT - MENUITEM "�� &��", IDM_CUSTOM + MENUITEM "Нови&чок", IDM_BEGINNER + MENUITEM "&Мастер", IDM_ADVANCED + MENUITEM "&Эксперт", IDM_EXPERT + MENUITEM "Нестандартные &параметры", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&��\tAlt+X", IDM_EXIT + MENUITEM "&Закрыть\tAlt+X", IDM_EXIT } - POPUP "&��" { - MENUITEM "&�� ", IDM_TIMES - MENUITEM "&� ��", IDM_ABOUT + POPUP "&Справка" { + MENUITEM "&Лучшее время", IDM_TIMES + MENUITEM "&О программе", IDM_ABOUT } } DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "Лучшее время" { - GROUPBOX "�� ", -1, 10, 10, 140, 45 - LTEXT "��", -1, 20, 20, 40, 8 - LTEXT "��", -1, 20, 30, 40, 8 - LTEXT "��", -1, 20, 40, 40, 8 + GROUPBOX "Лучшее время", -1, 10, 10, 140, 45 + LTEXT "Новичок", -1, 20, 20, 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 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -70,9 +73,9 @@ CAPTION " DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "��!" +CAPTION "Поздравляю!" { - LTEXT "��, �� ", -1, 10, 10, 150, 10 + LTEXT "Пожалуйста, введите Ваше имя", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } @@ -80,14 +83,14 @@ CAPTION " DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 140, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "Нестандартные параметры" { - LTEXT "�� ", -1, 5, 5, 70, 10 - LTEXT "�� ", -1, 5, 35, 70, 10 - LTEXT "�� ", -1, 5, 65, 70, 10 + 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, 80, 30, 50, 15 - PUSHBUTTON "��", IDCANCEL, 80, 50, 50, 15 + PUSHBUTTON "Отмена", IDCANCEL, 80, 50, 50, 15 }

1 0

Vladimir Pankratov : winefile: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: f7430fa05d9a6253c5625de2803efd997f4f8ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7430fa05d9a6253c5625de28… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:07 2009 +0500 winefile: Convert the Russian resources to UTF-8. --- programs/winefile/Ru.rc | 245 ++++++++++++++++++++++++----------------------- 1 files changed, 124 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7430fa05d9a6253c5625…

1 0

Vladimir Pankratov : wineconsole: Convert the Russian resources to UTF-8.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 1cae50f421efca5babaf2807b392ec2782a23db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cae50f421efca5babaf2807b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:28:44 2009 +0500 wineconsole: Convert the Russian resources to UTF-8. --- programs/wineconsole/wineconsole_Ru.rc | 125 ++++++++++++++++---------------- 1 files changed, 64 insertions(+), 61 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 40154a3..0cebb2d 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -20,78 +20,81 @@ #include "wineconsole_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN -IDS_EDIT, "&��" -IDS_DEFAULT, "�� &��" -IDS_PROPERTIES, "�&��" -IDS_MARK, "&��" -IDS_COPY, "&��" -IDS_PASTE, "&��" -IDS_SELECTALL, "�� &��" -IDS_SCROLL, "��&��" -IDS_SEARCH, "��&��" -IDS_FNT_DISPLAY, "�� %ld �� %ld �� " -IDS_FNT_PREVIEW_1, "�� " +IDS_EDIT, "&Правка" +IDS_DEFAULT, "По &умолчанию" +IDS_PROPERTIES, "С&войства" +IDS_MARK, "&Выделить" +IDS_COPY, "&Копировать" +IDS_PASTE, "&Вставить" +IDS_SELECTALL, "Выделить в&се" +IDS_SCROLL, "Прок&рутить" +IDS_SEARCH, "По&иск" +IDS_FNT_DISPLAY, "Каждый символ %ld пикселей в ширину и %ld пикселей в высоту" +IDS_FNT_PREVIEW_1, "Это тест" IDS_FNT_PREVIEW_2, "This is a test" -IDS_DLG_TIT_DEFAULT, "�� - �� " -IDS_DLG_TIT_CURRENT, "�� - �� " -IDS_DLG_TIT_ERROR, "�� " -IDS_DLG_ERR_SBWINSIZE, "�� " - -IDS_CMD_INVALID_EVENT_ID "wineconsole: �� \n" -IDS_CMD_INVALID_BACKEND "wineconsole: �� backend\n" -IDS_CMD_INVALID_OPTION "wineconsole: �� \n" -IDS_CMD_ABOUT "�� Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole: �� '%s'.\n"\ - "�� .\n" - -IDS_USAGE_HEADER "\n��:\n wineconsole [��] <��>\n\n��:\n" -IDS_USAGE_BACKEND " --backend={user|curses} �� 'user' �� \n"\ - " �� . 'curses' - ��\n"\ - " �� \n"\ -IDS_USAGE_COMMAND " <��> �� Wine\n" -IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\n�� Wine � �� Wine\n\n" +IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" +IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" +IDS_DLG_TIT_ERROR, "Ошибка настройки" +IDS_DLG_ERR_SBWINSIZE, "Размер буфера экрана должен быть не менее буфера окна" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Не верно указан код события\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Не известный backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Указанная опция не найдена\n" +IDS_CMD_ABOUT "Запуск программы в консоли Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Не удался запуск программы '%s'.\n"\ + "Не верно указанна команда.\n" + +IDS_USAGE_HEADER "\nВызов:\n wineconsole [опции] <команда>\n\nОпции:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Выбор 'user' откроет новое окно с полной поддержкой\n"\ + " всех режимов работы консоли. 'curses' - использует\n"\ + " текущее окно с ограниченной функциональностью\n"\ +IDS_USAGE_COMMAND " <команда> Имя программы для запуска в консоли Wine\n" +IDS_USAGE_FOOTER "\nНапример:\n wineconsole cmd\nЗапустить командный процессор Wine в консоли Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Опции " FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 60, 54, BS_GROUPBOX - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_SMALL, 14, 23, 52, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_MEDIUM, 14, 33, 52, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_LARGE, 14, 43, 52, 10, WS_TABSTOP - - GROUPBOX "��", -1, 75, 11, 123, 54, BS_GROUPBOX - LTEXT "�� ", -1, 79, 23, 50, 20 - AUTOCHECKBOX "&�trl", IDC_OPT_CONF_CTRL, 144, 23, 52, 10, WS_TABSTOP + GROUPBOX "Размер курсора", -1, 10, 11, 60, 54, BS_GROUPBOX + AUTORADIOBUTTON "&Маленький", IDC_OPT_CURSOR_SMALL, 14, 23, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&Средний", IDC_OPT_CURSOR_MEDIUM, 14, 33, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&Большой", IDC_OPT_CURSOR_LARGE, 14, 43, 52, 10, WS_TABSTOP + + GROUPBOX "Управление", -1, 75, 11, 123, 54, BS_GROUPBOX + LTEXT "Всплывающее меню", -1, 79, 23, 50, 20 + AUTOCHECKBOX "&Сtrl", IDC_OPT_CONF_CTRL, 144, 23, 52, 10, WS_TABSTOP AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 144, 33, 52, 10, WS_TABSTOP - LTEXT "�� ", -1, 79, 43, 60, 20 - AUTOCHECKBOX "&��", IDC_OPT_QUICK_EDIT, 144, 51, 52, 10, WS_TABSTOP + LTEXT "Быстрое редактирование", -1, 79, 43, 60, 20 + AUTOCHECKBOX "&включить", IDC_OPT_QUICK_EDIT, 144, 51, 52, 10, WS_TABSTOP - GROUPBOX "�� ", -1, 10, 67, 189, 35, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 77, 78, 18 + GROUPBOX "История команд", -1, 10, 67, 189, 35, BS_GROUPBOX + LTEXT "&История команд:", -1, 14, 77, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 82, 79, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&�� ", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Удалять дублирующиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Шрифт " FONT 8, "MS Shell Dlg" { - LTEXT "&��", -1, 5, 5, 24, 8 + LTEXT "&Шрифт", -1, 5, 5, 24, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL - LTEXT "&��", -1, 100, 5, 50, 8 + LTEXT "&Цвет", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 - LTEXT "&��", -1, 158, 5, 40, 8 + LTEXT "&Размер", -1, 158, 5, 40, 8 LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 LTEXT "", IDC_FNT_FONT_INFO, 128, 71, 80, 25 @@ -99,41 +102,41 @@ FONT 8, "MS Shell Dlg" IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Настройка " FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 100, 42, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 25, 54, 9 + GROUPBOX "Зона буфера", -1, 8, 11, 100, 42, BS_GROUPBOX + LTEXT "&Ширина :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&�� :", -1, 14, 39, 54, 9 + LTEXT "&Высота :", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "�� ", -1, 10, 55, 100, 42 - LTEXT "�&�� :", -1, 14, 69, 54, 9 + GROUPBOX "Размер окна", -1, 8, 55, 100, 42 + LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "�&�� :", -1, 14, 83, 54, 9 + LTEXT "В&ысота :", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "�� ", -1, 115, 11, 85, 42, BS_GROUPBOX - AUTOCHECKBOX "&�� ", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + GROUPBOX "Завершение программы", -1, 112, 11, 90, 43, BS_GROUPBOX + AUTOCHECKBOX "&Закрывать консоль", IDC_CNF_CLOSE_EXIT, 119, 25, 79, 20, WS_TABSTOP - GROUPBOX "��", -1, 115, 55, 85, 42 + GROUPBOX "Редактирование", -1, 112, 55, 90, 42 COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 198, 70 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "�� " +CAPTION "Параметры консоли" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Сохранить эти настройки для будущих сессий", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Изменить только текущую сессию", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 40, 50, 50, 14 - PUSHBUTTON "��", IDCANCEL, 110, 50, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14 }

1 0

Henri Verbeet : wined3d: get_drawable_size() needs a context.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 357ea123d909639991d2007e9e18a1f115a8b29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=357ea123d909639991d2007e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:37 2009 +0200 wined3d: get_drawable_size() needs a context. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 94000df..10b20fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4942,9 +4942,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa } } + ActivateContext(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); + target->get_drawable_size(target, &drawable_width, &drawable_height); - ActivateContext(This, (IWineD3DSurface *) target, CTXUSAGE_CLEAR); ENTER_GL(); /* Only set the values up once, as they are not changing */

1 0

Henri Verbeet : wined3d: Return the activated context from ActivateContext( ).
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: ea2caa9ba190bd3aae91d85ee4f949e3382e5d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2caa9ba190bd3aae91d85ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:36 2009 +0200 wined3d: Return the activated context from ActivateContext(). --- dlls/wined3d/context.c | 5 ++++- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1d25afc..5afbda7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1794,7 +1794,8 @@ static void context_apply_draw_buffer(struct WineD3DContext *context, BOOL blit) * usage: Prepares the context for blitting, drawing or other actions * *****************************************************************************/ -void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { +struct WineD3DContext *ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage) +{ struct WineD3DContext *current_context = context_get_current(); DWORD tid = GetCurrentThreadId(); DWORD i, dirtyState, idx; @@ -1929,4 +1930,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU default: FIXME("Unexpected context usage requested\n"); } + + return context; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a28878e..bb64875 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1262,7 +1262,7 @@ typedef enum ContextUsage { CTXUSAGE_CLEAR = 4, /* Drawable and states are set up for clearing */ } ContextUsage; -void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); +struct WineD3DContext *ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage); WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type);

1 0

Henri Verbeet : wined3d: Explicitly pass the wined3d context to context_apply_draw_buffer().
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: wine Branch: master Commit: 85e2c05e4ff666d2b7ae6a0e0bcce74a6d10ecc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e2c05e4ff666d2b7ae6a0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:35 2009 +0200 wined3d: Explicitly pass the wined3d context to context_apply_draw_buffer(). --- dlls/wined3d/context.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 61173fb..1d25afc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1734,16 +1734,19 @@ retry: } /* Context activation is done by the caller. */ -static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) +static void context_apply_draw_buffer(struct WineD3DContext *context, BOOL blit) { - const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + IWineD3DSurface *rt = context->current_rt; IWineD3DSwapChain *swapchain; + IWineD3DDeviceImpl *device; - if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) + device = ((IWineD3DSurfaceImpl *)rt)->resource.wineD3DDevice; + if (SUCCEEDED(IWineD3DSurface_GetContainer(rt, &IID_IWineD3DSwapChain, (void **)&swapchain))) { IWineD3DSwapChain_Release((IUnknown *)swapchain); ENTER_GL(); - glDrawBuffer(surface_get_gl_buffer(target, swapchain)); + glDrawBuffer(surface_get_gl_buffer(rt, swapchain)); checkGLcall("glDrawBuffers()"); LEAVE_GL(); } @@ -1756,12 +1759,12 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, { if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { - GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), device->draw_buffers)); checkGLcall("glDrawBuffers()"); } else { - glDrawBuffer(This->draw_buffers[0]); + glDrawBuffer(device->draw_buffers[0]); checkGLcall("glDrawBuffer()"); } } else { @@ -1771,7 +1774,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, } else { - glDrawBuffer(This->offscreenBuffer); + glDrawBuffer(device->offscreenBuffer); checkGLcall("glDrawBuffer()"); } LEAVE_GL(); @@ -1836,7 +1839,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU LEAVE_GL(); } if (context->draw_buffer_dirty) { - apply_draw_buffer(This, target, FALSE); + context_apply_draw_buffer(context, FALSE); context->draw_buffer_dirty = FALSE; } break; @@ -1858,7 +1861,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU context->draw_buffer_dirty = TRUE; } if (context->draw_buffer_dirty) { - apply_draw_buffer(This, target, TRUE); + context_apply_draw_buffer(context, TRUE); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { context->draw_buffer_dirty = FALSE; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
107
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2009