November 2006 - Wine-commits

Andrew Talbot : wined3d: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 92dc74016ad282516e86e0c3f39e6b80384ee350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dc74016ad282516e86e0c3f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Nov 24 14:15:16 2006 +0000 wined3d: Cast-qual warnings fix. --- dlls/wined3d/pixelshader.c | 9 ++++++--- dlls/wined3d/vertexshader.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 7b19d63..862d56a 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -938,9 +938,12 @@ static HRESULT WINAPI IWineD3DPixelShade TRACE("(%p) : Copying the function\n", This); if (NULL != pFunction) { - This->baseShader.function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); - if (!This->baseShader.function) return E_OUTOFMEMORY; - memcpy((void *)This->baseShader.function, pFunction, This->baseShader.functionLength); + void *function; + + function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); + if (!function) return E_OUTOFMEMORY; + memcpy(function, pFunction, This->baseShader.functionLength); + This->baseShader.function = function; } else { This->baseShader.function = NULL; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 4dac214..f68a2fb 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1214,9 +1214,12 @@ static HRESULT WINAPI IWineD3DVertexShad /* copy the function ... because it will certainly be released by application */ if (NULL != pFunction) { - This->baseShader.function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); - if (!This->baseShader.function) return E_OUTOFMEMORY; - memcpy((void *)This->baseShader.function, pFunction, This->baseShader.functionLength); + void *function; + + function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); + if (!function) return E_OUTOFMEMORY; + memcpy(function, pFunction, This->baseShader.functionLength); + This->baseShader.function = function; } else { This->baseShader.function = NULL; }

1 0

Andrew Talbot : wined3d: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: f3a515ce19f9c21b0198b9b1c03a462785c4c599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a515ce19f9c21b0198b9b1c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Nov 24 14:15:06 2006 +0000 wined3d: Cast-qual warnings fix. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e703e91..340a0a5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2574,7 +2574,7 @@ static HRESULT WINAPI IWineD3DDeviceIm glMatrixMode(GL_MODELVIEW); checkGLcall("glMatrixMode(GL_MODELVIEW)"); glPushMatrix(); - glLoadMatrixf((float *)lpmatrix); + glLoadMatrixf((const float *)lpmatrix); checkGLcall("glLoadMatrixf(...)"); /* Reset lights */ @@ -2629,7 +2629,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl FIXME("Unhandled transform state!!\n"); } - multiply_matrix(&temp, mat, (WINED3DMATRIX *) pMatrix); + multiply_matrix(&temp, mat, (const WINED3DMATRIX *) pMatrix); /* Apply change via set transform - will reapply to eg. lights this way */ return IWineD3DDeviceImpl_SetTransform(iface, State, &temp); @@ -6720,7 +6720,7 @@ static HRESULT WINAPI IWineD3DDeviceIm int j; /* hopefully using pointer addtion will be quicker than using a point + j * rowoffset */ - unsigned char* data =((unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; + const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; for(j = destTop ; j < (srcHeight + destTop) ; j++){ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 34e200f..8d09729 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2450,7 +2450,7 @@ WINED3DFORMAT pixelformat_for_depth(DWOR } } -void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2) { +void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2) { WINED3DMATRIX temp; /* Now do the multiplication 'by hand'. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00fe8d5..10ef914 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1272,7 +1272,7 @@ void set_texture_matrix(const float *s int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate); /* Math utils */ -void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2); +void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); /***************************************************************************** * To enable calling of inherited functions, requires prototypes

1 0

Andrew Talbot : wined3d: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 5381dd2cf6fe61f182911fa0ee7ce279e81ee546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5381dd2cf6fe61f182911fa0e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Nov 24 14:14:56 2006 +0000 wined3d: Cast-qual warnings fix. --- dlls/wined3d/baseshader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5e157eb..1d36454 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -701,7 +701,7 @@ void shader_generate_main( if (shader_is_comment(*pToken)) { DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; - TRACE("#%s\n", (char*)pToken); + TRACE("#%s\n", (const char*)pToken); pToken += comment_len; continue; } @@ -834,7 +834,7 @@ void shader_trace_init( if (shader_is_comment(*pToken)) { /** comment */ DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; ++pToken; - TRACE("//%s\n", (char*)pToken); + TRACE("//%s\n", (const char*)pToken); pToken += comment_len; len += comment_len + 1; continue; @@ -868,10 +868,10 @@ void shader_trace_init( unsigned int offset = shader_get_float_offset(*pToken); TRACE("def c%u = %f, %f, %f, %f", offset, - *(float *)(pToken + 1), - *(float *)(pToken + 2), - *(float *)(pToken + 3), - *(float *)(pToken + 4)); + *(const float *)(pToken + 1), + *(const float *)(pToken + 2), + *(const float *)(pToken + 3), + *(const float *)(pToken + 4)); pToken += 5; len += 5;

1 0

Francois Gouget : msi: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 48af421a8be2c031700e6f52d28dfbf1d2fbfbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48af421a8be2c031700e6f52d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:43:12 2006 +0100 msi: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/msi/msi_Pt.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc index e5799e3..3d90f71 100644 --- a/dlls/msi/msi_Pt.rc +++ b/dlls/msi/msi_Pt.rc @@ -2,6 +2,7 @@ * Portuguese resources for MSI * * Copyright 2005 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,3 +33,18 @@ STRINGTABLE DISCARDABLE 14 "caracter�stica de:" 15 "escolha qual pasta cont�m %s" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "localiza��o %s n�o encontrada" + 9 "insira o disco %s" + 10 "par�metros inv�lidos" + 11 "indique que pasta cont�m %s" + 12 "instalar fonte para a op��o em falta" + 13 "controlador de rede para a op��o em falta" + 14 "op��o de:" + 15 "indique que pasta cont�m %s" +}

1 0

Francois Gouget : msacm32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: a8cd5acdb87ffd7c226fed6df9d20c717cc0142b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8cd5acdb87ffd7c226fed6df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:43:04 2006 +0100 msacm32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/msacm32/msacm_Pt.rc | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc index ab8cd25..17cbca2 100644 --- a/dlls/msacm32/msacm_Pt.rc +++ b/dlls/msacm32/msacm_Pt.rc @@ -2,6 +2,7 @@ * Portuguese resource file for MS ACM * * Copyright 2003 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +23,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUG DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sele��o de som" +CAPTION "Selec��o de som" FONT 8, "MS Shell Dlg" BEGIN @@ -31,7 +32,44 @@ BEGIN COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Atributos:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Selec��o de som" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP

1 0

Francois Gouget : mpr: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: bc32fb64c831508b8cc4325ef4f911f977449cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc32fb64c831508b8cc4325ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:42:49 2006 +0100 mpr: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/mpr/mpr_Pt.rc | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr_Pt.rc b/dlls/mpr/mpr_Pt.rc index 0b3731e..f79a96d 100644 --- a/dlls/mpr/mpr_Pt.rc +++ b/dlls/mpr/mpr_Pt.rc @@ -2,6 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Marcelo Duarte + * Copyright (C) 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,9 @@ STRINGTABLE DISCARDABLE IDS_ENTIRENETWORK "Toda a rede" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entre a senha da rede" @@ -44,3 +48,25 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Indique a senha da rede" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Utilizador", -1, 40, 66, 50, 10 + LTEXT "Senha", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Francois Gouget : comctl32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 7965efd252932ef30910dfbe1e9b1c05607bd833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7965efd252932ef30910dfbe1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:41:48 2006 +0100 comctl32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/comctl32/comctl_Pt.rc | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc index 7d7ee30..0d8de92 100644 --- a/dlls/comctl32/comctl_Pt.rc +++ b/dlls/comctl32/comctl_Pt.rc @@ -1,5 +1,6 @@ /* * Copyright 2003 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,22 @@ BEGIN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Propriedades de %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE @@ -47,6 +64,8 @@ BEGIN END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizar barra de ferramentas" @@ -65,22 +84,34 @@ BEGIN LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_CLOSE "Fechar" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDM_TODAY "Hoje:" IDM_GOTODAY "Ir para hoje" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_SEPARATOR "Separador" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { HKY_NONE "Nenhum"

1 0

Francois Gouget : comdlg32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: cb4faf425fb00c304d8608d6ffd0e72dc2aba16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4faf425fb00c304d8608d6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:42:28 2006 +0100 comdlg32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/comdlg32/cdlg_Pt.rc | 486 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 486 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb4faf425fb00c304d860…

1 0

Francois Gouget : avifil32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: c5b5aaa08232331506b782297b9ec44617638b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b5aaa08232331506b782297… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 14:40:50 2006 +0100 avifil32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/avifil32/avifile_Pt.rc | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc index d243292..7e5d1c5 100644 --- a/dlls/avifil32/avifile_Pt.rc +++ b/dlls/avifil32/avifile_Pt.rc @@ -1,5 +1,6 @@ /* * Copyright 2003 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,6 +37,29 @@ BEGIN PUSHBUTTON "Cancelar",IDCANCEL,145,61,45,14 END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Op��es de compress�o" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Escolha a stream:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Op��es...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Interla�ar a todos os",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "molduras",-1,104,43,36,9 + LTEXT "Formato actual:",-1,3,56,53,9 + LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "OK",IDOK,145,42,45,14 + PUSHBUTTON "Cancelar",IDCANCEL,145,61,45,14 +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Formato wave: %s" @@ -48,3 +72,18 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Wine AVI-manipulador padr�o de arquivo" IDS_UNCOMPRESSED "sem compress�o" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Formato wave: %s" + IDS_WAVEFILETYPE "Formato wave" + IDS_ALLMULTIMEDIA "Todos os ficheiros multim�dia" + IDS_ALLFILES "Todos os ficheiros (*.*)(a)*.*" + IDS_VIDEO "v�deo" + IDS_AUDIO "�udio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Manipulador AVI Wine predefinido" + IDS_UNCOMPRESSED "sem compress�o" +}

1 0

appdb/ include/sidebar.php include/util.php ./ ...
by WineHQ 27 Nov '06

27 Nov '06

ChangeSet ID: 30029 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/26 21:14:58 Modified files: include : sidebar.php util.php Added files: . : browse_newest_apps.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add the page and sidebar entry for a 'Browse newest applications' page Patch: http://cvs.winehq.org/patch.py?id=30029 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/browse_newest_apps.php 1.23 1.24 +1 -0 appdb/include/sidebar.php 1.76 1.77 +7 -3 appdb/include/util.php Index: appdb/browse_newest_apps.php diff -u -p /dev/null appdb/browse_newest_apps.php:1.1 --- /dev/null 27 Nov 2006 3:14:58 -0000 +++ appdb/browse_newest_apps.php 27 Nov 2006 3:14:58 -0000 @@ -0,0 +1,69 @@ +<?php +/** + * Browse newest versions + * + */ + +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/filter.php"); + +// set default value +if(empty($aClean['iNumVersions']) || $aClean['iNumVersions'] > 200 || $aClean['iNumVersions'] < 0) + $aClean['iNumVersions'] = 25; + +apidb_header("Browse Newest Applications"); + +/* selector for how many versions to view */ +echo "<form method=\"post\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; +echo "<b>How many versions to display:</b>"; +echo "<select name='iNumVersions'>"; + +$numVersionsArray = array(25, 50, 100, 200); + +foreach($numVersionsArray as $i => $value) +{ + if($numVersionsArray[$i] == $aClean['iNumVersions']) + echo "<option selected=\"selected\">$numVersionsArray[$i]</option>"; + else + echo "<option>$numVersionsArray[$i]</option>"; +} +echo "</select>"; + +echo ' <input type="submit" value="Refresh" />'; +echo '</form>'; +echo '<br />'; + +/* Query the database for the n newest versions */ +$hResult = query_parameters("SELECT appId, appName, description, submitTime FROM appFamily WHERE + queued = 'false' ORDER BY appId DESC LIMIT ?", + $aClean['iNumVersions']); + +if($hResult) +{ + echo html_frame_start("", "90%", '', 0); + echo html_table_begin("width=\"100%\" align=\"center\""); + echo "<tr class=\"color4\">\n"; + echo "<td><font color=\"white\">Submission Date</font></td>\n"; + echo "<td><font color=\"white\">Application</font></td>\n"; + echo "<td><font color=\"white\">Description</font></td></td>\n"; + + $c = 1; + while($row = mysql_fetch_object($hResult)) + { + $bgcolor = ($c % 2) ? "color0" : "color1"; + $link = "<a href=\"appview.php?iAppId=$row->appId\"> $row->appName </a>"; + echo "<tr class=\"$bgcolor\">"; + echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime))."</td>\n"; + echo "<td>$link </td>\n"; + echo "<td>$row->description </td></tr>\n"; + $c++; + } + + echo html_table_end(); + echo html_frame_end(); +} + +apidb_footer(); + +?> Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.23 appdb/include/sidebar.php:1.24 --- appdb/include/sidebar.php:1.23 27 Nov 2006 3:14:58 -0000 +++ appdb/include/sidebar.php 27 Nov 2006 3:14:58 -0000 @@ -23,6 +23,7 @@ function global_sidebar_menu() { $g->add("AppDB Home", BASE); $g->add("Screenshots", BASE."viewScreenshots.php"); $g->add("Browse Apps", BASE."appbrowse.php"); + $g->add("Browse Newest Apps", BASE."browse_newest_apps.php"); $g->add("Browse Apps by Rating", BASE."browse_by_rating.php"); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application"); Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.76 appdb/include/util.php:1.77 --- appdb/include/util.php:1.76 27 Nov 2006 3:14:58 -0000 +++ appdb/include/util.php 27 Nov 2006 3:14:58 -0000 @@ -63,14 +63,18 @@ function values($arr) } -/* - * format date - */ +// print the month, day, year, hour, minute, second function print_date($sTimestamp) { return date("F d Y H:i:s", $sTimestamp); } +// print the month, day and year +function print_short_date($sTimestamp) +{ + return date("F d Y", $sTimestamp); +} + function mysqltimestamp_to_unixtimestamp($sTimestamp) { $d = substr($sTimestamp,6,2); // day

1 0