Thread: [Winmerge-svn] SF.net SVN: winmerge: [3520] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-04 16:24:02
|
Revision: 3520 http://svn.sourceforge.net/winmerge/?rev=3520&view=rev Author: kimmov Date: 2006-09-04 09:23:48 -0700 (Mon, 04 Sep 2006) Log Message: ----------- BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default" Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/PropRegistry.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-03 18:17:35 UTC (rev 3519) +++ trunk/Src/Changes.txt 2006-09-04 16:23:48 UTC (rev 3520) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-04 Kimmo + BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default" + Src: PropRegistry.cpp + 2006-09-01 Takashi Japanese translation - update Src/Languages/Japanese: MergeJapanese.rc Modified: trunk/Src/PropRegistry.cpp =================================================================== --- trunk/Src/PropRegistry.cpp 2006-09-03 18:17:35 UTC (rev 3519) +++ trunk/Src/PropRegistry.cpp 2006-09-04 16:23:48 UTC (rev 3520) @@ -75,6 +75,7 @@ DDX_Check(pDX, IDC_EXPLORER_ADVANCED, m_bContextAdvanced); DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff); DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath); + DDX_Check(pDX, IDC_EXPLORER_SUBFOLDERS, m_bContextSubfolders); //}}AFX_DATA_MAP } @@ -214,6 +215,11 @@ else dwContextEnabled &= ~CONTEXT_F_ADVANCED; + if (m_bContextSubfolders) + dwContextEnabled |= CONTEXT_F_SUBFOLDERS; + else + dwContextEnabled &= ~CONTEXT_F_SUBFOLDERS; + retVal = reg.WriteDword(f_RegValueEnabled, dwContextEnabled); if (retVal != ERROR_SUCCESS) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-04 19:17:41
|
Revision: 3521 http://svn.sourceforge.net/winmerge/?rev=3521&view=rev Author: sdottaka Date: 2006-09-04 12:16:56 -0700 (Mon, 04 Sep 2006) Log Message: ----------- PATCH: [ 1551332 ] defer loading plugin 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/Merge.rc trunk/Src/MergeDoc.cpp trunk/Src/MergeEditView.cpp trunk/Src/MergeEditView.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Changes.txt 2006-09-04 19:16:56 UTC (rev 3521) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-04 Takashi + PATCH: [ 1551332 ] defer loading plugin + Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h + Src/Languages/*: Merge*.rc + 2006-09-04 Kimmo BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default" Src: PropRegistry.cpp Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&\xCD\xE0\xEB\xE8\xF7\xED\xE8" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&\xCF\xF0\xE5\xE7\xE0\xF0\xE5\xE4\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediferenciaci\xF3" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -443,7 +443,7 @@ MENUITEM SEPARATOR POPUP "Ԥ\xB6Ա\xC8(&P)" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "\xD6\xD8\xD0\xC2װ\xC8\xEB\xB2\xE5\xBC\xFE(&R)", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "\xABe\xB8m\xA4\xA3\xA6P(&P)" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "\xAD\xAB\xB7s\xB8\xFC\xA4J\xA5~\xB1\xBE(&R)", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "Znovu &na\xE8\xEDst", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "Plug-ins he&rladen", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/French/MergeFrench.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -439,7 +439,7 @@ MENUITEM SEPARATOR POPUP "&Pr\xE9-comparer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Recharger les plugiciels", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "Plugins &neu laden", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&El\xF5vizsg\xE1l\xF3" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&B\xF5v\xEDtm\xE9nyek bet\xF6lt\xE9se", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Ricarica plugin", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93(&P)" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "\x83v\x83\x89\x83O\x83C\x83\x93\x82̍ēǍ\x9E\x82\xDD(&R)", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "\xC7÷\xAF\xB1\xD7\xC0\xCE \xB4ٽ\xC3 \xB7ε\xE5(&R)", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Forh\xE5ndsforskjell" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Oppdater programtillegg", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Polish/MergePolish.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&R\xF3\xBFnicowanie wst\xEApne" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Prze\xB3aduj wtyczki", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&\xCF\xF0\xE5\xE4\xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&\xCF\xE5\xF0\xE5\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&\xD6ppna plugins igen", ID_RELOAD_PLUGINS Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&\xD6ncelikli Fark" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "Eklentileri &Tekrar Y\xFCkle", ID_RELOAD_PLUGINS Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/MainFrm.cpp 2006-09-04 19:16:56 UTC (rev 3521) @@ -453,11 +453,6 @@ m_pMenus[MENU_DEFAULT]->ModifyODMenu(NULL, ID_TOOLS_GENERATEPATCH, IDB_TOOLS_GENERATEPATCH); m_pMenus[MENU_DEFAULT]->LoadToolbar(IDR_MAINFRAME); - // append the scripts submenu - HMENU scriptsSubmenu = GetScriptsSubmenu(m_pMenus[MENU_DEFAULT]->GetSafeHmenu()); - if (scriptsSubmenu != NULL) - CMergeEditView::createScriptsSubmenu(scriptsSubmenu); - FixupDebugMenu(m_pMenus[MENU_DEFAULT]); return(m_pMenus[MENU_DEFAULT]->Detach()); @@ -501,11 +496,6 @@ m_pMenus[MENU_MERGEVIEW]->ModifyODMenu(NULL, ID_EDIT_CLEAR_ALL_BOOKMARKS, IDB_EDIT_CLEAR_ALL_BOOKMARKS); m_pMenus[MENU_MERGEVIEW]->LoadToolbar(IDR_MAINFRAME); - // append the scripts submenu - HMENU scriptsSubmenu = GetScriptsSubmenu(m_pMenus[MENU_MERGEVIEW]->GetSafeHmenu()); - if (scriptsSubmenu != NULL) - CMergeEditView::createScriptsSubmenu(scriptsSubmenu); - FixupDebugMenu(m_pMenus[MENU_MERGEVIEW]); return(m_pMenus[MENU_MERGEVIEW]->Detach()); Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/Merge.rc 2006-09-04 19:16:56 UTC (rev 3521) @@ -441,7 +441,7 @@ MENUITEM SEPARATOR POPUP "&Prediffer" BEGIN - MENUITEM SEPARATOR + MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/MergeDoc.cpp 2006-09-04 19:16:56 UTC (rev 3521) @@ -2799,10 +2799,6 @@ nRescanResult = Rescan(bBinary, bIdentical); - // recreate the sub menu (to fill the "selected prediffers") - // keep after Rescan (in automatic mode, prediffer is set during the first Rescan) - GetMainFrame()->UpdatePrediffersMenu(); - // Open filed if rescan succeed and files are not binaries if (nRescanResult == RESCAN_OK && bBinary == FALSE) { Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/MergeEditView.cpp 2006-09-04 19:16:56 UTC (rev 3521) @@ -172,7 +172,7 @@ ON_COMMAND_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnScripts) ON_UPDATE_COMMAND_UI_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnUpdateScripts) ON_COMMAND(ID_NO_PREDIFFER, OnNoPrediffer) - ON_UPDATE_COMMAND_UI(ID_NO_PREDIFFER, OnUpdatePrediffer) + ON_UPDATE_COMMAND_UI(ID_NO_PREDIFFER, OnUpdateNoPrediffer) ON_COMMAND_RANGE(ID_PREDIFFERS_FIRST, ID_PREDIFFERS_LAST, OnPrediffer) ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFFERS_FIRST, ID_PREDIFFERS_LAST, OnUpdatePrediffer) ON_COMMAND(ID_FILE_MERGINGMODE, OnMergingMode) @@ -193,6 +193,7 @@ ON_COMMAND(ID_FILE_OPEN_WITH, OnOpenFileWith) ON_COMMAND(ID_VIEW_SWAPPANES, OnViewSwapPanes) ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFS, OnUpdateViewSwapPanes) + ON_UPDATE_COMMAND_UI(ID_NO_EDIT_SCRIPTS, OnUpdateNoEditScripts) ON_WM_SIZE() ON_COMMAND(ID_HELP, OnHelp) //}}AFX_MSG_MAP @@ -324,7 +325,6 @@ CMergeDoc* pDoc = GetDocument(); pDoc->UpdateHeaderActivity(m_nThisPane, bActivate); - GetMainFrame()->UpdatePrediffersMenu(); } int CMergeEditView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf) @@ -2318,6 +2318,19 @@ /** * @brief Called when an editor script item is updated */ +void CMergeEditView::OnUpdateNoEditScripts(CCmdUI* pCmdUI) +{ + // append the scripts submenu + HMENU scriptsSubmenu = dynamic_cast<CMainFrame*>(AfxGetMainWnd())->GetScriptsSubmenu(AfxGetMainWnd()->GetMenu()->m_hMenu); + if (scriptsSubmenu != NULL) + createScriptsSubmenu(scriptsSubmenu); + + pCmdUI->Enable(TRUE); +} + +/** + * @brief Called when an editor script item is updated + */ void CMergeEditView::OnUpdatePrediffer(CCmdUI* pCmdUI) { pCmdUI->Enable(TRUE); @@ -2340,6 +2353,16 @@ pCmdUI->SetRadio(pCmdUI->m_nID == m_CurrentPredifferID); } +/** + * @brief Update "Prediffer" menuitem + */ +void CMergeEditView::OnUpdateNoPrediffer(CCmdUI* pCmdUI) +{ + // recreate the sub menu (to fill the "selected prediffers") + GetMainFrame()->UpdatePrediffersMenu(); + OnUpdatePrediffer(pCmdUI); +} + void CMergeEditView::OnNoPrediffer() { OnPrediffer(ID_NO_PREDIFFER); Modified: trunk/Src/MergeEditView.h =================================================================== --- trunk/Src/MergeEditView.h 2006-09-04 16:23:48 UTC (rev 3520) +++ trunk/Src/MergeEditView.h 2006-09-04 19:16:56 UTC (rev 3521) @@ -262,6 +262,7 @@ afx_msg void OnUpdateWMGoto(CCmdUI* pCmdUI); afx_msg void OnUpdateScripts(CCmdUI* pCmdUI); afx_msg void OnScripts(UINT nID ); + afx_msg void OnUpdateNoPrediffer(CCmdUI* pCmdUI); afx_msg void OnUpdatePrediffer(CCmdUI* pCmdUI); afx_msg void OnNoPrediffer(); afx_msg void OnPrediffer(UINT nID ); @@ -283,6 +284,7 @@ afx_msg void OnOpenFileWithEditor(); afx_msg void OnViewSwapPanes(); afx_msg void OnUpdateViewSwapPanes(CCmdUI* pCmdUI); + afx_msg void OnUpdateNoEditScripts(CCmdUI* pCmdUI); afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnHelp(); //}}AFX_MSG This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-05 14:53:32
|
Revision: 3524 http://svn.sourceforge.net/winmerge/?rev=3524&view=rev Author: kimmov Date: 2006-09-05 07:52:54 -0700 (Tue, 05 Sep 2006) Log Message: ----------- PATCH: [ 1552095 ] Fix last compare method not visible in GUI list 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/Merge.rc Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Changes.txt 2006-09-05 14:52:54 UTC (rev 3524) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-05 Kimmo + PATCH: [ 1552095 ] Fix last compare method not visible in GUI list + Src: Merge.rc + Src/Languages/*: Merge*.rc + 2006-09-04 Takashi PATCH: [ 1551332 ] defer loading plugin Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1134,7 +1134,7 @@ CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF0\xE0\xE7\xEF\xEE\xE7\xED\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED &\xE1\xEB\xEE\xEA",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\xCC\xE5\xF2\xEE\xE4 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&\xD1\xEF\xF0\xE8 \xF1\xEB\xE5\xE4 \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "&Habilita detecci\xF3 de blocs despla\xE7ats",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "M\xE8tode de comparaci\xF3 de &fitxers:",IDC_STATIC,7,105,113,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,120,103,110,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,120,103,110,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Atura despr\xE9s de la primera difer\xE8ncia",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1134,7 +1134,7 @@ CONTROL "\xD4\xCA\xD0\xED\xBC\xEC\xB2\xE2\xD2ƶ\xAF\xC7\xF8\xBF\xE9(&N)",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\xCEļ\xFE\xB6Աȷ\xBD\xB7\xA8(&F)",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "\xD3\xF6\xB5\xBD\xCA״\xA6\xB2\xBBͬ\xBA\xF3ֹͣ(&T)",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "\xB1ҥβ\xBE\xB0ʰ϶\xFA(&N)",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\xC0ɮפ\xF1\xB8\xFB\xA4\xE8\xAAk(&F):",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "Povolit zji\x9A\x9Dov\xE1n\xED p\xF8esunut\xFDch &blok\xF9",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "Zp\xF9sob porovn\xE1n\xED &soubor\xF9:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Zastavit po prvn\xEDm &rozd\xEDlu",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "&Aktiver detektion af flyttede blokke",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Fil sammenligningsmetode:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "Detectie verplaatste blokken i&nschakelen",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "Met&hode bestandsvergelijking:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/French/MergeFrench.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1131,7 +1131,7 @@ CONTROL "&Qualifier la d\xE9tection des blocs d\xE9plac\xE9s",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Methode de comparaison:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Arr\xEAter \xE0 la premi\xE8re diff\xE9rence",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "Verschobene &Bl\xF6cke erkennen",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "Vergleichs&methode:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Nach dem ersten Unterschied &stoppen",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "Mozgatott &blokk \xE9szlel\xE9s bekapcsol\xE1sa",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&F\xE1jl \xF6sszehasonl\xEDt\xE1si m\xF3dszer:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Meg\xE1ll\xE1s az &els\xF5 k\xFCl\xF6nbs\xE9gn\xE9l",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "Attiva il rilevamento di blocc&hi spostati",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Metodo confronto file:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Fermati dopo la prima differenza",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "\x88ړ\xAE\x83u\x83\x8D\x83b\x83N\x8C\x9F\x8Fo\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&N)",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\x83t\x83@\x83C\x83\x8B\x94\xE4\x8Ar\x95\xFB\x96@(&F):",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "\x8Dŏ\x89\x82̍\xB7\x88قŔ\xE4\x8Ar\x82\xF0\x8FI\x97\xB9\x82\xB7\x82\xE9(&T)",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "\xC0̵\xBF\xBF\xB5\xBF\xAA ã\xB1\xE2 Ȱ\xBC\xBAȭ",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\xC6\xC4\xC0\xCF \xBA\xF1\xB1\xB3 \xB9\xE6\xBD\xC4(&F):",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "&Aktiver flyttet blokk-oppdagelse",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Filsammenligningsmetode:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,84,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Polish/MergePolish.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "W\xB3\xB9cz &wykrywanie przeniesionych blok\xF3w",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Metoda por\xF3wnania plik\xF3w:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Zatrzymaj po pierwszej r\xF3\xBFnicy",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "\xCE\xE1\xED\xE0\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xEF\xE5\xF0\xE5\xEC\xE5&\xF9\xE5\xED\xED\xFB\xF5 \xE1\xEB\xEE\xEA\xEE\xE2",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "\xCC\xE5\xF2\xEE\xE4 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xF4\xE0\xE9\xEB\xEE\xE2:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&\xCE\xF1\xF2\xE0\xED\xE0\xE2\xEB\xE8\xE2\xE0\xF2\xFC\xF1\xFF \xEF\xEE\xF1\xEB\xE5 \xEF\xE5\xF0\xE2\xEE\xE3\xEE \xEE\xF2\xEB\xE8\xF7\xE8\xFF",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,84,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "&Habilitar detecci\xF3n de bloques movidos",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "Com¶r:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Parar despu\xE9s de la primera diferencia",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "M&\xF6jligg\xF6r detektion av flyttade textblock",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&Filj\xE4mf\xF6relsemetod:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,84,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&toppa efter f\xF6rsta skillnaden",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2006-09-04 21:27:14 UTC (rev 3523) +++ trunk/Src/Merge.rc 2006-09-05 14:52:54 UTC (rev 3524) @@ -1133,7 +1133,7 @@ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9 - COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,52,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-06 20:25:30
|
Revision: 3533 http://svn.sourceforge.net/winmerge/?rev=3533&view=rev Author: kimmov Date: 2006-09-06 13:24:53 -0700 (Wed, 06 Sep 2006) Log Message: ----------- PATCH: [ 1552917 ] Fix GUI for autocompletion option 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/Merge.rc Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Changes.txt 2006-09-06 20:24:53 UTC (rev 3533) @@ -5,6 +5,9 @@ 2006-09-06 Kimmo PATCH: [ 1552901 ] Update VC loose filefilter Filters: Merge_VC_loose.flt + PATCH: [ 1552917 ] Fix GUI for autocompletion option + Src: Merge.rc + Src/Languages/*: Merge*.rc 2006-09-05 Kimmo PATCH: [ 1552095 ] Fix last compare method not visible in GUI list Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -742,17 +742,17 @@ CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF1\xE0\xEC\xEE &\xE5\xE4\xED\xEE \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xEE \xEA\xEE\xEF\xE8\xE5",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xE7\xE0",IDC_STATIC,7,87, + GROUPBOX "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xE7\xE0",IDC_STATIC,7,100, 221,37 CONTROL "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xCF\xE0\xEF\xEA\xE8",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xD4\xE0\xE9\xEB\xEE\xE2\xE5",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge \xEF\xEE\xE7\xE2\xEE\xEB\xFF\xE2\xE0 \xF1\xEA\xF0\xE8\xE2\xE0\xED\xE5 \xED\xE0 \xED\xFF\xEA\xEE\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF. \xCD\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xE1\xF3\xF2\xEE\xED\xE0 \xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8, \xE7\xE0 \xE4\xE0 \xEF\xEE\xEA\xE0\xE6\xE5\xF2\xE5 \xEF\xE0\xEA \xF2\xE5\xE7\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Permet d'executar nom\xE9s una inst\xE0ncia",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "Autocompletar al di\xE0leg d'obrir:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Permet m\xFAltiples finestres de comparaci\xF3 per",IDC_STATIC,7,87, + GROUPBOX "Permet m\xFAltiples finestres de comparaci\xF3 per",IDC_STATIC,7,100, 221,37 CONTROL "Comparaci\xF3 de &carpetes",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Comparaci\xF3 de &fitxers",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el bot\xF3 de Reinicialitzaci\xF3 per a fer visibles tots els quadres de missatges altre cop.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -745,14 +745,14 @@ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "\xD4\xCA\xD0\xED\xB6\xE0\xB8\xF6\xB6Աȴ\xB0\xBF\xDA",IDC_STATIC,7,87,221,37 + GROUPBOX "\xD4\xCA\xD0\xED\xB6\xE0\xB8\xF6\xB6Աȴ\xB0\xBF\xDA",IDC_STATIC,7,100,221,37 CONTROL "\xCEļ\xFE\xBCжԱ\xC8(&F)",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "\xCEļ\xFE\xB6Ա\xC8(&E)",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xD6\xD8\xD6\xC3",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xD6\xD8\xD6\xC3",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xAD\xAB\xB3]",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xAD\xAB\xB3]",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -743,15 +743,15 @@ LTEXT "Automatick\xE9 &dokon\xE8ov\xE1n\xED:",IDC_STATIC,19,72,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Povolit v\xEDce oken pro porovn\xE1n\xED",IDC_STATIC,7,87, + GROUPBOX "Povolit v\xEDce oken pro porovn\xE1n\xED",IDC_STATIC,7,100, 221,37 CONTROL "s&lo\x9Eek",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "&soubor\xF9",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "N\xECkter\xE1 obecn\xE1 okna se zpr\xE1vami je mo\x9Eno skr\xFDt.\nPo stisknut\xED tla\xE8\xEDtka Vr\xE1tit se v\x9Aechna tato okna op\xECt budou objevovat.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "V&r\xE1tit",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "V&r\xE1tit",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/French/MergeFrench.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -739,17 +739,17 @@ CONTROL "&Permetre une seule instance en ex\xE9cution",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,87, + GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,100, 221,37 CONTROL "comparaison de R\xE9pert&oires",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Nur eine Programm-Instanz zulassen",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "\xD6ffnen-Dialog Auto&vervollst\xE4ndigung:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Aktivieren mehrfacher Vergleichsfenster f\xFCr",IDC_STATIC,7,87, + GROUPBOX "Aktivieren mehrfacher Vergleichsfenster f\xFCr",IDC_STATIC,7,100, 221,37 CONTROL "&Ordnervergleich",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "D&ateivergleich",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge erlaubt das Verstecken von einigen h\xE4ufigen Meldungen.\nDr\xFCcken Sie die Zur\xFCcksetzen-Schaltfl\xE4che um alle Meldungen wieder sichtbar zumachen.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Zur\xFCcksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Zur\xFCcksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "Csak &egy p\xE9ld\xE1ny fut\xE1s\xE1nak enged\xE9lyez\xE9se",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:",IDC_STATIC,7,87, + GROUPBOX "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:",IDC_STATIC,7,100, 221,37 CONTROL "&Mappa \xF6sszehasonl\xEDt\xE1skor",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "&F\xE1jl \xF6sszehasonl\xEDt\xE1skor",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Vissza\xE1ll\xEDt",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Vissza\xE1ll\xEDt",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Permetti l'esecuzione di un'unica istanza del programma",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Attiva finestra di confronto multiplo per",IDC_STATIC,7,87, + GROUPBOX "Attiva finestra di confronto multiplo per",IDC_STATIC,7,100, 221,37 CONTROL "Confron&to di cartelle",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Confronto di &file",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "\x95\xA1\x90\x94\x82̃C\x83\x93\x83X\x83^\x83\x93\x83X\x82\xF0\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2(&O)",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "\x8AJ\x82\xAD\x83_\x83C\x83A\x83\x8D\x83O\x82̃I\x81[\x83g\x83R\x83\x93\x83v\x83\x8A\x81[\x83g(&O):",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,61,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "\x95\xA1\x90\x94\x82̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x97L\x8C\xF8",IDC_STATIC,7,87, + GROUPBOX "\x95\xA1\x90\x94\x82̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x97L\x8C\xF8",IDC_STATIC,7,100, 221,37 CONTROL "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar(&F)",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "\x83t\x83@\x83C\x83\x8B\x94\xE4\x8Ar(&E)",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge \x82́A\x82\xA2\x82\xAD\x82\xA9\x82̋\xA4\x92ʃ\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x94\xF1\x95\\x8E\xA6\x82ɂł\xAB\x82܂\xB7\x81B \x91S\x82Ẵ\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x8DĂѕ\\x8E\xA6\x82\xB3\x82\xB9\x82\xE9\x82ɂ́A\x83\x8A\x83Z\x83b\x83g\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x89\xBA\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\x83\x8A\x83Z\x83b\x83g",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\x83\x8A\x83Z\x83b\x83g",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xC3ʱ\xE2ȭ",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xC3ʱ\xE2ȭ",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Polish/MergePolish.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "Zezw\xF3l na uruchomienie tylko &jednej instancji programu",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "Otw\xF3rz okno autouzupe\xB3niania:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "W\xB3\xB9cz wiele okien por\xF3wnania dla",IDC_STATIC,7,87, + GROUPBOX "W\xB3\xB9cz wiele okien por\xF3wnania dla",IDC_STATIC,7,100, 221,37 CONTROL "Por\xF3wnania &folder\xF3w",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Por\xF3wnania &plik\xF3w",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge pozwala ukry\xE6 niekt\xF3re komunikaty. Naci\x9Cnij przycisk, aby wy\x9Cwietla\xE6 wszystkie komunikaty.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xE7\xE0\xEF\xF3\xF1\xEA \xF2\xEE\xEB\xFC\xEA\xEE \xEE\xE4\xED\xEE\xE9 \xEA\xEE\xEF\xE8\xE8",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xEA\xED\xE0 \xEC\xED\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF",IDC_STATIC,7,87, + GROUPBOX "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xEA\xED\xE0 \xEC\xED\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF",IDC_STATIC,7,100, 221,37 CONTROL "\xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xEF\xE0\xEF\xEE\xEA",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "\xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xF4\xE0\xE9\xEB\xEE\xE2",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xD1\xE1\xF0\xEE\xF1",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xD1\xE1\xF0\xEE\xF1",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Permitir solo una instancia en ejecuci\xF3n",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Habilitar m\xFAltiples ventanas de comparaci\xF3n para",IDC_STATIC,7,87, + GROUPBOX "Habilitar m\xFAltiples ventanas de comparaci\xF3n para",IDC_STATIC,7,100, 221,37 CONTROL "Comparaci\xF3n de &directorios",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Comparaci\xF3n de &ficheros",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge permite ocultar algunos mensajes comunes. Pulse Reset para hacer todos los mensajes visibles de nuevo.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "&Till\xE5t bara en upplaga att k\xF6ra",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "\xD6&ppna-dialog Auto-Komplettera:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r",IDC_STATIC,7,87, + GROUPBOX "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r",IDC_STATIC,7,100, 221,37 CONTROL "&J\xE4mf\xF6r kataloger",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "J\xE4m&f\xF6r filer",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge till\xE5ter d\xF6ljande av n\xE5gra meddelanderutor. Klicka p\xE5 \xC5terst\xE4ll-knappen f\xF6r att g\xF6ra alla meddelanderutor synliga igen.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "\xC5terst\xE4ll",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "\xC5terst\xE4ll",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2006-09-06 15:23:06 UTC (rev 3532) +++ trunk/Src/Merge.rc 2006-09-06 20:24:53 UTC (rev 3533) @@ -741,17 +741,17 @@ CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST | + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,87, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,98,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,108,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,140,168,31 - PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,146,50,14,NOT + IDC_STATIC,7,153,168,31 + PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ga...@us...> - 2006-09-08 09:10:07
|
Revision: 3535 http://svn.sourceforge.net/winmerge/?rev=3535&view=rev Author: galh Date: 2006-09-08 02:09:43 -0700 (Fri, 08 Sep 2006) Log Message: ----------- RFE: [ 1533506 ] Need command line switch for single-instance. Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Merge.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-07 15:50:50 UTC (rev 3534) +++ trunk/Src/Changes.txt 2006-09-08 09:09:43 UTC (rev 3535) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-08 Gal + RFE: [ 1533506 ] Need commandline switch for single-instance + Src: Merge.cpp + 2006-09-06 Kimmo PATCH: [ 1552901 ] Update VC loose filefilter Filters: Merge_VC_loose.flt Modified: trunk/Src/Merge.cpp =================================================================== --- trunk/Src/Merge.cpp 2006-09-07 15:50:50 UTC (rev 3534) +++ trunk/Src/Merge.cpp 2006-09-08 09:09:43 UTC (rev 3535) @@ -90,6 +90,41 @@ static void AddEnglishResourceHook(); +class CMergeCmdLineInfo : public CCommandLineInfo +{ + public: + + CMergeCmdLineInfo(); + + ~CMergeCmdLineInfo() { } + + virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast); + + public: + + BOOL m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */ +}; + +CMergeCmdLineInfo::CMergeCmdLineInfo() : CCommandLineInfo(), + m_bSingleInstance(FALSE) +{ + +} + +void CMergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) +{ + // Give our base class a chance to figure out what is the parameter. + CCommandLineInfo::ParseParam(pszParam, bFlag, bLast); + + if (TRUE == bFlag) + { + if (pszParam[0] == _T('s')) + { + m_bSingleInstance = TRUE; + } + } +} + ///////////////////////////////////////////////////////////////////////////// // CMergeApp construction @@ -159,6 +194,10 @@ #endif #endif + // Parse command-line arguments. + CMergeCmdLineInfo cmdInfo; + ParseCommandLine(cmdInfo); + // Set default codepage DirScan_InitializeDefaultCodepage(); @@ -166,7 +205,8 @@ // This is the name of the company of the original author (Dean Grimm) SetRegistryKey(_T("Thingamahoochie")); - BOOL bSingleInstance = GetProfileInt(_T("Settings"), _T("SingleInstance"), FALSE); + BOOL bSingleInstance = GetProfileInt(_T("Settings"), _T("SingleInstance"), FALSE) || + (TRUE == cmdInfo.m_bSingleInstance); HANDLE hMutex = NULL; if (bSingleInstance) @@ -213,12 +253,7 @@ InitializeFileFilters(); m_globalFileFilter.SetFilter(_T("*.*")); - // CG: The following block was added by the Splash Screen component. - { - CCommandLineInfo cmdInfo; - ParseCommandLine(cmdInfo); - CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew); - } + CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew); // Initialize i18n (multiple language) support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-10 13:51:50
|
Revision: 3539 http://svn.sourceforge.net/winmerge/?rev=3539&view=rev Author: kimmov Date: 2006-09-10 06:51:39 -0700 (Sun, 10 Sep 2006) Log Message: ----------- Czech translation update from Jan Hryz Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Languages/Czech/MergeCzech.rc Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-10 10:07:50 UTC (rev 3538) +++ trunk/Src/Changes.txt 2006-09-10 13:51:39 UTC (rev 3539) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-10 Kimmo + Czech translation update from Jan Hryz + Src/Languages/Czech/MergeCzech.rc + 2006-09-08 Gal RFE: [ 1533506 ] Need commandline switch for single-instance Src: Merge.cpp Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-10 10:07:50 UTC (rev 3538) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-10 13:51:39 UTC (rev 3539) @@ -341,14 +341,14 @@ MENUITEM "L&ev\xFD pouze pro \xE8ten\xED", ID_FILE_LEFT_READONLY MENUITEM "Pr&av\xFD pouze pro \xE8ten\xED", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "P\xF8ev\xE9st konce \xF8\xE1&dk\xF9" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX MENUITEM "&MAC (CR)", ID_EOL_TO_MAC END MENUITEM SEPARATOR - MENUITEM "&Re\x9Eim sl&u\xE8ov\xE1n\xED\tF9", ID_FILE_MERGINGMODE + MENUITEM "Re\x9Eim sl&u\xE8ov\xE1n\xED\tF9", ID_FILE_MERGINGMODE MENUITEM SEPARATOR MENUITEM "&Konec", ID_APP_EXIT END @@ -950,15 +950,15 @@ BEGIN CONTROL "Odeslat odstran\xECn\xE9 soubory do &ko\x9Ae",IDC_USE_RECYCLE_BIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10 - CONTROL "Ignorovat \xE8asov\xE9 rozd\xEDly men\x9A\xED ne\x9E 3 &sekundy", + CONTROL "&Ignorovat \xE8asov\xE9 rozd\xEDly men\x9A\xED ne\x9E 3 sekundy", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 - GROUPBOX "Integration",IDC_STATIC,7,30,218,46 + GROUPBOX "Integrace",IDC_STATIC,7,30,218,46 CONTROL "P\xF8idat do &m\xEDstn\xED nab\xEDdky v pr\xF9zkumn\xEDku",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 CONTROL "Povolit &roz\x9A\xED\xF8enou nab\xEDdku",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "V\xFDchoz\xED porovn\xE1n\xED v\xE8etn\xEC pod&slo\x9Eek",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 LTEXT "&Extern\xED editor:",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL @@ -1190,7 +1190,7 @@ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 PUSHBUTTON "Z&kou\x9Aka",IDC_FILTERFILE_TEST_BTN,7,114,50,14 - PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14 + PUSHBUTTON "&Instalovat...",IDC_FILTERFILE_INSTALL,137,114,50,14 PUSHBUTTON "&Nov\xFD...",IDC_FILTERFILE_NEWBTN,192,114,50,14 PUSHBUTTON "&Upravit...",IDC_FILTERFILE_EDITBTN,246,114,50,14 PUSHBUTTON "O&dstranit...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 @@ -1997,7 +1997,7 @@ IDS_COMPMETHOD_QUICK_CONTENTS "Rychl\xFD obsah" IDS_COMPMETHOD_MODDATE "Datum zm\xECny" IDS_COMPMETHOD_DATESIZE "Datum zm\xECny a velikost" - IDS_COMPMETHOD_SIZE "Size" + IDS_COMPMETHOD_SIZE "Velikost" END // FILTER OPTIONS @@ -2011,18 +2011,18 @@ IDS_FILEFILTER_SAVENEW "Zvolte n\xE1zev souboru pro nov\xFD filtr" IDS_FILEFILTER_FILEMASK "Filtry (*.flt)|*.flt|V\x9Aechny soubory (*.*)|*.*||" IDS_FILEFILTER_TMPL_MISSING - "Nelze nal\xE9zt soubor se \x9Aablonou pro filtrov\xE1n\xED soubor\xF9!\n\nZkop\xEDrujte pros\xEDm soubor %1 do slo\x9Eky WinMerge/Filters." + "Nelze nal\xE9zt soubor s filtrem!\n\nZkop\xEDrujte pros\xEDm soubor %1 do slo\x9Eky WinMerge/Filters." IDS_FILEFILTER_TMPL_COPY - "Nelze zkop\xEDrovat soubor se \x9Aablonou pro filtrov\xE1n\xED soubor\xF9 do slo\x9Eky filtr\xF9:\n%1\n\nUjist\xECte se pros\xEDm, \x9Ee slo\x9Eka existuje a je mo\x9En\xE9 do n\xED zapisovat." + "Nelze zkop\xEDrovat soubor s filtrem do slo\x9Eky filtr\xF9:\n%1\n\nUjist\xECte se pros\xEDm, \x9Ee slo\x9Eka existuje a je mo\x9En\xE9 do n\xED zapisovat." IDS_FILEFILTER_NO_USERFOLDER "Vlastn\xED slo\x9Eka filtr\xF9 nebyla zad\xE1na!\n\nZvolte pros\xEDm slo\x9Eku v dialogov\xE9m okn\xEC Mo\x9Enosti, v kategorii Syst\xE9m." IDS_FILEFILTER_DELETE_FAIL - "Chyba p\xF8i odstran\xECn\xED souboru se \x9Aablonou pro filtrov\xE1n\xED soubor\xF9:\n%1\n\nMo\x9En\xE1 je soubor ozna\xE8en pouze pro \xE8ten\xED?" - IDS_FILEFILTER_INSTALL "Locate filter file to install" + "Chyba p\xF8i odstran\xECn\xED souboru s filtrem:\n%1\n\nMo\x9En\xE1 je soubor ozna\xE8en pouze pro \xE8ten\xED?" + IDS_FILEFILTER_INSTALL "Vyhledat soubor s filtrem k instalaci" IDS_FILEFILTER_INSTALLFAIL - "Installing filter file failed.\n\nCould not copy new filter file to filter folder." + "Chyba p\xF8i instalaci souboru s filtrem.\n\nNov\xFD soubor nelze zkop\xEDrovat do slo\x9Eky filtr\xF9." IDS_FILEFILTER_OVERWRITE - "Filter file already exists. Overwrite existing filter?" + "Soubor s filtrem ji\x9E existuje. Chcete nahradit st\xE1vaj\xEDc\xED filtr?" END // VERSION CONTROL OPTIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-10 16:31:00
|
Revision: 3541 http://svn.sourceforge.net/winmerge/?rev=3541&view=rev Author: kimmov Date: 2006-09-10 09:30:20 -0700 (Sun, 10 Sep 2006) Log Message: ----------- PATCH: [ 1553714 ] Add new commandine switches to help dialog 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/Merge.rc trunk/Src/MergeArgs.cpp trunk/Src/resource.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Changes.txt 2006-09-10 16:30:20 UTC (rev 3541) @@ -5,6 +5,9 @@ 2006-09-10 Kimmo Czech translation update from Jan Hryz Src/Languages/Czech/MergeCzech.rc + PATCH: [ 1553714 ] Add new commandine switches to help dialog + Src: Merge.rc MergeArgs.cpp resource.h + Src/Languages/*: Merge*.rc 2006-09-08 Gal RFE: [ 1533506 ] Need commandline switch for single-instance Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1952,7 +1952,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1967,16 +1967,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1951,7 +1951,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Sintaxi : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "camiesq camidreta [camisortida]" IDS_CMDLINE_SYNTAX_ARG_FILTER "m\xE0scara/nom" IDS_CMDLINE_SYNTAX_LEFTDESC "descesq" @@ -1966,16 +1966,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f o -f especifica la m\xE0scara de fitxers o el nom del filtre per a comparar" - IDS_CMDLINE_FORGETLEFT "/ul o -ul diu al WinMerge que no afegeixi el cam\xED de l'esquerra a la llista de recents (MRU)" - IDS_CMDLINE_FORGETRIGHT "/ur o -ur diu al WinMerge que no afegeixi el cam\xED de la dreta a la llista de recents (MRU)" - IDS_CMDLINE_FORGETBOTH "/ub o -ub diu al WinMerge que no afegeixi cap dels dos camins a la llista de recents (MRU)" - IDS_CMDLINE_LEFT_RO "/wl o -wl obre el fitxer de l'esquerra inicialment com a nom\xE9s de lectura" - IDS_CMDLINE_RIGHT_RO "/wr o -wr obre el fitxer de la dreta inicialment com a nom\xE9s de lectura" - IDS_CMDLINE_LEFT_DESC "/dl o -dl afegeix una descripci\xF3 per a mostrar a la banda esquerra enlloc del nom del directori/fitxer" - IDS_CMDLINE_RIGHT_DESC "/dr o -dr afegeix una descripci\xF3 per a mostrar a la banda dreta enlloc del nom del directori/fitxer" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "camiesq \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda esquerra" IDS_CMDLINE_RIGHTPATH "camidreta \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda dreta" IDS_CMDLINE_OUTPUTPATH "camisortida \xE9s un directori de sortida opcional on voleu que siguin desats els fitxers fusionats" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1934,7 +1934,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1949,16 +1949,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "\xBBy\xAAk : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/French/MergeFrench.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1920,12 +1920,13 @@ STRINGTABLE BEGIN IDS_VERSION_FMT "Version %1 - Fran\xE7ais" + IDS_UNICODE "Unicode" END // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntaxe : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "CheminGauche CheminDroit [CheminSortie]" IDS_CMDLINE_SYNTAX_ARG_FILTER "masque/filtre" IDS_CMDLINE_SYNTAX_LEFTDESC "description" @@ -1940,17 +1941,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f d\xE9fini un masque ou un filtre, de fichier pour comparer" - IDS_CMDLINE_FORGETLEFT "/ul or -ul indique de ne pas ajouter le chemin de gauche \xE0 mes documents r\xE9cents" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur indique de ne pas ajouter le chemin de droite \xE0 mes documents r\xE9cents" - IDS_CMDLINE_FORGETBOTH "/ub or -ub indique de ne pas ajouter les deux chemins \xE0 mes documents r\xE9cents" - IDS_CMDLINE_LEFT_RO "/wl or -wl ouvre initialement le c\xF4t\xE9 gauche en leture seulement" - IDS_CMDLINE_RIGHT_RO "/wr or -wr ouvre initialement le c\xF4t\xE9 droit en leture seulement" - IDS_CMDLINE_LEFT_DESC "/dl or -dl indique une description plutot que le chemin complet pour le c\xF4t\xE9 gauche" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr indique une description plutot que le chemin complet pour le c\xF4t\xE9 droit" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "CheminGauche est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 gauche" IDS_CMDLINE_RIGHTPATH "CheminDroit est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 droit" IDS_CMDLINE_OUTPUTPATH "CheminSortie est un r\xE9pertoire optionel o\xF9 enregistrer les fichiers fusionn\xE9s" - IDS_UNICODE "Unicode" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "LinkerPfad RechterPfad [AusgabePfad]" IDS_CMDLINE_SYNTAX_ARG_FILTER "Maske/Name" IDS_CMDLINE_SYNTAX_LEFTDESC "LinkeBeschreibung" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f oder -f setzt die Dateimaske oder den Filtername f\xFCr den Vergleich" - IDS_CMDLINE_FORGETLEFT "/ul oder -ul befiehlt WinMerge, den linken Pfad nicht der 'K\xFCrzlich verwendet'-Liste hinzuzuf\xFCgen" - IDS_CMDLINE_FORGETRIGHT "/ur oder -ur befiehlt WinMerge, den rechten Pfad nicht der 'K\xFCrzlich verwendet'-Liste hinzuzuf\xFCgen" - IDS_CMDLINE_FORGETBOTH "/ub oder -ub befiehlt WinMerge, beide Pfade nicht der 'K\xFCrzlich verwendet'-Liste hinzuzuf\xFCgen" - IDS_CMDLINE_LEFT_RO "/wl oder -wl \xF6ffnet die linke Seite zun\xE4chst als schreibgesch\xFCtzt" - IDS_CMDLINE_RIGHT_RO "/wr oder -wr \xF6ffnet die rechte Seite zun\xE4chst als schreibgesch\xFCtzt" - IDS_CMDLINE_LEFT_DESC "/dl oder -dl f\xFCgt eine Beschreibung f\xFCr die linke Seite hinzu, die anstelle vom Verzeichnis/Dateinamen gezeigt wird" - IDS_CMDLINE_RIGHT_DESC "/dr oder -dr f\xFCgt eine Beschreibung f\xFCr die rechte Seite hinzu, die anstelle vom Verzeichnis/Dateinamen gezeigt wird" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "LinkerPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der linken Seite" IDS_CMDLINE_RIGHTPATH "RechterPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der rechten Seite" IDS_CMDLINE_OUTPUTPATH "AusgabePfad ist ein optionales Ausgabeverzeichnis, in dem Sie die vermischten Dateien speichern m\xF6chten" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1931,7 +1931,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Szintaxis : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1946,16 +1946,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Sintassi : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "percsx percdx [percoutput]" IDS_CMDLINE_SYNTAX_ARG_FILTER "maschera/nome" IDS_CMDLINE_SYNTAX_LEFTDESC "descsx" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f o -f imposta la maschera di file o il nome del filtro per il confronto" - IDS_CMDLINE_FORGETLEFT "/ul o -ul indica a winmerge di non aggiungere il percorso sinistro ai file usati di recente" - IDS_CMDLINE_FORGETRIGHT "/ur o -ur indica a winmerge di non aggiungere il percorso destro ai file usati di recente" - IDS_CMDLINE_FORGETBOTH "/ub o -ub indica a winmerge di non aggiungere entrambi i percorsi ai file usati di recente" - IDS_CMDLINE_LEFT_RO "/wl o -wl apre inizialmente il file sinistro in sola lettura" - IDS_CMDLINE_RIGHT_RO "/wr o -wr apre inizialmente il file destro in sola lettura" - IDS_CMDLINE_LEFT_DESC "/dl o -dl aggiunge una descrizione al lato sinistro mostrata al posto del nome della cartella/file" - IDS_CMDLINE_RIGHT_DESC "/dr o -dr aggiunge una descrizione al lato destro mostrata al posto del nome della cartella/file" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "percsx \xE8 la cartella o il nome del file da aprire sul lato sinistro" IDS_CMDLINE_RIGHTPATH "percdx \xE8 la cartella o il nome del file da aprire sul lato destro" IDS_CMDLINE_OUTPUTPATH "percoutput \xE8 una cartella di output opzionale in cui desideri siano salvati i file riuniti" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "\x83V\x83\x93\x83^\x83b\x83N\x83X : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f \x83t\x83@\x83C\x83\x8B\x83}\x83X\x83N\x82܂\xBD\x82̓t\x83B\x83\x8B\x83^\x96\xBC\x82\xF0\x90ݒ肵\x82܂\xB7" - IDS_CMDLINE_FORGETLEFT "/ul or -ul \x8D\xB6\x83p\x83X\x82\xF0MRU\x82ɒlj\xC1\x82\xB5\x82܂\xB9\x82\xF1" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur \x89E\x83p\x83X\x82\xF0MRU\x82ɒlj\xC1\x82\xB5\x82܂\xB9\x82\xF1" - IDS_CMDLINE_FORGETBOTH "/ub or -ub \x97\xBC\x91\xA4\x82̃p\x83X\x82\xF0MRU\x82ɒlj\xC1\x82\xB5\x82܂\xB9\x82\xF1" - IDS_CMDLINE_LEFT_RO "/wl or -wl \x8D\xB6\x91\xA4\x82\xF0\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82ŊJ\x82\xAB\x82܂\xB7" - IDS_CMDLINE_RIGHT_RO "/wr or -wr \x89E\x91\xA4\x82\xF0\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82ŊJ\x82\xAB\x82܂\xB7" - IDS_CMDLINE_LEFT_DESC "/dl or -dl \x83t\x83H\x83\x8B\x83_/\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̑\xE3\x82\xED\x82\xE8\x82ɐ\xE0\x96\xBE\x95\xB6\x82\xF0\x8D\xB6\x91\xA4\x82ɕ\\x8E\xA6\x82\xB5\x82܂\xB7" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr \x83t\x83H\x83\x8B\x83_/\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̑\xE3\x82\xED\x82\xE8\x82ɐ\xE0\x96\xBE\x95\xB6\x82\xF0\x89E\x91\xA4\x82ɕ\\x8E\xA6\x82\xB5\x82܂\xB7" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath \x82́A\x8D\xB6\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7" IDS_CMDLINE_RIGHTPATH "rightpath \x82́A\x89E\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7" IDS_CMDLINE_OUTPUTPATH "outputpath \x82́A\x8Fȗ\xAA\x89\\x82ȃ}\x81[\x83W\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82̕ۑ\xB6\x90\xE6\x83t\x83H\x83\x8B\x83_\x82ł\xB7" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntaks : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "vsti hsti [utsti]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "vbeskr" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f eller -f sett filmaske eller filternavn for sammenligning" - IDS_CMDLINE_FORGETLEFT "/ul eller -ul forteller WinMerge \xE5 ikke legge til venstre sti til MRU" - IDS_CMDLINE_FORGETRIGHT "/ur eller -ur forteller WinMerge \xE5 ikke legge til h\xF8yre sti til MRU" - IDS_CMDLINE_FORGETBOTH "/ub eller -ub forteller WinMerge \xE5 ikke legge til noen av stiene til MRU" - IDS_CMDLINE_LEFT_RO "/wl eller -wl \xE5pner venstre side skrivebskyttet initielt" - IDS_CMDLINE_RIGHT_RO "/wr eller -wr \xE5pner h\xF8yre side skrivebskyttet initielt" - IDS_CMDLINE_LEFT_DESC "/dl eller -dl legger til en beskrivelse for venstre side i steden for mappe/filnavn" - IDS_CMDLINE_RIGHT_DESC "/dr eller -dr legger til en beskrivelse for h\xF8yre side i steden for mappe/filnavn" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "vsti er mappen eller filen som skal \xE5pnes p\xE5 venstre side" IDS_CMDLINE_RIGHTPATH "hsti er mappen eller filen som skal \xE5pnes p\xE5 h\xF8yre side" IDS_CMDLINE_OUTPUTPATH "utsti er en valgfri mappe hvor flettede filer blir lagret" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Polish/MergePolish.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Sk\xB3adnia: WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "lewa\x9Ccie\xBFka prawa\x9Ccie\xBFka[\x9Ccie\xBFkawyj\x9Cciowa]" IDS_CMDLINE_SYNTAX_ARG_FILTER "maska/nazwa" IDS_CMDLINE_SYNTAX_LEFTDESC "lewypanel" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f lub -f ustawia mask\xEA pliku lub nazw\xEA filtra dla por\xF3wnania" - IDS_CMDLINE_FORGETLEFT "/ul lub -ul m\xF3wi winmerge, \xBFe nie nale\xBFy dodawa\xE6 lewej \x9Ccie\xBFki do listy ostatnio u\xBFywanych" - IDS_CMDLINE_FORGETRIGHT "/ur lub -ur m\xF3wi winmerge, \xBFe nie nale\xBFy dodawa\xE6 prawej \x9Ccie\xBFki do listy ostatnio u\xBFywanych" - IDS_CMDLINE_FORGETBOTH "/ub lub -ub m\xF3wi winmerge, \xBFe nie nale\xBFy dodawa\xE6 obu \x9Ccie\xBFek do listy ostatnio u\xBFywanych" - IDS_CMDLINE_LEFT_RO "/wl lub -wl otwiera lewy panel tylko do odczytu" - IDS_CMDLINE_RIGHT_RO "/wr lub -wr otwiera prawy panel tylko do odczytu" - IDS_CMDLINE_LEFT_DESC "/dl lub -dl dodaje opis dla lewej strony zamiast katalogu/pliku" - IDS_CMDLINE_RIGHT_DESC "/dr lub -dr dodaje opis dla prawej strony zamiast katalogu/pliku" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "lewa\x9Ccie\xBFka to katalog lub plik, kt\xF3ry ma by\xE6 otwarty w lewym panelu" IDS_CMDLINE_RIGHTPATH "prawa\x9Ccie\xBFka to katalog lub plik, kt\xF3ry ma by\xE6 otwarty w prawym panelu" IDS_CMDLINE_OUTPUTPATH "\x9Ccie\xBFkawyj\x9Cciowa to opcjonalny ktalaog wyj\x9Cciowy, gdzie maj\xB9 by\xE6 zachowane scalone pliki" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Sintaxis: : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "rutaizq rutadcha [rutasalida]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mascara/nombre" IDS_CMDLINE_SYNTAX_LEFTDESC "descizq" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f establece la mascara de ficheros o mascara de l\xEDneas para la comparaci\xF3n" - IDS_CMDLINE_FORGETLEFT "/ul or -ul no a\xF1adir la ruta izquierda a MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur no a\xF1adir la ruta derecha a MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub no a\xF1adir ninguna ruta a MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl abrir inicialmente el lado izquierdo como s\xF3lo lectura" - IDS_CMDLINE_RIGHT_RO "/wr or -wr abrir inicialmente el lado derecho como s\xF3lo lectura" - IDS_CMDLINE_LEFT_DESC "/dl or -dl a\xF1ade una descripci\xF3n al lado izquierdo en vez de la ruta directorio/nombre de fichero" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr a\xF1ade una descripci\xF3n al lado derecho en vez de la ruta directorio/nombre de fichero " + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "rutaizq es el directorio o nombre de fichero a ser abierto en el lado izquierdo" IDS_CMDLINE_RIGHTPATH "rutadcha es el directorio o nombre de fichero a ser abierto en el lado derecho" IDS_CMDLINE_OUTPUTPATH "rutasalida es un directorio opcional donde se guardaran los ficheros combinados" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f eller -f anger filmask eller filternamn f\xF6r j\xE4mf\xF6relse" - IDS_CMDLINE_FORGETLEFT "/ul eller -ul f\xE5r WinMerge att inte l\xE4gga till v\xE4nster s\xF6kv\xE4g till de senast anv\xE4nda filerna" - IDS_CMDLINE_FORGETRIGHT "/ur eller -ur f\xE5r WinMerge att inte l\xE4gga till h\xF6ger s\xF6kv\xE4g till de senast anv\xE4nda filerna" - IDS_CMDLINE_FORGETBOTH "/ub eller -ub f\xE5r WinMerge att inte l\xE4gga till b\xE5da s\xF6kv\xE4garna till de senast anv\xE4nda filerna" - IDS_CMDLINE_LEFT_RO "/wl eller -wl \xF6ppnar v\xE4nster fil som skrivskyddad i b\xF6rjan" - IDS_CMDLINE_RIGHT_RO "/wr eller -wr \xF6ppnar h\xF6ger fil som skrivskyddad i b\xF6rjan" - IDS_CMDLINE_LEFT_DESC "/dl eller -dl l\xE4gger till en visad beskrivning av v\xE4nster sida ist\xE4llet f\xF6r katalog/filnamn" - IDS_CMDLINE_RIGHT_DESC "/dr eller -dr l\xE4gger till en visad beskrivning av h\xF6ger sida ist\xE4llet f\xF6r katalog/filnamn" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 v\xE4nster sida" IDS_CMDLINE_RIGHTPATH "rightpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 h\xF6ger sida" IDS_CMDLINE_OUTPUTPATH "outputpath \xE4r en optionell outputkatalog d\xE4r du vill att \xE4ndrade filer ska sparas" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/Merge.rc 2006-09-10 16:30:20 UTC (rev 3541) @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/wl] [/wr]" + IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name" IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc" @@ -1948,16 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare" - IDS_CMDLINE_FORGETLEFT "/ul or -ul tells winmerge to not add left path to MRU" - IDS_CMDLINE_FORGETRIGHT "/ur or -ur tells winmerge to not add right path to MRU" - IDS_CMDLINE_FORGETBOTH "/ub or -ub tells winmerge to not add both paths to MRU" - IDS_CMDLINE_LEFT_RO "/wl or -wl initially opens left side as read-only" - IDS_CMDLINE_RIGHT_RO "/wr or -wr initially opens right side as read-only" - IDS_CMDLINE_LEFT_DESC "/dl or -dl adds a description for left side shown instead of directory/filename" - IDS_CMDLINE_RIGHT_DESC "/dr or -dr adds a description for right side shown instead of directory/filename" + IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" + IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" IDS_CMDLINE_LEFTPATH "leftpath is the directory or filename to open on the left side" IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side" IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved" + IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." END // VARIOUS OPTIONS Modified: trunk/Src/MergeArgs.cpp =================================================================== --- trunk/Src/MergeArgs.cpp 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/MergeArgs.cpp 2006-09-10 16:30:20 UTC (rev 3541) @@ -398,15 +398,11 @@ } /** @brief Put together string of all cmdline arguments */ -CString -CMergeApp::GetUsageDescription() +CString CMergeApp::GetUsageDescription() { - CString str; str += LoadResString(IDS_CMDLINE_SYNTAX); str += _T(" [/f ") + LoadResString(IDS_CMDLINE_SYNTAX_ARG_FILTER) + _T("]"); - str += _T(" [/dl ") + LoadResString(IDS_CMDLINE_SYNTAX_LEFTDESC) + _T("]"); - str += _T(" [/dr ") + LoadResString(IDS_CMDLINE_SYNTAX_RIGHTDESC) + _T("]"); str += _T(" "); str += LoadResString(IDS_CMDLINE_SYNTAX_ARGS); str += _T("\n\n") + LoadResString(IDS_CMDLINE_WHERE) + _T(" \n"); @@ -414,15 +410,11 @@ str += CmdlineOption(IDS_CMDLINE_RECURSIVE); str += CmdlineOption(IDS_CMDLINE_ESCKEY); str += CmdlineOption(IDS_CMDLINE_FILEMASK); - str += CmdlineOption(IDS_CMDLINE_FORGETLEFT); - str += CmdlineOption(IDS_CMDLINE_FORGETRIGHT); - str += CmdlineOption(IDS_CMDLINE_FORGETBOTH); - str += CmdlineOption(IDS_CMDLINE_LEFT_RO); - str += CmdlineOption(IDS_CMDLINE_RIGHT_RO); - str += CmdlineOption(IDS_CMDLINE_LEFT_DESC); - str += CmdlineOption(IDS_CMDLINE_RIGHT_DESC); + str += CmdlineOption(IDS_CMDLINE_FASTCLOSE); + str += CmdlineOption(IDS_CMDLINE_SINGLE_INST); str += CmdlineOption(IDS_CMDLINE_LEFTPATH); str += CmdlineOption(IDS_CMDLINE_RIGHTPATH); str += CmdlineOption(IDS_CMDLINE_OUTPUTPATH); + str += _T("\n\n") + LoadResString(IDS_CMDLINE_SEEMANUAL); return str; } Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2006-09-10 14:00:10 UTC (rev 3540) +++ trunk/Src/resource.h 2006-09-10 16:30:20 UTC (rev 3541) @@ -474,16 +474,13 @@ #define IDS_CMDLINE_RECURSIVE 16531 #define IDS_CMDLINE_ESCKEY 16532 #define IDS_CMDLINE_FILEMASK 16533 -#define IDS_CMDLINE_FORGETLEFT 16534 -#define IDS_CMDLINE_FORGETRIGHT 16535 +#define IDS_CMDLINE_FASTCLOSE 16534 +#define IDS_CMDLINE_SINGLE_INST 16535 #define IDS_CMDLINE_FORGETBOTH 16536 -#define IDS_CMDLINE_LEFT_RO 16537 -#define IDS_CMDLINE_RIGHT_RO 16538 -#define IDS_CMDLINE_LEFT_DESC 16539 -#define IDS_CMDLINE_RIGHT_DESC 16540 #define IDS_CMDLINE_LEFTPATH 16541 #define IDS_CMDLINE_RIGHTPATH 16542 #define IDS_CMDLINE_OUTPUTPATH 16543 +#define IDS_CMDLINE_SEEMANUAL 16544 #define IDS_DIRECTORY_WINDOW_TITLE 16800 #define IDS_FILE_COMPARISON_TITLE 16801 #define IDS_EMPTY_LEFT_FILE 16802 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-10 16:34:42
|
Revision: 3542 http://svn.sourceforge.net/winmerge/?rev=3542&view=rev Author: kimmov Date: 2006-09-10 09:34:36 -0700 (Sun, 10 Sep 2006) Log Message: ----------- PATCH: [ 1552228 ] Don't use 'export' as variable name Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/dllpstub.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-10 16:30:20 UTC (rev 3541) +++ trunk/Src/Changes.txt 2006-09-10 16:34:36 UTC (rev 3542) @@ -8,6 +8,8 @@ PATCH: [ 1553714 ] Add new commandine switches to help dialog Src: Merge.rc MergeArgs.cpp resource.h Src/Languages/*: Merge*.rc + PATCH: [ 1552228 ] Don't use 'export' as variable name + Src: dllpstub.cpp 2006-09-08 Gal RFE: [ 1533506 ] Need commandline switch for single-instance Modified: trunk/Src/dllpstub.cpp =================================================================== --- trunk/Src/dllpstub.cpp 2006-09-10 16:30:20 UTC (rev 3541) +++ trunk/Src/dllpstub.cpp 2006-09-10 16:34:36 UTC (rev 3542) @@ -20,6 +20,8 @@ DATE: BY: DESCRIPTION: ========== ================== ================================================ 2005/02/26 Jochen Tucht Created +2006/09/10 Kimmo Varis Don't use 'export' as variable name + Visual Studio 2005 warns about it. */ #include "stdafx.h" @@ -107,19 +109,19 @@ Throw(0, handle, CO_S_NOTALLINTERFACES, TRUE); } } - LPCSTR *export = proxy; + LPCSTR *pszExport = proxy; *proxy = NULL; - while ((name = *++export) != NULL) + while ((name = *++pszExport) != NULL) { - *export = (LPCSTR)GetProcAddress(handle, name); - if (*export == NULL) + *pszExport = (LPCSTR)GetProcAddress(handle, name); + if (*pszExport == NULL) { *proxy = proxy[1] = name; - export = proxy + 2; + pszExport = proxy + 2; break; } } - *export = (LPCSTR)handle; + *pszExport = (LPCSTR)handle; } } if ((name = *proxy) != NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-11 14:04:25
|
Revision: 3544 http://svn.sourceforge.net/winmerge/?rev=3544&view=rev Author: sdottaka Date: 2006-09-11 07:04:16 -0700 (Mon, 11 Sep 2006) Log Message: ----------- BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/MergeDoc.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-10 20:07:36 UTC (rev 3543) +++ trunk/Src/Changes.txt 2006-09-11 14:04:16 UTC (rev 3544) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-11 Takashi + BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect + Src: MergeDoc.cpp + 2006-09-10 Kimmo Czech translation update from Jan Hryz Src/Languages/Czech/MergeCzech.rc Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2006-09-10 20:07:36 UTC (rev 3543) +++ trunk/Src/MergeDoc.cpp 2006-09-11 14:04:16 UTC (rev 3544) @@ -892,7 +892,6 @@ } // if the current diff contains missing lines, remove them from both sides - int deleted_lines=0; int limit = cd_dend; // curView is the view which is changed, so the opposite of the source view @@ -903,15 +902,14 @@ { // text was missing, so delete rest of lines on both sides // delete only on destination side since rescan will clear the other side - if(cd_blank==0) + if (cd_dend + 1 < dbuf.GetLineCount()) { dbuf.DeleteText(dstView, cd_blank, 0, cd_dend+1, 0, CE_ACTION_MERGE); } else { - dbuf.DeleteText(dstView, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE); + dbuf.DeleteText(dstView, cd_blank, 0, cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE); } - deleted_lines=cd_dend-cd_blank+1; limit=cd_blank-1; dbuf.FlushUndoGroup(dstView); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-11 14:10:12
|
Revision: 3545 http://svn.sourceforge.net/winmerge/?rev=3545&view=rev Author: sdottaka Date: 2006-09-11 07:09:56 -0700 (Mon, 11 Sep 2006) Log Message: ----------- PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/GhostTextView.cpp trunk/Src/GhostTextView.h trunk/Src/MergeDiffDetailView.cpp trunk/Src/MergeDiffDetailView.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-11 14:04:16 UTC (rev 3544) +++ trunk/Src/Changes.txt 2006-09-11 14:09:56 UTC (rev 3545) @@ -3,6 +3,10 @@ (This summarizes all changes to all files under Src, including Src\Languages.) 2006-09-11 Takashi + PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down + Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h + +2006-09-11 Takashi BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect Src: MergeDoc.cpp Modified: trunk/Src/GhostTextView.cpp =================================================================== --- trunk/Src/GhostTextView.cpp 2006-09-11 14:04:16 UTC (rev 3544) +++ trunk/Src/GhostTextView.cpp 2006-09-11 14:09:56 UTC (rev 3545) @@ -147,10 +147,11 @@ m_pGhostTextBuffer->RestoreLastChangePos(ptLastChange); // restore the scrolling position - CPoint temp; - popPosition(m_nTopLinePushed, temp); - ASSERT_VALIDTEXTPOS(temp); - ScrollToLine(temp.y); + m_nTopSubLine = m_nTopSubLinePushed; + if (m_nTopSubLine >= GetSubLineCount()) + m_nTopSubLine = GetSubLineCount() - 1; + int nDummy; + GetLineBySubLine( m_nTopSubLine, m_nTopLine, nDummy ); } void CGhostTextView::PushCursors () @@ -177,7 +178,7 @@ pushPosition(m_ptLastChangePushed, m_pGhostTextBuffer->GetLastChangePos()); // and top line positions - pushPosition(m_nTopLinePushed, CPoint(0, m_nTopLine)); + m_nTopSubLinePushed = m_nTopSubLine; } Modified: trunk/Src/GhostTextView.h =================================================================== --- trunk/Src/GhostTextView.h 2006-09-11 14:04:16 UTC (rev 3544) +++ trunk/Src/GhostTextView.h 2006-09-11 14:09:56 UTC (rev 3545) @@ -86,7 +86,7 @@ /// memorize selected text during OnEditReplace : if (m_bSelectionPushed == TRUE) SCursorPushed m_ptSavedSelStartPushed, m_ptSavedSelEndPushed; /// memorize top line positions - SCursorPushed m_nTopLinePushed; + int m_nTopSubLinePushed; /** last change position, in the buffer ; used in insertText * initialized with (-1,-1), so don't assert for this invalid value */ Modified: trunk/Src/MergeDiffDetailView.cpp =================================================================== --- trunk/Src/MergeDiffDetailView.cpp 2006-09-11 14:04:16 UTC (rev 3544) +++ trunk/Src/MergeDiffDetailView.cpp 2006-09-11 14:09:56 UTC (rev 3545) @@ -616,7 +616,7 @@ m_lineBeginPushed = m_lineBegin; m_ptCursorPosPushed = m_ptCursorPos; // and top line positions - m_nTopLinePushed = m_nTopLine; + m_nTopSubLinePushed = m_nTopSubLine; } void CMergeDiffDetailView::PopCursors() @@ -643,9 +643,11 @@ } // restore the scrolling position - if (m_nTopLinePushed >= GetLineCount()) - m_nTopLinePushed = GetLineCount()-1; - ScrollToLine(m_nTopLinePushed); + m_nTopSubLine = m_nTopSubLinePushed; + if (m_nTopSubLine >= GetSubLineCount()) + m_nTopSubLine = GetSubLineCount() - 1; + int nDummy; + GetLineBySubLine( m_nTopSubLine, m_nTopLine, nDummy ); // other positions are set to (0,0) during ResetView } Modified: trunk/Src/MergeDiffDetailView.h =================================================================== --- trunk/Src/MergeDiffDetailView.h 2006-09-11 14:04:16 UTC (rev 3544) +++ trunk/Src/MergeDiffDetailView.h 2006-09-11 14:09:56 UTC (rev 3545) @@ -54,7 +54,7 @@ /// memorize cursor position CPoint m_ptCursorPosPushed; /// memorize top line positions - int m_nTopLinePushed; + int m_nTopSubLinePushed; private: HWND m_hwndFrame; //*< Frame window handle */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-12 18:41:06
|
Revision: 3556 http://svn.sourceforge.net/winmerge/?rev=3556&view=rev Author: kimmov Date: 2006-09-12 11:40:52 -0700 (Tue, 12 Sep 2006) Log Message: ----------- PATCH: [ 1556851 ] An Swedish translation update - submitted by Hans Eriksson Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Languages/Swedish/MergeSwedish.rc Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-11 21:23:26 UTC (rev 3555) +++ trunk/Src/Changes.txt 2006-09-12 18:40:52 UTC (rev 3556) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-12 Kimmo + PATCH: [ 1556851 ] An Swedish translation update + Submitted by Hans Eriksson + Src/Languages/Swedish: MergeSwedish.rc + 2006-09-11 WinMerge beta release 2.5.6 (revision 3552) 2006-09-11 Takashi Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-11 21:23:26 UTC (rev 3555) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-12 18:40:52 UTC (rev 3556) @@ -1948,12 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f eller -f anger filmask eller filternamn f\xF6r j\xE4mf\xF6relse" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x eller -x avslutar WinMerge om resultatet \xE4r identiskt" + IDS_CMDLINE_SINGLE_INST "/s eller -s \xF6ppnar s\xF6kv\xE4gar till existerande WinMerge version" IDS_CMDLINE_LEFTPATH "leftpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 v\xE4nster sida" IDS_CMDLINE_RIGHTPATH "rightpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 h\xF6ger sida" - IDS_CMDLINE_OUTPUTPATH "outputpath \xE4r en optionell outputkatalog d\xE4r du vill att \xE4ndrade filer ska sparas" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_OUTPUTPATH "outputpath \xE4r en optionell utdatakatalog d\xE4r du vill att \xE4ndrade filer ska sparas" + IDS_CMDLINE_SEEMANUAL "Se manualen f\xF6r komplett kommandoradsreferens." END // VARIOUS OPTIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-12 21:31:16
|
Revision: 3558 http://svn.sourceforge.net/winmerge/?rev=3558&view=rev Author: sdottaka Date: 2006-09-12 14:30:47 -0700 (Tue, 12 Sep 2006) Log Message: ----------- PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/GhostTextView.cpp trunk/Src/MergeDiffDetailView.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-12 21:02:54 UTC (rev 3557) +++ trunk/Src/Changes.txt 2006-09-12 21:30:47 UTC (rev 3558) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-12 Takashi + PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down + Src: GhostTextView.cpp MergeDiffDetailView.cpp + 2006-09-12 Kimmo PATCH: [ 1556851 ] An Swedish translation update Submitted by Hans Eriksson Modified: trunk/Src/GhostTextView.cpp =================================================================== --- trunk/Src/GhostTextView.cpp 2006-09-12 21:02:54 UTC (rev 3557) +++ trunk/Src/GhostTextView.cpp 2006-09-12 21:30:47 UTC (rev 3558) @@ -152,6 +152,7 @@ m_nTopSubLine = GetSubLineCount() - 1; int nDummy; GetLineBySubLine( m_nTopSubLine, m_nTopLine, nDummy ); + RecalcVertScrollBar(TRUE); } void CGhostTextView::PushCursors () Modified: trunk/Src/MergeDiffDetailView.cpp =================================================================== --- trunk/Src/MergeDiffDetailView.cpp 2006-09-12 21:02:54 UTC (rev 3557) +++ trunk/Src/MergeDiffDetailView.cpp 2006-09-12 21:30:47 UTC (rev 3558) @@ -648,6 +648,7 @@ m_nTopSubLine = GetSubLineCount() - 1; int nDummy; GetLineBySubLine( m_nTopSubLine, m_nTopLine, nDummy ); + RecalcVertScrollBar(TRUE); // other positions are set to (0,0) during ResetView } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-13 17:52:36
|
Revision: 3560 http://svn.sourceforge.net/winmerge/?rev=3560&view=rev Author: kimmov Date: 2006-09-13 10:52:30 -0700 (Wed, 13 Sep 2006) Log Message: ----------- BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 - fix from Perry Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/SuperComboBox.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-13 17:03:39 UTC (rev 3559) +++ trunk/Src/Changes.txt 2006-09-13 17:52:30 UTC (rev 3560) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-13 Kimmo + BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 + Fix from Perry + Src: Common/SuperComboBox.cpp + 2006-09-12 Takashi PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down Src: GhostTextView.cpp MergeDiffDetailView.cpp Modified: trunk/Src/Common/SuperComboBox.cpp =================================================================== --- trunk/Src/Common/SuperComboBox.cpp 2006-09-13 17:03:39 UTC (rev 3559) +++ trunk/Src/Common/SuperComboBox.cpp 2006-09-13 17:52:30 UTC (rev 3560) @@ -420,8 +420,7 @@ hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf); if (SUCCEEDED(hres)) { - // Make sure it's ANSI - WORD wsz[MAX_PATH]; + WCHAR wsz[MAX_PATH]; #ifdef _UNICODE wcsncpy((wchar_t *)wsz, lpsz, sizeof(wsz)/sizeof(WCHAR)); #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-13 21:36:52
|
Revision: 3561 http://svn.sourceforge.net/winmerge/?rev=3561&view=rev Author: kimmov Date: 2006-09-13 14:36:42 -0700 (Wed, 13 Sep 2006) Log Message: ----------- PATCH: [ 1558152 ] Italian translation updated - submitted by Andrea Decorte Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Languages/Italian/MergeItalian.rc Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-13 17:52:30 UTC (rev 3560) +++ trunk/Src/Changes.txt 2006-09-13 21:36:42 UTC (rev 3561) @@ -6,6 +6,9 @@ BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 Fix from Perry Src: Common/SuperComboBox.cpp + PATCH: [ 1558152 ] Italian translation updated + Submitted by Andrea Decorte + Src/Languages/Italian: MergeItalian.rc 2006-09-12 Takashi PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-13 17:52:30 UTC (rev 3560) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-13 21:36:42 UTC (rev 3561) @@ -128,12 +128,12 @@ BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "C&opy to Right", ID_L2R - MENUITEM "Cop&y to Left", ID_R2L + MENUITEM "C&opia a destra", ID_L2R + MENUITEM "Cop&ia a sinistra", ID_R2L MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_EDIT_CUT - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste", ID_EDIT_PASTE + MENUITEM "&Taglia", ID_EDIT_CUT + MENUITEM "&Copia", ID_EDIT_COPY + MENUITEM "I&ncolla", ID_EDIT_PASTE END END @@ -145,7 +145,7 @@ MENUITEM "&Apri...\tCtrl+A", ID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Apri pro&getto...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "Sal&va progetto...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "&Esci", ID_APP_EXIT END @@ -179,7 +179,7 @@ END POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -195,11 +195,11 @@ POPUP "&?" BEGIN MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&Indice...", ID_HELP_INDEX + MENUITEM "Ce&rca...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG - MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "&Supporto per gli archivi inattivo...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "Licenza pubblica GNU...", ID_HELP_GNULICENSE MENUITEM "Infor&mazioni su WinMerge...", ID_APP_ABOUT @@ -214,12 +214,12 @@ MENUITEM "&Apri...\tCtrl+A", ID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Apri pro&getto...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "Sal&va progetto...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "Fil&e di sinistra di Sola lettura", ID_FILE_LEFT_READONLY MENUITEM "F&ile di destra di Sola lettura", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File En&coding", ID_FILE_ENCODING + MENUITEM "&Codifica dei file", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Esci", ID_APP_EXIT END @@ -230,27 +230,27 @@ MENUITEM "Op&zioni", ID_OPTIONS MENUITEM SEPARATOR MENUITEM "A&ggiorna\tF5", ID_REFRESH - MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN + MENUITEM "Aggio&rna selezionati\tCtrl+F5", ID_DIR_RESCAN END POPUP "&Visualizza" BEGIN - MENUITEM "Show &Identical Items", ID_OPTIONS_SHOWIDENTICAL - MENUITEM "Show &Different Items", ID_OPTIONS_SHOWDIFFERENT - MENUITEM "Show L&eft Unique Items", ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "Show Ri&ght Unique Items", ID_OPTIONS_SHOWUNIQUERIGHT - MENUITEM "Show S&kipped Items", ID_OPTIONS_SHOWSKIPPED - MENUITEM "S&how Binary Files", ID_OPTIONS_SHOWBINARIES + MENUITEM "Mostra elementi &identici", ID_OPTIONS_SHOWIDENTICAL + MENUITEM "Mostra elementi di&fferenti", ID_OPTIONS_SHOWDIFFERENT + MENUITEM "Mostra elementi unici di &sinistra", ID_OPTIONS_SHOWUNIQUELEFT + MENUITEM "Mostra elementi unici di &destra", ID_OPTIONS_SHOWUNIQUERIGHT + MENUITEM "Mostra elementi sa<ati", ID_OPTIONS_SHOWSKIPPED + MENUITEM "Mostra i file binari", ID_OPTIONS_SHOWBINARIES MENUITEM SEPARATOR MENUITEM "M&ostra elementi nascosti", ID_VIEW_SHOWHIDDENITEMS MENUITEM SEPARATOR MENUITEM "&Carattere...", ID_VIEW_SELECTFONT MENUITEM "&Utilizza carattere predefinito", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "Barra degli &strumenti", ID_VIEW_TOOLBAR - MENUITEM "&Barra di stato", ID_VIEW_STATUS_BAR + MENUITEM "&Barra degli strumenti", ID_VIEW_TOOLBAR + MENUITEM "Ba&rra di stato", ID_VIEW_STATUS_BAR MENUITEM "Statistic&he del confronto", ID_VIEW_DIR_STATISTICS MENUITEM SEPARATOR - MENUITEM "&Lingua...", ID_VIEW_LANGUAGE + MENUITEM "Ling&ua...", ID_VIEW_LANGUAGE END POPUP "&Unisci" BEGIN @@ -286,7 +286,7 @@ END POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -302,11 +302,11 @@ POPUP "&?" BEGIN MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&Indice...", ID_HELP_INDEX + MENUITEM "Ce&rca...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG - MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "&Supporto per gli archivi inattivo...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "Licenza pubblica GNU...", ID_HELP_GNULICENSE MENUITEM "Infor&mazioni su WinMerge...", ID_APP_ABOUT @@ -321,7 +321,7 @@ MENUITEM "&Apri...\tCtrl+A", ID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Apri pro&getto...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "Sal&va progetto...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "&Salva\tCtrl+S", ID_FILE_SAVE POPUP "Sa&lva sinistro" @@ -341,7 +341,7 @@ MENUITEM "Fil&e di sinistra di Sola lettura", ID_FILE_LEFT_READONLY MENUITEM "F&ile di destra di Sola lettura", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "&Converti caratteri di fine linea a" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX @@ -372,17 +372,17 @@ MENUITEM "< Vuoto >", ID_NO_EDIT_SCRIPTS END MENUITEM SEPARATOR - POPUP "Avanzate" + POPUP "Avanzat&e" BEGIN MENUITEM "&Copia con numeri di linea\tCtrl+Shift+C", ID_EDIT_COPY_LINENUMBERS END - POPUP "&Bookmarks" + POPUP "Segnali&bri" BEGIN - MENUITEM "&Toggle Bookmark\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK - MENUITEM "&Next Bookmark\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK - MENUITEM "&Previous bookmark\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK - MENUITEM "&Clear All Bookmarks", ID_EDIT_CLEAR_ALL_BOOKMARKS + MENUITEM "&Imposta segnalibro\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK + MENUITEM "Segnalibro successi&vo\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK + MENUITEM "&Segnalibro precedente\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK + MENUITEM "&Cancella tutti i segnalibri", ID_EDIT_CLEAR_ALL_BOOKMARKS END MENUITEM "Va&i a...\tCtrl+G", ID_EDIT_WMGOTO MENUITEM SEPARATOR @@ -397,7 +397,7 @@ MENUITEM SEPARATOR MENUITEM "&Visualizza spazi bianchi", ID_VIEW_WHITESPACE MENUITEM "Visualizza &differenze nelle linee", ID_VIEW_LINEDIFFS - MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS + MENUITEM "Mostra i &numeri delle righe", ID_VIEW_LINENUMBERS MENUITEM "A capo a&utomatico", ID_VIEW_WORDWRAP MENUITEM SEPARATOR MENUITEM "Sc&ambia pannelli", ID_VIEW_SWAPPANES @@ -421,7 +421,7 @@ MENUITEM "C&opia a destra\tFreccia destra", ID_L2R MENUITEM "Co&pia a sinistra\tFreccia sinistra", ID_R2L MENUITEM SEPARATOR - MENUITEM "Copia a &destra e avanza\tAlt+Ctrl+Destra", ID_L2RNEXT + MENUITEM "Copia a des&tra e avanza\tAlt+Ctrl+Destra", ID_L2RNEXT MENUITEM "Copia &a sinistra e avanza\tAlt+Ctrl+Sinistra", ID_R2LNEXT MENUITEM SEPARATOR MENUITEM "Copia tutto a destra", ID_ALL_RIGHT @@ -448,7 +448,7 @@ END POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -464,11 +464,11 @@ POPUP "&?" BEGIN MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&Indice...", ID_HELP_INDEX + MENUITEM "Ce&rca...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG - MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "&Supporto per gli archivi inattivo...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "Licenza pubblica GNU...", ID_HELP_GNULICENSE MENUITEM "Infor&mazioni su WinMerge...", ID_APP_ABOUT @@ -499,10 +499,10 @@ MENUITEM "&Destra", ID_DIR_DEL_RIGHT MENUITEM "&Entrambi", ID_DIR_DEL_BOTH END - MENUITEM "Re&name", ID_DIR_ITEM_RENAME + MENUITEM "&Rinomina", ID_DIR_ITEM_RENAME MENUITEM "&Nascondi elementi", ID_DIR_HIDE_FILENAMES MENUITEM SEPARATOR - POPUP "Ap&ri file di sinistra" + POPUP "Apri &file di sinistra" BEGIN MENUITEM "con l'applicazione ®istrata", ID_DIR_OPEN_LEFT MENUITEM "con l'&editor esterno", ID_DIR_OPEN_LEFT_WITHEDITOR @@ -521,7 +521,7 @@ MENUITEM "&Destra (%1 su %2)", ID_DIR_COPY_PATHNAMES_RIGHT MENUITEM "&Entrambi (%1 su %2)", ID_DIR_COPY_PATHNAMES_BOTH END - MENUITEM "Copia nomi dei &file", ID_DIR_COPY_FILENAMES + MENUITEM "Copia nomi dei fi&le", ID_DIR_COPY_FILENAMES MENUITEM SEPARATOR POPUP "&Zippa" BEGIN @@ -676,7 +676,7 @@ LTEXT "Stato:",IDC_OPEN_STATUS,15,102,192,8 DEFPUSHBUTTON "OK",IDOK,316,11,50,14 PUSHBUTTON "Annulla",IDCANCEL,316,28,50,14 - PUSHBUTTON "Help",ID_HELP,316,45,50,14 + PUSHBUTTON "Aiuto",ID_HELP,316,45,50,14 GROUPBOX "File o cartelle da confrontare",IDC_FILES_DIRS_GROUP,7, 7,302,111 END @@ -740,7 +740,7 @@ WS_TABSTOP,7,47,206,10 CONTROL "&Permetti l'esecuzione di un'unica istanza del programma",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 - LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 + LTEXT "Completamento automatico nella scelta dei file:",IDC_STATIC,19,72,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Attiva finestra di confronto multiplo per",IDC_STATIC,7,100, @@ -783,7 +783,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "&Espressione regolare",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "&Fermati alla fine del file",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 GROUPBOX "Direzione",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "&Su",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | @@ -953,19 +953,19 @@ CONTROL "Ignora differenze di tempo inferiori a 3 secondi", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 - GROUPBOX "Integration",IDC_STATIC,7,30,218,46 + GROUPBOX "Integrazione",IDC_STATIC,7,30,218,46 CONTROL "&Aggiungi al menu contestuale di Explorer",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 CONTROL "Atti&va menu avanzato",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "Imposta come predefinita l'inclusione di sottocartelle",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 LTEXT "&Editor esterno:",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL PUSHBUTTON "&Sfoglia...",IDC_EXT_EDITOR_BROWSE,179,93,50,14 - LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8 + LTEXT "Cartella dei &filtri:",IDC_STATIC,7,111,166,8 EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14 + PUSHBUTTON "Sfoglia...",IDC_FILTER_USER_BROWSE,179,121,50,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180 @@ -1031,7 +1031,7 @@ IDD_DIRCOLS DIALOGEX 0, 0, 307, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Visualizza colonne" +CAPTION "Scelta delle colonne" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Mostra le colonne",IDC_GROUP_SHOW,7,7,145,102 @@ -1137,8 +1137,8 @@ WS_VSCROLL | WS_TABSTOP CONTROL "&Fermati dopo la prima differenza",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 - GROUPBOX "Comments",IDC_STATIC,7,134,221,32 - CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button", + GROUPBOX "Commenti",IDC_STATIC,7,134,221,32 + CONTROL "Filtra i commenti",IDC_FILTERCOMMENTS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10 PUSHBUTTON "Predefinito",IDC_COMPARE_DEFAULTS,7,179,50,14 END @@ -1189,8 +1189,8 @@ CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 - PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14 - PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14 + PUSHBUTTON "Prova",IDC_FILTERFILE_TEST_BTN,7,114,50,14 + PUSHBUTTON "Installa...",IDC_FILTERFILE_INSTALL,137,114,50,14 PUSHBUTTON "Nuovo...",IDC_FILTERFILE_NEWBTN,192,114,50,14 PUSHBUTTON "Modifica...",IDC_FILTERFILE_EDITBTN,246,114,50,14 PUSHBUTTON "Elimina...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 @@ -1384,7 +1384,7 @@ LTEXT "&Stile:",IDC_STATIC,7,37,35,8 COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button", + CONTROL "&Copia negli appunti",IDC_REPORT_COPYCLIPBOARD,"Button", BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10 DEFPUSHBUTTON "OK",IDOK,157,60,50,14 PUSHBUTTON "Annulla",IDCANCEL,211,60,50,14 @@ -1471,64 +1471,64 @@ IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Codepage" +CAPTION "Codice di pagina" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36 - CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | + GROUPBOX "Coinvolge",IDC_AFFECTS_GROUP,5,7,166,36 + CONTROL "&Sinistra",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,54,8 - LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8 - CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | + LTEXT "(Coinvolge)",IDC_LEFT_FILES_LABEL,70,18,93,8 + CONTROL "&Destra",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,54,8 - LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8 - GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63 - LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10 + LTEXT "(Coinvolge)",IDC_RIGHT_FILES_LABEL,70,29,93,8 + GROUPBOX "Scegli codice di pagina per",IDC_LOADING_GROUP,5,48,166,63 + LTEXT "Caricamento &file:",IDC_LOAD_FILES_LABEL,12,64,72,10 EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10 - LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10 + LTEXT "&Salvataggio file:",IDC_SAVE_FILES_LABEL,12,79,67,10 EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10 - CONTROL "&Use same codepage for both", + CONTROL "&Usa lo stesso codice di pagina per entrambi", IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,96,150,10 - DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14 + DEFPUSHBUTTON "&Applica",IDOK,65,117,50,14 + PUSHBUTTON "Annu&lla",IDCANCEL,121,117,50,14 END IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Test Filter" +CAPTION "Prova del filtro" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Testing filter ...",IDC_HEADER,7,7,82,8 - LTEXT "(filter name)",IDC_HEADER_FILTER_NAME,90,6,152,8 - LTEXT "&Enter text to test:",IDC_PROMPT_LABEL,7,21,80,8 + LTEXT "Filtro in prova ...",IDC_HEADER,7,7,82,8 + LTEXT "(nome del filtro)",IDC_HEADER_FILTER_NAME,90,6,152,8 + LTEXT "&Inserisci testo di prova:",IDC_PROMPT_LABEL,7,21,80,8 EDITTEXT IDC_TEST_TEXT,90,19,152,12,ES_AUTOHSCROLL - CONTROL "&Folder Name",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX | + CONTROL "&Nome cartella",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,92,8 - LTEXT "Result:",IDC_STATIC,7,49,34,8 + LTEXT "Risultato:",IDC_STATIC,7,49,34,8 EDITTEXT IDC_RESULTS,7,59,235,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP - DEFPUSHBUTTON "&Test",IDC_TEST_BTN,133,121,50,14 - PUSHBUTTON "&Close",IDCANCEL,192,121,50,14 + DEFPUSHBUTTON "&Prova",IDC_TEST_BTN,133,121,50,14 + PUSHBUTTON "&Chiudi",IDCANCEL,192,121,50,14 END IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 197, 157 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Dialog" +CAPTION "Finestra" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Use customized text colors", + CONTROL "&Utilizza colori personalizzati per il testo", IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,14,161,10 - GROUPBOX "Custom text colors",IDC_CUSTOM_COLORS_GROUP,27,33,159, + GROUPBOX "Colori personalizzati per il testo",IDC_CUSTOM_COLORS_GROUP,27,33,159, 111 - LTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10 - LTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,31,87,61,8 - LTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,31,116,61,8 - CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8 - CTEXT "Text",IDC_TEXT_COLUMN_LABEL,145,44,29,8 + LTEXT "Spazi bianchi:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10 + LTEXT "Testo normale:",IDC_TEXT_COLOR_LABEL,31,87,61,8 + LTEXT "Selezione:",IDC_SELECTION_COLOR_LABEL,31,116,61,8 + CTEXT "Sfondo",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8 + CTEXT "Testo",IDC_TEXT_COLUMN_LABEL,145,44,29,8 CONTROL "Btn",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,58,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -1549,24 +1549,24 @@ IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Paths" +CAPTION "Percorsi" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - RTEXT "&Left:",IDC_STATIC,7,11,40,8 + RTEXT "&Sinistra:",IDC_STATIC,7,11,40,8 EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14 - CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 - RTEXT "&Right:",IDC_STATIC,7,42,40,8 + PUSHBUTTON "Sfoglia...",IDC_PROJ_LFILE_BROWSE,265,8,50,14 + CONTROL "Sola &lettura",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 + RTEXT "&Destra:",IDC_STATIC,7,42,40,8 EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14 - CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 - RTEXT "&Filter:",IDC_STATIC,7,74,40,8 + PUSHBUTTON "Sfoglia...",IDC_PROJ_RFILE_BROWSE,265,40,50,14 + CONTROL "Sola lett&ura",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 + RTEXT "&Filtro:",IDC_STATIC,7,74,40,8 EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14 - CONTROL "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button", + PUSHBUTTON "Seleziona...",IDC_PROJ_FILTER_SELECT,265,72,50,14 + CONTROL "&Includi sottocartelle",IDC_PROJ_INC_SUBFOLDERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10 - PUSHBUTTON "Open...",IDC_PROJ_OPEN,211,103,50,14 - PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14 + PUSHBUTTON "Apri...",IDC_PROJ_OPEN,211,103,50,14 + PUSHBUTTON "Salva...",IDC_PROJ_SAVE,265,103,50,14 END #ifndef _MAC @@ -1746,12 +1746,12 @@ STRINGTABLE BEGIN ID_FILE_OPENPROJECT "Apre un file di progetto\nFile di progetto (Ctrl+J)" - IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file" - IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file" - IDS_PROJFILEDLG_CAPTION "Project File" - IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded." - IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved." - ID_FILE_SAVEPROJECT "Save current paths and options to project file\nSave Project File" + IDS_UNK_ERROR_READING_PROJECT "Errore sconosciuto provando a aprire il file di progetto" + IDS_UNK_ERROR_SAVING_PROJECT "Errore sconosciuto provando a salvare il file di progetto" + IDS_PROJFILEDLG_CAPTION "File di progetto" + IDS_PROJFILE_LOAD_SUCCESS "File di progetto caricato con successo." + IDS_PROJFILE_SAVE_SUCCESS "File di progetto salvato con successo." + ID_FILE_SAVEPROJECT "Salva i percorsi correnti e le opzioni in un file di progetto\nSalva il file di progetto" END STRINGTABLE @@ -1877,8 +1877,8 @@ // SPLASH SCREEN TEXTS STRINGTABLE BEGIN - IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" - IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details." + IDS_SPLASH_DEVELOPERS "Sviluppatori:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" + IDS_SPLASH_GPLTEXT "WinMerge non offre ASSOLUTAMENTE NESSUNA GARANZIA. Questo \xE8 software libero e sei il benvenuto se desideri ridistribuirlo sotto certe condizioni; guarda la Licenza pubblica GNU nel men\xF9 ? per ulteriori dettagli." END // "DO NOT SHOW AGAIN" MESSAGEBOXES @@ -1915,7 +1915,7 @@ IDS_OPTIONSPG_EDITOR "Editor" IDS_OPTIONSPG_COLORS "Colori" IDS_OPTIONSPG_SYNTAXCOLORS "Colorazione sintassi" - IDS_OPTIONSPG_TEXTCOLORS "Text Colors" + IDS_OPTIONSPG_TEXTCOLORS "Colori del testo" IDS_OPTIONSPG_SYSTEM "Sistema" IDS_OPTIONSPG_VERSIONCONTROL "Controllo versioni" IDS_OPTIONSPG_CODEPAGE "Codice di pagina" @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" + IDS_CMDLINE_SYNTAX "Sintassi : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "percsx percdx [percoutput]" IDS_CMDLINE_SYNTAX_ARG_FILTER "maschera/nome" IDS_CMDLINE_SYNTAX_LEFTDESC "descsx" @@ -1948,12 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f o -f imposta la maschera di file o il nome del filtro per il confronto" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x o -x chiude WinMerge se gli elementi confrontati sono identici" + IDS_CMDLINE_SINGLE_INST "/s o -s apre i percorsi nell'istanza corrente di WinMerge" IDS_CMDLINE_LEFTPATH "percsx \xE8 la cartella o il nome del file da aprire sul lato sinistro" IDS_CMDLINE_RIGHTPATH "percdx \xE8 la cartella o il nome del file da aprire sul lato destro" IDS_CMDLINE_OUTPUTPATH "percoutput \xE8 una cartella di output opzionale in cui desideri siano salvati i file riuniti" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_SEEMANUAL "Guarda il manuale per una guida completa sulla linea di comando." END // VARIOUS OPTIONS @@ -1964,7 +1964,7 @@ IDS_DIFF_OPEN_NO_SET_PROPS "Sono state effettuate modifiche ai file dell'attuale sessione di confronto. Alcune impostazioni potrebbero non venire applicate fino al riavvio del confronto corrente tra file." IDS_FONT_CHANGE "Il carattere selezionato non sar\xE0 utilizzato nelle finestre di visualizzazione delle differenze attualmente attive." IDS_OPTIONS_INVALID_TABSIZE - "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." + "Il valore delle tabulazione inserito non \xE8 una dimensione valida per WinMerge.\n\nUtilizza per favore un valore compreso tra 1 e %1." END // BROWSE FILE @@ -1981,9 +1981,9 @@ // REPORT FILES STRINGTABLE BEGIN - IDS_TEXT_REPORT_FILES "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" - IDS_HTML_REPORT_FILES "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" - IDS_XML_REPORT_FILES "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" + IDS_TEXT_REPORT_FILES "File di testo (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tutti i file (*.*)|*.*||" + IDS_HTML_REPORT_FILES "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||" + IDS_XML_REPORT_FILES "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" END // COMPARE OPTIONS @@ -1992,8 +1992,8 @@ IDS_COMPMETHOD_FULL_CONTENTS "Contenuti completi" IDS_COMPMETHOD_QUICK_CONTENTS "Contenuti rapidi" IDS_COMPMETHOD_MODDATE "Data ultima modifica" - IDS_COMPMETHOD_DATESIZE "Modified Date and Size" - IDS_COMPMETHOD_SIZE "Size" + IDS_COMPMETHOD_DATESIZE "Data ultima modifica e dimens." + IDS_COMPMETHOD_SIZE "Dimensioni" END // FILTER OPTIONS @@ -2007,18 +2007,18 @@ IDS_FILEFILTER_SAVENEW "Inserisci il nome del file per il nuovo filtro" IDS_FILEFILTER_FILEMASK "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||" IDS_FILEFILTER_TMPL_MISSING - "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder." + "Impossibile trofvare il file di modello per i filtri di file!\n\nCopia per favore il file %1 nella sottocartella Filters di WinMerge." IDS_FILEFILTER_TMPL_COPY - "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." + "Impossibile copiare il file di modello per i filtri di file nella cartella apposita Filters:\n%1\n\nAssicurati che questa cartella esista e si abbiano i permessi di scrittura." IDS_FILEFILTER_NO_USERFOLDER - "User's filter file folder is not defined!\n\nPlease select filter folder in options/System." + "La cartella dei file di filtro dell'utente non \xE8 definita!\n\nScegli per favore una cartella per i filtri in Opzioni->Sistema." IDS_FILEFILTER_DELETE_FAIL - "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" - IDS_FILEFILTER_INSTALL "Locate filter file to install" + "Eliminazione del file di filtro fallita:\n%1\n\nIl file potrebbe essere di sola lettura." + IDS_FILEFILTER_INSTALL "Scegli il file con il filtro da installare" IDS_FILEFILTER_INSTALLFAIL - "Installing filter file failed.\n\nCould not copy new filter file to filter folder." + "Installazione del file del filtro fallita.\n\nImpossibile copiare il nuovo file nella cartella dei filtri." IDS_FILEFILTER_OVERWRITE - "Filter file already exists. Overwrite existing filter?" + "Il file del filtro esiste gi\xE0. Desideri sovrascrivere il file esistente?" END // VERSION CONTROL OPTIONS @@ -2040,7 +2040,7 @@ // STATUS BAR : CURRENT OPERATION STATUS STRINGTABLE BEGIN - IDS_STATUS_RESCANNING "Scansione file..." + IDS_STATUS_RESCANNING "Scansione file in corso..." IDS_STATUS_OPENING_SELECTION "Apertura selezione" IDS_STATUS_COPYL2R "Copia da sinistra a destra in corso" IDS_STATUS_COPYR2L "Copia da destra a sinistra in corso" @@ -2093,7 +2093,7 @@ IDS_BINFILES_IDENTICAL "%1\n%2\n\nsono file binari identici." IDS_BINFILES_DIFFERENT "%1\n%2\n\nsono file binari diversi." IDS_OTHER_IS_BINARY "%1\n\n\xE8 un file binario. Impossibile confrontare un file binario e uno di testo." - IDS_ERROR_FILEOPEN "Impossibile aprire file\n%1\n\n%2" + IDS_ERROR_FILEOPEN "Impossibile aprire il file\n%1\n\n%2" END // SAVING FILE @@ -2101,7 +2101,7 @@ BEGIN IDS_SAVE_AS_TITLE "Salva con nome" IDS_SAVE_FMT "Vuoi salvare le modifiche in %1?" - IDS_SAVEREADONLY_FMT "%1 \xE8 marcato come di sola lettura. Desideri non tenere conto di questa impostazione ? (No per salvare con un nuovo nome.)" + IDS_SAVEREADONLY_FMT "%1 \xE8 marcato come di sola lettura. Desideri non tenere conto di questa impostazione? (Premi No per salvare con un nuovo nome.)" IDS_ERROR_FILE_WRITEABLE "Errore nel controllo sui permessi di scrittura della destinazione" IDS_ERROR_BACKUP "Errore durante il salvataggio di una copia di backup del file" IDS_BACKUP_FAILED_PROMPT @@ -2126,7 +2126,7 @@ STRINGTABLE BEGIN IDS_NOPROJECT "\xC8 necessario specificare il percorso di un progetto SourceSafe per continuare (Es.: $/MioProgetto)" - IDS_VSS_CHECKOUT_STATUS "Estrazione dei file da VSS..." + IDS_VSS_CHECKOUT_STATUS "Estrazione dei file da VSS in corso..." IDS_VSSERROR "SourceSafe ha generato un errore tentando di estrarre il file. Impossibile continuare..." IDS_VSS_RUN_ERROR "Errore nell'esecuzione di un comando del sistema di versioning." IDS_VSSFOLDER_AND_FILE_NOMATCH "La cartella di lavoro di VSS e la posizione del file corrente non coincidono. Continuare?" @@ -2157,8 +2157,8 @@ ID_DIR_DEL_LEFT "Elimina la voce selezionata sulla sinistra" ID_DIR_DEL_RIGHT "Elimina la voce selezionata sulla destra" ID_DIR_DEL_BOTH "Elimina gli elementi selezionati in entrambi i lati" - ID_DIR_HIDE_FILENAMES "Nascondi elementi selezionati (filtro al volo)" - ID_DIR_ITEM_RENAME "Rename selected item on both sides" + ID_DIR_HIDE_FILENAMES "Nascondi gli elementi selezionati (filtro al volo)" + ID_DIR_ITEM_RENAME "Rinomina gli elementi selezionati su entrambi i lati" IDS_COPY_TO_LEFT "Da Destra a Sinistra (%1)" IDS_COPY_TO_RIGHT "Da Sinistra a Destra (%1)" IDS_COPY_TO_LEFT2 "Da Destra a Sinistra (%1 su %2)" @@ -2185,8 +2185,8 @@ IDS_MOVE_RIGHT_TO2 "Destra in... (%1 su %2)" IDS_SELECT_DEST_LEFT "Lato sinistro - scegli cartella di destinazione:" IDS_SELECT_DEST_RIGHT "Lato destro - scegli cartella di destinazione:" - IDS_FILES_AFFECTED_FMT "(%1 Files Affected)" - IDS_FILES_AFFECTED_FMT2 "(%1 of %2 Files Affected)" + IDS_FILES_AFFECTED_FMT "(%1 file coinvolti)" + IDS_FILES_AFFECTED_FMT2 "(%1 file su %2 coinvolti)" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION @@ -2210,8 +2210,8 @@ ID_DIR_OPEN_RIGHT "Apre il file di destra" ID_DIR_OPEN_RIGHT_WITHEDITOR "Apre il file di destra con l'editor esterno" ID_DIR_OPEN_RIGHT_WITH "Apre il file di destra con..." - IDS_ERROR_EXECUTE_FILE "Failed to execute external editor: %1" - IDS_UNKNOWN_EXECUTE_FILE "Unknown extension on external editor: %1" + IDS_ERROR_EXECUTE_FILE "Impossibile lanciare l'editor esterno: %1" + IDS_UNKNOWN_EXECUTE_FILE "Estensione sconosciuta per l'editor esterno: %1" ID_DIR_COPY_FILENAMES "Copia i nomi dei file negli appunti" ID_DIR_COPY_PATHNAMES_LEFT "Copia i percorsi del lato sinistro negli appunti" ID_DIR_COPY_PATHNAMES_RIGHT "Copia i percorsi del lato destro negli appunti" @@ -2258,8 +2258,8 @@ IDS_COLHDR_RESULT_ABBR "Risultato breve" IDS_COLHDR_LATTRIBUTES "Attributi sinistra" IDS_COLHDR_RATTRIBUTES "Attributi destra" - IDS_COLHDR_LEOL_TYPE "Left EOL" - IDS_COLHDR_REOL_TYPE "Right EOL" + IDS_COLHDR_LEOL_TYPE "EOL di sinistra" + IDS_COLHDR_REOL_TYPE "EOL di destra" END // DIRECTORY DIFFING : COLUMN TITLES #3 @@ -2267,8 +2267,8 @@ BEGIN IDS_COLHDR_LENCODING "Codifica di sinistra" IDS_COLHDR_RENCODING "Codifica di destra" - IDS_COLHDR_NIDIFFS "Ignored Diff." - IDS_COLHDR_NSDIFFS "Differences" + IDS_COLHDR_NIDIFFS "Diff. ignorate" + IDS_COLHDR_NSDIFFS "Differenze" IDS_COLHDR_BINARY "Binario" END @@ -2323,8 +2323,8 @@ IDS_COLDESC_RESULT_ABBR "Risultato del confronto nella forma breve." IDS_COLDESC_LATTRIBUTES "Attributi del file di sinistra." IDS_COLDESC_RATTRIBUTES "Attributi del file di destra." - IDS_COLDESC_LEOL_TYPE "Left side file EOL type" - IDS_COLDESC_REOL_TYPE "Right side file EOL type" + IDS_COLDESC_LEOL_TYPE "Tipo di fine linea nel file di sinistra" + IDS_COLDESC_REOL_TYPE "Tipo di fine linea nel file di destra" END // DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2) @@ -2332,8 +2332,8 @@ BEGIN IDS_COLDESC_LENCODING "Codifica del file di sinistra." IDS_COLDESC_RENCODING "Codifica del file di destra." - IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." - IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences." + IDS_COLDESC_NIDIFFS "Numero di differenze ignorate nel file. Queste differenze sono ignorate da WinMerge e non possono venire unite." + IDS_COLDESC_NSDIFFS "Numero di differenze nel file. Questo numero non include le differenze ignorate." IDS_COLDESC_BINARY "Mostra un asterisco (*) se il file \xE8 binario." END @@ -2344,7 +2344,7 @@ IDS_REPORT_COMMALIST "Lista separata da virgole" IDS_REPORT_TABLIST "Lista separata da Tab" IDS_REPORT_SIMPLEHTML "HTML semplice" - IDS_REPORT_SIMPLEXML "Simple XML" + IDS_REPORT_SIMPLEXML "XML semplice" IDS_REPORT_FILEOVERWRITE "Il file di rapporto esiste gi\xE0. Vuoi sovrascrivere il file esistente?" IDS_REPORT_ERROR "Errore nella creazione del rapporto:\n%1" @@ -2367,20 +2367,20 @@ come equivalenti, imposta l'opzione 'Ignora le differenze di \ carriage return' nella linguetta Confronto delle Opzioni \ (raggiungibile dal menu Modifica->Opzioni)." - IDS_SUGGEST_PRESERVEEOL "Gli EOL sono di tipi diversi (DOS/UNIX/MAC) nel file '%1'.\nCon le opzioni correnti, essi verranno unificati nel tipo principale.\nDesideri cambiare le opzioni e conservare gli EOL diversi ?" + IDS_SUGGEST_PRESERVEEOL "Gli EOL sono di tipi diversi (DOS/UNIX/MAC) nel file '%1'.\nCon le opzioni correnti, essi verranno unificati nel tipo principale.\nDesideri cambiare le opzioni e conservare gli EOL diversi?" IDS_PREDIFFER_ERROR "C'\xE8 stato un errore nel prediffing del file '%1' con il plugin '%2'. Il prediffing non verr\xE0 pi\xF9 applicato." IDS_INVALID_DIRECTORY "La cartella selezionata non \xE8 valida." - IDS_CANNOT_OPEN_BINARYFILE "Impossibile aprire file binario nell'editor." + IDS_CANNOT_OPEN_BINARYFILE "Impossibile aprire il file binario nell'editor." END // Encoding issues STRINGTABLE BEGIN - IDS_SUGGEST_IGNORECODEPAGE "Il file sinistro (cp%d) e destro (cp%d) non hanno lo stesso codice di pagina.\nLa visualizzazione di ciascun file con il proprio codice di pagina fornir\xE0 una migliore visualizzazione ma l'unione/copia sar\xE0 pericolosa.\nWould you like to treat both files as being in the default windows codepage (recommended)?" + IDS_SUGGEST_IGNORECODEPAGE "Il file sinistro (cp%d) e destro (cp%d) non hanno lo stesso codice di pagina.\nLa visualizzazione di ciascun file con il proprio codice di pagina fornir\xE0 una migliore visualizzazione ma l'unione/copia sar\xE0 pericolosa.\nDesideri trattare entrambi i file come se avessero il codice di pagina predefinito di Windows (raccomandato)?" IDS_DIFFERENT_UNICODINGS "Attenzione: i file usano codifiche differenti, sinistra=%s e destra=%s, e l'unione pu\xF2 causare una perdita di informazioni." - IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files" - IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file" - IDS_LOSSY_TRANSCODING_LEFT "Information lost due to encoding errors: left file" + IDS_LOSSY_TRANSCODING_BOTH "Informazioni perse a causa di errori nella codifica: entrambi i file" + IDS_LOSSY_TRANSCODING_RIGHT "Informazioni perse a causa di errori nella codifica: file di destra" + IDS_LOSSY_TRANSCODING_LEFT "Informazioni perse a causa di errori nella codifica: file di sinistra" END // EDITOR : SHOW LINE DIFF @@ -2438,7 +2438,7 @@ Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati. Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi." IDS_MERGE7Z_ENABLE_0 "\nNota: l'integrazione con 7-Zip \xE8 stata disattivata nelle opzioni di WinMerge." - IDS_MERGE7Z_ENABLE_2 "\nNote: l'integrazione con 7-Zip \xE8 limitata a una installazione standalone nelle opzioni di WinMerge." + IDS_MERGE7Z_ENABLE_2 "\nNote: l'integrazione con 7-Zip \xE8 limitata a una installazione indipendente nelle opzioni di WinMerge." IDS_OPT_EXPORT_CAPTION "Scegli file per l'esportazione" IDS_OPT_IMPORT_CAPTION "Scegli file per l'importazione" IDS_OPT_IMPORT_DONE "Opzioni importate dal file." @@ -2751,8 +2751,8 @@ IDS_EOL_DOS "Win" IDS_EOL_MAC "Mac" IDS_EOL_UNIX "Unix" - IDS_EOL_MIXED "Mixed" - IDS_EOL_BIN "Binary" + IDS_EOL_MIXED "Mescolato" + IDS_EOL_BIN "Binario" END // Folder compare short size suffixes @@ -2780,33 +2780,33 @@ ID_EOL_TO_UNIX "Converti gli EOL (End of line) in formato UNIX" ID_EOL_TO_MAC "Converti gli EOL (End of line) in formato MAC" ID_FILE_MERGINGMODE "Passa dalla modalit\xE0 di editing a quella di 'Unione', in cui l'integrazione delle differenze \xE8 pi\xF9 rapida" - ID_FILE_ENCODING "View and adjust file encoding properties\nFile encoding properties" + ID_FILE_ENCODING "Visualizza e regola le propriet\xE0 della codifica dei file\nPropriet\xE0 della codifica dei file" END // EDIT MENU STRINGTABLE BEGIN - ID_SELECTLINEDIFF "Select difference area in the current line\nDifference in the Current Line" + ID_SELECTLINEDIFF "Seleziona l'area della differenza nella linea corrente\nDifferenza nella linea corrente" ID_EDIT_WMGOTO "Vai a una linea o una differenza\nVai a (Ctrl+G)" ID_OPTIONS "Imposta le opzioni del programma\nOpzioni" ID_REFRESH "Aggiorna la visualizzazione\nAggiorna (F5)" ID_EDIT_COPY_LINENUMBERS "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio" ID_DIR_RESCAN "Aggiorna gli elementi selezionati" - ID_EDIT_TOGGLE_BOOKMARK "Toggle bookmark" - ID_EDIT_GOTO_NEXT_BOOKMARK "Go to next bookmark" - ID_EDIT_GOTO_PREV_BOOKMARK "Go to previous bookmark" - ID_EDIT_CLEAR_ALL_BOOKMARKS "Clear all bookmarks" + ID_EDIT_TOGGLE_BOOKMARK "Imposta un segnalibro" + ID_EDIT_GOTO_NEXT_BOOKMARK "Va al segnalibro successivo" + ID_EDIT_GOTO_PREV_BOOKMARK "Va al segnalibro precedente" + ID_EDIT_CLEAR_ALL_BOOKMARKS "Cancella tutti i segnalibri" END // VIEW MENU (ITEM TYPE) STRINGTABLE BEGIN - ID_OPTIONS_SHOWIDENTICAL "Displays items that are exactly the same\nShow Identical Items" - ID_OPTIONS_SHOWDIFFERENT "Displays items that have differences\nShow Different Items" - ID_OPTIONS_SHOWUNIQUELEFT "Displays items that exist in only on the left side\nShow Left Unique Items" - ID_OPTIONS_SHOWUNIQUERIGHT "Displays items that exist in only on the right side\nShow Right Unique Items" - ID_OPTIONS_SHOWBINARIES "Displays binary files\nShow Binary Files" - ID_OPTIONS_SHOWSKIPPED "Displays skipped items\nShow Skipped Items" + ID_OPTIONS_SHOWIDENTICAL "Mostra gli elementi che sono completamente identici\nMostra elementi identici" + ID_OPTIONS_SHOWDIFFERENT "Mostra gli elementi che hanno delle differenze\nMostra elementi differenti" + ID_OPTIONS_SHOWUNIQUELEFT "Mostra gli elementi che esistono solo sul lato sinistro\nMostra elementi unici a sinistra" + ID_OPTIONS_SHOWUNIQUERIGHT "Mostra gli elementi che esistono solo sul lato destro\nMostra elementi unici a destra" + ID_OPTIONS_SHOWBINARIES "Mostra i file binari\nMostra i file binari" + ID_OPTIONS_SHOWSKIPPED "Mostra gli elementi saltati\nMostra gli elementi saltati" END // VIEW MENU @@ -2821,7 +2821,7 @@ ID_VIEW_LANGUAGE "Seleziona la lingua dell'interfaccia utente\nLingua" ID_VIEW_LINEDIFFS "Mostra le differenze all'interno delle linee con colori diversi\nMostra differenze nelle linee" ID_VIEW_SWAPPANES "Scambia le posizioni dei due pannelli" - ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers" + ID_VIEW_LINENUMBERS "Mostra i numeri delle righe\nMostra numeri delle righe" ID_VIEW_WORDWRAP "Vai a capo automaticamente\nVa a capo automaticamente (word wrap)" END @@ -2830,9 +2830,9 @@ BEGIN ID_PREVDIFF "Visualizza la differenza precedente\nDifferenza precedente (Maiusc+Tab)" ID_NEXTDIFF "Visualizza la differenza successiva\nDifferenza successiva (Tab)" - ID_FIRSTDIFF "Scorri fino alla prima differenza\nPrima differenza (Alt+Home)" - ID_CURDIFF "Scorri fino alla differenza corrente\nDifferenza corrente (Alt+Invio)" - ID_LASTDIFF "Scorri fino all'ultima differenza\nUltima differenza (Alt+Fine)" + ID_FIRSTDIFF "Scorre fino alla prima differenza\nPrima differenza (Alt+Home)" + ID_CURDIFF "Scorre fino alla differenza corrente\nDifferenza corrente (Alt+Invio)" + ID_LASTDIFF "Scorre fino all'ultima differenza\nUltima differenza (Alt+Fine)" ID_L2R "Copia il testo selezionato dal file di sinistra a quello di destra\nCopia a destra (Freccia destra)" ID_R2L "Copia il testo selezionato dal file di destra a quello di sinistra\nCopia a sinistra (Freccia sinistra)" ID_L2RNEXT "Copia la differenza a destra e avanza alla prossima\nCopia a destra e avanza (Ctrl+Alt+Destra)" @@ -2846,7 +2846,7 @@ // TOOLS MENU STRINGTABLE BEGIN - ID_TOOLS_CUSTOMIZECOLUMNS "Seleziona e riordina le colonne nei confronti tra cartelle" + ID_TOOLS_CUSTOMIZECOLUMNS "Seleziona e riordina le colonne da visualizzare nei confronti tra cartelle" ID_TOOLS_GENERATEPATCH "Crea un file di patch" ID_TOOLS_FILTERS "Seleziona e modifica i filtri" ID_TOOLS_GENERATEREPORT "Genera un rapporta con i risultati del confronto" @@ -2856,7 +2856,7 @@ STRINGTABLE BEGIN ID_UNPACK_MANUAL "L'utente seleziona lo scompattore (nessuna scompattazione nel confronto tra cartelle)" - ID_UNPACK_AUTO "Lo scompattatore adatto \xE8 applicato a entrambi i file (basta che un file abbia l'estensione)" + ID_UNPACK_AUTO "Lo scompattatore adatto \xE8 applicato a entrambi i file (\xE8 sufficiente che uno dei file abbia l'estensione)" ID_POPUP_OPEN_WITH_UNPACKER "Seleziona uno scomapattatore per modificare questo file" ID_NO_PREDIFFER "No prediffer (normale)" ID_SUGGESTED_PLUGINS "Plugin suggeriti" @@ -2878,8 +2878,8 @@ ID_HELP_GETCONFIG "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo" ID_HELP_GNULICENSE "Visualizza la licenza pubblica GNU" IDS_PRIVATEBUILD_FMT "Build privata: %1" - ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index" - ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search" + ID_HELP_INDEX "Apre l'indice della guida di WinMerge\nIndice della guida" + ID_HELP_SEARCH "Apre la ricerca nella guida di WinMerge\nRicerca nella guida" END // PLUGINS DIALOGS AND DYNAMIC MENUS @@ -2916,9 +2916,9 @@ // AUTOCOMPLETE COMBOBOX OPTIONS STRINGTABLE BEGIN - IDS_AUTOCOMPLETE_DISABLED "Disabled" - IDS_AUTOCOMPLETE_FILE_SYS "From file system" - IDS_AUTOCOMPLETE_MRU "From MRU list" + IDS_AUTOCOMPLETE_DISABLED "Disattivato" + IDS_AUTOCOMPLETE_FILE_SYS "Dal file system" + IDS_AUTOCOMPLETE_MRU "Dalla lista dei file recenti" END // END STRINGS SYNCHRO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-15 20:56:02
|
Revision: 3565 http://svn.sourceforge.net/winmerge/?rev=3565&view=rev Author: kimmov Date: 2006-09-15 13:55:54 -0700 (Fri, 15 Sep 2006) Log Message: ----------- PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/MessageBoxDialog.cpp trunk/Src/Common/MessageBoxDialog.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-15 20:43:06 UTC (rev 3564) +++ trunk/Src/Changes.txt 2006-09-15 20:55:54 UTC (rev 3565) @@ -5,6 +5,8 @@ 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit ShellExtension: WinMergeShell.cpp WinMergeShell.h + PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog + Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h 2006-09-13 Kimmo BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 Modified: trunk/Src/Common/MessageBoxDialog.cpp =================================================================== --- trunk/Src/Common/MessageBoxDialog.cpp 2006-09-15 20:43:06 UTC (rev 3564) +++ trunk/Src/Common/MessageBoxDialog.cpp 2006-09-15 20:55:54 UTC (rev 3565) @@ -394,7 +394,7 @@ * displaying the dialog. Otherwise the message box will be displayed in * the normal way. */ -int CMessageBoxDialog::DoModal ( ) +INT_PTR CMessageBoxDialog::DoModal ( ) { // Check whether the result may be retrieved from the registry. if ( ( m_nStyle & MB_DONT_DISPLAY_AGAIN ) || Modified: trunk/Src/Common/MessageBoxDialog.h =================================================================== --- trunk/Src/Common/MessageBoxDialog.h 2006-09-15 20:43:06 UTC (rev 3564) +++ trunk/Src/Common/MessageBoxDialog.h 2006-09-15 20:55:54 UTC (rev 3565) @@ -159,7 +159,7 @@ // Methods for handling common window functions. // Method for displaying the dialog. - virtual int DoModal ( ); + virtual INT_PTR DoModal ( ); // Method for closing the dialog. void EndDialog ( int nResult ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-15 21:15:21
|
Revision: 3566 http://svn.sourceforge.net/winmerge/?rev=3566&view=rev Author: kimmov Date: 2006-09-15 14:14:54 -0700 (Fri, 15 Sep 2006) Log Message: ----------- PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility) Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/ChildFrm.cpp trunk/Src/ChildFrm.h trunk/Src/Common/MessageBoxDialog.cpp trunk/Src/Common/MessageBoxDialog.h trunk/Src/DirCompProgressDlg.cpp trunk/Src/DirCompProgressDlg.h trunk/Src/DirView.cpp trunk/Src/DirView.h trunk/Src/MainFrm.cpp trunk/Src/MainFrm.h trunk/Src/MergeEditView.cpp trunk/Src/MergeEditView.h trunk/Src/OpenDlg.cpp trunk/Src/OpenDlg.h trunk/Src/Splash.cpp trunk/Src/Splash.h trunk/Src/editlib/ccrystaltextview.h trunk/Src/editlib/ccrystaltextview2.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/Changes.txt 2006-09-15 21:14:54 UTC (rev 3566) @@ -7,6 +7,12 @@ ShellExtension: WinMergeShell.cpp WinMergeShell.h PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h + PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility) + Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp + Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp + Opendlg.h Splash.cpp Splash.h + Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h + Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h 2006-09-13 Kimmo BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 Modified: trunk/Src/ChildFrm.cpp =================================================================== --- trunk/Src/ChildFrm.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/ChildFrm.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -557,7 +557,7 @@ return &m_wndFilePathBar; } -void CChildFrame::OnTimer(UINT nIDEvent) +void CChildFrame::OnTimer(UINT_PTR nIDEvent) { if (IsWindowVisible()) { Modified: trunk/Src/ChildFrm.h =================================================================== --- trunk/Src/ChildFrm.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/ChildFrm.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -119,7 +119,7 @@ afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnClose(); afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg LRESULT OnStorePaneSizes(WPARAM wParam, LPARAM lParam); //}}AFX_MSG DECLARE_MESSAGE_MAP() Modified: trunk/Src/Common/MessageBoxDialog.cpp =================================================================== --- trunk/Src/Common/MessageBoxDialog.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/Common/MessageBoxDialog.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -701,7 +701,7 @@ * When a timeout for the message box is set, this method will perform the * update of the dialog controls every second. */ -void CMessageBoxDialog::OnTimer ( UINT nIDEvent ) +void CMessageBoxDialog::OnTimer ( UINT_PTR nIDEvent ) { // Check whether the event is interesting for us. if ( nIDEvent == MESSAGE_BOX_TIMER ) Modified: trunk/Src/Common/MessageBoxDialog.h =================================================================== --- trunk/Src/Common/MessageBoxDialog.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/Common/MessageBoxDialog.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -175,7 +175,7 @@ virtual BOOL PreTranslateMessage ( MSG* pMsg ); // Method for handling a timer event. - afx_msg void OnTimer ( UINT nIDEvent ); + afx_msg void OnTimer ( UINT_PTR nIDEvent ); protected: Modified: trunk/Src/DirCompProgressDlg.cpp =================================================================== --- trunk/Src/DirCompProgressDlg.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/DirCompProgressDlg.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -129,7 +129,7 @@ /** * @brief Timer message received. */ -void DirCompProgressDlg::OnTimer(UINT nIDEvent) +void DirCompProgressDlg::OnTimer(UINT_PTR nIDEvent) { if (nIDEvent == IDT_UPDATE) { Modified: trunk/Src/DirCompProgressDlg.h =================================================================== --- trunk/Src/DirCompProgressDlg.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/DirCompProgressDlg.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -67,7 +67,7 @@ // Generated message map functions //{{AFX_MSG(DirCompProgressDlg) afx_msg BOOL OnInitDialog(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnBnClickedComparisonStop(); //}}AFX_MSG DECLARE_MESSAGE_MAP() Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/DirView.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -2189,7 +2189,7 @@ PostMessage(WM_TIMER, COLUMN_REORDER); } -void CDirView::OnTimer(UINT nIDEvent) +void CDirView::OnTimer(UINT_PTR nIDEvent) { if (nIDEvent == COLUMN_REORDER) { Modified: trunk/Src/DirView.h =================================================================== --- trunk/Src/DirView.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/DirView.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -315,7 +315,7 @@ afx_msg LRESULT OnUpdateUIMessage(WPARAM wParam, LPARAM lParam); afx_msg void OnRefresh(); afx_msg void OnUpdateRefresh(CCmdUI* pCmdUI); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnEditColumns(); afx_msg void OnLeftReadOnly(); afx_msg void OnUpdateLeftReadOnly(CCmdUI* pCmdUI); Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/MainFrm.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -2809,7 +2809,7 @@ * @brief Handle timer events. * @param [in] nIDEvent Timer that timed out. */ -void CMainFrame::OnTimer(UINT nIDEvent) +void CMainFrame::OnTimer(UINT_PTR nIDEvent) { switch (nIDEvent) { Modified: trunk/Src/MainFrm.h =================================================================== --- trunk/Src/MainFrm.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/MainFrm.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -272,7 +272,7 @@ afx_msg void OnFileOpenproject(); afx_msg LRESULT OnCopyData(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnUser(WPARAM wParam, LPARAM lParam); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnWindowCloseAll(); afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI); afx_msg void OnSaveProject(); Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/MergeEditView.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -1501,7 +1501,7 @@ } -void CMergeEditView::OnTimer(UINT nIDEvent) +void CMergeEditView::OnTimer(UINT_PTR nIDEvent) { // Maybe we want theApp::OnIdle to proceed before processing a timer message // ...but for this the queue must be empty Modified: trunk/Src/MergeEditView.h =================================================================== --- trunk/Src/MergeEditView.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/MergeEditView.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -233,7 +233,7 @@ afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI); afx_msg void OnEditRedo(); afx_msg void OnUpdateEditRedo(CCmdUI* pCmdUI); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnUpdateFileSaveLeft(CCmdUI* pCmdUI); afx_msg void OnUpdateFileSaveRight(CCmdUI* pCmdUI); afx_msg void OnRefresh(); Modified: trunk/Src/OpenDlg.cpp =================================================================== --- trunk/Src/OpenDlg.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/OpenDlg.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -544,7 +544,7 @@ UpdateButtonStates(); } -void COpenDlg::OnTimer(UINT nIDEvent) +void COpenDlg::OnTimer(UINT_PTR nIDEvent) { if (nIDEvent == IDT_CHECKFILES) UpdateButtonStates(); Modified: trunk/Src/OpenDlg.h =================================================================== --- trunk/Src/OpenDlg.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/OpenDlg.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -104,7 +104,7 @@ afx_msg void OnSelchangeLeftCombo(); afx_msg void OnSelchangeRightCombo(); afx_msg void OnEditEvent(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnSelectUnpacker(); afx_msg void OnSelectFilter(); afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized); Modified: trunk/Src/Splash.cpp =================================================================== --- trunk/Src/Splash.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/Splash.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -254,7 +254,7 @@ /** * @brief Hide splashscreen after specified time. */ -void CSplashWnd::OnTimer(UINT /*nIDEvent*/) +void CSplashWnd::OnTimer(UINT_PTR nIDEvent) { // Destroy the splash screen window. HideSplashScreen(); Modified: trunk/Src/Splash.h =================================================================== --- trunk/Src/Splash.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/Splash.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -73,7 +73,7 @@ //{{AFX_MSG(CSplashWnd) afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnPaint(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Modified: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/editlib/ccrystaltextview.h 2006-09-15 21:14:54 UTC (rev 3566) @@ -853,7 +853,7 @@ afx_msg void OnHScroll (UINT nSBCode, UINT nPos, CScrollBar * pScrollBar); afx_msg void OnLButtonUp (UINT nFlags, CPoint point); afx_msg void OnMouseMove (UINT nFlags, CPoint point); - afx_msg void OnTimer (UINT nIDEvent); + afx_msg void OnTimer (UINT_PTR nIDEvent); afx_msg void OnKillFocus (CWnd * pNewWnd); afx_msg void OnLButtonDblClk (UINT nFlags, CPoint point); afx_msg void OnEditCopy (); Modified: trunk/Src/editlib/ccrystaltextview2.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview2.cpp 2006-09-15 20:55:54 UTC (rev 3565) +++ trunk/Src/editlib/ccrystaltextview2.cpp 2006-09-15 21:14:54 UTC (rev 3566) @@ -980,7 +980,7 @@ } void CCrystalTextView:: -OnTimer (UINT nIDEvent) +OnTimer (UINT_PTR nIDEvent) { CView::OnTimer (nIDEvent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 07:06:38
|
Revision: 3569 http://svn.sourceforge.net/winmerge/?rev=3569&view=rev Author: kimmov Date: 2006-09-16 00:06:32 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Remove unused variable Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/editlib/memcombo.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-16 06:55:20 UTC (rev 3568) +++ trunk/Src/Changes.txt 2006-09-16 07:06:32 UTC (rev 3569) @@ -5,6 +5,8 @@ 2006-09-16 Kimmo PATCH: [ 1559619 ] 64-bit shellextension project file ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj + Remove unused variable + Src/editlib: memcombo.cpp 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified: trunk/Src/editlib/memcombo.cpp =================================================================== --- trunk/Src/editlib/memcombo.cpp 2006-09-16 06:55:20 UTC (rev 3568) +++ trunk/Src/editlib/memcombo.cpp 2006-09-16 07:06:32 UTC (rev 3569) @@ -204,7 +204,6 @@ CReg reg; if (reg.Open (HKEY_CURRENT_USER, _T ("SOFTWARE\\EditPad"), KEY_READ)) { - POSITION pos = groups.GetStartPosition (); static LPCTSTR name[] = { _T("FindText"), _T("ReplaceText") }; CString value; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 07:14:11
|
Revision: 3570 http://svn.sourceforge.net/winmerge/?rev=3570&view=rev Author: kimmov Date: 2006-09-16 00:14:04 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Remove unused variable Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/OpenDlg.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-16 07:06:32 UTC (rev 3569) +++ trunk/Src/Changes.txt 2006-09-16 07:14:04 UTC (rev 3570) @@ -7,6 +7,8 @@ ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj Remove unused variable Src/editlib: memcombo.cpp + Remove unused variable + Src: OpenDlg.cpp 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified: trunk/Src/OpenDlg.cpp =================================================================== --- trunk/Src/OpenDlg.cpp 2006-09-16 07:06:32 UTC (rev 3569) +++ trunk/Src/OpenDlg.cpp 2006-09-16 07:14:04 UTC (rev 3570) @@ -446,8 +446,6 @@ */ BOOL COpenDlg::SelectFile(CString& path, LPCTSTR initialPath) { - BOOL is_open = TRUE; // this method is only for common file open dialog - CString title; VERIFY(title.LoadString(IDS_OPEN_TITLE)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 07:38:55
|
Revision: 3571 http://svn.sourceforge.net/winmerge/?rev=3571&view=rev Author: kimmov Date: 2006-09-16 00:38:48 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Fix typecasting warnings Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/MergeDoc.cpp trunk/Src/locality.cpp trunk/Src/locality.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-16 07:14:04 UTC (rev 3570) +++ trunk/Src/Changes.txt 2006-09-16 07:38:48 UTC (rev 3571) @@ -9,6 +9,8 @@ Src/editlib: memcombo.cpp Remove unused variable Src: OpenDlg.cpp + Fix typecasting warnings + Src: locality.cpp locality.h MergeDoc.cpp 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2006-09-16 07:14:04 UTC (rev 3570) +++ trunk/Src/MergeDoc.cpp 2006-09-16 07:38:48 UTC (rev 3571) @@ -71,11 +71,10 @@ extern CLogFile gLog; +/** @brief Max len of path in caption. */ static const UINT CAPTION_PATH_MAX = 50; -/** - * @brief EOL types - */ +/** @brief EOL types */ static LPCTSTR crlfs[] = { _T ("\x0d\x0a"), // DOS/Windows style @@ -83,6 +82,9 @@ _T ("\x0d") // Macintosh style }; +static CString GetLineByteTimeReport(UINT lines, __int64 bytes, + const COleDateTime & start); + ///////////////////////////////////////////////////////////////////////////// // CMergeDoc @@ -1422,11 +1424,15 @@ /** * @brief Return a string giving #lines and #bytes and how much time elapsed. + * @param [in] lines Count of lines. + * @param [in] bytes Count of bytes. + * @param [in] start Time used. + * @return Formatted string. */ -static CString -GetLineByteTimeReport(UINT lines, UINT bytes, const COleDateTime & start) +static CString GetLineByteTimeReport(UINT lines, __int64 bytes, + const COleDateTime & start) { - CString sLines = locality::NumToLocaleStr(lines); + CString sLines = locality::NumToLocaleStr((int)lines); CString sBytes = locality::NumToLocaleStr(bytes); COleDateTimeSpan duration = COleDateTime::GetCurrentTime() - start; CString sMinutes = locality::NumToLocaleStr((int)duration.GetTotalMinutes()); @@ -1525,12 +1531,12 @@ CString eol, preveol; CString sline; bool done = false; - int next_line_report = 100; // for trace messages - int next_line_multiple = 5; // for trace messages + UINT next_line_report = 100; // for trace messages + UINT next_line_multiple = 5; // for trace messages COleDateTime start = COleDateTime::GetCurrentTime(); // for trace messages // Manually grow line array exponentially - int arraysize = 500; + UINT arraysize = 500; m_aLines.SetSize(arraysize); // preveol must be initialized for empty files Modified: trunk/Src/locality.cpp =================================================================== --- trunk/Src/locality.cpp 2006-09-16 07:14:04 UTC (rev 3570) +++ trunk/Src/locality.cpp 2006-09-16 07:38:48 UTC (rev 3571) @@ -63,8 +63,11 @@ * * NB: We are not converting digits from ASCII via LOCALE_SNATIVEDIGITS * So we always use ASCII digits, instead of, eg, the Chinese digits + * + * @param [in] n Number to convert. + * @return Converted string. */ -CString NumToLocaleStr(UINT n) +CString NumToLocaleStr(int n) { TCHAR numbuff[34]; _ltot(n, numbuff, 10); @@ -72,6 +75,22 @@ } /** + * @brief Print an integer into a CString, in appropriate fashion for locale & user preferences + * + * NB: We are not converting digits from ASCII via LOCALE_SNATIVEDIGITS + * So we always use ASCII digits, instead of, eg, the Chinese digits + * + * @param [in] n Number to convert. + * @return Converted string. + */ +CString NumToLocaleStr(__int64 n) +{ + TCHAR numbuff[34]; + _i64tot(n, numbuff, 10); + return GetLocaleStr(numbuff); +} + +/** * @brief Insert commas (or periods) into string, as appropriate for locale & preferences * * NB: We are not converting digits from ASCII via LOCALE_SNATIVEDIGITS Modified: trunk/Src/locality.h =================================================================== --- trunk/Src/locality.h 2006-09-16 07:14:04 UTC (rev 3570) +++ trunk/Src/locality.h 2006-09-16 07:38:48 UTC (rev 3571) @@ -11,7 +11,8 @@ namespace locality { -CString NumToLocaleStr(UINT n); +CString NumToLocaleStr(int n); +CString NumToLocaleStr(__int64 n); CString GetLocaleStr(const CString & str, int decimalDigits = 0); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 07:48:46
|
Revision: 3572 http://svn.sourceforge.net/winmerge/?rev=3572&view=rev Author: kimmov Date: 2006-09-16 00:48:38 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Remove unused variable Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/FileActionScript.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-16 07:38:48 UTC (rev 3571) +++ trunk/Src/Changes.txt 2006-09-16 07:48:38 UTC (rev 3572) @@ -11,6 +11,8 @@ Src: OpenDlg.cpp Fix typecasting warnings Src: locality.cpp locality.h MergeDoc.cpp + Remove unused variable + Src: FileActionScript.cpp 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified: trunk/Src/FileActionScript.cpp =================================================================== --- trunk/Src/FileActionScript.cpp 2006-09-16 07:38:48 UTC (rev 3571) +++ trunk/Src/FileActionScript.cpp 2006-09-16 07:48:38 UTC (rev 3572) @@ -87,7 +87,6 @@ */ int FileActionScript::VCSCheckOut(const CString &path, BOOL &bApplyToAll) { - CMainFrame *pMf = dynamic_cast<CMainFrame*>(AfxGetMainWnd()); CString strErr; int retVal = SCRIPT_SUCCESS; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 07:50:21
|
Revision: 3573 http://svn.sourceforge.net/winmerge/?rev=3573&view=rev Author: kimmov Date: 2006-09-16 00:50:15 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Remove unused variable Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/FileFiltersDlg.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-16 07:48:38 UTC (rev 3572) +++ trunk/Src/Changes.txt 2006-09-16 07:50:15 UTC (rev 3573) @@ -13,6 +13,8 @@ Src: locality.cpp locality.h MergeDoc.cpp Remove unused variable Src: FileActionScript.cpp + Remove unused variable + Src: FileFiltersDlg.cpp 2006-09-15 Kimmo BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified: trunk/Src/FileFiltersDlg.cpp =================================================================== --- trunk/Src/FileFiltersDlg.cpp 2006-09-16 07:48:38 UTC (rev 3572) +++ trunk/Src/FileFiltersDlg.cpp 2006-09-16 07:50:15 UTC (rev 3573) @@ -499,7 +499,6 @@ void FileFiltersDlg::UpdateFiltersList() { int count = m_Filters->GetSize(); - int listItems = m_listFilters.GetItemCount(); m_listFilters.DeleteAllItems(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-19 14:52:39
|
Revision: 3581 http://svn.sourceforge.net/winmerge/?rev=3581&view=rev Author: kimmov Date: 2006-09-19 07:52:33 -0700 (Tue, 19 Sep 2006) Log Message: ----------- PATCH: [ 1561001 ] Fix FileActionScript type in running actions Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/FileActionScript.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-19 14:49:21 UTC (rev 3580) +++ trunk/Src/Changes.txt 2006-09-19 14:52:33 UTC (rev 3581) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-19 Kimmo + PATCH: [ 1561001 ] Fix FileActionScript type in running actions + Src: FileActionScript.cpp + 2006-09-18 Kimmo Cleanup 64-bit ShellExtension projectfile, add a debug target ShellExtension: ShellExtensionX64.vcproj Modified: trunk/Src/FileActionScript.cpp =================================================================== --- trunk/Src/FileActionScript.cpp 2006-09-19 14:49:21 UTC (rev 3580) +++ trunk/Src/FileActionScript.cpp 2006-09-19 14:52:33 UTC (rev 3581) @@ -124,7 +124,7 @@ int FileActionScript::CreateOperationsScripts() { UINT operation = 0; - UINT operFlags = 0; + FILEOP_FLAGS operFlags = 0; BOOL bApplyToAll = FALSE; BOOL bContinue = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-19 16:24:07
|
Revision: 3583 http://svn.sourceforge.net/winmerge/?rev=3583&view=rev Author: kimmov Date: 2006-09-19 09:24:01 -0700 (Tue, 19 Sep 2006) Log Message: ----------- PATCH: [ 1561008 ] Warning fix for FileActionScript Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/DirDoc.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-19 15:21:49 UTC (rev 3582) +++ trunk/Src/Changes.txt 2006-09-19 16:24:01 UTC (rev 3583) @@ -4,7 +4,9 @@ 2006-09-19 Kimmo PATCH: [ 1561001 ] Fix FileActionScript type in running actions - Src: FileActionScript.cpp + Src: FileActionScript.cpp + PATCH: [ 1561008 ] Warning fix for FileActionScript + Src: DirDoc.cpp 2006-09-18 Kimmo Cleanup 64-bit ShellExtension projectfile, add a debug target Modified: trunk/Src/DirDoc.cpp =================================================================== --- trunk/Src/DirDoc.cpp 2006-09-19 15:21:49 UTC (rev 3582) +++ trunk/Src/DirDoc.cpp 2006-09-19 16:24:01 UTC (rev 3583) @@ -927,7 +927,7 @@ // Use FileActionItem types for simplicity for now. // Better would be to use FileAction contained, since it is not // UI dependent. - switch (act.atype) + switch (act.UIResult) { case FileActionItem::UI_SYNC: SetDiffSide(DIFFCODE::BOTH, act.context); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-19 16:36:02
|
Revision: 3584 http://svn.sourceforge.net/winmerge/?rev=3584&view=rev Author: kimmov Date: 2006-09-19 09:35:48 -0700 (Tue, 19 Sep 2006) Log Message: ----------- PATCH: [ 1561080 ] Cleanup for loglevel definition Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/LogFile.cpp trunk/Src/Common/LogFile.h trunk/Src/DirDoc.cpp trunk/Src/DirScan.cpp trunk/Src/MainFrm.cpp trunk/Src/Plugins.cpp trunk/Src/StdAfx.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/Changes.txt 2006-09-19 16:35:48 UTC (rev 3584) @@ -7,6 +7,9 @@ Src: FileActionScript.cpp PATCH: [ 1561008 ] Warning fix for FileActionScript Src: DirDoc.cpp + PATCH: [ 1561080 ] Cleanup for loglevel definition + Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp + Src/Common: LogFile.cpp LogFile.h 2006-09-18 Kimmo Cleanup 64-bit ShellExtension projectfile, add a debug target Modified: trunk/Src/Common/LogFile.cpp =================================================================== --- trunk/Src/Common/LogFile.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/Common/LogFile.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -37,8 +37,8 @@ LPCTSTR szLogPath /*= NULL*/, BOOL bDeleteExisting /*=FALSE*/) : m_nMaxSize(MEGA) , m_bEnabled(FALSE) - , m_nDefaultLevel(LOGLEVEL::LMSG) - , m_nMaskLevel(LOGLEVEL::LALL) + , m_nDefaultLevel(LMSG) + , m_nMaskLevel(LALL) { SetFile(szLogName, szLogPath, bDeleteExisting); m_hLogMutex = CreateMutex(NULL, FALSE, MutexName); @@ -162,7 +162,7 @@ WriteV(m_nDefaultLevel, pszFormat, arglist); va_end(arglist); } - return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY; + return m_nMaskLevel & LSILENTVERIFY; } /** @@ -183,7 +183,7 @@ WriteV(m_nDefaultLevel, strFormat, arglist); va_end(arglist); } - return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY; + return m_nMaskLevel & LSILENTVERIFY; } /** @@ -201,7 +201,7 @@ WriteV(level, pszFormat, arglist); va_end(arglist); } - return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY; + return m_nMaskLevel & LSILENTVERIFY; } /** @@ -221,7 +221,7 @@ WriteV(level, strFormat, arglist); va_end(arglist); } - return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY; + return m_nMaskLevel & LSILENTVERIFY; } /** @@ -235,7 +235,7 @@ CString msg; msg.FormatV(pszFormat, arglist); msg.Insert(0, GetPrefix(level)); - if (level & LOGLEVEL::LOSERROR) + if (level & LOSERROR) { TCHAR cause[5120]; CInternetException(GetLastError()).GetErrorMessage(cause, countof(cause)); @@ -244,7 +244,7 @@ msg.TrimRight(_T("\r\n")); msg += _T("\n"); WriteRaw(msg); - if (level & LOGLEVEL::LDEBUG) + if (level & LDEBUG) { OutputDebugString(msg); } @@ -312,21 +312,21 @@ LPCTSTR str = _T(""); switch (level & 0x0FFF) { - case LOGLEVEL::LERROR: + case LERROR: str = _T("ERROR: "); break; - case LOGLEVEL::LWARNING: + case LWARNING: str = _T("WARNING: "); break; - case LOGLEVEL::LNOTICE: + case LNOTICE: str = _T("NOTICE: "); break; - case LOGLEVEL::LMSG: + case LMSG: break; - case LOGLEVEL::LCODEFLOW: + case LCODEFLOW: str = _T("FLOW: "); break; - case LOGLEVEL::LCOMPAREDATA: + case LCOMPAREDATA: str = _T("COMPARE: "); break; default: Modified: trunk/Src/Common/LogFile.h =================================================================== --- trunk/Src/Common/LogFile.h 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/Common/LogFile.h 2006-09-19 16:35:48 UTC (rev 3584) @@ -11,28 +11,6 @@ #define AFX_LOGFILE_H__803A3641_FE03_11D0_95CD_444553540000__INCLUDED_ /** - * @brief Messagelevels for log writing. - */ -struct LOGLEVEL -{ - enum - { - LALL = -1, /**< All messages written */ - LERROR = 0x1, /**< Error messages */ - LWARNING = 0x2, /**< Warning messages */ - LNOTICE = 0x4, /**< Important messages */ - LMSG = 0x8, /**< Normal messages */ - LCODEFLOW = 0x10, /**< Code flow messages */ - LCOMPAREDATA = 0x20, /**< Compare data (dump) */ - - /* These flags are not loglevels, but have special meaning */ - LOSERROR = 0x1000, /**< Append description of last error */ - LSILENTVERIFY = 0x2000, /**< No VERIFY popup, please */ - LDEBUG = 0x4000, /**< Append message to debug window as well */ - }; -}; - -/** * @brief Class for writing log files. * * Allows setting masks and levels for messages. They are used for @@ -54,6 +32,23 @@ class CLogFile { public: + /** @brief Messagelevels for log writing. */ + enum + { + LALL = -1, /**< All messages written */ + LERROR = 0x1, /**< Error messages */ + LWARNING = 0x2, /**< Warning messages */ + LNOTICE = 0x4, /**< Important messages */ + LMSG = 0x8, /**< Normal messages */ + LCODEFLOW = 0x10, /**< Code flow messages */ + LCOMPAREDATA = 0x20, /**< Compare data (dump) */ + + /* These flags are not loglevels, but have special meaning */ + LOSERROR = 0x1000, /**< Append description of last error */ + LSILENTVERIFY = 0x2000, /**< No VERIFY popup, please */ + LDEBUG = 0x4000, /**< Append message to debug window as well */ + }; + CLogFile(LPCTSTR szLogName = NULL, LPCTSTR szLogPath = NULL, BOOL bDeleteExisting = FALSE); virtual ~CLogFile(); Modified: trunk/Src/DirDoc.cpp =================================================================== --- trunk/Src/DirDoc.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/DirDoc.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -283,7 +283,7 @@ m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, LoadResString(IDS_STATUS_RESCANNING)); - gLog.Write(LOGLEVEL::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"), + gLog.Write(CLogFile::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"), m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath()); m_pCompareStats->Reset(); m_pDirView->StartCompare(m_pCompareStats); @@ -676,7 +676,7 @@ */ void CDirDoc::CompareReady() { - gLog.Write(LOGLEVEL::LNOTICE, _T("Directory scan complete\n")); + gLog.Write(CLogFile::LNOTICE, _T("Directory scan complete\n")); // finish the cursor (the hourglass/pointer combo) we had open during display delete m_statusCursor; @@ -829,7 +829,7 @@ */ void CDirDoc::AbortCurrentScan() { - gLog.Write(LOGLEVEL::LNOTICE, _T("Dircompare aborted!")); + gLog.Write(CLogFile::LNOTICE, _T("Dircompare aborted!")); m_diffThread.Abort(); } Modified: trunk/Src/DirScan.cpp =================================================================== --- trunk/Src/DirScan.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/DirScan.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -577,7 +577,7 @@ gLog.Write ( - LOGLEVEL::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), + CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), (LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), di.diffcode ); pCtxt->AddDiff(di); @@ -633,7 +633,7 @@ gLog.Write ( - LOGLEVEL::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), + CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), (LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), code ); pCtxt->m_pCompareStats->IncreaseTotalItems(); Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/MainFrm.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -228,9 +228,9 @@ gLog.SetFile(_T("WinMerge.log")); if (logging == 1) - gLog.SetMaskLevel(LOGLEVEL::LALL); + gLog.SetMaskLevel(CLogFile::LALL); else if (logging == 2) - gLog.SetMaskLevel(LOGLEVEL::LERROR | LOGLEVEL::LWARNING); + gLog.SetMaskLevel(CLogFile::LERROR | CLogFile::LWARNING); } m_pSyntaxColors = new SyntaxColors(); @@ -1188,7 +1188,7 @@ // Anything that can go wrong inside InitCompare() will yield an // exception. There is no point in checking return value. pDirDoc->InitCompare(paths, bRecurse, pTempPathContext); - gLog.Write(LOGLEVEL::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."), + gLog.Write(CLogFile::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."), strLeft, strRight); pDirDoc->SetReadOnly(TRUE, bROLeft); @@ -1203,7 +1203,7 @@ } else { - gLog.Write(LOGLEVEL::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."), + gLog.Write(CLogFile::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."), strLeft, strRight); FileLocation filelocLeft(strLeft); @@ -2172,7 +2172,7 @@ files[1] = files[0]; } - gLog.Write(LOGLEVEL::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."), + gLog.Write(CLogFile::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."), files[0], files[1]); // Check if they dropped a project file Modified: trunk/Src/Plugins.cpp =================================================================== --- trunk/Src/Plugins.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/Plugins.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -558,7 +558,7 @@ if (IsWindowsScriptThere()) GetScriptletsAt(path, _T(".sct"), theScriptletList ); // VBS/JVS scriptlet else - gLog.Write(LOGLEVEL::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)")); + gLog.Write(CLogFile::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)")); GetScriptletsAt(path, _T(".ocx"), theScriptletList ); // VB COM object GetScriptletsAt(path, _T(".dll"), theScriptletList ); // VC++ COM object scriptletsLoaded = true; Modified: trunk/Src/StdAfx.cpp =================================================================== --- trunk/Src/StdAfx.cpp 2006-09-19 16:24:01 UTC (rev 3583) +++ trunk/Src/StdAfx.cpp 2006-09-19 16:35:48 UTC (rev 3584) @@ -34,7 +34,7 @@ /** @brief Report DeleteFile() failure to gLog */ UINT gLog::DeleteFileFailed(LPCTSTR path) { - return::gLog.Write(LOGLEVEL::LERROR|LOGLEVEL::LOSERROR|LOGLEVEL::LDEBUG, _T("DeleteFile(%s) failed: "), path); + return::gLog.Write(CLogFile::LERROR|CLogFile::LOSERROR|CLogFile::LDEBUG, _T("DeleteFile(%s) failed: "), path); } // Convert any negative inputs to negative char equivalents @@ -133,7 +133,7 @@ TRACE(_T("%s: %s\n"), (LPCTSTR)now, sz); #if defined (_DEBUG) || defined (ENABLE_LOG) - gLog.Write(LOGLEVEL::LERROR, sz); + gLog.Write(CLogFile::LERROR, sz); #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-20 14:18:26
|
Revision: 3587 http://svn.sourceforge.net/winmerge/?rev=3587&view=rev Author: kimmov Date: 2006-09-20 07:18:18 -0700 (Wed, 20 Sep 2006) Log Message: ----------- PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/UniFile.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-20 06:06:36 UTC (rev 3586) +++ trunk/Src/Changes.txt 2006-09-20 14:18:18 UTC (rev 3587) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-20 Kimmo + PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage + Src/Common: UniFile.cpp + 2006-09-19 Kimmo PATCH: [ 1561001 ] Fix FileActionScript type in running actions Src: FileActionScript.cpp Modified: trunk/Src/Common/UniFile.cpp =================================================================== --- trunk/Src/Common/UniFile.cpp 2006-09-20 06:06:36 UTC (rev 3586) +++ trunk/Src/Common/UniFile.cpp 2006-09-20 14:18:18 UTC (rev 3587) @@ -118,8 +118,12 @@ // MSVC6 CFile file((HFILE)handle); #else - // MSVC7 (VC.NET) +#ifdef _WIN64 + CFile file((HFILE)handle); +#else // _WIN64 + // MSVC7 (VC.NET) CFile file(handle); +#endif // _WIN64 #endif CFileStatus status; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |