June 2010 - Wine-commits - list.winehq.org

Francois Gouget : gdiplus: Make measure_ranges_callback() static.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: a56375fcb56d9bef8d510d43e03a581683c2488f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56375fcb56d9bef8d510d43e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:12:48 2010 +0200 gdiplus: Make measure_ranges_callback() static. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68e422e..da3c15f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3653,7 +3653,7 @@ struct measure_ranges_args { GpRegion **regions; }; -GpStatus measure_ranges_callback(GpGraphics *graphics, +static GpStatus measure_ranges_callback(GpGraphics *graphics, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data)

1 0

Francois Gouget : d3dx9_36: Make assemble_shader() static.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 3133b71e9257f505f3658a7d0d93aed36d66be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3133b71e9257f505f3658a7d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:12:41 2010 +0200 d3dx9_36: Make assemble_shader() static. --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3a7824a..9677e0b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -382,7 +382,7 @@ static int wpp_close_output(void) return 1; } -HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, +static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs) { struct bwriter_shader *shader;

1 0

Francois Gouget : wordpad: Make print_preview() and preview_page_hittest() static.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: a413afa3e5ce02eca0f32574e82a6b23ce1c2e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a413afa3e5ce02eca0f32574e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:13:11 2010 +0200 wordpad: Make print_preview() and preview_page_hittest() static. --- programs/wordpad/print.c | 4 ++-- programs/wordpad/wordpad.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 1d4e6e3..231c90e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -891,7 +891,7 @@ static void update_preview_buttons(HWND hMainWnd) EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); } -LRESULT print_preview(HWND hwndPreview) +static LRESULT print_preview(HWND hwndPreview) { HDC hdc; RECT window, background; @@ -1039,7 +1039,7 @@ static void toggle_num_pages(HWND hMainWnd) /* Returns the page shown that the point is in (1 or 2) or 0 if the point * isn't inside either page */ -int preview_page_hittest(POINT pt) +static int preview_page_hittest(POINT pt) { RECT rc; rc.left = preview.spacing.cx; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index c250cc1..c3c5bc0 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -247,7 +247,6 @@ LRESULT preview_command(HWND, WPARAM); void init_preview(HWND, LPWSTR); void close_preview(HWND); BOOL preview_isactive(void); -LRESULT print_preview(HWND); void get_default_printer_opts(void); void registry_set_pagemargins(HKEY); void registry_read_pagemargins(HKEY);

1 0

Francois Gouget : kernel32: GetProcessDword() is unused so remove it.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 7bf45b4c358e6dbc2e9ee9798daae7e196873038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf45b4c358e6dbc2e9ee9798… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:13:52 2010 +0200 kernel32: GetProcessDword() is unused so remove it. We use krnl386.exe16's implementation instead. --- dlls/kernel32/process.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cc2a6ba..1e4a6e1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2637,16 +2637,6 @@ DWORD WINAPI GetProcessFlags( DWORD processid ) } -/*********************************************************************** - * GetProcessDword (KERNEL32.18) - */ -DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) -{ - FIXME( "(%d, %d): not supported\n", dwProcessID, offset ); - return 0; -} - - /********************************************************************* * OpenProcess (KERNEL32.@) *

1 0

Francois Gouget : usbd.sys: Fix the test for type control endpoints.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 3c58b1a6f699f308780900223a841df84da5dcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c58b1a6f699f308780900223… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:17:22 2010 +0200 usbd.sys: Fix the test for type control endpoints. The value of USB_ENDPOINT_TYPE_CONTROL is 0 so and-ing with it makes no sense. --- dlls/usbd.sys/usbd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 4727512..80fd02e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -125,14 +125,21 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo->Pipes[i].MaximumPacketSize = endpointDescriptor->wMaxPacketSize; interfaceInfo->Pipes[i].EndpointAddress = endpointDescriptor->bEndpointAddress; interfaceInfo->Pipes[i].Interval = endpointDescriptor->bInterval; - if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_CONTROL) + switch (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) + { + case USB_ENDPOINT_TYPE_CONTROL: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeControl; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_BULK) + break; + case USB_ENDPOINT_TYPE_BULK: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeBulk; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_INTERRUPT) + break; + case USB_ENDPOINT_TYPE_INTERRUPT: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeInterrupt; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_ISOCHRONOUS) + break; + case USB_ENDPOINT_TYPE_ISOCHRONOUS: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeIsochronous; + break; + } endpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) USBD_ParseDescriptors( ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, endpointDescriptor + 1, USB_ENDPOINT_DESCRIPTOR_TYPE );

1 0

Francois Gouget : winecfg: The winecfg debug channel is unused so remove it .
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: c5bd7e4eb62db23ba2834540727348722ec59b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bd7e4eb62db23ba28345407… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:18:26 2010 +0200 winecfg: The winecfg debug channel is unused so remove it. --- programs/winecfg/about.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index b8a6964..d6b2a7d 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -29,12 +29,10 @@ #include <windows.h> #include <commctrl.h> #include <shellapi.h> -#include <wine/debug.h> #include "resource.h" #include "winecfg.h" -WINE_DEFAULT_DEBUG_CHANNEL(winecfg); static HICON logo = NULL; static HFONT titleFont = NULL;

1 0

Francois Gouget : programs: Remove spaces before '\n's in the resources.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: c59b791b855e3632eec7056073dec7cc0b7a8ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59b791b855e3632eec705607… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 24 10:22:43 2010 +0200 programs: Remove spaces before '\n's in the resources. --- programs/notepad/Si.rc | 2 +- programs/taskmgr/Si.rc | 4 ++-- programs/xcopy/Ro.rc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 531e9fa..1947286 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -133,7 +133,7 @@ STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ Ta datoteka vsebuje Unicode znake, ki bodo izgubljeni,\n\ -če datoteko shranite v %s kodiranju. \n\ +če datoteko shranite v %s kodiranju.\n\ Da bi te znake obdržali, kliknite Prekliči in izberite\n\ eno izmed Unicode možnosti v seznamu kodiranj.\n\ Nadaljujem?" diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 858e9d2..496c94a 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -547,9 +547,9 @@ BEGIN nezaželjene posledice, vključno z nesabilnostjo sistema. Ali ste\n\ prepričani, da želite spremeniti prioriteto?" IDS_PRIORITY_UNABLE2CHANGE "Ne morem spremeniti prioritete" - IDS_TERMINATE_MESSAGE "OPOZORILO: Prekinjanje procesa lahko povzroči nezaželjene \n\ + IDS_TERMINATE_MESSAGE "OPOZORILO: Prekinjanje procesa lahko povzroči nezaželjene\n\ posledice, vključno z izgubo podatkov in nestabilnostjo sistema.\n\ - Pred prekinitvijo proces ne bo imel možnosti shraniti svojega \n\ + Pred prekinitvijo proces ne bo imel možnosti shraniti svojega\n\ stanja ali podatkov. Ali ste prepričani, da želite\n\ prekiniti proces?" IDS_TERMINATE_UNABLE2TERMINATE "Ne morem prekiniti procesa" diff --git a/programs/xcopy/Ro.rc b/programs/xcopy/Ro.rc index 3e8a655..bf4f5eb 100644 --- a/programs/xcopy/Ro.rc +++ b/programs/xcopy/Ro.rc @@ -64,7 +64,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/T] Creează o structură de directoare goale, dar nu copiază fișiere\n\ [/Y] Nu solicita confirmarea la suprascrierea fișierelor\n\ [/-Y] Solicită confirmarea la suprascrierea fișierelor\n\ -[/P] Solicită confirmarea înainte de copierea fiecărui fișier sursă \n\ +[/P] Solicită confirmarea înainte de copierea fiecărui fișier sursă\n\ [/N] Copiază utilizând prescurtări de nume\n\ [/U] Copiază numai fișierele care există deja în destinație\n\ [/R] Suprascrie orice fișiere cu protecție la modificări\n\

1 0

Gustavo Henrique Milaré : wordpad: Fix Portuguese translation.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 49c685e43afb0535923dfcf415d661e2c49adfa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c685e43afb0535923dfcf41… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 16:16:56 2010 -0300 wordpad: Fix Portuguese translation. --- programs/wordpad/Pt.rc | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index b7f9c52..2bc44fe 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -310,33 +310,33 @@ BEGIN STRING_ALL_FILES, "Todos os documentos (*.*)" END -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Esquerda" - STRING_ALIGN_RIGHT, "Direita" - STRING_ALIGN_CENTER, "Centro" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Documento rich text" - STRING_NEWFILE_TXT, "Documento de texto" - STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" -END - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE BEGIN - STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE BEGIN - STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" END @@ -344,6 +344,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + STRING_ALIGN_LEFT, "Esquerda" + STRING_ALIGN_RIGHT, "Direita" + STRING_ALIGN_CENTER, "Centro" +END + +STRINGTABLE DISCARDABLE +BEGIN STRING_VIEWPROPS_TITLE, "Opções" STRING_VIEWPROPS_TEXT, "Texto" STRING_VIEWPROPS_RICHTEXT, "Rich text"

1 0

Michael Stefaniuc : oledlg: Add the Romanian translation.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 756df72a04e45d392adb75ae157727e4cf645844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756df72a04e45d392adb75ae1… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Thu Jun 24 00:01:00 2010 +0200 oledlg: Add the Romanian translation. Translation by Claudia Cotună, reviewed by Alexandru Băluț. --- dlls/oledlg/Makefile.in | 1 + dlls/oledlg/oledlg_Ro.rc | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 6f9a3bf..70648f3 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ oledlg_No.rc \ oledlg_Pl.rc \ oledlg_Pt.rc \ + oledlg_Ro.rc \ oledlg_Ru.rc \ oledlg_Si.rc \ oledlg_Sv.rc \ diff --git a/dlls/oledlg/oledlg_Ro.rc b/dlls/oledlg/oledlg_Ro.rc new file mode 100644 index 0000000..8ffa714 --- /dev/null +++ b/dlls/oledlg/oledlg_Ro.rc @@ -0,0 +1,101 @@ +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 314, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inserare obiect" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Tipul obiectului:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Renunță",IDCANCEL,221,24,66,14 + GROUPBOX "Rezultat",IDC_RESULT,7,103,208,41 + CONTROL "Creează nou",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,67,10 + CONTROL "Creează un control",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,74,10 + CONTROL "Creează din fișier",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Adăugă un control...",IDC_ADDCONTROL,82,88,72,14,NOT WS_VISIBLE + CONTROL "Afișează ca pictogramă",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,86,10 + PUSHBUTTON "Navigare...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fișier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Inserați un nou obiect %s în document" + IDS_RESULTFILEOBJDESC "Inserați conținutul fișierului ca pe un obiect în document, astfel încât să îl puteți activa utilizând programul care l-a creat." + IDS_BROWSE "Navigare" + IDS_NOTOLEMOD "Fișierul nu pare a fi un modul OLE valid. Nu se poate înregistra controlul OLE." + IDS_NOTOLEMODCAPTION "Adaugă un control" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 324, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inserare specială" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sursă:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "I&nserează", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Inserează &legătura", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 74, 10 + LTEXT "C&a:", -1, 81, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 235, 6, 86, 14 + CONTROL "Renunță", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 23, 86, 14 + CONTROL "A&jutor", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 42, 86, 14 + CONTROL "A&fișează ca pictogramă", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 235, 59, 86, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 235, 75, 66, 44 + CONTROL "Schimbare p&ictogramă...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 123, 82, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< textul rezultat apare aici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 65, 100, 159, 35 + CONTROL "Rezultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 223, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Inserează conținutul din clipboard în document ca %s." + IDS_PS_PASTE_OBJECT "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s. Va fi afișat ca o pictogramă." + IDS_PS_PASTE_LINK_DATA "Inserează conținutul din clipboard în document ca %s. Datele sunt legate de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_PASTE_LINK_OBJECT "Inserează o imagine a conținutului din clipboard în document. Imaginea este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserează o scurtătură care conduce la locația conținutului din clipboard. Scurtătura este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_NON_OLE "Inserează conținutul din clipboard în document." + IDS_PS_UNKNOWN_TYPE "Tip necunoscut" + IDS_PS_UNKNOWN_SRC "Sursă necunoscută" + IDS_PS_UNKNOWN_APP "programul care l-a creat" +}

1 0

Dylan Smith : wordpad: Remove untranslated resources from the Chinese translation.
by Alexandre Julliard 24 Jun '10

24 Jun '10

Module: wine Branch: master Commit: 63b04e4abfcc441edd7dc31e01f6b10c5621f049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b04e4abfcc441edd7dc31e0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 23 19:19:50 2010 -0400 wordpad: Remove untranslated resources from the Chinese translation. --- programs/wordpad/Zh.rc | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 135f00c..bae40a7 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -111,30 +111,6 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和时间"

1 0