August 2009 - Wine-commits - list.winehq.org

Andrew Nguyen : user32/tests: Fix a test failure on Win9x.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 918c9d599489a79cb4c512918578ced4d33f6565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918c9d599489a79cb4c512918… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Aug 24 01:50:30 2009 -0500 user32/tests: Fix a test failure on Win9x. --- dlls/user32/tests/dialog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index dfb2483..b7d2b46 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -965,7 +965,8 @@ static void test_DialogBoxParamA(void) SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || + broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); }

1 0

Piotr Caban : jscript: Added String.substr implementation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: b9d7ebd95ab9da6e60fdacab1c69db3d181fcaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d7ebd95ab9da6e60fdacab1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 23 23:38:33 2009 +0200 jscript: Added String.substr implementation. --- dlls/jscript/string.c | 78 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 23 +++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ea499aa..2350f56 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1380,11 +1380,85 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +/* ECMA-262 3rd Edition B.2.3 */ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR val_str = NULL; + const WCHAR *str; + INT start=0, len; + DWORD length; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; + }else { + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + + if(arg_cnt(dp) >= 1) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + if(FAILED(hres)) { + SysFreeString(val_str); + return hres; + } + + if(V_VT(&v) == VT_I4) { + start = V_I4(&v); + if(start < 0) + start = 0; + else if(start >= length) + start = length; + }else { + start = V_R8(&v) < 0.0 ? 0 : length; + } + } + + if(arg_cnt(dp) >= 2) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + if(FAILED(hres)) { + SysFreeString(val_str); + return hres; + } + + if(V_VT(&v) == VT_I4) { + len = V_I4(&v); + if(len < 0) + len = 0; + else if(len > length-start) + len = length-start; + }else { + len = V_R8(&v) < 0.0 ? 0 : length-start; + } + }else { + len = length-start; + } + + hres = S_OK; + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocStringLen(str+start, len); + if(!V_BSTR(retv)) + hres = E_OUTOFMEMORY; + } + + SysFreeString(val_str); + return hres; } static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4d9caf3..efc55a4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -111,6 +111,10 @@ ok(str.toString() === "", "str.toString() = " + str.toString()); var str = new String("test", "abc"); ok(str.toString() === "test", "str.toString() = " + str.toString()); +var strObj = new Object(); +strObj.toString = function() { return "abcd" }; +strObj.substr = String.prototype.substr; + tmp = "value " + str; ok(tmp === "value test", "'value ' + str = " + tmp); @@ -172,6 +176,25 @@ ok(tmp === "bc", "'abcd'.substring(1,3,2) = " + tmp); tmp = "abcd".substring(); ok(tmp === "abcd", "'abcd'.substring() = " + tmp); +tmp = "abcd".substr(1,3); +ok(tmp === "bcd", "'abcd'.substr(1,3) = " + tmp); +tmp = "abcd".substr(-1,3); +ok(tmp === "abc", "'abcd'.substr(-1,3) = " + tmp); +tmp = "abcd".substr(1,6); +ok(tmp === "bcd", "'abcd'.substr(1,6) = " + tmp); +tmp = "abcd".substr(2,-1); +ok(tmp === "", "'abcd'.substr(3,1) = " + tmp); +tmp = "abcd".substr(2,0); +ok(tmp === "", "'abcd'.substr(2,2) = " + tmp); +tmp = "abcd".substr(true,"3"); +ok(tmp === "bcd", "'abcd'.substr(true,'3') = " + tmp); +tmp = "abcd".substr(1,3,2); +ok(tmp === "bcd", "'abcd'.substr(1,3,2) = " + tmp); +tmp = "abcd".substr(); +ok(tmp === "abcd", "'abcd'.substr() = " + tmp); +tmp = strObj.substr(1,1); +ok(tmp === "b", "'abcd'.substr(1,3) = " + tmp); + tmp = "abcd".slice(1,3); ok(tmp === "bc", "'abcd'.slice(1,3) = " + tmp); tmp = "abcd".slice(1,-1);

1 0

Piotr Caban : jscript: Fixed Function method's lengths.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 0091b3fb1ac340a01b947dea69b885028c9cd2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0091b3fb1ac340a01b947dea6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 23 23:38:16 2009 +0200 jscript: Fixed Function method's lengths. --- dlls/jscript/function.c | 4 ++-- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 661b93c..f54c8c6 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -360,8 +360,8 @@ static void Function_destructor(DispatchEx *dispex) } static const builtin_prop_t Function_props[] = { - {applyW, Function_apply, PROPF_METHOD}, - {callW, Function_call, PROPF_METHOD}, + {applyW, Function_apply, PROPF_METHOD|2}, + {callW, Function_call, PROPF_METHOD|1}, {lengthW, Function_length, 0}, {toStringW, Function_toString, PROPF_METHOD} }; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8b4316f..4d9caf3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1552,4 +1552,10 @@ testFunctions(Object.prototype, [ ["valueOf", 0] ]); +testFunctions(Function.prototype, [ + ["apply", 2], + ["call", 1], + ["toString", 0] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed keywords handling.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 7701acc26906efc81881373d35d4a955f28e375f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7701acc26906efc81881373d3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 23 23:38:06 2009 +0200 jscript: Fixed keywords handling. --- dlls/jscript/lex.c | 13 +++++++------ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index eb9b835..1b33737 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -105,6 +105,12 @@ static int lex_error(parser_ctx_t *ctx, HRESULT hres) return -1; } +/* ECMA-262 3rd Edition 7.6 */ +static BOOL is_identifier_char(WCHAR c) +{ + return isalnumW(c) || c == '$' || c == '_' || c == '\\'; +} + static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; @@ -117,7 +123,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lva p2++; } - if(*p2 || (p1 < ctx->end && isalnumW(*p1))) + if(*p2 || (p1 < ctx->end && is_identifier_char(*p1))) return 1; *lval = ctx->ptr; @@ -131,11 +137,6 @@ static BOOL is_endline(WCHAR c) return c == '\n' || c == '\r' || c == 0x2028 || c == 0x2029; } -static BOOL is_identifier_char(WCHAR c) -{ - return isalnumW(c) || c == '$' || c == '_' || c == '\\'; -} - static int hex_to_int(WCHAR c) { if('0' <= c && c <= '9') diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 8150d65..fa100ea 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -898,4 +898,6 @@ ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function ok(createNullBSTR() === '', "createNullBSTR() !== ''"); +function do_test() {} + reportSuccess();

1 0

Nikolay Sivov : comctl32/tests: Move message testing helpers to header.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 03a3207cc7364e86adca5eea65b2a1d92b191785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a3207cc7364e86adca5eea6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 23 12:39:27 2009 +0400 comctl32/tests: Move message testing helpers to header. --- dlls/comctl32/tests/Makefile.in | 1 - dlls/comctl32/tests/msg.c | 256 --------------------------------------- dlls/comctl32/tests/msg.h | 235 ++++++++++++++++++++++++++++++++++- 3 files changed, 228 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03a3207cc7364e86adca5…

1 0

Akihiro Sagawa : winecfg: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 7bee216daf67fea87f19f7ccd53a4466fa800eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bee216daf67fea87f19f7ccd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:41 2009 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 5faff4f..5b77da7 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -127,6 +127,16 @@ BEGIN PUSHBUTTON "キャンセル",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "ドライブレターを選択" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "キャンセル",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" @@ -179,7 +189,7 @@ BEGIN COMBOBOX IDC_DSOUND_HW_ACCEL,100,228,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "既定のサンプルレート(&S):",IDC_STATIC,15,247,70,8 COMBOBOX IDC_DSOUND_RATES,90,245,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "既定のサンプルごとのビット数(&B):",IDC_STATIC,137,232,80,8 + LTEXT "既定の量子化ビット数(&B):",IDC_STATIC,137,247,80,8 COMBOBOX IDC_DSOUND_BITS,220,245,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END

1 0

Akihiro Sagawa : csetupapi: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: d3fc9a59cc224a570cfa414eb75b10d73757cc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fc9a59cc224a570cfa414eb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:40 2009 +0900 csetupapi: Update Japanese translation. --- dlls/setupapi/Ja.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ja.rc b/dlls/setupapi/Ja.rc index 50fcb7a..3fbfa4e 100644 --- a/dlls/setupapi/Ja.rc +++ b/dlls/setupapi/Ja.rc @@ -25,6 +25,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "ファイル '%s' (%s 上) が必要です。" + IDS_UNKNOWN "不明" + IDS_COPYFROM "コピー元:" + IDS_INFO "このファイルがあるパスを入力し、[OK]をクリックしてください。" +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "ファイルをコピーしています..." @@ -37,3 +45,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "ファイルが必要です" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "製造元のインストールディスクを挿入し、\n以下で正しいドライブが選択されていることを確認してください。", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "製造元のファイルのコピー元:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "キャンセル", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "参照...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Akihiro Sagawa : regedit: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: aa916afc9df86da01b197f993f5071e866fba998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa916afc9df86da01b197f993… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:38 2009 +0900 regedit: Update Japanese translation. --- programs/regedit/Ja.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index 4175acd..a39e0a4 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -258,7 +258,7 @@ BEGIN ID_EDIT_MODIFY "値のデータを変更" ID_EDIT_NEW_KEY "新しいキーを追加" ID_EDIT_NEW_STRINGVALUE "新しい文字列値を追加" - ID_EDIT_NEW_BINARYVALUE "新しいバイナリを追加" + ID_EDIT_NEW_BINARYVALUE "新しいバイナリ値を追加" ID_EDIT_NEW_DWORDVALUE "新しいDWORD値を追加" ID_EDIT_NEW_MULTI_STRINGVALUE "新しい複数行文字列値を追加" ID_REGISTRY_IMPORTREGISTRYFILE "テキストファイルをレジストリにインポート" @@ -286,13 +286,14 @@ BEGIN ID_EDIT_COPYKEYNAME "選択したキーの名前をクリップボードにコピー" ID_EDIT_FIND "キー、値、データから文字列を検索" ID_EDIT_FINDNEXT "以前の検索条件において次の候補を検索" + ID_EDIT_EXPORT "選択したレジストリキー以下をテキストファイルに出力" END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "エラー" - IDS_BAD_KEY "キー '%s'が所得できません" - IDS_BAD_VALUE "値 '%s'が所得できません" + IDS_BAD_KEY "キー '%s' を削除できません" + IDS_BAD_VALUE "値 '%s' を削除できません" IDS_UNSUPPORTED_TYPE "このタイプのキーは編集できません (%u)" IDS_TOO_BIG_VALUE "値が大きすぎます (%u)" IDS_DELETE_BOX_TITLE "値の削除確認"

1 0

Akihiro Sagawa : shell32: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 03157495a2e668591f887f492daa463edc402a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03157495a2e668591f887f492… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:34 2009 +0900 shell32: Update Japanese translation. --- dlls/shell32/shell32_Ja.rc | 68 ++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index e426ee5..d3ae40a 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "大きなアイコン(&G)", FCIDM_SHVIEW_BIGICON - MENUITEM "小さなアイコン(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "大きいアイコン(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "小さいアイコン(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "一覧(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細(&D)", FCIDM_SHVIEW_REPORTVIEW END @@ -81,7 +81,7 @@ BEGIN POPUP "" BEGIN MENUITEM "選択(&S)" FCIDM_SHVIEW_OPEN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE + MENUITEM "エクスプローラ(&X)", FCIDM_SHVIEW_EXPLORE MENUITEM "開く(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "切り取り(&U)", FCIDM_SHVIEW_CUT @@ -105,8 +105,8 @@ BEGIN POPUP "表示(&V)" BEGIN - MENUITEM "大きなアイコン(&G)", FCIDM_SHVIEW_BIGICON - MENUITEM "小さなアイコン(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "大きいアイコン(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "小さいアイコン(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "一覧(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細(&D)", FCIDM_SHVIEW_REPORTVIEW END @@ -184,8 +184,8 @@ CAPTION "" FONT 9, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 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.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 - LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + LTEXT "Wine で実行するプログラム、または開くフォルダ名、ドキュメント名、インターネットリソース名を入力してください。", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "名前(&O):", 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 "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -203,11 +203,11 @@ STRINGTABLE IDS_SHV_COLUMN6 "合計サイズ" IDS_SHV_COLUMN7 "空き容量" IDS_SHV_COLUMN8 "名前" - IDS_SHV_COLUMN9 "Comments" + IDS_SHV_COLUMN9 "コメント" IDS_SHV_COLUMN10 "所有者" IDS_SHV_COLUMN11 "グループ" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_DELFROM "元の場所" + IDS_SHV_COLUMN_DELDATE "削除日" /* special folders */ IDS_DESKTOP "デスクトップ" @@ -223,23 +223,23 @@ STRINGTABLE IDS_SELECT "選択" IDS_OPEN "開く" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" - IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" - IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" - 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 "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - 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?" + IDS_CREATEFOLDER_DENIED "新しいフォルダを作成できませんでした。アクセスが拒否されました。" + IDS_CREATEFOLDER_CAPTION "フォルダの作成に失敗" + IDS_DELETEITEM_CAPTION "ファイルの削除の確認" + IDS_DELETEFOLDER_CAPTION "フォルダの削除の確認" + IDS_DELETEITEM_TEXT "'%1' を削除しますか?" + IDS_DELETEMULTIPLE_TEXT "これら %1 ファイルを削除しますか?" + IDS_DELETESELECTED_TEXT "選択されているファイルを削除しますか?" + IDS_TRASHITEM_TEXT "'%1' をごみ箱に移しますか?" + IDS_TRASHFOLDER_TEXT "'%1' とその中にあるすべてのファイルをごみ箱に移しますか?" + IDS_TRASHMULTIPLE_TEXT "これら %1 ファイルをごみ箱に移しますか?" + IDS_CANTTRASH_TEXT "'%1' はごみ箱に移せません。代わりに削除しますか?" + IDS_OVERWRITEFILE_TEXT "このフォルダにはすでに '%1' というファイルが存在します。\n\nこのファイルを上書きしますか?" + IDS_OVERWRITEFILE_CAPTION "ファイルの上書きの確認" + IDS_OVERWRITEFOLDER_TEXT "このフォルダにはすでに '%1' というフォルダが存在します。\n\n"\ + "移動またはコピー先フォルダに選択されたフォルダ内のファイルと\n"\ + "同じ名前のファイルがある場合、新しいファイルで上書きされます。\n"\ + "フォルダの移動またはコピーを続けますか?" /* message box strings */ IDS_RESTART_TITLE "再起動" @@ -248,8 +248,8 @@ STRINGTABLE IDS_SHUTDOWN_PROMPT "Wine セッションをシャットダウンしますか?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_ERROR "[ファイルを指定して実行]ダイアログを表示できません。(内部エラー)" + IDS_RUNDLG_BROWSE_ERROR "[参照]ダイアログを表示できません (内部エラー)" IDS_RUNDLG_BROWSE_CAPTION "参照" IDS_RUNDLG_BROWSE_FILTER "実行可能ファイル\0*.exe\0すべてのファイル\0*.*\0\0" @@ -282,11 +282,13 @@ STRINGTABLE IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "新しいフォルダ" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine コントロールパネル" + IDS_CPANEL_NAME "名前" + IDS_CPANEL_DESCRIPTION "説明" + + IDS_SHLEXEC_NOASSOC "このファイルの種類に関連付けられた Windows プログラムはありません。" } STRINGTABLE

1 0

Akihiro Sagawa : comctl32: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 06ad76809b2243659cf36fa32b3de409bc1016c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ad76809b2243659cf36fa32… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:31 2009 +0900 comctl32: Update Japanese translation. --- dlls/comctl32/comctl_Ja.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/comctl_Ja.rc b/dlls/comctl32/comctl_Ja.rc index 3262f33..ce16f5a 100644 --- a/dlls/comctl32/comctl_Ja.rc +++ b/dlls/comctl32/comctl_Ja.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for %s" +CAPTION "%sのプロパティ" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -38,11 +38,11 @@ END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" +CAPTION "ウィザード" FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "< 戻る(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "進む(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "次へ(&N) >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "完了", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "キャンセル", IDCANCEL,178,138,50,14 PUSHBUTTON "ヘルプ", IDHELP,235,138,50,14,WS_GROUP @@ -54,7 +54,7 @@ END IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" +CAPTION "ツールバーのカスタマイズ" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "閉じる(&C)", IDCANCEL,308,6,44,14 @@ -62,31 +62,31 @@ BEGIN PUSHBUTTON "ヘルプ(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "上へ (&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "下へ (&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 + LTEXT "利用可能なボタン(&V):", -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 "追加(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- 削除(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 + LTEXT "ツールバーのボタン(&T):", -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 STRINGTABLE DISCARDABLE { - IDS_CLOSE "Close" + IDS_CLOSE "閉じる" } STRINGTABLE DISCARDABLE { - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" + IDM_TODAY "今日:" + IDM_GOTODAY "今日へ移動" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "Separator" + IDS_SEPARATOR "区切り" } STRINGTABLE DISCARDABLE { - HKY_NONE "None" + HKY_NONE "なし" }

1 0