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

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 9e3e9b49a5232ebf2d41bad84cb98be58e9ab068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3e9b49a5232ebf2d41bad84… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jun 19 23:04:36 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/string.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index b33b145..5fb2003 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -100,11 +100,19 @@ static BOOL init(void) SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ"); SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QEBA_NXZ"); }else { +#ifdef __arm__ + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QAA(a)PBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QAA(a)ABV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QAA(a)XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QBA_NXZ"); +#else SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QAE(a)PBD@Z"); SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QAE(a)ABV01@@Z"); SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QAE(a)XZ"); SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ"); SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QBE_NXZ"); +#endif /* __arm__ */ } init_thiscall_thunk();

1 0

Jacek Caban : dwmapi: Added DwmGetCompositionTimingInfo stub.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: f98ccb82b9987d0c9cff79e15ac8c08a82cd011d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98ccb82b9987d0c9cff79e15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 20 15:29:17 2013 +0200 dwmapi: Added DwmGetCompositionTimingInfo stub. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8f8f7a3..5f74970 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -28,7 +28,7 @@ @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) -@ stub DwmGetCompositionTimingInfo +@ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 39a9918..e6154ba 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -208,3 +208,15 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i return E_NOTIMPL; } + +/********************************************************************** + * DwmGetCompositionTimingInfo (DWMAPI.@) + */ +HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) +{ + static int i; + + if(!i++) FIXME("(%p %p)\n", hwnd, info); + + return E_NOTIMPL; +}

1 0

Matteo Bruni : d3d9/tests: Skip unbound_sampler_test if cube or volume textures aren't supported.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: aeade16d62d94b941a8d7e48b5fb6f3897fcb84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeade16d62d94b941a8d7e48b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:26 2013 +0200 d3d9/tests: Skip unbound_sampler_test if cube or volume textures aren't supported. --- dlls/d3d9/tests/visual.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 73f5066..ee15651 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12763,6 +12763,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; DWORD color; + D3DCAPS9 caps; static const DWORD ps_code[] = { @@ -12805,6 +12806,14 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} }; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) || !(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("No cube / volume textures support, skipping the unbound sampler test.\n"); + return; + } + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTextureStage failed, %#x.\n", hr);

1 0

Kamil Pošvic : po: Update Czech translation.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: a356d47969181f6b071a13586ea4a87274c5843b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a356d47969181f6b071a13586… Author: Kamil Pošvic <kamil(a)posvic.com> Date: Wed Jun 19 23:49:28 2013 +0200 po: Update Czech translation. --- po/cs.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/cs.po b/po/cs.po index be67930..723b702 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1198,7 +1198,7 @@ msgstr "Připojuji se k %s" #: credui.rc:29 msgid "Logon unsuccessful" -msgstr "Přihlášení proběhlo úspěšně" +msgstr "Přihlášení proběhlo neúspěšně" #: credui.rc:30 msgid "" @@ -1415,19 +1415,19 @@ msgstr "" #: crypt32.rc:74 msgid "Title" -msgstr "" +msgstr "Titul" #: crypt32.rc:75 msgid "Given Name" -msgstr "" +msgstr "Křesní jméno" #: crypt32.rc:76 msgid "Initials" -msgstr "" +msgstr "Iniciály" #: crypt32.rc:77 msgid "Surname" -msgstr "" +msgstr "Příjmení" #: crypt32.rc:78 msgid "Domain Component" @@ -1752,7 +1752,7 @@ msgstr "" #: crypt32.rc:158 cryptui.rc:129 msgid "File Recovery" -msgstr "" +msgstr "Obnovení souboru" #: crypt32.rc:159 cryptui.rc:134 msgid "Root List Signer" @@ -1784,7 +1784,7 @@ msgstr "" #: crypt32.rc:170 msgid "Personal" -msgstr "" +msgstr "Osobní" #: crypt32.rc:171 msgid "Intermediate Certification Authorities" @@ -1792,7 +1792,7 @@ msgstr "" #: crypt32.rc:172 msgid "Other People" -msgstr "" +msgstr "Ostatní" #: crypt32.rc:173 msgid "Trusted Publishers" @@ -1812,7 +1812,7 @@ msgstr "" #: crypt32.rc:181 msgid "Certificate Serial Number=" -msgstr "" +msgstr "Sériové číslo certifikátu" #: crypt32.rc:182 msgid "Other Name=" @@ -1820,11 +1820,11 @@ msgstr "" #: crypt32.rc:183 msgid "Email Address=" -msgstr "" +msgstr "Emailová adresa" #: crypt32.rc:184 msgid "DNS Name=" -msgstr "" +msgstr "Jméno DNS=" #: crypt32.rc:185 msgid "Directory Address" @@ -1836,11 +1836,11 @@ msgstr "" #: crypt32.rc:187 msgid "IP Address=" -msgstr "" +msgstr "IP Adresa=" #: crypt32.rc:188 msgid "Mask=" -msgstr "" +msgstr "Maska=" #: crypt32.rc:189 msgid "Registered ID=" @@ -1879,7 +1879,7 @@ msgstr "" #: crypt32.rc:196 msgid "Information Not Available" -msgstr "" +msgstr "Informace nejsou dostupné" #: crypt32.rc:197 msgid "Authority Info Access" @@ -1916,7 +1916,7 @@ msgstr "" #: crypt32.rc:205 msgid "Full Name" -msgstr "" +msgstr "Celé jméno" #: crypt32.rc:206 msgid "RDN Name" @@ -1960,15 +1960,15 @@ msgstr "" #: crypt32.rc:216 taskmgr.rc:397 msgid "Available" -msgstr "" +msgstr "Dostupné" #: crypt32.rc:217 msgid "Not Available" -msgstr "" +msgstr "Nedostupné" #: crypt32.rc:218 msgid "Meets Criteria=" -msgstr "" +msgstr "Splňuje kritéria=" #: crypt32.rc:219 cryptui.rc:163 oleaut32.rc:29 wininet.rc:80 ipconfig.rc:44 msgid "Yes" @@ -2032,7 +2032,7 @@ msgstr "" #: crypt32.rc:234 msgid "Signature" -msgstr "" +msgstr "Podpis" #: crypt32.rc:235 msgid "SSL CA" @@ -2184,7 +2184,7 @@ msgstr "" #: cryptui.rc:265 cryptui.rc:66 msgid "Select Certificate Store" -msgstr "" +msgstr "Vybrat uložení certifikátu" #: cryptui.rc:268 msgid "Select the certificate store you want to use:" @@ -2192,7 +2192,7 @@ msgstr "" #: cryptui.rc:271 msgid "&Show physical stores" -msgstr "" +msgstr "&Zobrazit úložiště" #: cryptui.rc:277 cryptui.rc:288 cryptui.rc:305 cryptui.rc:319 cryptui.rc:68 msgid "Certificate Import Wizard"

1 0

Alexandre Julliard : gdi32: Put vertical font families after their horizontal counterpart in the font list .
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: e531306f7ad6292fe0deff1533e25059d88df93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e531306f7ad6292fe0deff153… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 12:12:16 2013 +0200 gdi32: Put vertical font families after their horizontal counterpart in the font list. --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2ec7335..bdd6df7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1622,6 +1622,38 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu } } +/* move vertical fonts after their horizontal counterpart */ +/* assumes that font_list is already sorted by family name */ +static void reorder_vertical_fonts(void) +{ + Family *family, *next, *vert_family; + struct list *ptr, *vptr; + struct list vertical_families = LIST_INIT( vertical_families ); + + LIST_FOR_EACH_ENTRY_SAFE( family, next, &font_list, Family, entry ) + { + if (family->FamilyName[0] != '@') continue; + list_remove( &family->entry ); + list_add_tail( &vertical_families, &family->entry ); + } + + ptr = list_head( &font_list ); + vptr = list_head( &vertical_families ); + while (ptr && vptr) + { + family = LIST_ENTRY( ptr, Family, entry ); + vert_family = LIST_ENTRY( vptr, Family, entry ); + if (strcmpiW( family->FamilyName, vert_family->FamilyName + 1 ) > 0) + { + list_remove( vptr ); + list_add_before( ptr, vptr ); + vptr = list_head( &vertical_families ); + } + else ptr = list_next( &font_list, ptr ); + } + list_move_tail( &font_list, &vertical_families ); +} + static void load_font_list_from_cache(HKEY hkey_font_cache) { DWORD size, family_index = 0; @@ -1672,6 +1704,8 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) release_family( family ); size = sizeof(buffer); } + + reorder_vertical_fonts(); } static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition)

1 0

Ken Thomases : winemac: Don' t complain that WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS is unrecognized.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 92a67d4259404e98a1971ac75076e34905fdc166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a67d4259404e98a1971ac75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 19 19:08:48 2013 -0500 winemac: Don't complain that WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS is unrecognized. --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5328489..3c0041b 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1239,7 +1239,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) activate_on_focus_time = GetTickCount(); if (!activate_on_focus_time) activate_on_focus_time = 1; TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); - break; + return 0; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0

Alexandre Julliard : gdi32: Add support for loading name strings in Apple Unicode format.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 102b2785f4e9d892fa4ae7a84ccc57792000e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102b2785f4e9d892fa4ae7a84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 21:07:33 2013 +0200 gdi32: Add support for loading name strings in Apple Unicode format. --- dlls/gdi32/freetype.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 468ea4b..2ec7335 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1325,6 +1325,19 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; name_lang = mac_langid_table[name->language_id]; break; + case TT_PLATFORM_APPLE_UNICODE: + switch (name->encoding_id) + { + case TT_APPLE_ID_DEFAULT: + case TT_APPLE_ID_ISO_10646: + case TT_APPLE_ID_UNICODE_2_0: + if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + name_lang = mac_langid_table[name->language_id]; + break; + default: + return 0; + } + break; default: return 0; } @@ -1342,6 +1355,7 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name ) switch (name->platform_id) { + case TT_PLATFORM_APPLE_UNICODE: case TT_PLATFORM_MICROSOFT: ret = HeapAlloc( GetProcessHeap(), 0, name->string_len + sizeof(WCHAR) ); for (i = 0; i < name->string_len / 2; i++)

1 0

Alexandre Julliard : winemac.drv: Don' t register IME classes before the dll is initialized.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 410b728c7b04abba1a7de2a4e9ec287b593ad76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=410b728c7b04abba1a7de2a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 17:02:01 2013 +0200 winemac.drv: Don't register IME classes before the dll is initialized. --- dlls/winemac.drv/macdrv_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d72b036..470553e 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -164,7 +164,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach(void) +static BOOL process_attach( HINSTANCE instance ) { SessionAttributeBits attributes; OSStatus status; @@ -186,6 +186,7 @@ static BOOL process_attach(void) set_app_icon(); macdrv_clipboard_process_attach(); + IME_RegisterClasses( instance ); return TRUE; } @@ -279,8 +280,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - IME_RegisterClasses(hinst); - ret = process_attach(); + ret = process_attach( hinst ); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: b9aa0c6fbf6c10184e550b9ae0116397b8951741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9aa0c6fbf6c10184e550b9ae… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Thu Jun 20 22:42:41 2013 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 84 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 0681c4e..84be9fa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1190,7 +1190,8 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除大寫鎖定。" +"請在輸入密碼前按下 Caps Lock 鍵，解除\n" +"大寫鎖定。" #: credui.rc:31 msgid "Caps Lock is On" @@ -3095,11 +3096,11 @@ msgstr "我的最愛(&I)" #: hhctrl.rc:33 msgid "Hide &Tabs" -msgstr "隱藏分頁標籤(&T)" +msgstr "隱藏分頁(&T)" #: hhctrl.rc:34 msgid "Show &Tabs" -msgstr "顯示分頁標籤(&T)" +msgstr "顯示分頁(&T)" #: hhctrl.rc:39 msgid "Show" @@ -3263,7 +3264,7 @@ msgstr "空白頁面(&B)" #: inetcpl.rc:53 msgid "Browsing history" -msgstr "瀏覽記錄" +msgstr "瀏覽歷程" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3279,7 +3280,7 @@ msgstr "設定(&S)…" #: inetcpl.rc:65 msgid "Delete browsing history" -msgstr "刪除瀏覽記錄" +msgstr "刪除瀏覽歷程" #: inetcpl.rc:68 msgid "" @@ -3303,7 +3304,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷史記錄\n" +"歷程\n" "您曾存取過的網站清單。" #: inetcpl.rc:74 @@ -3504,11 +3505,11 @@ msgstr "在迴圈之外不可有 continue" #: jscript.rc:42 msgid "Label redefined" -msgstr "標籤重複定義" +msgstr "標貼重複定義" #: jscript.rc:43 msgid "Label not found" -msgstr "找不到標籤" +msgstr "找不到標貼" #: jscript.rc:44 msgid "Conditional compilation is turned off" @@ -3952,7 +3953,7 @@ msgstr "無效的層級。\n" #: winerror.mc:491 msgid "No volume label.\n" -msgstr "沒有卷冊標籤。\n" +msgstr "沒有卷冊標貼。\n" #: winerror.mc:496 msgid "Module not found.\n" @@ -3968,7 +3969,7 @@ msgstr "沒有要等待的子行程。\n" #: winerror.mc:511 msgid "Child process has not completed.\n" -msgstr "子行程未已完成。\n" +msgstr "子行程還未完成。\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" @@ -4064,7 +4065,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: winerror.mc:636 msgid "Volume label too long.\n" -msgstr "卷冊標籤太長。\n" +msgstr "卷冊標貼太長。\n" #: winerror.mc:641 msgid "Too many TCBs.\n" @@ -6012,7 +6013,7 @@ msgstr "不受支援的轉送語法。\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "無效的標定。\n" +msgstr "無效的標籤。\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" @@ -7500,7 +7501,7 @@ msgstr "倒回" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "追蹤標記" +msgstr "追蹤標籤" #: shdoclc.rc:197 msgid "Resource Failures" @@ -7898,7 +7899,7 @@ msgstr "印表套頁" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "記錄" +msgstr "歷程" #: shell32.rc:212 msgid "Program Files" @@ -9311,10 +9312,10 @@ msgstr "" "GOTO 命令在批次檔內將執行順序轉移到另一個\n" "敘述。\n" "\n" -"做為 GOTO 目標之用的標籤長度最多可以是 255 字元，\n" +"做為 GOTO 目標之用的標貼長度最多可以是 255 字元，\n" "但是不可以包含空格 (這是與其他作業系統不同的\n" -"地方)。如果兩個以上相同的標籤存在於批次檔中，\n" -"將會一律執行第一個。試圖前往不存在的標籤會\n" +"地方)。如果兩個以上相同的標貼存在於批次檔中，\n" +"將會一律執行第一個。試圖前往不存在的標貼會\n" "終止批次檔的執行。\n" "\n" "GOTO 用於互動模式中將沒有任何效果。\n" @@ -9355,11 +9356,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟卷冊標籤。\n" +"LABEL 用於設定磁碟卷冊標貼。\n" "\n" "語法：LABEL [裝置代號:]\n" -"命令將向您提示詢問新的卷冊標籤用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標籤。\n" +"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" +"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" #: cmd.rc:103 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -9624,7 +9625,7 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: cmd.rc:231 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的卷冊標籤。\n" +msgstr "VOL 顯示磁碟裝置的卷冊標貼。\n" #: cmd.rc:235 msgid "" @@ -9798,7 +9799,7 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的卷冊標籤\n" +"VOL\t\t顯示磁碟裝置的卷冊標貼\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" @@ -9880,7 +9881,7 @@ msgstr "開啟 %1 失敗\n" #: cmd.rc:337 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標籤\n" +msgstr "無法呼叫批次命令稿外部的批次標貼\n" #: cmd.rc:338 xcopy.rc:42 msgctxt "All key" @@ -9917,7 +9918,7 @@ msgstr "" #: cmd.rc:345 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標籤 (11 個字元，<Enter> 表示沒有)？" +msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" #: cmd.rc:346 msgid "PATH not found\n" @@ -9949,7 +9950,7 @@ msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" #: cmd.rc:353 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標籤。\n" +msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" #: cmd.rc:354 msgid " (Yes|No)" @@ -10622,7 +10623,7 @@ msgstr "複製 C&LSID 到剪貼簿" #: oleview.rc:54 msgid "Copy &HTML object Tag to clipboard" -msgstr "複製 &HTML 物件標記到剪貼簿" +msgstr "複製 &HTML 物件標籤到剪貼簿" #: oleview.rc:60 msgid "&Expert mode" @@ -11626,7 +11627,7 @@ msgstr "選擇行(&S)…" #: taskmgr.rc:69 taskmgr.rc:258 msgid "&CPU History" -msgstr "&CPU 記錄" +msgstr "&CPU 歷程" #: taskmgr.rc:71 taskmgr.rc:259 msgid "&One Graph, All CPUs" @@ -11786,11 +11787,11 @@ msgstr "非置換頁" #: taskmgr.rc:414 msgid "CPU usage history" -msgstr "CPU 使用記錄" +msgstr "CPU 使用歷程" #: taskmgr.rc:415 msgid "Memory usage history" -msgstr "記憶體使用記錄" +msgstr "記憶體使用歷程" #: taskmgr.rc:428 taskmgr.rc:327 msgid "Debug Channels" @@ -12145,11 +12146,11 @@ msgstr "在效能圖表上顯示核心使用時間" #: taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "在一張記錄圖表顯示所有 CPU 用量" +msgstr "在一張歷程圖表顯示所有 CPU 用量" #: taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "每一個 CPU 有自己的記錄圖表" +msgstr "每一個 CPU 有自己的歷程圖表" #: taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" @@ -12317,11 +12318,10 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：終止行程可以造成 undesired\n" -"結果包含失真的資料和系統 instability。\n" -"行程將無法被給定的 chance 到儲存它的狀態或\n" -"資料之前它被終止。確定要\n" -"終止行程？" +"警告：終止行程可能造成預料之外的\n" +"結果像是資料的漏失與系統的不穩定。\n" +"行程將無法有機會於終止之前能夠儲存\n" +"它的狀態或資料。您確定要終止行程嗎？" #: taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -12599,7 +12599,7 @@ msgstr "瀏覽(&W)…" #: winecfg.rc:244 msgid "&Label:" -msgstr "標籤(&L)：" +msgstr "標貼(&L)：" #: winecfg.rc:246 msgid "S&erial:" @@ -13021,7 +13021,7 @@ msgstr "啟用(&E)" #: wineconsole.rc:72 msgid "Command history" -msgstr "指令記錄" +msgstr "指令歷程" #: wineconsole.rc:73 msgid "&Number of recalled commands:" @@ -13753,7 +13753,7 @@ msgstr "格式(&O)" #: wordpad.rc:82 wordpad.rc:105 msgid "&Bullet points" -msgstr "要點(&B)" +msgstr "項目符號(&B)" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..." @@ -13761,7 +13761,7 @@ msgstr "段落(&P)…" #: wordpad.rc:84 msgid "&Tabs..." -msgstr "標籤(&T)…" +msgstr "分頁(&T)…" #: wordpad.rc:85 msgid "Backgroun&d" @@ -13821,11 +13821,11 @@ msgstr "對齊" #: wordpad.rc:239 msgid "Tabs" -msgstr "標籤" +msgstr "分頁" #: wordpad.rc:242 msgid "Tab stops" -msgstr "標籤停點" +msgstr "定位停點" #: wordpad.rc:248 msgid "Remove al&l"

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: 15171d8d05a56eec0ec9cb72418afd7a6d164d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15171d8d05a56eec0ec9cb724… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 19 17:49:12 2013 +0200 loader: Update French translation of wine manpage. --- loader/wine.fr.man.in | 119 +++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15171d8d05a56eec0ec9c…

1 0