June 2008 - Wine-Commits - list.winehq.org

Michael Stefaniuc : winefile: Fix the Italian translation.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: ce864bb2edd9b8da03dc8058eefeea66e811e079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce864bb2edd9b8da03dc8058e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:22:37 2008 +0200 winefile: Fix the Italian translation. --- programs/winefile/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index 75a6450..832d422 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -165,8 +165,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select destination" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Statico", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Percorso:", -1, "Statico", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Percorso:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annulla", 2, 158, 23, 47, 14

1 0

Michael Stefaniuc : winefile: Fix the Portuguese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: e37690689d63cfc216ac16b40710e8b03d4a312d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37690689d63cfc216ac16b40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:22:16 2008 +0200 winefile: Fix the Portuguese translations. --- programs/winefile/Pt.rc | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index 0a859b3..d23038d 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -261,6 +261,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Pesquisar...", ID_HELP MENUITEM "&Usar a ajuda", ID_HELP_USING MENUITEM SEPARATOR + MENUITEM "&Sobre o Winefile...", ID_ABOUT } } @@ -343,6 +344,12 @@ STRINGTABLE IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Ainda n�o implementado" IDS_WINE_FILE "Wine File" + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Tamanho" + IDS_COL_CDATE "CData" + IDS_COL_ADATE "AData" + IDS_COL_MDATE "MData" + IDS_COL_IDX "�ndice/Inode" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -358,19 +365,21 @@ STRINGTABLE IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Ainda n�o implementado" IDS_WINE_FILE "Ficheiro Wine" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -STRINGTABLE -{ IDS_COL_NAME "Nome" IDS_COL_SIZE "Tamanho" IDS_COL_CDATE "CData" IDS_COL_ADATE "AData" IDS_COL_MDATE "MData" IDS_COL_IDX "�ndice/Inode" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ IDS_COL_LINKS "Liga��es" IDS_COL_ATTR "Atributos" IDS_COL_SEC "Seguran�a" + + IDS_FREE_SPACE_FMT "%s of %s free" }

1 0

Michael Stefaniuc : start: Fix the Portuguese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 7563654a236b2335fd0abbe2ef7581102a737d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7563654a236b2335fd0abbe2e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:21:57 2008 +0200 start: Fix the Portuguese translations. --- programs/start/Pt.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index aad9ea7..ef8656b 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -61,6 +61,8 @@ Veja o arquivo COPYING.LIB para informa " STRING_EXECFAIL "Aplica��o n�o pode ser iniciada, ou n�o existe aplica��o associada com o arquivo especificado.\nShellExecuteEx falhou" + +STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -104,4 +106,6 @@ Veja o ficheiro COPYING.LIB para informa " STRING_EXECFAIL "A aplica��o n�o pode ser iniciada, ou n�o existe aplica��o associada com o ficheiro especificado.\nShellExecuteEx falhado" + +STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename." }

1 0

Michael Stefaniuc : winefile: Fix the Swedish translation.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 0c1b666737331289d7460756326de7fe9a9593ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1b666737331289d74607563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:22:54 2008 +0200 winefile: Fix the Swedish translation. --- programs/winefile/Sv.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 3e3de43..a0926db 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -200,4 +200,6 @@ STRINGTABLE IDS_COL_LINKS "L�nkar" IDS_COL_ATTR "Attribut" IDS_COL_SEC "S�kerhet" + + IDS_FREE_SPACE_FMT "%s of %s free" }

1 0

Michael Stefaniuc : regedit: Fix the Portugese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: b5cfaad49c1c62170ada0204b08fe91b1a851eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cfaad49c1c62170ada0204b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 00:00:27 2008 +0200 regedit: Fix the Portugese translations. Thanks to Mauricio Teixeira <mteixeira(a)webset.net> for the translations. --- programs/regedit/Pt.rc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/Pt.rc b/programs/regedit/Pt.rc index 700c639..12485b5 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -50,6 +50,7 @@ BEGIN MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Bin�rio", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valor de palavras &m�ltiplas", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE @@ -108,6 +109,7 @@ BEGIN MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Bin�rio", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valor de palavras &m�ltiplas", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE @@ -161,11 +163,13 @@ BEGIN MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Bin�rio", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valor de palavras &m�ltiplas", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE MENUITEM "&Renomear\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "E&xportar..." ID_EDIT_EXPORT MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Localizar\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -238,8 +242,6 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "Editor de Registo" - IDC_REGEDIT "REGEDIT" - IDC_REGEDIT_FRAME "REGEDIT_FRAME" END @@ -359,6 +361,7 @@ BEGIN IDS_DELETE_BOX_TEXT "Tem certeza que deseja excluir o valor '%s'?" IDS_NEWKEY "Nova chave #%d" IDS_NEWVALUE "Novo valor #%d" + IDS_NOTFOUND "Chave de busca '%s' n�o encontrada" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -374,6 +377,7 @@ BEGIN IDS_DELETE_BOX_TEXT "Tem certeza que deseja excluir o valor '%s'?" IDS_NEWKEY "Nova chave #%d" IDS_NEWVALUE "Novo valor #%d" + IDS_NOTFOUND "Chave de busca '%s' n�o encontrada" END /*****************************************************************/

1 0

Michael Stefaniuc : cmd: Fix the Portuguese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 8fe5bbf20fed6ec57da5733e882fe3047460f54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe5bbf20fed6ec57da5733e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:21:40 2008 +0200 cmd: Fix the Portuguese translations. --- programs/cmd/Pt.rc | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index baf5be1..0c715d4 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -196,6 +196,12 @@ O flag de verifica WCMD_VOL, "Ajuda do comando VOL\n" + WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ +stack, and then changes the current directory to the supplied one.\n" + + WCMD_POPD, "POPD changes current directory to the last one saved with\n\ +PUSHD.\n" + WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_EXIT, @@ -218,7 +224,9 @@ MD (MKDIR)\tCria um subdiret MORE\t\tDisplay output in pages\n\ MOVE\t\tMove um arquivo, conjunto de arquivos ou uma �rvore de diret�rios\n\ PATH\t\tConfigira o caminho de procura\n\ +POPD\t\tRestores the directory to the last one saved with PUSHD\n\ PROMPT\t\tMuda o 'prompt' de comando\n\ +PUSHD\t\tChanges to a new directory, saving the current one\n\ REN (RENAME)\tRenomeia um arquivo\n\ RD (RMDIR)\tApaga um subdiret�rio\n\ SET\t\tConfigura ou mostra vari�veis de ambiente\n\ @@ -229,6 +237,14 @@ VER\t\tMostra a vers VOL\t\tMostra o r�tulo do volume de uma unidade de disco\n\ EXIT\t\tFecha o CMD\n\n\ Entre HELP <comando> para maiores informa��es sobre alguns dos comandos acima\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" + WCMD_NOASSOC, "File association missing for extension %s\n" + WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite %s" + WCMD_MORESTR, "More..." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -407,6 +423,12 @@ O flag de verifica WCMD_VOL, "Ajuda do comando VOL\n" + WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ +stack, and then changes the current directory to the supplied one.\n" + + WCMD_POPD, "POPD changes current directory to the last one saved with\n\ +PUSHD.\n" + WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_EXIT, @@ -429,7 +451,9 @@ MD (MKDIR)\tCria um subdirect MORE\t\tDisplay output in pages\n\ MOVE\t\tMove um ficheiro, conjunto de ficheiros ou uma �rvore de direct�rios\n\ PATH\t\tConfigura o caminho de procura\n\ +POPD\t\tRestores the directory to the last one saved with PUSHD\n\ PROMPT\t\tMuda a 'prompt' de comando\n\ +PUSHD\t\tChanges to a new directory, saving the current one\n\ REN (RENAME)\tRenomeia um ficheiro\n\ RD (RMDIR)\tApaga um subdirect�rio\n\ SET\t\tConfigura ou mostra vari�veis de ambiente\n\

1 0

Michael Stefaniuc : cmdlgtst: Fix the Portuguese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: e51ed2f4a7b75fd60745b530bcc01233ae94712b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ed2f4a7b75fd60745b530b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:22:28 2008 +0200 cmdlgtst: Fix the Portuguese translations. --- programs/cmdlgtst/Pt.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc index 699c034..836f210 100644 --- a/programs/cmdlgtst/Pt.rc +++ b/programs/cmdlgtst/Pt.rc @@ -41,6 +41,7 @@ CmdlgtstMenu MENU MENUITEM "&Substituir texto", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_U_PRINT + MENUITEM "Pa&ge Setup", CM_U_PAGESETUP } POPUP "F&lags" @@ -53,6 +54,7 @@ CmdlgtstMenu MENU MENUITEM "&Localizar/Substituir", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_F_PRINT + MENUITEM "Pa&ge Setup", CM_F_PAGESETUP } POPUP "Aj&uda" @@ -84,6 +86,7 @@ CmdlgtstMenu MENU MENUITEM "&Substituir texto", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_U_PRINT + MENUITEM "Pa&ge Setup", CM_U_PAGESETUP } POPUP "F&lags" @@ -96,6 +99,7 @@ CmdlgtstMenu MENU MENUITEM "&Localizar/Substituir", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_F_PRINT + MENUITEM "Pa&ge Setup", CM_F_PAGESETUP } POPUP "Aj&uda"

1 0

Paul Vriens : oleaut32/tests: Cleanup typelib after the test.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 4ee90e94f6f1c6c979e51ea44c5a6241b9b2beb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee90e94f6f1c6c979e51ea44… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 30 19:16:40 2008 +0200 oleaut32/tests: Cleanup typelib after the test. --- dlls/oleaut32/tests/tmarshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 98ed428..3812b72 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1179,5 +1179,8 @@ START_TEST(tmarshal) test_typelibmarshal(); test_DispCallFunc(); + hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, 1); + ok_ole_success(hr, UnRegisterTypeLib); + CoUninitialize(); }

1 0

Michael Stefaniuc : shell32: Fix the Portugese translations.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: ea4d31b3a4edd9b9035bf561bc416fbb7b648c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4d31b3a4edd9b9035bf561b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 00:00:10 2008 +0200 shell32: Fix the Portugese translations. Thanks to Mauricio Teixeira <mteixeira(a)webset.net> for the translations. --- dlls/shell32/shell32_Pt.rc | 46 +++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index 2fbf8d0..5ba9006 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -160,32 +160,36 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sobre %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "&Licen�a do Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine foi disponibilizado por:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Executando em %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine foi disponibilizado por:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Acerca do %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "&Licen�a do Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine disponibilizado por:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Executando em %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine disponibilizado por:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -238,6 +242,8 @@ STRINGTABLE IDS_SHV_COLUMN9 "Coment�rios" IDS_SHV_COLUMN10 "Dono" IDS_SHV_COLUMN11 "Grupo" + IDS_SHV_COLUMN_DELFROM "Localiza��o original" + IDS_SHV_COLUMN_DELDATE "Data de exclus�o" /* special folders */ IDS_DESKTOP "�rea de trabalho" @@ -258,6 +264,11 @@ STRINGTABLE IDS_DELETEITEM_TEXT "Voc� tem certeza que deseja excluir '%1'?" IDS_DELETEMULTIPLE_TEXT "Voc� tem certeza que deseja excluir estes %1 itens?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" + IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" + IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" + IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ "If the files in the destination folder have the same names as files in the\n"\ @@ -298,6 +309,8 @@ STRINGTABLE IDS_COMMON_PICTURES "Documentos\\Minhas Imagens" IDS_COMMON_VIDEO "Documentos\\Meus V�deos" IDS_CDBURN_AREA "Configura��es locais\\Dados de aplicativos\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "Nova Pasta" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -316,6 +329,8 @@ STRINGTABLE IDS_SHV_COLUMN9 "Coment�rios" IDS_SHV_COLUMN10 "Dono" IDS_SHV_COLUMN11 "Grupo" + IDS_SHV_COLUMN_DELFROM "Localiza��o original" + IDS_SHV_COLUMN_DELDATE "Data de exclus�o" /* special folders */ IDS_DESKTOP "Ambiente de trabalho" @@ -335,8 +350,17 @@ STRINGTABLE IDS_DELETEFOLDER_CAPTION "Confirmar exclus�o da pasta" IDS_DELETEITEM_TEXT "Tem certeza que deseja excluir '%1'?" IDS_DELETEMULTIPLE_TEXT "Tem certeza que deseja excluir estes %1 itens?" + IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" + IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" + IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" + IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "Substituir ficheiro %1?" IDS_OVERWRITEFILE_CAPTION "Confirmar substitui��o de ficheiro" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ + "If the files in the destination folder have the same names as files in the\n"\ + "selected folder they will be replaced. Do you still want to move or copy\n"\ + "the folder?" /* message box strings */ IDS_RESTART_TITLE "Reiniciar" @@ -373,5 +397,5 @@ STRINGTABLE IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus V�deos" IDS_CDBURN_AREA "Defini��es locais\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nova Pasta" }

1 0

Chris Morgan : Pass a valid link resource to mysql_real_escape_string()
by Chris Morgan May 31, 2008

May 31, 2008

Module: appdb Branch: master Commit: 13fe229774c52ad5df50b415b3ba6f86206e5fe1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=13fe229774c52ad5df50b415… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sun Jun 1 00:19:49 2008 -0400 Pass a valid link resource to mysql_real_escape_string() --- include/query.php | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/include/query.php b/include/query.php index 4643621..0c45496 100644 --- a/include/query.php +++ b/include/query.php @@ -190,7 +190,18 @@ function query_num_rows($hResult) function query_escape_string($sString) { - return mysql_real_escape_string($sString); + global $hAppdbLink; + + if(!is_resource($hAppdbLink)) + { + // The last argument makes sure we are really opening a new connection + $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true); + if(!$hAppdbLink) + die("Database error, please try again soon."); + mysql_select_db(APPS_DB, $hAppdbLink); + } + + return mysql_real_escape_string($sString, $hAppdbLink); } function query_field_type($hResult, $iFieldOffset)

1 0