X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Src%2Fresource.h;h=a9b40f89fd292a78281e22153499028065afb64d;hb=6a962a142cca208e6ecb0289f269dd05976c4278;hp=41fe0813f25b8442edce402bdc1271b276bb2390;hpb=f51f6e279915a9c6a98c7ce34435e319301e0129;p=winmerge-jp%2Fwinmerge-jp.git diff --git a/Src/resource.h b/Src/resource.h index 41fe0813f..a9b40f89f 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -568,22 +568,23 @@ #define IDC_COMPARETABLE_CSV_PATTERNS 1405 #define IDC_COMPARETABLE_TSV_PATTERNS 1406 #define IDC_COMPARETABLE_DSV_PATTERNS 1407 -#define IDC_COMPARETABLE_DSV_DELIM_CHAR 1408 -#define IDC_COMPARETABLE_ALLOWNEWLINE 1409 -#define IDC_COMPARETABLE_QUOTE_CHAR 1410 -#define IDC_OPTIONS 1411 -#define IDC_SWAP01_STATIC 1412 -#define IDC_SWAP12_STATIC 1413 -#define IDC_SWAP02_STATIC 1414 -#define IDC_DIFF_ALGORITHM 1415 -#define IDC_INDENT_HEURISTIC 1416 -#define IDC_LIST_FILE 1417 -#define IDC_FLDCONFIRM_DONTASKAGAIN 1418 -#define IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES 1419 -#define IDC_LFILTER_CLEARBTN 1420 -#define IDC_MESSAGEBOX_LIST 1421 -#define IDC_PROJECT_LIST 1422 -#define IDC_DIFF_IGNORENUMBERS 1423 +#define IDC_COMPARETABLE_CSV_DELIM_CHAR 1408 +#define IDC_COMPARETABLE_DSV_DELIM_CHAR 1409 +#define IDC_COMPARETABLE_ALLOWNEWLINE 1410 +#define IDC_COMPARETABLE_QUOTE_CHAR 1411 +#define IDC_OPTIONS 1412 +#define IDC_SWAP01_STATIC 1413 +#define IDC_SWAP12_STATIC 1414 +#define IDC_SWAP02_STATIC 1415 +#define IDC_DIFF_ALGORITHM 1416 +#define IDC_INDENT_HEURISTIC 1417 +#define IDC_LIST_FILE 1418 +#define IDC_FLDCONFIRM_DONTASKAGAIN 1419 +#define IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES 1420 +#define IDC_LFILTER_CLEARBTN 1421 +#define IDC_MESSAGEBOX_LIST 1422 +#define IDC_PROJECT_LIST 1423 +#define IDC_DIFF_IGNORENUMBERS 1424 #define IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE 1425 #define IDC_COMPAREWEBPAGE_USERDATAFOLDER_TYPE 1426 #define IDC_COMPAREWEBPAGE_URLPATTERNTOINCLUDE 1427 @@ -902,35 +903,36 @@ #define IDS_COLORSCHEME_JSON 33170 #define IDS_COLORSCHEME_LISP 33171 #define IDS_COLORSCHEME_LUA 33172 -#define IDS_COLORSCHEME_NSIS 33173 -#define IDS_COLORSCHEME_PASCAL 33174 -#define IDS_COLORSCHEME_PERL 33175 -#define IDS_COLORSCHEME_PHP 33176 -#define IDS_COLORSCHEME_PO 33177 -#define IDS_COLORSCHEME_POWERSHELL 33178 -#define IDS_COLORSCHEME_PYTHON 33179 -#define IDS_COLORSCHEME_REXX 33180 -#define IDS_COLORSCHEME_RSRC 33181 -#define IDS_COLORSCHEME_RUBY 33182 -#define IDS_COLORSCHEME_RUST 33183 -#define IDS_COLORSCHEME_SGML 33184 -#define IDS_COLORSCHEME_SH 33185 -#define IDS_COLORSCHEME_SIOD 33186 -#define IDS_COLORSCHEME_SMARTY 33187 -#define IDS_COLORSCHEME_SQL 33188 -#define IDS_COLORSCHEME_TCL 33189 -#define IDS_COLORSCHEME_TEX 33190 -#define IDS_COLORSCHEME_VERILOG 33191 -#define IDS_COLORSCHEME_VHDL 33192 -#define IDS_COLORSCHEME_XML 33193 -#define ID_COLORSCHEME_LAST 33193 -#define ID_TOOLBAR_NONE 33194 -#define ID_TOOLBAR_SMALL 33195 -#define ID_TOOLBAR_BIG 33196 -#define ID_TOOLBAR_HUGE 33197 -#define ID_VIEW_RESIZE_PANES 33198 -#define ID_VIEW_ZOOMIN 33199 -#define ID_VIEW_ZOOMOUT 33200 +#define IDS_COLORSCHEME_MATLAB 33173 +#define IDS_COLORSCHEME_NSIS 33174 +#define IDS_COLORSCHEME_PASCAL 33175 +#define IDS_COLORSCHEME_PERL 33176 +#define IDS_COLORSCHEME_PHP 33177 +#define IDS_COLORSCHEME_PO 33178 +#define IDS_COLORSCHEME_POWERSHELL 33179 +#define IDS_COLORSCHEME_PYTHON 33180 +#define IDS_COLORSCHEME_REXX 33181 +#define IDS_COLORSCHEME_RSRC 33182 +#define IDS_COLORSCHEME_RUBY 33183 +#define IDS_COLORSCHEME_RUST 33184 +#define IDS_COLORSCHEME_SGML 33185 +#define IDS_COLORSCHEME_SH 33186 +#define IDS_COLORSCHEME_SIOD 33187 +#define IDS_COLORSCHEME_SMARTY 33188 +#define IDS_COLORSCHEME_SQL 33189 +#define IDS_COLORSCHEME_TCL 33190 +#define IDS_COLORSCHEME_TEX 33191 +#define IDS_COLORSCHEME_VERILOG 33192 +#define IDS_COLORSCHEME_VHDL 33193 +#define IDS_COLORSCHEME_XML 33194 +#define ID_COLORSCHEME_LAST 33194 +#define ID_TOOLBAR_NONE 33195 +#define ID_TOOLBAR_SMALL 33196 +#define ID_TOOLBAR_BIG 33197 +#define ID_TOOLBAR_HUGE 33198 +#define ID_VIEW_RESIZE_PANES 33199 +#define ID_VIEW_ZOOMIN 33200 +#define ID_VIEW_ZOOMOUT 33201 #define ID_VIEW_ZOOMNORMAL 33202 #define ID_PLUGINS_LIST 33203 #define ID_PREDIFFER_MANUAL 33204 @@ -1598,105 +1600,7 @@ #define IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 44181 #define IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 44182 #define IDS_PLUGIN_ALL 44200 -#define IDS_PLUGIN_PROCESS_TYPE1 44201 -#define IDS_PLUGIN_PROCESS_TYPE2 44202 -#define IDS_PLUGIN_PROCESS_TYPE3 44203 -#define IDS_PLUGIN_PROCESS_TYPE4 44204 -#define IDS_PLUGIN_PROCESS_TYPE5 44205 -#define IDS_PLUGIN_PROCESS_TYPE6 44206 -#define IDS_PLUGIN_PROCESS_TYPE7 44207 -#define IDS_PLUGIN_PROCESS_TYPE8 44208 -#define IDS_PLUGIN_PROCESS_TYPE9 44209 -#define IDS_PLUGIN_MENU_CAPTION1 44211 -#define IDS_PLUGIN_MENU_CAPTION2 44212 -#define IDS_PLUGIN_MENU_CAPTION3 44213 -#define IDS_PLUGIN_MENU_CAPTION4 44214 -#define IDS_PLUGIN_MENU_CAPTION5 44215 -#define IDS_PLUGIN_MENU_CAPTION6 44216 -#define IDS_PLUGIN_MENU_CAPTION7 44217 -#define IDS_PLUGIN_MENU_CAPTION8 44218 -#define IDS_PLUGIN_MENU_CAPTION9 44219 -#define IDS_PLUGIN_MENU_CAPTION10 44220 -#define IDS_PLUGIN_MENU_CAPTION11 44221 -#define IDS_PLUGIN_MENU_CAPTION12 44222 -#define IDS_PLUGIN_MENU_CAPTION13 44223 -#define IDS_PLUGIN_MENU_CAPTION14 44224 -#define IDS_PLUGIN_MENU_CAPTION15 44225 -#define IDS_PLUGIN_MENU_CAPTION16 44226 -#define IDS_PLUGIN_MENU_CAPTION17 44227 -#define IDS_PLUGIN_MENU_CAPTION18 44228 -#define IDS_PLUGIN_MENU_CAPTION19 44229 -#define IDS_PLUGIN_MENU_CAPTION20 44230 -#define IDS_PLUGIN_MENU_CAPTION21 44231 -#define IDS_PLUGIN_MENU_CAPTION22 44232 -#define IDS_PLUGIN_MENU_CAPTION23 44233 -#define IDS_PLUGIN_MENU_CAPTION24 44234 -#define IDS_PLUGIN_MENU_CAPTION25 44235 -#define IDS_PLUGIN_MENU_CAPTION26 44236 -#define IDS_PLUGIN_MENU_CAPTION27 44237 -#define IDS_PLUGIN_MENU_CAPTION28 44238 -#define IDS_PLUGIN_MENU_CAPTION29 44239 -#define IDS_PLUGIN_MENU_CAPTION30 44240 -#define IDS_PLUGIN_MENU_CAPTION31 44241 -#define IDS_PLUGIN_MENU_CAPTION32 44242 -#define IDS_PLUGIN_MENU_CAPTION33 44243 -#define IDS_PLUGIN_MENU_CAPTION34 44244 -#define IDS_PLUGIN_MENU_CAPTION35 44245 -#define IDS_PLUGIN_MENU_CAPTION36 44246 -#define IDS_PLUGIN_MENU_CAPTION37 44247 -#define IDS_PLUGIN_MENU_CAPTION38 44248 -#define IDS_PLUGIN_MENU_CAPTION39 44249 -#define IDS_PLUGIN_MENU_CAPTION40 44250 -#define IDS_PLUGIN_DESCRIPTION1 44351 -#define IDS_PLUGIN_DESCRIPTION2 44352 -#define IDS_PLUGIN_DESCRIPTION3 44353 -#define IDS_PLUGIN_DESCRIPTION4 44354 -#define IDS_PLUGIN_DESCRIPTION5 44355 -#define IDS_PLUGIN_DESCRIPTION6 44356 -#define IDS_PLUGIN_DESCRIPTION7 44357 -#define IDS_PLUGIN_DESCRIPTION8 44358 -#define IDS_PLUGIN_DESCRIPTION9 44359 -#define IDS_PLUGIN_DESCRIPTION10 44360 -#define IDS_PLUGIN_DESCRIPTION11 44361 -#define IDS_PLUGIN_DESCRIPTION12 44362 -#define IDS_PLUGIN_DESCRIPTION13 44363 -#define IDS_PLUGIN_DESCRIPTION14 44364 -#define IDS_PLUGIN_DESCRIPTION15 44365 -#define IDS_PLUGIN_DESCRIPTION16 44366 -#define IDS_PLUGIN_DESCRIPTION17 44367 -#define IDS_PLUGIN_DESCRIPTION18 44368 -#define IDS_PLUGIN_DESCRIPTION19 44369 -#define IDS_PLUGIN_DESCRIPTION20 44370 -#define IDS_PLUGIN_DESCRIPTION21 44371 -#define IDS_PLUGIN_DESCRIPTION22 44372 -#define IDS_PLUGIN_DESCRIPTION23 44373 -#define IDS_PLUGIN_DESCRIPTION24 44374 -#define IDS_PLUGIN_DESCRIPTION25 44375 -#define IDS_PLUGIN_DESCRIPTION26 44376 -#define IDS_PLUGIN_DESCRIPTION27 44377 -#define IDS_PLUGIN_DESCRIPTION28 44378 -#define IDS_PLUGIN_DESCRIPTION29 44379 -#define IDS_PLUGIN_DESCRIPTION30 44380 -#define IDS_PLUGIN_DESCRIPTION31 44381 -#define IDS_PLUGIN_DESCRIPTION32 44382 -#define IDS_PLUGIN_DESCRIPTION33 44383 -#define IDS_PLUGIN_DESCRIPTION34 44384 -#define IDS_PLUGIN_DESCRIPTION35 44385 -#define IDS_PLUGIN_DESCRIPTION36 44386 -#define IDS_PLUGIN_DESCRIPTION37 44387 -#define IDS_PLUGIN_DESCRIPTION38 44388 -#define IDS_PLUGIN_DESCRIPTION39 44389 -#define IDS_PLUGIN_DESCRIPTION40 44390 -#define IDS_PLUGIN_DESCRIPTION41 44391 -#define IDS_PLUGIN_DESCRIPTION42 44392 -#define IDS_PLUGIN_DESCRIPTION43 44393 -#define IDS_PLUGIN_DESCRIPTION44 44394 -#define IDS_PLUGIN_DESCRIPTION45 44395 -#define IDS_PLUGIN_DESCRIPTION46 44396 -#define IDS_PLUGIN_DESCRIPTION47 44397 -#define IDS_PLUGIN_DESCRIPTION48 44398 -#define IDS_PLUGIN_DESCRIPTION49 44399 -#define IDS_PLUGIN_DESCRIPTION50 44400 +#define IDS_PLUGIN_OTHERS 44201 #define IDS_PLUGIN_MISSING_PLUGIN_NAME 44490 #define IDS_PLUGIN_MISSING_QUOTATION_MARK 44491 #define IDS_PLUGIN_TITLE1 44492