[Winmerge-svn] SF.net SVN: winmerge: [4250] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2007-04-12 16:23:13
|
Revision: 4250 http://svn.sourceforge.net/winmerge/?rev=4250&view=rev Author: kimmov Date: 2007-04-12 09:23:11 -0700 (Thu, 12 Apr 2007) Log Message: ----------- PATCH: [ 1698641 ] Add 32x32 toolbar Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Languages/Brazilian/MergeBrazilian.rc trunk/Src/Languages/Bulgarian/MergeBulgarian.rc trunk/Src/Languages/Catalan/MergeCatalan.rc trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc trunk/Src/Languages/Czech/MergeCzech.rc trunk/Src/Languages/Danish/MergeDanish.rc trunk/Src/Languages/Dutch/MergeDutch.rc trunk/Src/Languages/French/MergeFrench.rc trunk/Src/Languages/German/MergeGerman.rc trunk/Src/Languages/Hungarian/MergeHungarian.rc trunk/Src/Languages/Italian/MergeItalian.rc trunk/Src/Languages/Japanese/MergeJapanese.rc trunk/Src/Languages/Korean/MergeKorean.rc trunk/Src/Languages/Norwegian/MergeNorwegian.rc trunk/Src/Languages/Polish/MergePolish.rc trunk/Src/Languages/Russian/MergeRussian.rc trunk/Src/Languages/Slovak/MergeSlovak.rc trunk/Src/Languages/Spanish/MergeSpanish.rc trunk/Src/Languages/Swedish/MergeSwedish.rc trunk/Src/Languages/Turkish/MergeTurkish.rc trunk/Src/MainFrm.cpp trunk/Src/MainFrm.h trunk/Src/Merge.rc trunk/Src/OptionsDef.h trunk/Src/OptionsInit.cpp trunk/Src/resource.h Added Paths: ----------- trunk/Src/res/ToolbarDisabled32.bmp trunk/Src/res/ToolbarEnabled32.bmp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Changes.txt 2007-04-12 16:23:11 UTC (rev 4250) @@ -5,6 +5,10 @@ 2007-04-12 Kimmo BUG: [ 1698159 ] Invalid state change assertion Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompProgressDlg.cpp + PATCH: [ 1698641 ] Add 32x32 toolbar + Src: MainFrm.cpp MainFrm.h Merge.rc OptionsDef.h OptionsInit.cpp resource.h + Src/Languages/*: Merge*.rc + Src/res new files: ToolbarDisabled32.bmp ToolbarEnabled32.bmp 2007-04-11 Kimmo Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Escolher &Fonte...", ID_VIEW_SELECTFONT MENUITEM "Usar F&onte Padr\xE3o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra de &Ferramentas", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra de &Status", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Escolher &Fonte...", ID_VIEW_SELECTFONT MENUITEM "Usar F&onte Padr\xE3o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra de &Ferramentas", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra de &Status", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Barra de &Ferramentas", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra de &Status", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Diff &Pane", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Portuguese (Brazil) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT MENUITEM "\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xF8&\xF0\xE8\xF4\xF2 \xEF\xEE \xEF\xEE\xE4\xF0\xE0\xE7\xE1\xE8\xF0\xE0\xED\xE5", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&\xC8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xCB\xE5\xED\xF2\xE0 \xED\xE0 \xF1\xFA\xF1\xF2\xEE\xFF\xED\xE8\xE5\xF2\xEE", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT MENUITEM "\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xF8&\xF0\xE8\xF4\xF2 \xEF\xEE \xEF\xEE\xE4\xF0\xE0\xE7\xE1\xE8\xF0\xE0\xED\xE5", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&\xC8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xCB\xE5\xED\xF2\xE0 \xED\xE0 \xF1\xFA\xF1\xF2\xEE\xFF\xED\xE8\xE5\xF2\xEE", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xD1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA\xE0 \xED\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5\xF2\xEE", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "\xD0\xE0\xE7\xEC\xE5\xED\xE8 \xEB\xE8\xF1\xF2\xEE\xE2\xE5\xF2\xE5", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\xCB\xE5\xED\xF2\xE0 \xF1 &\xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xCB\xE5\xED\xF2\xE0 \xED\xE0 \xF1\xFA\xF1\xF2\xEE\xFF\xED\xE8\xE5\xF2\xEE", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xCB\xE8\xF1\xF2 \xF1 &\xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0", ID_VIEW_DETAIL_BAR @@ -2951,6 +2966,14 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + + // END STRINGS SYNCHRO #endif // Bulgarian (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "&Tipus de lletra...", ID_VIEW_SELECTFONT MENUITEM "Empra el tipus de lletra del &sistema", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra d'ei&nes", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra d'est&at", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "&Tipus de lletra...", ID_VIEW_SELECTFONT MENUITEM "Empra el tipus de lletra del &sistema", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra d'ei&nes", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra d'est&at", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Estad\xEDstiques de &comparaci\xF3", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "&Intercanvia les subfinestres", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Barra d'ei&nes", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra d'est&at", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Subfinest&ra de difer\xE8ncies", ID_VIEW_DETAIL_BAR @@ -2951,6 +2966,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Catalan (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -127,7 +127,12 @@ MENUITEM "ѡ\xD4\xF1\xD7\xD6\xCC\xE5(&F)...", ID_VIEW_SELECTFONT MENUITEM "ʹ\xD3\xC3Ĭ\xC8\xCF\xD7\xD6\xCC\xE5(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xB9\xA4\xBE\xDF\xC0\xB8(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "״̬\xC0\xB8(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -214,7 +219,12 @@ MENUITEM "ѡ\xD4\xF1\xD7\xD6\xCC\xE5(&F)...", ID_VIEW_SELECTFONT MENUITEM "ʹ\xD3\xC3Ĭ\xC8\xCF\xD7\xD6\xCC\xE5(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xB9\xA4\xBE\xDF\xC0\xB8(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "״̬\xC0\xB8(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -379,7 +389,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\xB9\xA4\xBE\xDF\xC0\xB8(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "״̬\xC0\xB8(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xB6Աȴ\xB0\xB8\xF1(&P)", ID_VIEW_DETAIL_BAR @@ -2927,6 +2942,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Chinese (Simplified) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "\xBF\xEF\xA8\xFA\xA6r\xAB\xAC(&F)...", ID_VIEW_SELECTFONT MENUITEM "\xA8ϥιw\xB3]\xAA\xBA\xA6r\xAB\xAC(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xA4u\xA8\xE3\xA6C(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xAA\xAC\xBAA\xA6C(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "\xBF\xEF\xA8\xFA\xA6r\xAB\xAC(&F)...", ID_VIEW_SELECTFONT MENUITEM "\xA8ϥιw\xB3]\xAA\xBA\xA6r\xAB\xAC(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xA4u\xA8\xE3\xA6C(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xAA\xAC\xBAA\xA6C(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\xA4u\xA8\xE3\xA6C(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xAA\xAC\xBAA\xA6C(&S)", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xA4\xA3\xA6P\xB5\xA1\xAE\xD8(&P)", ID_VIEW_DETAIL_BAR @@ -2928,6 +2943,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Chinese (Traditional) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "&Vybrat p\xEDsmo...", ID_VIEW_SELECTFONT MENUITEM "P&ou\x9E\xEDt v\xFDchoz\xED p\xEDsmo", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Panel &n\xE1stroj\xF9", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Stavov\xFD \xF8\xE1dek", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "&Vybrat p\xEDsmo...", ID_VIEW_SELECTFONT MENUITEM "P&ou\x9E\xEDt v\xFDchoz\xED p\xEDsmo", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Panel &n\xE1stroj\xF9", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tavov\xFD \xF8\xE1dek", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "St&atistika porovn\xE1n\xED", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Za&m\xECnit panely", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Panel &n\xE1stroj\xF9", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Stavov\xFD \xF8\xE1dek", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "&Rozd\xEDlov\xFD panel", ID_VIEW_DETAIL_BAR @@ -2926,6 +2941,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Czech (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "V\xE6lg &skrifttype...", ID_VIEW_SELECTFONT MENUITEM "Brug standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "V&\xE6rkt\xF8jslinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "V\xE6lg &skrifttype...", ID_VIEW_SELECTFONT MENUITEM "Brug standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "V&\xE6rkt\xF8jslinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "V&\xE6rkt\xF8jslinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "H&orisontalt panel", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Danish (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Kies &Font...", ID_VIEW_SELECTFONT MENUITEM "Gebruik standaard F&ont", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Werkbalk", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Status Balk", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Kies &Font...", ID_VIEW_SELECTFONT MENUITEM "Gebruik standaard F&ont", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Werkbalk", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Status Balk", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "&Werkbalk", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Statusbalk", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Diff &Pane", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Dutch (Netherlands) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/French/MergeFrench.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Choisir une &police...", ID_VIEW_SELECTFONT MENUITEM "&Utiliser la police par d\xE9faut", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barre d'&\xE9tat", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Choisir une &police...", ID_VIEW_SELECTFONT MENUITEM "&Utiliser la police par d\xE9faut", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barre d'&\xE9tat", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Comparer les &statistiques", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "&Intervertir les fen\xEAtres", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barre d'&\xE9tat", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "D\xE9&tail des diff\xE9rences", ID_VIEW_DETAIL_BAR @@ -2925,6 +2940,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // French (France) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/German/MergeGerman.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Schrift &ausw\xE4hlen...", ID_VIEW_SELECTFONT MENUITEM "Standard-Schrift &verwenden", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Schrift &ausw\xE4hlen...", ID_VIEW_SELECTFONT MENUITEM "Standard-Schrift &verwenden", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "V&ergleichsstatistik", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Ausschnitt v&ertauschen", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "U&nterschiedsleiste", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Bet\xFBt\xEDpus...", ID_VIEW_SELECTFONT MENUITEM "Alap\xE9rtelmezett bet\xFBt\xEDpus haszn\xE1lata", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Eszk\xF6zt\xE1r", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xC1lapotsor", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Bet\xFBt\xEDpus...", ID_VIEW_SELECTFONT MENUITEM "Alap\xE9rtelmezett bet\xFBt\xEDpus haszn\xE1lata", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Eszk\xF6zt\xE1r", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xC1lapotsor", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "&Eszk\xF6zt\xE1r", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xC1lapotsor", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Elt\xE9r\xE9s &panel", ID_VIEW_DETAIL_BAR @@ -2931,6 +2946,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "&Carattere...", ID_VIEW_SELECTFONT MENUITEM "&Utilizza carattere predefinito", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra degli &strumenti", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Barra di stato", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "&Carattere...", ID_VIEW_SELECTFONT MENUITEM "&Utilizza carattere predefinito", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Barra degli strumenti", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Ba&rra di stato", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Statistic&he del confronto", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sc&ambia pannelli", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Barra degli &strumenti", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Barra di stato", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "&Pannello delle differenze", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Italian (Italy) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "\x83t\x83H\x83\x93\x83g\x91I\x91\xF0(&F)...", ID_VIEW_SELECTFONT MENUITEM "\x83f\x83t\x83H\x83\x8B\x83g\x83t\x83H\x83\x93\x83g\x82\xF0\x8Eg\x97p(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\x83c\x81[\x83\x8B\x83o\x81[(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\x83X\x83e\x81[\x83^\x83X\x83o\x81[(&S)", ID_VIEW_STATUS_BAR MENUITEM "\x83^\x83u\x83o\x81[(&B)", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "\x83t\x83H\x83\x93\x83g\x91I\x91\xF0(&F)...", ID_VIEW_SELECTFONT MENUITEM "\x83f\x83t\x83H\x83\x8B\x83g\x83t\x83H\x83\x93\x83g\x82\xF0\x8Eg\x97p(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\x83c\x81[\x83\x8B\x83o\x81[(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\x83X\x83e\x81[\x83^\x83X\x83o\x81[(&S)", ID_VIEW_STATUS_BAR MENUITEM "\x83^\x83u\x83o\x81[(&B)", ID_VIEW_TAB_BAR MENUITEM "\x94\xE4\x8Ar\x93\x9D\x8Cv(&R)", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "\x83y\x83C\x83\x93\x82̌\xF0\x8A\xB7(&A)", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\x83c\x81[\x83\x8B\x83o\x81[(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\x83X\x83e\x81[\x83^\x83X\x83o\x81[(&S)", ID_VIEW_STATUS_BAR MENUITEM "\x83^\x83u\x83o\x81[(&B)", ID_VIEW_TAB_BAR MENUITEM "Diff\x83y\x83C\x83\x93(&P)", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Japanese (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,9 +125,14 @@ MENUITEM "\xC6\xF9Ʈ \xBC\xB1\xC5\xC3(&F)...", ID_VIEW_SELECTFONT MENUITEM "\xB1⺻ \xC6\xF9Ʈ \xBB\xE7\xBF\xEB(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xC5\xF8\xB9\xD9(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xBB\xF3\xC5\xC2 ǥ\xBD\xC3\xC1\xD9(&S)", ID_VIEW_STATUS_BAR - MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR MENUITEM "\xBE\xF0\xBE\xEE(&L)...", ID_VIEW_LANGUAGE END @@ -212,9 +217,14 @@ MENUITEM "\xC6\xF9Ʈ \xBC\xB1\xC5\xC3(&F)...", ID_VIEW_SELECTFONT MENUITEM "\xB1⺻ \xC6\xF9Ʈ \xBB\xE7\xBF\xEB(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xC5\xF8\xB9\xD9(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xBB\xF3\xC5\xC2 ǥ\xBD\xC3\xC1\xD9(&S)", ID_VIEW_STATUS_BAR - MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS MENUITEM SEPARATOR MENUITEM "\xBE\xF0\xBE\xEE(&L)...", ID_VIEW_LANGUAGE @@ -377,9 +387,14 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\xC5\xF8\xB9\xD9(&T)", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "\xBB\xF3\xC5\xC2 ǥ\xBD\xC3\xC1\xD9(&S)", ID_VIEW_STATUS_BAR - MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xBC\xB1\xC5\xC3 \xBA\xF1\xB1\xB3â \xBA\xB8\xB1\xE2(&P)", ID_VIEW_DETAIL_BAR MENUITEM "\xC0\xA7ġ ǥ\xBD\xC3â(&C)", ID_VIEW_LOCATION_BAR MENUITEM SEPARATOR @@ -2931,6 +2946,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Korean (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Velg &skrifttype...", ID_VIEW_SELECTFONT MENUITEM "Bruk standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Verkt\xF8ylinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Velg &skrifttype...", ID_VIEW_SELECTFONT MENUITEM "Bruk standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Verkt\xF8ylinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "&Verkt\xF8ylinje", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "&Forskjellsvindu", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Norwegian (Bokmal) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Polish/MergePolish.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Zmi&e\xF1 czcionk\xEA...", ID_VIEW_SELECTFONT MENUITEM "Czcionka &domy\x9Clna", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Pasek &narz\xEAdzi", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Pasek s&tanu", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Zmi&e\xF1 czcionk\xEA...", ID_VIEW_SELECTFONT MENUITEM "Czcionka &domy\x9Clna", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Pasek &narz\xEAdzi", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Pasek s&tanu", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Statystyki po&r\xF3wnania", ID_VIEW_DIR_STATISTICS @@ -377,7 +387,12 @@ MENUITEM SEPARATOR MENUITEM "Za&mie\xF1 panele", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "Pasek &narz\xEAdzi", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Pasek s&tanu", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Panel &r\xF3\xBFnic", ID_VIEW_DETAIL_BAR @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Polish (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -212,7 +212,12 @@ MENUITEM "\xC2\xFB\xE1\xF0\xE0\xF2\xFC &\xD8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT MENUITEM "\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF8\xF0\xE8\xF4\xF2 \xEF\xEE &\xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "\xCF\xE0&\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xD1\xF2\xF0\xEE\xEA\xE0 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xFF", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS @@ -377,7 +382,12 @@ MENUITEM SEPARATOR MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "\xCF\xE0&\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&\xD1\xF2\xF0\xEE\xEA\xE0 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xFF", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\xCF\xE0\xED\xE5&\xEB\xFC \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF", ID_VIEW_DETAIL_BAR @@ -2926,6 +2936,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Russian (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "&Zvoli\x9D p\xEDsmo...", ID_VIEW_SELECTFONT MENUITEM "Pou\x9Ei\x9D z\xE1kladn\xE9 p\xEDsm&o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "&Zvoli\x9D p\xEDsmo...", ID_VIEW_SELECTFONT MENUITEM "Pou\x9Ei\x9D z\xE1kladn\xE9 p\xEDsm&o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "\x8Atatistika po&rovnania", ID_VIEW_DIR_STATISTICS @@ -377,10 +387,15 @@ MENUITEM SEPARATOR MENUITEM "&Vymeni\x9D panely", ID_VIEW_SWAPPANES MENUITEM SEPARATOR - MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "&Panel s rozdielom", ID_VIEW_DETAIL_BAR - MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "&Loka\xE8n\xFD panel", ID_VIEW_LOCATION_BAR MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE @@ -2933,6 +2948,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Slovak (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Seleccionar &tipo de letra...", ID_VIEW_SELECTFONT MENUITEM "Usar tipo de letra del Siste&ma", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra de &herramientas", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Barra de &estado", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,9 +217,14 @@ MENUITEM "Seleccionar &tipo de letra...", ID_VIEW_SELECTFONT MENUITEM "Usar tipo de letra del Siste&ma", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra de &herramientas", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END + MENUITEM "Barra de &estado", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR - MENUITEM "Barra de &estado", ID_VIEW_STATUS_BAR MENUITEM "Estad\xEDsticas de &comparaci\xF3n", ID_VIEW_DIR_STATISTICS MENUITEM SEPARATOR MENUITEM "Idi&oma...", ID_VIEW_LANGUAGE @@ -2933,6 +2943,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Spanish (Modern) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,8 +125,14 @@ MENUITEM "V\xE4lj tecken&snitt...", ID_VIEW_SELECTFONT MENUITEM "Anv\xE4nd standardtec&kensnitt", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "V&erktygsf\xE4lt", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatusf\xE4lt", ID_VIEW_STATUS_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR MENUITEM "S&pr\xE5k...", ID_VIEW_LANGUAGE END @@ -211,8 +217,14 @@ MENUITEM "V\xE4lj tecken&snitt...", ID_VIEW_SELECTFONT MENUITEM "Anv\xE4nd standardtec&kensnitt", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "V&erktygsf\xE4lt", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "S&tatusf\xE4lt", ID_VIEW_STATUS_BAR + MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM "J\xE4mf\xF6&rstatistik", ID_VIEW_DIR_STATISTICS MENUITEM SEPARATOR MENUITEM "S&pr\xE5k...", ID_VIEW_LANGUAGE @@ -2931,6 +2943,13 @@ IDS_COLORSCHEME_XML "XML" END +STRINGTABLE +BEGIN + ID_TOOLBAR_NONE "Hide the toolbar" + ID_TOOLBAR_SMALL "Show small toolbar" + ID_TOOLBAR_BIG "Show big toolbar" +END + // END STRINGS SYNCHRO #endif // Swedish (Default) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-04-12 15:02:42 UTC (rev 4249) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-04-12 16:23:11 UTC (rev 4250) @@ -125,7 +125,12 @@ MENUITEM "Fo&nt Se\xE7", ID_VIEW_SELECTFONT MENUITEM "&Varsay\xFDlan Fontu Kullan", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Ara\xE7 \xC7ubu\xF0u", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Durum \xC7ubu\xF0u", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM SEPARATOR @@ -212,7 +217,12 @@ MENUITEM "Fo&nt Se\xE7", ID_VIEW_SELECTFONT MENUITEM "&Varsay\xFDlan Fontu Kullan", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Ara\xE7 \xC7ubu\xF0u", ID_VIEW_TOOLBAR + POPUP "&Toolbar" + BEGIN + MENUITEM "&None", ID_TOOLBAR_NONE + MENUITEM "&Small", ID_TOOLBAR_SMALL + MENUITEM "&Big", ID_TOOLBAR_BIG + END MENUITEM "Durum \xC7ubu\xF0u", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR MENUITEM ... [truncated message content] |