October 2011 - Wine-commits

Ken Sharp : browseui: Update English resources.
by Alexandre Julliard 20 Oct '11

20 Oct '11

1 0

Henri Verbeet : d3d9/tests: Add a small test for multisampled GetRenderTargetData().
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 12a99309d9e595d11f5d7b2ec8b17c9bd086f9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a99309d9e595d11f5d7b2ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:12 2011 +0200 d3d9/tests: Add a small test for multisampled GetRenderTargetData(). --- dlls/d3d9/tests/visual.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 75132ff..c583b12 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12607,6 +12607,56 @@ static void update_surface_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(src_tex); } +static void multisample_get_rtdata_test(IDirect3DDevice9 *device) +{ + IDirect3DSurface9 *original_ds, *original_rt, *rt, *readback; + IDirect3D9 *d3d9; + HRESULT hr; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); + IDirect3D9_Release(d3d9); + if (FAILED(hr)) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); + ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); + ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr); + + IDirect3DSurface9_Release(original_ds); + IDirect3DSurface9_Release(original_rt); + IDirect3DSurface9_Release(readback); + IDirect3DSurface9_Release(rt); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -12781,6 +12831,7 @@ START_TEST(visual) srgbwrite_format_test(device_ptr); clip_planes_test(device_ptr); update_surface_test(device_ptr); + multisample_get_rtdata_test(device_ptr); cleanup: if(device_ptr) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_set_gamma_ramp() const.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 23ee1a451b954fb70671023a9ff82090ddf266bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ee1a451b954fb70671023a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:13 2011 +0200 wined3d: Make the device parameter to wined3d_device_set_gamma_ramp() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26b4d27..cfd8ced 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5823,7 +5823,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device return WINED3D_OK; } -void CDECL wined3d_device_set_gamma_ramp(struct wined3d_device *device, +void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a94f5d0..f16530c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2295,7 +2295,7 @@ HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const WINED3DDISPLAYMODE *mode); -void __cdecl wined3d_device_set_gamma_ramp(struct wined3d_device *device, +void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_gamma_ramp() const.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: da32d34439f4a58cbff1ecdbc9f3f8de184538d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da32d34439f4a58cbff1ecdbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:14 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_gamma_ramp() const. --- dlls/wined3d/device.c | 3 ++- include/wine/wined3d.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfd8ced..67e50b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5838,7 +5838,8 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, } } -void CDECL wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp) +void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, + UINT swapchain_idx, WINED3DGAMMARAMP *ramp) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f16530c..97df749 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,7 +2218,8 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); -void __cdecl wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp); +void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, + UINT swapchain_idx, WINED3DGAMMARAMP *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light);

1 0

Andrew Eikum : dsound: Don't claim to support hardware buffers.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 9b15c17376a6943af05f8d118386d87c6ac3829b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b15c17376a6943af05f8d118… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 19 15:07:18 2011 -0500 dsound: Don't claim to support hardware buffers. --- dlls/dsound/dsound.c | 10 ++++ dlls/dsound/tests/dsound.c | 111 +++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/tests/dsound8.c | 110 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b15c17376a6943af05f8…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: a2f54992a54b51dd59beee1ef068067e649a2e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f54992a54b51dd59beee1ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 19 14:39:29 2011 -0600 po: Update Catalan translation. --- po/ca.po | 70 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 30 insertions(+), 40 deletions(-) diff --git a/po/ca.po b/po/ca.po index 37a088d..a857878 100644 --- a/po/ca.po +++ b/po/ca.po @@ -153,11 +153,11 @@ msgstr "Carpetas de Documents" #: comdlg32.rc:31 shell32.rc:200 msgid "My Documents" -msgstr "Els meus Documents" +msgstr "Els meus documents" #: comdlg32.rc:32 msgid "My Favorites" -msgstr "Els meus Preferits" +msgstr "Els meus preferits" #: comdlg32.rc:33 msgid "System Path" @@ -174,7 +174,7 @@ msgstr "Fonts" #: comdlg32.rc:36 shell32.rc:154 regedit.rc:200 msgid "My Computer" -msgstr "El meu Ordinador" +msgstr "El meu ordinador" #: comdlg32.rc:41 msgid "System Folders" @@ -399,7 +399,7 @@ msgstr "" #: comdlg32.rc:151 msgid "Select a font size between %d and %d points." -msgstr "Seleccioneu una mida de font entre %d i %d punts." +msgstr "Seleccioneu una mida de lletra entre %d i %d punts." #: comdlg32.rc:152 ieframe.rc:32 msgid "&Save" @@ -1365,7 +1365,7 @@ msgstr "Xifratge de Dades" #: crypt32.rc:228 msgid "Key Agreement" -msgstr "Accord de Clau" +msgstr "Acord de Clau" #: crypt32.rc:229 msgid "Certificate Signing" @@ -2079,7 +2079,7 @@ msgstr "Í&ndex" #: hhctrl.rc:30 notepad.rc:52 msgid "&Search" -msgstr "Cerca" +msgstr "&Cerca" #: hhctrl.rc:31 msgid "Favor&ites" @@ -5900,7 +5900,7 @@ msgstr "Copia fitxers de:" #: setupapi.rc:31 msgid "Type the path where the file is located, and then click OK." msgstr "" -"Introduïu la ruta en que es troba el fitxer i llavors feu clic en D'accord." +"Introduïu la ruta en que es troba el fitxer i llavors feu clic en D'acord." #: shdoclc.rc:39 msgid "F&orward" @@ -6740,9 +6740,8 @@ msgid "Trash" msgstr "Paperera" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld bytes" +msgstr "%d bytes" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7768,7 +7767,7 @@ msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winefile.rc:64 wordpad.rc:81 msgid "&Font..." -msgstr "&Font..." +msgstr "&Tipus de lletra..." #: clock.rc:34 msgid "&Without Titlebar" @@ -8714,7 +8713,7 @@ msgstr "%s %s %s Recursos oberts: %lu\n" #: net.rc:44 msgid "OK" -msgstr "D'accord" +msgstr "D'acord" #: net.rc:45 msgid "Paused" @@ -9438,7 +9437,7 @@ msgstr "&Copia Nom de Clau" #: regedit.rc:60 regedit.rc:112 wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "Cerca...\tCtrl+&F" +msgstr "&Cerca...\tCtrl+&F" #: regedit.rc:61 msgid "Find Ne&xt\tF3" @@ -10446,7 +10445,7 @@ msgstr "Fitxer de tema (*.msstyles; *.theme)" #: winecfg.rc:44 msgid "Select a theme file" -msgstr "Seleccionar fitxer de tema" +msgstr "Seleccioneu un fitxer de tema" #: winecfg.rc:45 msgid "Folder" @@ -10454,7 +10453,7 @@ msgstr "Carpeta" #: winecfg.rc:46 msgid "Links to" -msgstr "Vincula a" +msgstr "Enllaça a" #: winecfg.rc:42 msgid "Wine configuration for %s" @@ -10490,19 +10489,19 @@ msgstr "Advertència: biblioteca de sistema" #: winecfg.rc:53 msgid "native" -msgstr "natiu" +msgstr "nativa" #: winecfg.rc:54 msgid "builtin" -msgstr "incorporada" +msgstr "interna" #: winecfg.rc:55 msgid "native, builtin" -msgstr "natiu, incorporada" +msgstr "nativa, interna" #: winecfg.rc:56 msgid "builtin, native" -msgstr "incorporada, natiu" +msgstr "interna, nativa" #: winecfg.rc:57 msgid "disabled" @@ -10522,7 +10521,7 @@ msgstr "Usar ajustaments globals" #: winecfg.rc:61 msgid "Select an executable file" -msgstr "Seleccioneu fitxer executable" +msgstr "Seleccioneu un fitxer executable" #: winecfg.rc:66 msgid "Hardware" @@ -10939,11 +10938,11 @@ msgstr "&Quant al Gestor de Fixers de Wine..." #: winefile.rc:93 msgid "Applying font settings" -msgstr "Aplicant ajustaments de font" +msgstr "Aplicant ajustaments de lletra" #: winefile.rc:94 msgid "Error while selecting new font." -msgstr "Error al seleccionar la nova font." +msgstr "Error al seleccionar el nou tipus de lletra." #: winefile.rc:99 msgid "Wine File Manager" @@ -11401,59 +11400,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Nombre de paràmetres invàlid - Useu xcopy /? per ajuda\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Paràmetre invàlida '%s' - Useu xcopy /? per ajuda\n" +msgstr "Paràmetre invàlida '%1' - Useu xcopy /? per ajuda\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Premeu <enter> per començar a copiar\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d fitxer(s) es copiarian\n" +msgstr "%1!d! fitxer(s) es copiarian\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d fitxer(s) copiat(s)\n" +msgstr "%1!d! fitxer(s) copiat(s)\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"És '%s' un nom de fitxer o un directori\n" -"a la destinació?\n" +"És '%1' un nom de fitxer o un\n" +"directori a la destinació?\n" "(F - Fitxer, D - Directori)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Sí|No)\n" +msgstr "%1? (Sí|No)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Sobreescriure %s? (Yes|No|All)\n" +msgstr "Sobreescriure %1? (Yes|No|All)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "La còpia de '%s' a '%s' ha fallat amb r/c %d\n" +msgstr "La còpia de '%1' a '%2' ha fallat amb r/c %d\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "S'ha fallat en obrir '%s'\n" +msgstr "S'ha fallat en obrir '%1'\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "S'ha fallat durant la lectura de '%s'\n" +msgstr "S'ha fallat durant la lectura de '%1'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Alex Henrie : winecfg: Add Catalan translation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 648b36bb062449dc8c59e2bcdff9cbbcbf27936e URL: http://source.winehq.org/git/wine.git/?a=commit;h=648b36bb062449dc8c59e2bcd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 19 14:39:38 2011 -0600 winecfg: Add Catalan translation. --- programs/winecfg/Ca.rc | 203 ++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/Makefile.in | 1 + 2 files changed, 204 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=648b36bb062449dc8c59e…

1 0

Alex Henrie : comctl32: Add Catalan translation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 83c72e874a118c738144d02276458f43da952447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c72e874a118c738144d0227… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 19 14:39:42 2011 -0600 comctl32: Add Catalan translation. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/comctl_Ca.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 1385da7..e5d9f3c 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -45,6 +45,7 @@ C_SRCS = \ RC_SRCS = \ comctl32.rc \ comctl_Bg.rc \ + comctl_Ca.rc \ comctl_Cs.rc \ comctl_Da.rc \ comctl_De.rc \ diff --git a/dlls/comctl32/comctl_Ca.rc b/dlls/comctl32/comctl_Ca.rc new file mode 100644 index 0000000..b95263b --- /dev/null +++ b/dlls/comctl32/comctl_Ca.rc @@ -0,0 +1,66 @@ +/* + * 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 "comctl32.h" + +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Propietats de %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "D'acord", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancella", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Aplica", 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 + + +IDD_WIZARD DIALOG 0, 0, 290, 159 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Enrere", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Proper >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Finalitza", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Cancella", IDCANCEL,178,138,50,14 + PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Customize Toolbar" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Tanca", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&einicia", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Mou A&munt", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Mou A&baix", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Botons disponibles:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Afegeix ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Treu", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Botons de barra d'&eines:", -1,182,5,78,10 + 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

1 0

Alex Henrie : comdlg32: Update Catalan translation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 7c6bf9c66c635d50836562e205188e7f6fe9252a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6bf9c66c635d50836562e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 19 14:39:47 2011 -0600 comdlg32: Update Catalan translation. --- dlls/comdlg32/cdlg_Ca.rc | 154 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ca.rc b/dlls/comdlg32/cdlg_Ca.rc index 2859912..e691134 100644 --- a/dlls/comdlg32/cdlg_Ca.rc +++ b/dlls/comdlg32/cdlg_Ca.rc @@ -120,10 +120,10 @@ FONT 8, "MS Shell Dlg" CHOOSE_FONT DIALOG 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Tipus de lletra" +CAPTION "Tipus de Lletra" FONT 8, "MS Shell Dlg" { - LTEXT "&Tipus de lletra:",1088 ,6,3,40,9 + LTEXT "&Tipus de lletra:",1088 ,6,3,50,9 COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "&Estil del tipus de lletra:",1089 ,108,3,44,9 @@ -144,7 +144,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "Scr&ipt:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -219,3 +219,151 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } + + +PRINT32 DIALOG 32, 32, 288, 186 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Imprimir" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "D'acord", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancella", IDCANCEL, 232,164, 48,14, WS_GROUP + + GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "A&juda", pshHelp, 50, 161, 48,14, WS_GROUP + CONTROL "Imprimeix a &fitxer", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "&Propietats", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nom:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Estat:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Estat de Maniqu", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipus:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Tipus de Maniqu", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "On:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Ubicaci de Maniqu", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentari:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Observaci de Maniqu", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Nombre de &copies:",stc5,168,108,68,8 + ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "C&ompagina", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "Interval d'impressi", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&Tot", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&Selecci", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "&de:", stc2, 52,124, 20,8 + RTEXT "&a:", stc3, 100,124, 16,8 +} + +PRINT32_SETUP DIALOG 32, 32, 288, 178 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Configuraci de la Impressi" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "D'acord",IDOK,180,156,48,14,WS_GROUP + PUSHBUTTON "Cancella",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ + + GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Propietats", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nom:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Estat:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Estat de Maniqu", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipus:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Tipus de Maniqu", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "On:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Ubicaci de Maniqu", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentari:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Observaci de Maniqu", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Paper", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Mida:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&Font:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "Orientaci", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&Vertical", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "&Horizontal", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +PAGESETUPDLGORD DIALOG 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Configuraci de la Pgina" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Mida:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Safata:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Orientaci", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Horizontal", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Vores", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Esquerra:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Dreta:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "S&uperior:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Inferior:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "D'acord", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Cancella", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Imp&ressora...", psh3, 184, 220, 48, 14 +END + +NEWFILEOPENORD DIALOG 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Obrir" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Cerca &en:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "&Nom de fitxer:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,60,110,155,12,ES_AUTOHSCROLL + + LTEXT "Fitxers de &tipus:",IDC_FILETYPESTATIC,5,128,55,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,60,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "Obre per noms &lectura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&Obre", IDOK,222,110,50,14 + PUSHBUTTON "Cancella", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Ajuda", pshHelp,222,145,50,14 +} + +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "Obrir" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nom de fitxer:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + + LTEXT "Fitxers de tipus:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&Obre", IDOK, 350, 240, 40, 14, WS_GROUP + PUSHBUTTON "Cancella", IDCANCEL, 395, 240, 40, 14 + PUSHBUTTON "&Ajuda", pshHelp, 350, 272, 40, 14 +}

1 0

Alex Henrie : shell32: Update Catalan translation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 7604803dff2c356f528a0d0df6a655b74d074b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7604803dff2c356f528a0d0df… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 19 14:39:51 2011 -0600 shell32: Update Catalan translation. --- dlls/shell32/shell32_Ca.rc | 66 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index b3c3074..a617770 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -20,18 +20,64 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Navegar per Carpeta" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "D'acord", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancella", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + +SHNEWBRSFORFOLDER_MSGBOX DIALOG 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Navegar per Carpeta" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Carpeta:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Fer Una Nova Carpeta", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "D'acord", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancella", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Missatge" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&S", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "S a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancella", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Quant a %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + DEFPUSHBUTTON "D'acord", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "&Llicencia de 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 "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Executant en %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -40,11 +86,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" { - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i Wine el obrir per vs.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "D'acord", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancella", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Navega...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP }

1 0