wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

José Manuel Ferrer Ortiz : winecfg: Spanish translation update.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: ed92d80682150a06f1e712479b4627d70a74b887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92d80682150a06f1e712479… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sun Aug 28 10:55:04 2011 +0100 winecfg: Spanish translation update. --- programs/winecfg/Es.rc | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 2507ec0..2b70ce8 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -2,7 +2,7 @@ * WineCfg resources * Spanish Language Support * - * Copyright 2003-2009 Jos� Manuel Ferrer Ortiz + * Copyright 2003-2011 Jos� Manuel Ferrer Ortiz * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or @@ -37,9 +37,9 @@ BEGIN LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_ABT_LICENSE_TEXT,105,64,145,60 GROUPBOX " Informaci�n de Registro de Windows ", IDC_STATIC, 15, 155, 230, 55 - LTEXT "Propietario:", IDC_STATIC, 22, 171, 40, 20 + LTEXT "&Propietario:", IDC_STATIC, 22, 171, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP - LTEXT "Organizaci�n:", IDC_STATIC, 22, 185, 50, 20 + LTEXT "&Organizaci�n:", IDC_STATIC, 22, 185, 50, 20 EDITTEXT IDC_ABT_ORG, 75, 185, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END @@ -63,10 +63,10 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuraci�n de ventanas ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Permitir al gestor de ventanas decorar las ventanas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Permitir al gestor de ventanas controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Capturar el &rat�n autom�ticamente en pantalla completa",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Permitir al gestor de ventanas &decorar las ventanas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "Permitir al gestor de ventanas &controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "&Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Dimensiones:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED @@ -74,9 +74,9 @@ BEGIN EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Soporte Vertex Shader: ",IDC_STATIC,15,110,80,32 + LTEXT "Soporte &Vertex Shader: ",IDC_STATIC,15,110,80,32 COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Permitir Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 + CONTROL "Permitir &Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 GROUPBOX " Resoluci�n de pantalla ",IDC_STATIC,8,151,244,63 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 @@ -92,10 +92,10 @@ BEGIN GROUPBOX " Reemplazos de DLL ",IDC_STATIC,8,4,244,210 LTEXT "Cada librer�a de enlace din�mico se puede especificar para que sea la interna (proporcionada por Wine) o la nativa (obtenida de Windows o proporcionada por la aplicaci�n)." ,IDC_STATIC,16,16,220,32 - LTEXT "Nuevo reemplazo para librer�a:",IDC_STATIC,16,58,100,8 + LTEXT "&Nuevo reemplazo para librer�a:",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "&A�adir",IDC_DLLS_ADDDLL, 164,68,82,13 - LTEXT "Reemplazos existentes:",IDC_STATIC,16,86,100,8 + LTEXT "&Reemplazos existentes:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,112,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Editar",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "E&liminar",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -151,7 +151,7 @@ BEGIN EDITTEXT IDC_EDIT_DEVICE,45,150,150,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "E&xaminar...",IDC_BUTTON_BROWSE_DEVICE,200,150,46,13 - LTEXT "&Etiqueta:",IDC_STATIC_LABEL,15,168,29,12 + LTEXT "Eti&queta:",IDC_STATIC_LABEL,15,168,29,12 EDITTEXT IDC_EDIT_LABEL,45,165,78,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "&N� serie:",IDC_STATIC_SERIAL,15,183,29,12 EDITTEXT IDC_EDIT_SERIAL,45,180,78,13,ES_AUTOHSCROLL | WS_TABSTOP @@ -163,17 +163,17 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Selecci�n de controlador ",IDC_STATIC,8,4,244,160 - LTEXT " Seleccione un controlador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci�n de m�s de un controlador. Para configurar un controlador haga doble click sobre �l.",IDC_STATIC,15,15,227,35 + GROUPBOX " Selecci�n de controlador ",IDC_STATIC,8,4,244,160 + LTEXT "Seleccione un controlador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci�n de m�s de un controlador. Para configurar un controlador haga doble clic sobre �l.",IDC_STATIC,15,15,227,35 CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "Probar sonido",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 + PUSHBUTTON "Probar &sonido",IDC_AUDIO_TEST,170,50,59,14 + PUSHBUTTON "&Panel de control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Aceleraci�n Hardware: ",IDC_STATIC,15,180,90,10 + LTEXT "Aceleraci�n &Hardware: ",IDC_STATIC,15,180,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Frecuencia muestreo:",IDC_STATIC,15,197,70,8 + LTEXT "&Frecuencia muestreo:",IDC_STATIC,15,197,70,8 COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits por muestra:",IDC_STATIC,137,197,80,8 + LTEXT "&Bits por muestra:",IDC_STATIC,137,197,80,8 COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -182,25 +182,25 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Apariencia ",IDC_STATIC,8,4,244,106 - LTEXT "Tema:",IDC_STATIC,15,16,130,8 + LTEXT "&Tema:",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Instalar tema...",IDC_THEME_INSTALL,152,23,93,14 + PUSHBUTTON "&Instalar tema...",IDC_THEME_INSTALL,152,23,93,14 LTEXT "Color:",IDC_THEME_COLORTEXT,15,40,112,8 COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Tama�o:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Elemento:",IDC_STATIC,15,64,112,8 + LTEXT "&Elemento:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW LTEXT "Tama�o:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Fuente",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "&Fuente",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " Carpetas del sistema ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Enlace a:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "E&nlace a:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Explorar",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "E&xplorar",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END

1 0

José Manuel Ferrer Ortiz : appwiz.cpl: Spanish translation update.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 4fc6fa37346fa0fecc9440fd6eb1e3fbfbd5acaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc6fa37346fa0fecc9440fd6… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sun Aug 28 10:55:04 2011 +0100 appwiz.cpl: Spanish translation update. --- dlls/appwiz.cpl/Es.rc | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Es.rc b/dlls/appwiz.cpl/Es.rc index 3c4c77c..6ee3097 100644 --- a/dlls/appwiz.cpl/Es.rc +++ b/dlls/appwiz.cpl/Es.rc @@ -2,6 +2,7 @@ * Add/Remove Programs Spanish resources * * Copyright 2010 Jaime Rave +* Copyright 2011 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,11 +31,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalar/Desinstalar" FONT 8, "MS Shell Dlg" { - CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o tu disco duro, haz clic en instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o su disco duro, haga clic en Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "El siguiete software puede ser eliminado automaticamente. Para quitar un programa o modificar sus componentes instalados, seleccionanlo en la lista y haz clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "El siguiente software puede ser eliminado automáticamente. Para quitar un programa o modificar sus componentes instalados, selecciónelo en la lista y haga clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Información de soporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 @@ -54,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Contacto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 CONTROL "Información de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 CONTROL "Teléfono de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Leeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Léeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 CONTROL "Actualizaciones del Producto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 CONTROL "Comentarios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 @@ -66,3 +67,19 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine no pudo encontrar el paquete de Gecko, el cual es necesario para que las " \ + "aplicaciones que embeban HTML funcionen correctamente. Wine puede descargarlo e " \ + "instalarlo automáticamente por usted.\n\n" \ + "Nota: se recomienda que utilice en su lugar los paquetes de su distribución. " \ + "Veáse http://wiki.winehq.org/Gecko para más detalles.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +}

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a5f1eeb5f09357ba85bac5887ea6ffc51aee95f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f1eeb5f09357ba85bac5887… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Aug 27 11:30:06 2011 +0900 po: Updated Korean translation. --- po/ko.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 92ae190..c8020d5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -775,7 +775,7 @@ msgstr "단체 단위" #: crypt32.rc:74 msgid "Common Name" -msgstr "보통 이름" +msgstr "완전한 이름" #: crypt32.rc:75 msgid "Locality" @@ -791,16 +791,15 @@ msgstr "제목" #: crypt32.rc:78 msgid "Given Name" -msgstr "주어진 이름" +msgstr "이름" #: crypt32.rc:79 msgid "Initials" msgstr "머릿글자" #: crypt32.rc:80 -#, fuzzy msgid "Surname" -msgstr "사용자 이름" +msgstr "성" #: crypt32.rc:81 msgid "Domain Component" @@ -10231,7 +10230,6 @@ msgid "Drives" msgstr "드라이브" #: winecfg.rc:41 -#, fuzzy msgid "Select the Unix target directory, please." msgstr "유닉스 목적 폴더를 선택하십시오."

1 0

Francois Gouget : net: Add support for enumerating the running services with 'net start'.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a64f42b8d7cd66fa59809531f8c973cf116195af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64f42b8d7cd66fa59809531f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 26 17:41:52 2011 +0200 net: Add support for enumerating the running services with 'net start'. --- po/ar.po | 31 ++++++++++++++++--------- po/bg.po | 31 ++++++++++++++++--------- po/ca.po | 31 ++++++++++++++++--------- po/cs.po | 31 ++++++++++++++++--------- po/da.po | 32 +++++++++++++++++--------- po/de.po | 32 +++++++++++++++++--------- po/el.po | 31 ++++++++++++++++--------- po/en.po | 31 ++++++++++++++++--------- po/en_US.po | 37 +++++++++++++++++++----------- po/eo.po | 31 ++++++++++++++++--------- po/es.po | 31 ++++++++++++++++--------- po/fa.po | 31 ++++++++++++++++--------- po/fi.po | 31 ++++++++++++++++--------- po/fr.po | 32 +++++++++++++++++--------- po/he.po | 32 +++++++++++++++++--------- po/hi.po | 31 ++++++++++++++++--------- po/hu.po | 31 ++++++++++++++++--------- po/it.po | 32 +++++++++++++++++--------- po/ja.po | 32 +++++++++++++++++--------- po/ko.po | 32 +++++++++++++++++--------- po/lt.po | 32 +++++++++++++++++--------- po/ml.po | 31 ++++++++++++++++--------- po/nb_NO.po | 32 +++++++++++++++++--------- po/nl.po | 32 +++++++++++++++++--------- po/or.po | 31 ++++++++++++++++--------- po/pa.po | 31 ++++++++++++++++--------- po/pl.po | 32 +++++++++++++++++--------- po/pt_BR.po | 32 +++++++++++++++++--------- po/pt_PT.po | 32 +++++++++++++++++--------- po/rm.po | 31 ++++++++++++++++--------- po/ro.po | 32 +++++++++++++++++--------- po/ru.po | 32 +++++++++++++++++--------- po/sk.po | 31 ++++++++++++++++--------- po/sl.po | 32 +++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 31 ++++++++++++++++--------- po/sr_RS(a)latin.po | 31 ++++++++++++++++--------- po/sv.po | 32 +++++++++++++++++--------- po/te.po | 31 ++++++++++++++++--------- po/th.po | 31 ++++++++++++++++--------- po/tr.po | 31 ++++++++++++++++--------- po/uk.po | 32 +++++++++++++++++--------- po/wa.po | 31 ++++++++++++++++--------- po/wine.pot | 31 ++++++++++++++++--------- po/zh_CN.po | 31 ++++++++++++++++--------- po/zh_TW.po | 31 ++++++++++++++++--------- programs/net/net.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- programs/net/net.rc | 4 ++- programs/net/resources.h | 2 + 48 files changed, 979 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a64f42b8d7cd66fa59809…

1 0

Francois Gouget : net: Fix the parameter checking, /help handling and usage .
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 175953563bd7b230f78c000290e9c155d61e792b URL: http://source.winehq.org/git/wine.git/?a=commit;h=175953563bd7b230f78c00029… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 17:40:17 2011 +0200 net: Fix the parameter checking, /help handling and usage. Also simplify and improve the usage messages. --- po/ar.po | 48 +++++++++++++++-------------- po/bg.po | 48 +++++++++++++++-------------- po/ca.po | 48 +++++++++++++++-------------- po/cs.po | 48 +++++++++++++++-------------- po/da.po | 70 +++++++++++++++++++++--------------------- po/de.po | 68 ++++++++++++++++++++-------------------- po/el.po | 48 +++++++++++++++-------------- po/en.po | 66 +++++++++++++++++++-------------------- po/en_US.po | 77 +++++++++++++++++++++++++-------------------- po/eo.po | 48 +++++++++++++++-------------- po/es.po | 52 +++++++++++++++---------------- po/fa.po | 48 +++++++++++++++-------------- po/fi.po | 48 +++++++++++++++-------------- po/fr.po | 68 ++++++++++++++++++++-------------------- po/he.po | 68 ++++++++++++++++++++-------------------- po/hi.po | 48 +++++++++++++++-------------- po/hu.po | 48 +++++++++++++++-------------- po/it.po | 68 ++++++++++++++++++++-------------------- po/ja.po | 68 ++++++++++++++++++++-------------------- po/ko.po | 70 +++++++++++++++++++++--------------------- po/lt.po | 68 ++++++++++++++++++++-------------------- po/ml.po | 48 +++++++++++++++-------------- po/nb_NO.po | 70 +++++++++++++++++++++--------------------- po/nl.po | 68 ++++++++++++++++++++-------------------- po/or.po | 48 +++++++++++++++-------------- po/pa.po | 48 +++++++++++++++-------------- po/pl.po | 70 +++++++++++++++++++++--------------------- po/pt_BR.po | 68 ++++++++++++++++++++-------------------- po/pt_PT.po | 68 ++++++++++++++++++++-------------------- po/rm.po | 48 +++++++++++++++-------------- po/ro.po | 68 ++++++++++++++++++++-------------------- po/ru.po | 68 ++++++++++++++++++++-------------------- po/sk.po | 48 +++++++++++++++-------------- po/sl.po | 70 +++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 48 +++++++++++++++-------------- po/sr_RS(a)latin.po | 48 +++++++++++++++-------------- po/sv.po | 68 ++++++++++++++++++++-------------------- po/te.po | 48 +++++++++++++++-------------- po/th.po | 48 +++++++++++++++-------------- po/tr.po | 48 +++++++++++++++-------------- po/uk.po | 68 ++++++++++++++++++++-------------------- po/wa.po | 48 +++++++++++++++-------------- po/wine.pot | 48 +++++++++++++++-------------- po/zh_CN.po | 48 +++++++++++++++-------------- po/zh_TW.po | 48 +++++++++++++++-------------- programs/net/net.c | 47 ++++++++++++++++----------- programs/net/net.rc | 8 ++--- programs/net/resources.h | 1 - 48 files changed, 1348 insertions(+), 1289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=175953563bd7b230f78c0…

1 0

Alexandre Julliard : gdi32: Remove an unused variable.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 987a18a55ce78b5d12881dc7b36b5536e2e286c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987a18a55ce78b5d12881dc7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:52:09 2011 +0200 gdi32: Remove an unused variable. --- dlls/gdi32/dibdrv/bitblt.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 5d8b54e..646aaf0 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -711,7 +711,6 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info { dib_info *dib, stand_alone; DWORD ret; - POINT origin; dib_info src_dib; HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; @@ -757,9 +756,6 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); src_dib.bits.is_copy = bits->is_copy; - origin.x = src->visrect.left; - origin.y = src->visrect.top; - if (!hbitmap) { if (clip) saved_clip = add_extra_clipping_region( pdev, clip );

1 0

Alexandre Julliard : comctl32: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: bd3b0e4f70a7ffb90aeafac0711ae81cddc1fa46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3b0e4f70a7ffb90aeafac07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:27 2011 +0200 comctl32: Simplify the DIB byte width computation. --- dlls/comctl32/imagelist.c | 30 +----------------------------- dlls/comctl32/tests/imagelist.c | 19 +------------------ 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 66cd03d..ec62370 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2061,41 +2061,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, /*********************************************************************** - * DIB_GetDIBWidthBytes - * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. - */ -static int DIB_GetDIBWidthBytes( int width, int depth ) -{ - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - break; - } - return 4 * words; -} - -/*********************************************************************** * DIB_GetDIBImageBytes * * Return the number of bytes used to hold the image in a DIB bitmap. */ static int DIB_GetDIBImageBytes( int width, int height, int depth ) { - return DIB_GetDIBWidthBytes( width, depth ) * abs( height ); + return (((width * depth + 31) / 8) & ~3) * abs( height ); } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 46b3595..0441fd0 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -738,24 +738,7 @@ static struct my_IStream Test_Stream = { { &Test_Stream_Vtbl }, 0, 0 }; static INT DIB_GetWidthBytes( int width, int bpp ) { - int words; - - switch (bpp) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - case 32: words = width; break; - - default: - trace("Unknown depth %d, please report.\n", bpp ); - assert(0); - return -1; - } - return 4 * words; + return ((width * bpp + 31) / 8) & ~3; } static void check_bitmap_data(const char *bm_data, ULONG bm_data_size,

1 0

Alexandre Julliard : winex11: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 8cf6424057fb7c055fee915c00ab213486f4fe1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf6424057fb7c055fee915c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:21 2011 +0200 winex11: Simplify the DIB byte width computation. --- dlls/winex11.drv/dib.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 812117a..3630c3e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -154,23 +154,7 @@ static inline int X11DRV_DIB_GetXImageWidthBytes( int width, int depth ) */ static int X11DRV_DIB_GetDIBWidthBytes( int width, int depth ) { - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3) / 4; break; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return 4 * words; + return ((width * depth + 31) / 8) & ~3; }

1 0

Alexandre Julliard : wineps: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 6fd40e3cae9ac9dcad85bd6b1636ae8d49f03880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd40e3cae9ac9dcad85bd6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:17 2011 +0200 wineps: Simplify the DIB byte width computation. --- dlls/wineps.drv/bitmap.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 7f2d507..33c72d8 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -31,22 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ static inline int get_dib_width_bytes( int width, int depth ) { - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: words = width; break; - } - return 4 * words; + return ((width * depth + 31) / 8) & ~3; }

1 0

Alexandre Julliard : user32: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 16944f500dacb86cf0399c8830aa5ddab53015fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16944f500dacb86cf0399c883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:13 2011 +0200 user32: Simplify the DIB byte width computation. --- dlls/user32/cursoricon.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index aeb1987..7475ecab 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -316,29 +316,13 @@ static void *map_fileW( LPCWSTR name, LPDWORD filesize ) /*********************************************************************** - * get_dib_width_bytes + * get_dib_image_size * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. + * Return the size of a DIB bitmap in bytes. */ -static int get_dib_width_bytes( int width, int depth ) +static int get_dib_image_size( int width, int height, int depth ) { - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return 4 * words; + return (((width * depth + 31) / 8) & ~3) * abs( height ); } @@ -866,8 +850,7 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn color_bits = (const char*)bmi + size; mask_bits = (const char*)color_bits + - get_dib_width_bytes( bmi->bmiHeader.biWidth, - bmi->bmiHeader.biBitCount ) * abs(bmi_copy->bmiHeader.biHeight); + get_dib_image_size( bmi->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, bmi->bmiHeader.biBitCount ); alpha = 0; if (monochrome) @@ -2084,7 +2067,7 @@ static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biSizeImage = get_dib_image_size( width, height, info->bmiHeader.biBitCount ); info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
77
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 August 2011