mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-11 21:03:05 +08:00
Merge remote-tracking branch 'upstream/master' into Dev_Master
This commit is contained in:
commit
2bb681e762
@ -263,7 +263,7 @@ BEGIN
|
||||
CONTROL "終了時に最近使ったファイル一覧を保存(&S)",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,167,10
|
||||
CONTROL "カーソル位置を保存(&P)",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,120,10
|
||||
CONTROL "検索文字列を保存(&R)",IDC_REMEMBERSEARCHPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,131,120,10
|
||||
CONTROL "&Autoload most recent file on startup.",IDC_AUTOLOAD_MRU_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,143,180,10
|
||||
CONTROL "開始時に最も最近のファイルを自動読込(&A)",IDC_AUTOLOAD_MRU_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,143,180,10
|
||||
CONTROL "一覧から削除", IDC_REMOVE, "Button", BS_DEFSPLITBUTTON | WS_TABSTOP | WS_DISABLED, 212, 107, 50, 14
|
||||
DEFPUSHBUTTON "OK",IDOK,154,158,50,14,WS_DISABLED
|
||||
PUSHBUTTON "閉じる",IDCANCEL,212,158,50,14
|
||||
@ -531,7 +531,7 @@ BEGIN
|
||||
LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8
|
||||
LTEXT "1ずつ増加 (0で開始)",IDC_STATIC5,57,92,109,8
|
||||
LTEXT "${0L+I+N}", IDC_MODLNS_TINYEXPR_ALL,12,102,30,8
|
||||
LTEXT "${<expr>} defines math formulas.",IDC_STATIC5,57,102,175,8
|
||||
LTEXT "${<式>} で数式を定義",IDC_STATIC5,57,102,175,8
|
||||
END
|
||||
|
||||
IDD_MUI_INSERTTAG DIALOGEX 0, 0, 182, 70
|
||||
|
||||
@ -499,14 +499,14 @@ END
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_LEX_STD_CH_MODIFIED "変更履歴の目印 修正"
|
||||
IDS_LEX_STD_CH_MODIFIED "変更履歴の目印 修正済み"
|
||||
IDS_LEX_STD_CH_SAVED "変更履歴の目印 保存済み"
|
||||
IDS_LEX_STD_CH_REV_TO_MOD "変更履歴の目印 Reverted to Modified"
|
||||
IDS_LEX_STD_CH_REV_TO_ORG "変更履歴の目印 元に戻した"
|
||||
IDS_LEX_2ND_CH_MODIFIED "第2 変更履歴の目印 修正"
|
||||
IDS_LEX_STD_CH_REV_TO_MOD "変更履歴の目印 修正済みへと戻した"
|
||||
IDS_LEX_STD_CH_REV_TO_ORG "変更履歴の目印 原文へと戻した"
|
||||
IDS_LEX_2ND_CH_MODIFIED "第2 変更履歴の目印 修正済み"
|
||||
IDS_LEX_2ND_CH_SAVED "第2 変更履歴の目印 保存済み"
|
||||
IDS_LEX_2ND_CH_REV_TO_MOD "第2 変更履歴の目印 Reverted to Modified"
|
||||
IDS_LEX_2ND_CH_REV_TO_ORG "第2 変更履歴の目印 元に戻した"
|
||||
IDS_LEX_2ND_CH_REV_TO_MOD "第2 変更履歴の目印 修正済みへと戻した"
|
||||
IDS_LEX_2ND_CH_REV_TO_ORG "第2 変更履歴の目印 原文へと戻した"
|
||||
END
|
||||
|
||||
STRINGTABLE
|
||||
|
||||
@ -312,7 +312,7 @@ BEGIN
|
||||
MENUITEM "単語や行を選択(&W)\tCtrl+Spc", IDM_EDIT_SELECTWORD
|
||||
MENUITEM "一致文字列すべてに複数カーソル(&A)\tCtrl+Shift+Spc", IDM_EDIT_SELECTALLMATCHES
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "改行で「元に戻す」の履歴を区切る(&T)", IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK
|
||||
MENUITEM "「元に戻す」の履歴を改行で区切る(&T)", IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "しおり(ブックマーク)(&K)"
|
||||
@ -377,7 +377,7 @@ BEGIN
|
||||
POPUP "単語出現マーカー(&k)"
|
||||
BEGIN
|
||||
MENUITEM "オン(&A)\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF
|
||||
MENUITEM "しおりの余白も使用(&B)", IDM_VIEW_MARKOCCUR_BOOKMARKS
|
||||
MENUITEM "しおり用の余白も使用(&B)", IDM_VIEW_MARKOCCUR_BOOKMARKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "単語一望モードを無効に(&V)", IDM_VIEW_MARKOCCUR_VISIBLE
|
||||
MENUITEM SEPARATOR
|
||||
@ -391,8 +391,8 @@ BEGIN
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "行番号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
|
||||
MENUITEM "しおりの余白(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
|
||||
MENUITEM "変更履歴の余白", IDM_VIEW_CHGHIST_TOGGLE_MARGIN
|
||||
MENUITEM "しおり用の余白(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
|
||||
MENUITEM "変更履歴用の余白", IDM_VIEW_CHGHIST_TOGGLE_MARGIN
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "折りたたみ(&F)"
|
||||
BEGIN
|
||||
@ -492,7 +492,7 @@ BEGIN
|
||||
MENUITEM "保存/最近使ったファイルの履歴(&R)", IDM_SET_NOSAVERECENT
|
||||
MENUITEM "保存/カーソル位置(文書ごと)(&C)", IDM_SET_NOPRESERVECARET
|
||||
MENUITEM "保存/検索文字列(&S)", IDM_SET_NOSAVEFINDREPL
|
||||
MENUITEM "&Autoload Recent File", IDM_SET_AUTOLOAD_MRU_FILE
|
||||
MENUITEM "最近のファイルを自動読込(&A)", IDM_SET_AUTOLOAD_MRU_FILE
|
||||
END
|
||||
POPUP "ウィンドウ(&I)"
|
||||
BEGIN
|
||||
@ -592,7 +592,7 @@ BEGIN
|
||||
MENUITEM "表示/コード折りたたみ", IDM_VIEW_FOLDING
|
||||
MENUITEM "表示/行番号", IDM_VIEW_LINENUMBERS
|
||||
MENUITEM "表示/しおりの余白", IDM_VIEW_BOOKMARK_MARGIN
|
||||
MENUITEM "表示/変更履歴", IDM_VIEW_CHGHIST_TOGGLE_MARGIN
|
||||
MENUITEM "表示/変更履歴用の余白 ", IDM_VIEW_CHGHIST_TOGGLE_MARGIN
|
||||
END
|
||||
POPUP "+"
|
||||
BEGIN
|
||||
|
||||
Loading…
Reference in New Issue
Block a user