From e699646de87bfa6c306f2b8edc410d9fb547e08c Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Fri, 5 Sep 2008 17:00:16 +0000 Subject: [PATCH] Update winfile and write to most recent Wine Version. svn path=/trunk/; revision=35962 --- rosapps/applications/winfile/lang/ja-JP.rc | 260 ++++++++++++++++++ rosapps/applications/winfile/lang/zh-CN.rc | 304 +++++++++++++++------ rosapps/applications/winfile/rsrc.rc | 1 + rosapps/applications/winfile/winefile.c | 20 +- rosapps/applications/write/write.c | 4 +- 5 files changed, 494 insertions(+), 95 deletions(-) create mode 100644 rosapps/applications/winfile/lang/ja-JP.rc diff --git a/rosapps/applications/winfile/lang/ja-JP.rc b/rosapps/applications/winfile/lang/ja-JP.rc new file mode 100644 index 00000000000..7bd1fae12a8 --- /dev/null +++ b/rosapps/applications/winfile/lang/ja-JP.rc @@ -0,0 +1,260 @@ +/* + * WineFile + * Japanese Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * + * 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 + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "ファイル(&F)" { + MENUITEM "開く(&O)\tEnter", ID_ACTIVATE + MENUITEM "移動(&M)...\tF7", ID_FILE_MOVE + MENUITEM "コピー(&C)...\tF8", ID_FILE_COPY + MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "削除(&D)\tDel", ID_FILE_DELETE + MENUITEM "名前の変更(&N)...", 109 + MENUITEM "プロパティ(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "圧縮(&O)...", 119 + MENUITEM "解凍(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "実行(&R)...", ID_EXECUTE + MENUITEM "印刷(&P)...", 102 + MENUITEM "関連付け...", 103 + MENUITEM SEPARATOR + MENUITEM "ディレクトリを作成(&E)...", 111 + MENUITEM "検索(&H)...", 104 + MENUITEM "ファイルを選択(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "終了(&X)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "終了(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ディスク(&D)" { + MENUITEM "ディスクをコピー(&C)...", 201 + MENUITEM "&Label Disk...", 202 + MENUITEM SEPARATOR + MENUITEM "ディスクをフォーマット(&F)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Make System Disk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "ネットワークドライブに接続(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "ネットワークドライブを切断(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Share as...", 254 + MENUITEM "&Remove Share...", 255 + MENUITEM SEPARATOR + MENUITEM "ドライブを選択(&S)...", 251 + } + + POPUP "ディレクトリ(&R)" { + MENUITEM "&Next Level\t+", 301 + MENUITEM "ツリーを展開(&T)\t*", 302 + MENUITEM "すべてを展開(&A)\tStrg+*", 303 + MENUITEM "ツリーを折り畳む(&T)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Mark Children", 505 + } + + POPUP "表\示(&V)" { + MENUITEM "ツリーとディレクトリ(&R)", 413 + MENUITEM "ツリーのみ(&E)", 411 + MENUITEM "ディレクトリのみ(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "分割(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "名前(&N)", ID_VIEW_NAME + MENUITEM "すべてのファイル詳細(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "部分詳細(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "名前で並べ替え(&S)", ID_VIEW_SORT_NAME + MENUITEM "種類で並べ替え(&B)", ID_VIEW_SORT_TYPE + MENUITEM "サイズで並べ替え(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "日付で並べ替え(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filter by &...", ID_VIEW_FILTER + } + + POPUP "オプション(&O)" { + MENUITEM "確認(&C)...", 501 + MENUITEM "フォント(&F)...", ID_SELECT_FONT + MENUITEM "ツールバーをカスタマイズ(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "ツールバー(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ドライブバー(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "ステータスバー(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "全画面表\示(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimize on run", 504 + MENUITEM "終了時に設定を保存(&S)", ID_VIEW_SAVESETTINGS + } + + + POPUP "セキュリティ(&S)" { + MENUITEM "&Access...", 605 + MENUITEM "&Logging...", 606 + MENUITEM "&Owner...", 607 + } + + POPUP "ウィンドウ(&W)" { + MENUITEM "新規ウィンドウ(&W)", ID_WINDOW_NEW + MENUITEM "重ねて表\示\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "上下に並べて表\示(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "左右に並べて表\示(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "更新(&R)\tF5", ID_REFRESH + } + + POPUP "ヘルプ(&H)" { + MENUITEM "ヘルプ トピック(&H)\tF1", ID_HELP + MENUITEM "ヘルプの検索(&S)...\tF1", ID_HELP + MENUITEM "ヘルプを使う(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile について(&A)...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "実行" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "コマンド(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14 + PUSHBUTTON "ヘルプ(&H)", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "移動先を選択" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "パス(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14 + PUSHBUTTON "参照(&B)", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "By File Type" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "File Type",-1,7,23,87,56 + CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 + LTEXT "&File Name:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Full &Path:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Last Change:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Size:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributes",-1,7,79,158,46 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Version Information",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Applying font settings" + IDS_FONT_SEL_ERROR "Error while selecting new font." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine ファイルマネージャ" + IDS_ERROR "Error" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Desktop" + IDS_SHELL "シェル" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "未実装" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "名前" + IDS_COL_SIZE "サイズ" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "リンク" + IDS_COL_ATTR "属性" + IDS_COL_SEC "セキュリティ" + + IDS_FREE_SPACE_FMT "%s of %s free" +} diff --git a/rosapps/applications/winfile/lang/zh-CN.rc b/rosapps/applications/winfile/lang/zh-CN.rc index 39851c89be8..53955c10c92 100644 --- a/rosapps/applications/winfile/lang/zh-CN.rc +++ b/rosapps/applications/winfile/lang/zh-CN.rc @@ -1,8 +1,9 @@ /* * WineFile - * Simplified Chinese Language Support + * Simplified and Traditional Chinese Language Support * * Copyright 2002 liuspider + * Copyright 2008 Hongbo Ni * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,140 +20,283 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "ホトシ」ィ&F」ゥ" { - MENUITEM "エソェ」ィ&O」ゥ\tEnter", ID_ACTIVATE - MENUITEM "メニカッ」ィ&M」ゥ...\tF7", ID_FILE_MOVE - MENUITEM "クエヨニ」ィ&C」ゥ...\tF8", ID_FILE_COPY - MENUITEM "ホサモレシフー螢ィ&I」ゥ...\tF9", 118 - MENUITEM "ノセウ」ィ&D」ゥ\tDel", ID_FILE_DELETE - MENUITEM "クトテ」ィ&N」ゥ...", 109 - MENUITEM "ハミヤ」ィ&I」ゥ...\tAlt+Enter", ID_EDIT_PROPERTIES + POPUP "譁莉カ(&F)" { + MENUITEM "謇灘シ(&O)\tEnter", ID_ACTIVATE + MENUITEM "遘サ蜉ィ(&M)...\tF7", ID_FILE_MOVE + MENUITEM "螟榊宛(&C)...\tF8", ID_FILE_COPY + MENUITEM "菴堺コ主岡雍エ譚ソ(&I)...\tF9", 118 + MENUITEM "蛻髯、(&D)\tDel", ID_FILE_DELETE + MENUITEM "謾ケ蜷(&N)...", 109 + MENUITEM "螻樊ァ(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "ムケヒ」ィ&O」ゥ...", 119 - MENUITEM "ス簷ケヒ」ィ&O」ゥ...", 120 + MENUITEM "蜴狗シゥ(&O)...", 119 + MENUITEM "隗」蜴狗シゥ(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "ヤヒミミ」ィ&R」ゥ...", ID_EXECUTE - MENUITEM "エモ。」ィ&P」ゥ...", 102 - MENUITEM "ナ葷テホトシマ犹リ...", 103 + MENUITEM "霑占。(&R)...", ID_EXECUTE + MENUITEM "謇灘魂(&P)...", 102 + MENUITEM "驟咲スョ譁莉カ逶ク蜈ウ...", 103 MENUITEM SEPARATOR - MENUITEM "スィチ「トソツシ」ィ&E」ゥ...", 111 - MENUITEM "イ鰈メ」ィ&H」ゥ...", 104 - MENUITEM "ム。ヤホトシ」ィ&S」ゥ...", 116 + MENUITEM "蟒コ遶狗岼蠖(&E)...", 111 + MENUITEM "譟・謇セ(&H)...", 104 + MENUITEM "騾画叫譁莉カ(&S)...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "ヘヒウ」ィ&X」ゥ\tAlt+X", ID_FILE_EXIT + MENUITEM "騾蜃コ(&X)\tAlt+X", ID_FILE_EXIT #else - MENUITEM "ヘヒウ」ィ&X」ゥ", ID_FILE_EXIT + MENUITEM "騾蜃コ(&X)", ID_FILE_EXIT #endif } - POPUP "エナナフ」ィ&D」ゥ" { - MENUITEM "クエヨニ」ィ&C」ゥ...", 201 - MENUITEM "テテ」ィ&L」ゥ...", 202 + POPUP "逎∫尨(&D)" { + MENUITEM "螟榊宛(&C)...", 201 + MENUITEM "蜻ス蜷(&L)...", 202 MENUITEM SEPARATOR - MENUITEM "クハスサッ」ィ&」ゥ...", ID_FORMAT_DISK + MENUITEM "譬シ蠑丞喧(&)...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "スィチ「マオヘウナフ」ィ&M」ゥ...", -1 /*TODO*/ + MENUITEM "蟒コ遶狗ウサ扈溽尨(&M)...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "チャスモヘツ酩カッニ」ィ&N」ゥ", ID_CONNECT_NETWORK_DRIVE - MENUITEM "カマソェヘツ酩カッニチャスモ」ィ&D」ゥ", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "霑樊磁鄂醍サ憺ゥア蜉ィ蝎ィ(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "譁ュ蠑鄂醍サ憺ゥア蜉ィ蝎ィ霑樊磁(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "ケイマホェ...", 254 - MENUITEM "ノセウケイマ」ィ&R」ゥ...", 255 + MENUITEM "蜈ア莠ォ荳コ...", 254 + MENUITEM "蛻髯、蜈ア莠ォ(&R)...", 255 MENUITEM SEPARATOR - MENUITEM "ム。ヤヌカッニ」ィ&S」ゥ...", 251 + MENUITEM "騾画叫鬩ア蜉ィ蝎ィ(&S)...", 251 } - POPUP "トソツシ」ィ&D」ゥ" { - MENUITEM "マツメサイ罐ィ&N」ゥ\t+", 301 - MENUITEM "ユケソェ」ィ&T」ゥ\t*", 302 - MENUITEM "ネォイソユケソェ」ィ&A」ゥ\tStrg+*", 303 - MENUITEM "ユロオ」ィ&R」ゥ\t-", 304 + POPUP "逶ョ蠖(&D)" { + MENUITEM "荳倶ク螻(&N)\t+", 301 + MENUITEM "螻募シ(&T)\t*", 302 + MENUITEM "蜈ィ驛ィ螻募シ(&A)\tStrg+*", 303 + MENUITEM "謚伜匠(&R)\t-", 304 MENUITEM SEPARATOR - MENUITEM "アシヌラモトソツシ」ィ&M」ゥ", 505 + MENUITEM "譬隶ー蟄千岼蠖(&M)", 505 } - POPUP "ハモヘシ」ィ&V」ゥ" { - MENUITEM "トソツシハサニトレネン」ィ&R」ゥ", 413 - MENUITEM "スマヤハセトソツシハ」ィ&E」ゥ", 411 - MENUITEM "スマヤハセトソツシトレネン」ィ&O」ゥ", 412 + POPUP "隗蝗セ(&V)" { + MENUITEM "逶ョ蠖墓第惻蝎ィ蜀螳ケ(&R)", 413 + MENUITEM "莉譏セ遉コ逶ョ蠖墓(&E)", 411 + MENUITEM "莉譏セ遉コ逶ョ蠖募螳ケ(&O)", 412 MENUITEM SEPARATOR - MENUITEM "キヨク」ィ&L」ゥ", ID_VIEW_SPLIT + MENUITEM "蛻蜑イ(&L)", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "ホトシテテ」ィ&N」ゥ", ID_VIEW_NAME - MENUITEM "ホトシママ、チミア」ィ&A」ゥ", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "イソキヨハミヤ」ィ&P」ゥ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "譁莉カ蜷咲ァー(&N)", ID_VIEW_NAME + MENUITEM "譁莉カ隸ヲ諠蛻苓。ィ(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "驛ィ蛻螻樊ァ(&P)...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "ーエホトシテナナミ」ィ&S」ゥ", ID_VIEW_SORT_NAME - MENUITEM "ーエタ獎ヘナナミ」ィ&B」ゥ", ID_VIEW_SORT_TYPE - MENUITEM "ーエエミ。ナナミ」ィ&Z」ゥ", ID_VIEW_SORT_SIZE - MENUITEM "ーエネユニレナナミ」ィ&D」ゥ", ID_VIEW_SORT_DATE + MENUITEM "謖画枚莉カ蜷肴賜蠎(&S)", ID_VIEW_SORT_NAME + MENUITEM "謖臥アサ蝙区賜蠎(&B)", ID_VIEW_SORT_TYPE + MENUITEM "謖牙、ァ蟆乗賜蠎(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "謖画律譛滓賜蠎(&D)", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "カィヨニナナミ...", ID_VIEW_FILTER + MENUITEM "螳壼宛謗貞コ...", ID_VIEW_FILTER } - POPUP "ム。マ」ィ&O」ゥ" { - MENUITEM "ネキカィキスハス」ィ&C」ゥ...", 501 - MENUITEM "ラヨフ螢ィ&F」ゥ...", ID_SELECT_FONT - MENUITEM "カィヨニケ、セ゚フ」ィ&B」ゥ...", 512 + POPUP "騾蛾。ケ(&O)" { + MENUITEM "遑ョ螳壽婿蠑(&C)...", 501 + MENUITEM "蟄嶺ス(&F)...", ID_SELECT_FONT + MENUITEM "螳壼宛蟾・蜈キ譚。(&B)...", 512 MENUITEM SEPARATOR - MENUITEM "ケ、セ゚フ」ィ&T」ゥ", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "ヌカッニチミア」ィ&D」ゥ", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "ラエフャタク」ィ&S」ゥ", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "蟾・蜈キ譚。(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "鬩ア蜉ィ蝎ィ蛻苓。ィ(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "迥カ諤∵(&S)", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "ネォニチ」ィ&U」ゥ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "蜈ィ螻(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 + MENUITEM "蜷ッ蜉ィ蜷取怙蟆丞喧(&M)", 504 + MENUITEM "騾蜃コ譌カ菫晏ュ倩ョセ鄂ョ(&S)", 511 } - POPUP "ーイネォ」ィ&S」ゥ" { - MENUITEM "キテホハ」ィ&A」ゥ...", 605 - MENUITEM "オヌツシ」ィ&L」ゥ...", 606 - MENUITEM "ヒモミユ゚」ィ&O」ゥ...", 607 + POPUP "螳牙ィ(&S)" { + MENUITEM "隶ソ髣ョ(&A)...", 605 + MENUITEM "逋サ蠖(&L)...", 606 + MENUITEM "謇譛芽(&O)...", 607 } - POPUP "エーソレ」ィ&W」ゥ" { - MENUITEM "ミツスィ」ィ&W)", ID_WINDOW_NEW - MENUITEM "イ羞\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "ヒョニスニスニフ」ィ&H」ゥ", ID_WINDOW_TILE_HORZ - MENUITEM "エケヨアニスニフ」ィ&」ゥ\tCtrl+F4", ID_WINDOW_TILE_VERT + POPUP "遯怜哨(&W)" { + MENUITEM "譁ー蟒コ(&W)", ID_WINDOW_NEW + MENUITEM "螻ょ匠\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "豌エ蟷ウ蟷ウ體コ(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "蝙ら峩蟷ウ體コ(&)\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "ラヤカッナナチミ", ID_WINDOW_AUTOSORT + MENUITEM "閾ェ蜉ィ謗貞", ID_WINDOW_AUTOSORT #endif - MENUITEM "ラヤカッナナチミヘシア凜ィ&S」ゥ", ID_WINDOW_ARRANGE - MENUITEM "ヒ「ミツ」ィ&R」ゥ\tF5", ID_REFRESH + MENUITEM "閾ェ蜉ィ謗貞怜崟譬(&S)", ID_WINDOW_ARRANGE + MENUITEM "蛻キ譁ー(&R)\tF5", ID_REFRESH } POPUP "&?" { - MENUITEM "ーヨヨフ筌ィ&H」ゥ\tF1", ID_HELP - MENUITEM "ヒムヒーヨ」ィ&S」ゥ...\tF1", ID_HELP - MENUITEM "ハケモテーヨ」ィ&U」ゥ\tF1", ID_HELP_USING + MENUITEM "蟶ョ蜉ゥ荳サ鬚(&H)\tF1", ID_HELP + MENUITEM "謳懃エ「蟶ョ蜉ゥ(&S)...\tF1", ID_HELP + MENUITEM "菴ソ逕ィ蟶ョ蜉ゥ(&U)\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&ケリモレ Winefile...", ID_ABOUT + MENUITEM "&蜈ウ莠 Winefile...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ヤヒミミ" +CAPTION "霑占。" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "テチ」ィ&C」ゥ」コ", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "蜻ス莉、(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "ラホェチャスモ」ィ&S」ゥ", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "ネキカィ", 1, 158, 6, 47, 14 - PUSHBUTTON "ネ。マ", 2, 158, 23, 47, 14 - PUSHBUTTON "ーヨ」ィ&H」ゥ", 254, 158, 43, 47, 14 + CONTROL "菴應クコ霑樊磁(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "遑ョ螳", 1, 158, 6, 47, 14 + PUSHBUTTON "蜿匁カ", 2, 158, 23, 47, 14 + PUSHBUTTON "蟶ョ蜉ゥ(&H)", 254, 158, 43, 47, 14 } + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "讙疲。(&F)" { + MENUITEM "髢句福(&O)\tEnter", ID_ACTIVATE + MENUITEM "遘サ蜍(&M)...\tF7", ID_FILE_MOVE + MENUITEM "隍陬ス(&C)...\tF8", ID_FILE_COPY + MENUITEM "菴肴名蜑ェ雋シ譚ソ(&I)...\tF9", 118 + MENUITEM "蛻ェ髯、(&D)\tDel", ID_FILE_DELETE + MENUITEM "謾ケ蜷(&N)...", 109 + MENUITEM "螻ャ諤ァ(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "螢鍋クョ(&O)...", 119 + MENUITEM "隗」螢鍋クョ(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "蝓キ陦(&R)...", ID_EXECUTE + MENUITEM "蛻怜魂(&P)...", 102 + MENUITEM "驟咲スョ讙疲。育嶌髣...", 103 + MENUITEM SEPARATOR + MENUITEM "蟒コ遶狗岼骭(&E)...", 111 + MENUITEM "譟・謇セ(&H)...", 104 + MENUITEM "驕ク謫讙疲。(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "邨先據(&X)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "邨先據(&X)", ID_FILE_EXIT +#endif + } + + POPUP "逎∫乢(&D)" { + MENUITEM "隍陬ス(&C)...", 201 + MENUITEM "蜻ス蜷(&L)...", 202 + MENUITEM SEPARATOR + MENUITEM "譬シ蠑丞喧(&)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "蟒コ遶狗ウサ邨ア逶、(&M)...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "騾」謗・邯イ霍ッ蜆イ蟄俶ァス(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "譁キ髢狗カイ霍ッ蜆イ蟄俶ァス騾」謗・(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "蜈ア莠ォ轤コ...", 254 + MENUITEM "蛻ェ髯、蜈ア莠ォ(&R)...", 255 + MENUITEM SEPARATOR + MENUITEM "驕ク謫蜆イ蟄俶ァス(&S)...", 251 + } + + POPUP "逶ョ骭(&D)" { + MENUITEM "荳倶ク螻、(&N)\t+", 301 + MENUITEM "螻暮幕(&T)\t*", 302 + MENUITEM "蜈ィ驛ィ螻暮幕(&A)\tStrg+*", 303 + MENUITEM "謚倡槙(&R)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "讓呵ィ伜ュ千岼骭(&M)", 505 + } + + POPUP "讙「隕(&V)" { + MENUITEM "逶ョ骭讓ケ讖溷勣蜈ァ螳ケ(&R)", 413 + MENUITEM "蜒鬘ッ遉コ逶ョ骭讓ケ(&E)", 411 + MENUITEM "蜒鬘ッ遉コ逶ョ骭蜈ァ螳ケ(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "蛻蜑イ(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "讙疲。亥錐遞ア(&N)", ID_VIEW_NAME + MENUITEM "讙疲。郁ゥウ諠蛻苓。ィ(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "驛ィ蛻螻ャ諤ァ(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "謖画ェ疲。亥錐謗貞(&S)", ID_VIEW_SORT_NAME + MENUITEM "謖蛾。槫梛謗貞(&B)", ID_VIEW_SORT_TYPE + MENUITEM "謖牙、ァ蟆乗賜蛻(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "謖画律譛滓賜蛻(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "螳夊」ス謗貞...", ID_VIEW_FILTER + } + + POPUP "驕ク鬆(&O)" { + MENUITEM "遒コ螳壽婿蠑(&C)...", 501 + MENUITEM "蟄怜梛(&F)...", ID_SELECT_FONT + MENUITEM "螳夊」ス蟾・蜈キ譴(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "蟾・蜈キ譴(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "蜆イ蟄俶ァス蛻苓。ィ(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "迢諷区ャ(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "蜈ィ螻(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "蝠溷虚蠕梧怙蟆丞喧(&M)", 504 + MENUITEM "邨先據譎ょ┫蟄倩ィュ螳(&S)", 511 + } + + + POPUP "螳牙ィ(&S)" { + MENUITEM "險ェ蝠(&A)...", 605 + MENUITEM "逋サ骭(&L)...", 606 + MENUITEM "謇譛芽(&O)...", 607 + } + + POPUP "遯怜哨(&W)" { + MENUITEM "譁ー蟒コ(&W)", ID_WINDOW_NEW + MENUITEM "螻、逍浬tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "豌エ蟷ウ蟷ウ驪ェ(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "蝙ら峩蟷ウ驪ェ(&)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "閾ェ蜍墓賜蛻", ID_WINDOW_AUTOSORT +#endif + MENUITEM "閾ェ蜍墓賜蛻怜恂讓(&S)", ID_WINDOW_ARRANGE + MENUITEM "蛻キ譁ー(&R)\tF5", ID_REFRESH + } + + POPUP "&?" { + MENUITEM "蟷ォ蜉ゥ荳サ鬘(&H)\tF1", ID_HELP + MENUITEM "謳懃エ「蟷ォ蜉ゥ(&S)...\tF1", ID_HELP + MENUITEM "菴ソ逕ィ蟷ォ蜉ゥ(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&髣懈名 Winefile...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "蝓キ陦" +FONT 8, "PMingLiu" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "謖莉、(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "菴懃ぜ騾」謗・(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "遒コ螳", 1, 158, 6, 47, 14 + PUSHBUTTON "蜿匁カ", 2, 158, 23, 47, 14 + PUSHBUTTON "蟷ォ蜉ゥ(&H)", 254, 158, 43, 47, 14 +} + +#pragma code_page(default) diff --git a/rosapps/applications/winfile/rsrc.rc b/rosapps/applications/winfile/rsrc.rc index ea0fe1302e4..525c4e9ccad 100644 --- a/rosapps/applications/winfile/rsrc.rc +++ b/rosapps/applications/winfile/rsrc.rc @@ -63,6 +63,7 @@ IDB_IMAGES BITMAP DISCARDABLE images.bmp #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" diff --git a/rosapps/applications/winfile/winefile.c b/rosapps/applications/winfile/winefile.c index 79ccbd4ab7e..a51c80b8fe4 100644 --- a/rosapps/applications/winfile/winefile.c +++ b/rosapps/applications/winfile/winefile.c @@ -867,20 +867,14 @@ static LPITEMIDLIST get_path_pidl(LPTSTR path, HWND hwnd) static LPITEMIDLIST get_to_absolute_pidl(Entry* entry, HWND hwnd) { if (entry->up && entry->up->etype==ET_SHELL) { - IShellFolder* folder = entry->up->folder; - WCHAR buffer[MAX_PATH]; + LPITEMIDLIST idl = NULL; - HRESULT hr = path_from_pidlW(folder, entry->pidl, buffer, MAX_PATH); - - if (SUCCEEDED(hr)) { - LPITEMIDLIST pidl; - ULONG len; - - hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); - - if (SUCCEEDED(hr)) - return pidl; + while (entry->up) { + idl = ILCombine(ILClone(entry->pidl), idl); + entry = entry->up; } + + return idl; } else if (entry->etype == ET_WINDOWS) { TCHAR path[MAX_PATH]; @@ -2708,7 +2702,7 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); /* no change? */ - if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths))) + if (!anyway && !memcmp(orgWidths, pane->widths, sizeof(orgWidths))) return FALSE; /* don't move, if only collapsing an entry */ diff --git a/rosapps/applications/write/write.c b/rosapps/applications/write/write.c index a6116da482a..4a015962b97 100644 --- a/rosapps/applications/write/write.c +++ b/rosapps/applications/write/write.c @@ -40,7 +40,7 @@ int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdP lstrcatW(path, SZ_BACKSLASH); lstrcatW(path, SZ_WORDPAD); - stinf.cb = sizeof(STARTUPINFO); + stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) @@ -48,7 +48,7 @@ int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdP return 0; failed: - LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + LoadStringW(GetModuleHandleW(NULL), IDS_FAILED, path, MAX_PATH); MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); return 1; }