July 2009 - Wine-commits - list.winehq.org

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

20 Jul '09

Module: wine Branch: master Commit: 8682830355480ed63545746220d9a14e130ec9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8682830355480ed6354574622… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:55 2009 +0500 notepad: Convert the Russian resources to UTF-8. --- programs/notepad/Ru.rc | 139 +++++++++++++++++++++++++++--------------------- 1 files changed, 79 insertions(+), 60 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index 6e9f64e..814b7fc 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -20,46 +20,49 @@ #include "notepad_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "��&��\tCtrl+N", CMD_NEW - MENUITEM "&��...\tCtrl+O", CMD_OPEN - MENUITEM "&��\tCtrl+S", CMD_SAVE - MENUITEM "�� &��...", CMD_SAVE_AS + POPUP "&Файл" { + MENUITEM "Созд&ать\tCtrl+N", CMD_NEW + MENUITEM "&Открыть...\tCtrl+O", CMD_OPEN + MENUITEM "&Сохранить\tCtrl+S", CMD_SAVE + MENUITEM "Сохранить &как...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&��...\tCtrl+P", CMD_PRINT - MENUITEM "��&�� ...", CMD_PAGE_SETUP - MENUITEM "&�� ...", CMD_PRINTER_SETUP + MENUITEM "&Печатать...\tCtrl+P", CMD_PRINT + MENUITEM "Пара&метры страницы...", CMD_PAGE_SETUP + MENUITEM "&Настройка принтера...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "�&��", CMD_EXIT + MENUITEM "В&ыход", CMD_EXIT } -POPUP "&��" { - MENUITEM "&��\tCtrl+Z", CMD_UNDO +POPUP "&Правка" { + MENUITEM "&Отменить\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+X", CMD_CUT - MENUITEM "&��\tCtrl+C", CMD_COPY - MENUITEM "��&��\tCtrl+V", CMD_PASTE - MENUITEM "&��\tDel", CMD_DELETE + MENUITEM "&Вырезать\tCtrl+X", CMD_CUT + MENUITEM "&Копировать\tCtrl+C", CMD_COPY + MENUITEM "Вст&авить\tCtrl+V", CMD_PASTE + MENUITEM "&Удалить\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�� &��", CMD_SELECT_ALL - MENUITEM "��&� � ��\tF5", CMD_TIME_DATE + MENUITEM "Выделить в&се", CMD_SELECT_ALL + MENUITEM "Врем&я и дата\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&�� ", CMD_WRAP - MENUITEM "&��...", CMD_FONT + MENUITEM "&Перенос по словам", CMD_WRAP + MENUITEM "&Шрифт...", CMD_FONT } -POPUP "�&��" { - MENUITEM "&��...", CMD_SEARCH - MENUITEM "�� &��\tF3", CMD_SEARCH_NEXT +POPUP "П&оиск" { + MENUITEM "&Найти...", CMD_SEARCH + MENUITEM "Найти &далее\tF3", CMD_SEARCH_NEXT } -POPUP "&��" { - MENUITEM "&��", CMD_HELP_CONTENTS - MENUITEM "&��...", CMD_HELP_SEARCH - MENUITEM "&�� ", CMD_HELP_ON_HELP +POPUP "&Справка" { + MENUITEM "&Содержание", CMD_HELP_CONTENTS + MENUITEM "&Поиск...", CMD_HELP_SEARCH + MENUITEM "&Использование справки", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&� Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&О Notepad", CMD_HELP_ABOUT_NOTEPAD } } @@ -68,53 +71,69 @@ POPUP "& DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "�� " +CAPTION "Параметры страницы" { -LTEXT "�&�� :", 0x140, 10, 07, 40, 15 +LTEXT "В&ерхний колонтитул:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "�&�� :", 0x142, 10, 24, 40, 15 +LTEXT "Н&ижний колонтитул:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "�� (��):", 0x144, 10, 43,160, 45 -LTEXT "&��:", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "Поля (мм):", 0x144, 10, 43,160, 45 +LTEXT "&Левое:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "&Верхнее:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "&Правое:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "&Нижнее:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&��", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "Отмена", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Справка", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Кодировка:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "�� &p" - -STRING_NOTEPAD, "��" -STRING_ERROR, "��" -STRING_WARNING, "��" -STRING_INFO, "��" - -STRING_UNTITLED, "(�� )" - -STRING_ALL_FILES, "�� (*.*)" -STRING_TEXT_FILES_TXT, "�� (*.txt)" - -STRING_TOOLARGE, "�� '%s' �� .\n \ -�� ." -STRING_NOTEXT, "�� . \ -\n�� -�� ." -STRING_DOESNOTEXIST, "�� '%s'\n�� \n\n \ -�� ?" -STRING_NOTSAVED, "�� '%s'\n�� \n\n \ -�� ?" -STRING_NOTFOUND, "'%s' �� ." -STRING_OUT_OF_MEMORY, "�� \ -\n�� ." +STRING_PAGESETUP_FOOTERVALUE, "Страница &p" + +STRING_NOTEPAD, "Блокнот" +STRING_ERROR, "ОШИБКА" +STRING_WARNING, "ВНИМАНИЕ" +STRING_INFO, "Информация" + +STRING_UNTITLED, "(без заголовка)" + +STRING_ALL_FILES, "Все файлы (*.*)" +STRING_TEXT_FILES_TXT, "Текстовые файлы (*.txt)" + +STRING_TOOLARGE, "Файл '%s' слишком большой для блокнота.\n \ +Используйте другой редактор." +STRING_NOTEXT, "Вы не ввели никакого текста. \ +\nВведите что-нибудь и попробуйте еще." +STRING_DOESNOTEXIST, "Файл '%s'\nне существует\n\n \ +Хотите создать новый файл?" +STRING_NOTSAVED, "Файл '%s'\nбыл изменен\n\n \ +Хотите сохранить изменения?" +STRING_NOTFOUND, "'%s' не найден." +STRING_OUT_OF_MEMORY, "Недостаточно памяти для завершения этой операции \ +\nЗакройте одно или несколько приложений и повторите попытку." + +STRING_UNICODE_LE, "Юникод (UTF-16)" +STRING_UNICODE_BE, "Юникод (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Этот файл содержит текст в формате Юникод, который будет потерян, если вы сохраните этот файл как файл в кодировке %s.\n\ +Чтобы сохранить данные в формате Юникод, нажмите кнопку \"Отмена\" и выберите\n\ +один из вариантов сохранения в формате Юникод.\n\ +Продолжить?" }

1 0

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

20 Jul '09

Module: wine Branch: master Commit: 6f4b182b7e08152ca05f7e9a8572de8e7535d4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4b182b7e08152ca05f7e9a8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:38 2009 +0500 cmdlgtst: Convert the Russian resources to UTF-8. --- programs/cmdlgtst/Ru.rc | 125 ++++++++++++++++++++++++----------------------- 1 files changed, 64 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f4b182b7e08152ca05f7…

1 0

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

20 Jul '09

Module: wine Branch: master Commit: e02f113f315357551bd798e02cf6c507bc1041c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02f113f315357551bd798e02… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:18 2009 +0500 clock: Convert the Russian resources to UTF-8. --- programs/clock/Ru.rc | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/programs/clock/Ru.rc b/programs/clock/Ru.rc index df5b489..71bd67f 100644 --- a/programs/clock/Ru.rc +++ b/programs/clock/Ru.rc @@ -20,29 +20,34 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "&��", IDM_ANALOG - MENUITEM "&��", IDM_DIGITAL + POPUP "&Свойства" { + MENUITEM "&Аналовые", IDM_ANALOG + MENUITEM "&Цифровые", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "&��...", IDM_FONT + MENUITEM "&Шрифт...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_NOTITLE + MENUITEM "&Без заголовка", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "&��", IDM_SECONDS - MENUITEM "&��", IDM_DATE + MENUITEM "&Секунды", IDM_SECONDS + MENUITEM "&Дата", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_ONTOP + MENUITEM "&Поверх всех", IDM_ONTOP } - POPUP "&��" { - MENUITEM "&��...", IDM_LICENSE - MENUITEM "&�� ...", IDM_NOWARRANTY - MENUITEM "&� ��...", IDM_ABOUT + POPUP "&Сведения" { + MENUITEM "&Лицензия...", IDM_LICENSE + MENUITEM "&БЕЗ ГАРАНТИЙ...", IDM_NOWARRANTY + MENUITEM "&О программе...", IDM_ABOUT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -IDS_CLOCK, "��" +IDS_CLOCK, "Часы" }

1 0

Stefan Dösinger : wined3d: Set the highest dirty marker after marking shader constants dirty.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: e06997359f7a38ef9920627cd88e7fccb349cffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06997359f7a38ef9920627cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 17 15:26:44 2009 +0200 wined3d: Set the highest dirty marker after marking shader constants dirty. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 172cd6b..078005f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1794,10 +1794,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(This->activeContext->vshader_const_dirty) { memset(This->activeContext->vshader_const_dirty, 1, sizeof(*This->activeContext->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); + This->highest_dirty_vs_const = GL_LIMITS(vshader_constantsF); } if(This->activeContext->pshader_const_dirty) { memset(This->activeContext->pshader_const_dirty, 1, sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); + This->highest_dirty_ps_const = GL_LIMITS(pshader_constantsF); } This->activeContext = context; context_set_last_device(This);

1 0

Stefan Dösinger : wined3d: Don' t activate a context unless we need one.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: cd7f43b00dbe12f3b999773b0dfca27f7137c501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7f43b00dbe12f3b999773b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 17 11:48:32 2009 +0200 wined3d: Don't activate a context unless we need one. --- dlls/wined3d/arb_program_shader.c | 8 ++++++-- dlls/wined3d/glsl_shader.c | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6b82049..e7ca690 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4359,8 +4359,6 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)baseShader->baseShader.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) iface; @@ -4369,6 +4367,9 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { if(!shader_data) return; /* This can happen if a shader was never compiled */ ENTER_GL(); + + if(shader_data->num_gl_shaders) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + for(i = 0; i < shader_data->num_gl_shaders; i++) { GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); @@ -4384,6 +4385,9 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { if(!shader_data) return; /* This can happen if a shader was never compiled */ ENTER_GL(); + + if(shader_data->num_gl_shaders) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + for(i = 0; i < shader_data->num_gl_shaders; i++) { GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0189616..65c5b04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4331,8 +4331,6 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { */ char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - if(pshader) { struct glsl_pshader_private *shader_data; ps = (IWineD3DPixelShaderImpl *) This; @@ -4344,6 +4342,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { return; } + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) { ENTER_GL(); @@ -4361,6 +4361,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { return; } + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) { ENTER_GL();

1 0

Austin English : shell32: Adjust shell folders to more closely match Windows.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: c68a20fb800b4ac6755f25b577bfdd318710402f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a20fb800b4ac6755f25b57… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 19 18:44:59 2009 -0500 shell32: Adjust shell folders to more closely match Windows. --- dlls/shell32/shellpath.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 44f0750..0f07a85 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -764,6 +764,7 @@ static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' ' static const WCHAR Common_AppDataW[] = {'C','o','m','m','o','n',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s','k','t','o','p','\0'}; static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'}; +static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'}; static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'}; static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'}; static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'}; @@ -981,7 +982,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x1f - CSIDL_COMMON_FAVORITES */ CSIDL_Type_AllUsers, - FavoritesW, + Common_FavoritesW, MAKEINTRESOURCEW(IDS_FAVORITES) }, { /* 0x20 - CSIDL_INTERNET_CACHE */ @@ -2041,6 +2042,10 @@ static HRESULT _SHRegisterCommonShellFolders(void) CSIDL_COMMON_APPDATA, CSIDL_COMMON_TEMPLATES, CSIDL_COMMON_DOCUMENTS, + CSIDL_COMMON_ADMINTOOLS, + CSIDL_COMMON_MUSIC, + CSIDL_COMMON_PICTURES, + CSIDL_COMMON_VIDEO, }; HRESULT hr;

1 0

Austin English : notepad: English resource fixes.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 95a7e5f8bd4308f5389705998792114c98a8d65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a7e5f8bd4308f5389705998… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 19 19:23:24 2009 -0500 notepad: English resource fixes. --- programs/notepad/En.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 15439b1..d9ea7cd 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -116,14 +116,14 @@ STRING_UNTITLED, "Untitled" STRING_ALL_FILES, "All files (*.*)" STRING_TEXT_FILES_TXT, "Text files (*.txt)" -STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ +STRING_TOOLARGE, "File '%s' is too large for notepad.\n\ Please use a different editor." -STRING_NOTEXT, "You didn't enter any text. \ +STRING_NOTEXT, "You didn't enter any text.\ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s' does not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s' has been modified\n\n \ -Would you like to save the changes ?" +STRING_DOESNOTEXIST, "File '%s' does not exist.\n\n\ +Do you want to create a new file?" +STRING_NOTSAVED, "File '%s' has been modified.\n\n\ +Would you like to save the changes?" STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task.\nClose one or more applications to increase the amount of free memory."

1 0

Frédéric Delanoy : notepad: French resources fixes.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: addeb0e34abc522c659e73905f7e02cf1c99cb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addeb0e34abc522c659e73905… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 20 10:50:03 2009 +0200 notepad: French resources fixes. --- programs/notepad/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 3ec4262..77b3c3c 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -124,9 +124,9 @@ STRING_TOOLARGE, "Le fichier « %s » est trop gr Veuillez utiliser un autre éditeur." STRING_NOTEXT, "Vous n'avez pas entré de texte. \ Veuillez taper quelque chose et recommencer" -STRING_DOESNOTEXIST, "Le fichier « %s »\nn'existe pas.\n\n\ +STRING_DOESNOTEXIST, "Le fichier « %s » n'existe pas.\n\n\ Voulez-vous créer un nouveau fichier ?" -STRING_NOTSAVED, "Le fichier « %s »\na été modifié\n\n \ +STRING_NOTSAVED, "Le fichier « %s » a été modifié\n\n\ Voulez-vous enregistrer vos modifications ?" STRING_NOTFOUND, "« %s » non trouvé." STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour terminer cette \

1 0

Nikolay Sivov : wingdi.h: Fix RGBQUAD and RGBTRIPLE to match PSDK.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 1218c2b5f6104223ac0c965149317631e7566341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1218c2b5f6104223ac0c96514… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 19 23:59:19 2009 +0400 wingdi.h: Fix RGBQUAD and RGBTRIPLE to match PSDK. --- include/wingdi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index a6cdd64..0e5d5e6 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1775,14 +1775,14 @@ typedef struct tagEXTLOGPEN /* Device-independent bitmaps */ -typedef struct { +typedef struct tagRGBQUAD { BYTE rgbBlue; BYTE rgbGreen; BYTE rgbRed; BYTE rgbReserved; } RGBQUAD, *LPRGBQUAD; -typedef struct { +typedef struct tagRGBTRIPLE { BYTE rgbtBlue; BYTE rgbtGreen; BYTE rgbtRed;

1 0

Aurimas Fišeras : Various small Lithuanian translation fixes.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: d05f1d3e0a51359805f7f70f637edd834baa7c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f1d3e0a51359805f7f70f6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 19 18:42:46 2009 +0300 Various small Lithuanian translation fixes. --- dlls/crypt32/crypt32_Lt.rc | 4 ++-- dlls/cryptui/cryptui_Lt.rc | 4 ++-- dlls/localui/ui_Lt.rc | 2 +- dlls/oledlg/oledlg_Lt.rc | 2 +- dlls/setupapi/Lt.rc | 2 +- dlls/shell32/shell32_Lt.rc | 12 ++++++------ programs/regedit/Lt.rc | 10 +++++----- programs/start/Lt.rc | 2 +- programs/taskmgr/Lt.rc | 2 +- programs/uninstaller/Lt.rc | 2 +- programs/winemine/Lt.rc | 2 +- programs/xcopy/Lt.rc | 10 +++++----- 12 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d05f1d3e0a51359805f7f…

1 0