SIDEFLAG=0x300, LEFT=0x100, RIGHT=0x200, BOTH=0x300,
COMPAREFLAGS=0x7000, NOCMP=0x0000, SAME=0x1000, DIFF=0x2000, CMPERR=0x4000,
FILTERFLAGS=0x30000, INCLUDED=0x10000, SKIPPED=0x20000,
+ SCANFLAGS=0x100000, NEEDSCAN=0x100000,
};
int diffcode;
bool isResultFiltered() const { return ((diffcode & DIFFCODE::FILTERFLAGS) == DIFFCODE::SKIPPED); }
// type
bool isBin() const { return ((diffcode & DIFFCODE::TEXTFLAG) == DIFFCODE::BIN); }
+ // rescan
+ bool isScanNeeded() const { return ((diffcode & DIFFCODE::SCANFLAGS) == DIFFCODE::NEEDSCAN); }
+
};
/**
UINT nThreadState;
BOOL bRecursive;
DiffThreadAbortable * m_pAbortgate;
+ bool bOnlyRequested;
DiffFuncStruct()
: context(0)
, msgUIUpdate(0)
, nThreadState(THREAD_NOTSTARTED)
, bRecursive(FALSE)
, m_pAbortgate(0)
+ , bOnlyRequested(false)
{}
};
m_pDiffParm->msgUIUpdate = m_msgUpdateUI;
m_pDiffParm->hWindow = m_hWnd;
m_pDiffParm->m_pAbortgate = m_pAbortgate;
+ m_pDiffParm->bOnlyRequested = m_bOnlyRequested;
m_bAborting = FALSE;
m_pDiffParm->nThreadState = THREAD_COMPARING;
}
/**
+ * @brief Selects to compare all or only selected items.
+ * @param [in] bSelected If TRUE only selected items are compared.
+ */
+void CDiffThread::SetCompareSelected(bool bSelected /*=FALSE*/)
+{
+ m_bOnlyRequested = bSelected;
+}
+
+/**
* @brief Returns thread's current state
*/
UINT CDiffThread::GetThreadState() const
DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam;
HWND hWnd = myStruct->hWindow;
UINT msgID = myStruct->msgUIUpdate;
+ bool bOnlyRequested = myStruct->bOnlyRequested;
// keep the scripts alive during the Rescan
// when we exit the thread, we delete this and release the scripts
paths.SetLeft(myStruct->context->GetNormalizedLeft());
paths.SetRight(myStruct->context->GetNormalizedRight());
- DirScan_GetItems(paths, subdir, &itemList, casesensitive, depth, myStruct->m_pAbortgate);
- DirScan_CompareItems(itemList, myStruct->context, myStruct->m_pAbortgate);
+ if (bOnlyRequested)
+ {
+ DirScan_CompareItems(myStruct->context, myStruct->m_pAbortgate);
+ }
+ else
+ {
+ DirScan_GetItems(paths, subdir, &itemList, casesensitive, depth, myStruct->m_pAbortgate);
+ DirScan_CompareItems(itemList, myStruct->context, myStruct->m_pAbortgate);
+ }
// Send message to UI to update
myStruct->nThreadState = THREAD_COMPLETED;
UINT CompareDirectories(CString dir1, CString dir2, BOOL bRecursive);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg, UINT statusMsg);
+ void SetCompareSelected(bool bSelected = false);
// runtime interface for main thread, called on main thread
UINT GetThreadState() const;
UINT m_msgUpdateStatus;
HWND m_hWnd;
bool m_bAborting;
+ bool m_bOnlyRequested;
};
UINT DiffThread(LPVOID lpParam);
}
}
}
+
+/**
+ * @brief Mark selected items as needing for rescan.
+ */
+void CDirView::MarkForRescan()
+{
+ int sel = -1;
+ CString slFile, srFile;
+ while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
+ {
+ DIFFITEM di = GetDiffItem(sel);
+ GetDocument()->SetDiffStatus(DIFFCODE::NEEDSCAN, DIFFCODE::SCANFLAGS, sel);
+ }
+ GetDocument()->SetMarkedRescan();
+}
, m_bRecursive(FALSE)
, m_statusCursor(NULL)
, m_bReuseCloses(FALSE)
+, m_bMarkedRescan(FALSE)
{
DIFFOPTIONS options = {0};
m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath());
pf->clearStatus();
pf->ShowProcessingBar(TRUE);
- m_pCtxt->RemoveAll();
+
+ // Don't clear if only scanning selected items
+ if (!m_bMarkedRescan)
+ m_pCtxt->RemoveAll();
m_pCtxt->m_hDirFrame = pf->GetSafeHwnd();
m_pCtxt->m_msgUpdateStatus = MSG_STAT_UPDATE;
m_diffThread.SetContext(m_pCtxt);
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
m_diffThread.SetMessageIDs(MSG_UI_UPDATE, MSG_STAT_UPDATE);
+ m_diffThread.SetCompareSelected(m_bMarkedRescan);
m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(),
m_pCtxt->GetNormalizedRight(), m_bRecursive);
+ m_bMarkedRescan = FALSE;
}
/**
CString GetLeftBasePath() const { return m_pCtxt->GetNormalizedLeft(); }
CString GetRightBasePath() const { return m_pCtxt->GetNormalizedRight(); }
void RemoveDiffByKey(POSITION key) { m_pCtxt->RemoveDiff(key); }
+ void SetMarkedRescan() {m_bMarkedRescan = TRUE; }
protected:
CDiffWrapper m_diffWrapper;
CString m_strRightDesc; /**< Left side desription text */
PluginManager m_pluginman;
BOOL m_bReuseCloses; /**< Are we closing because of reuse? */
+ BOOL m_bMarkedRescan; /**< If TRUE next rescan scans only marked items */
};
//{{AFX_INSERT_LOCATION}}
const DiffFileData * pDiffFileData);
static void AddToList(CString sDir, const fentry * lent, const fentry * rent,
int code, DiffItemList * pList);
+static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt);
/** @brief cmpmth is a typedef for a pointer to a method */
typedef int (CString::*cmpmth)(LPCTSTR sz) const;
}
/**
+ * @brief Compare DiffItems in context marked for rescan.
+ *
+ * @param pCtxt [in,out] Compare context: contains list of items.
+ * @param piAbortable [in] Interface allowing to abort compare
+ * @return 1 if compare finished, -1 if compare was aborted
+ */
+int DirScan_CompareItems(CDiffContext * pCtxt, IAbortable * piAbortable)
+{
+ POSITION pos = pCtxt->GetFirstDiffPosition();
+
+ while (pos != NULL)
+ {
+ if (piAbortable && piAbortable->ShouldAbort())
+ return -1;
+
+ POSITION oldPos = pos;
+ DIFFITEM di = pCtxt->GetNextDiffPosition(pos);
+ if (di.isScanNeeded())
+ {
+ BOOL bItemsExist = TRUE;
+ pCtxt->RemoveDiff(oldPos);
+ UpdateDiffItem(di, bItemsExist, pCtxt);
+ if (bItemsExist)
+ CompareDiffItem(di, pCtxt);
+ }
+ }
+ return 1;
+}
+
+/**
+ * @brief Update diffitem file/dir infos.
+ *
+ * Re-tests dirs/files if sides still exists, and updates infos for
+ * existing sides. This assumes filenames, or paths are not changed.
+ * Since in normal situations (I can think of) they cannot change
+ * after first compare.
+ *
+ * @param [in,out] di DiffItem to update.
+ * @param [out] bExists Set to
+ * - TRUE if one of items exists so diffitem is valid
+ * - FALSE if items were deleted, so diffitem is not valid
+ * @param [in] pCtxt Compare context
+ */
+void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt)
+{
+ _stat stats;
+ CString leftpath;
+ CString rightpath;
+ BOOL bLeftExists = FALSE;
+ BOOL bRightExists = FALSE;
+
+ bExists = TRUE;
+ leftpath = di.getLeftFilepath(pCtxt->GetNormalizedLeft());
+ leftpath = paths_ConcatPath(leftpath, di.sfilename);
+ rightpath = di.getRightFilepath(pCtxt->GetNormalizedRight());
+ rightpath = paths_ConcatPath(rightpath, di.sfilename);
+
+ // Re-check if left/right sides still exists (or are added)
+ if (_tstat(leftpath, &stats) == 0)
+ bLeftExists = TRUE;
+ if (_tstat(rightpath, &stats) == 0)
+ bRightExists = TRUE;
+
+ // Clear side-info and file-infos
+ di.diffcode &= ~DIFFCODE::SIDEFLAG;
+ di.left.Clear();
+ di.right.Clear();
+
+ // Update infos for existing sides
+ if (bLeftExists && bRightExists)
+ {
+ di.diffcode |= DIFFCODE::BOTH;
+ pCtxt->UpdateInfoFromDiskHalf(di, di.left);
+ pCtxt->UpdateInfoFromDiskHalf(di, di.right);
+ }
+ else if (bLeftExists && !bRightExists)
+ {
+ di.diffcode |= DIFFCODE::LEFT;
+ pCtxt->UpdateInfoFromDiskHalf(di, di.left);
+ }
+ else if (!bLeftExists && bRightExists)
+ {
+ di.diffcode |= DIFFCODE::RIGHT;
+ pCtxt->UpdateInfoFromDiskHalf(di, di.right);
+ }
+ else if (!bLeftExists && !bRightExists)
+ {
+ bExists = FALSE;
+ }
+}
+
+/**
* @brief Compare two diffitems and add results to difflist in context.
*
* @param [in] di DiffItem to compare
CString sRightDir = pCtxt->GetNormalizedRight();
static const TCHAR backslash[] = _T("\\");
+ // Clear possible rescan-flag
+ di.diffcode &= ~DIFFCODE::NEEDSCAN;
+
if (!di.sSubdir.IsEmpty())
{
sLeftDir += backslash + di.sSubdir;
bool casesensitive, int depth, IAbortable * piAbortable);
int DirScan_CompareItems(DiffItemList & list, CDiffContext * pCtxt, IAbortable * piAbortable);
+int DirScan_CompareItems(CDiffContext * pCtxt, IAbortable * piAbortable);
void DirScan_InitializeDefaultCodepage();
ON_WM_SIZE()
ON_COMMAND(ID_MERGE_DELETE, OnDelete)
ON_UPDATE_COMMAND_UI(ID_MERGE_DELETE, OnUpdateDelete)
+ ON_COMMAND(ID_DIR_RESCAN, OnMarkedRescan)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
}
*pResult = 0;
}
+
+/**
+ * @brief Called when item is marked for rescan.
+ */
+void CDirView::OnMarkedRescan()
+{
+ GetDocument()->SetMarkedRescan();
+ MarkForRescan();
+ GetDocument()->Rescan();
+}
void PerformActionList(ActionList & actions);
void UpdateCopiedItems(ActionList & actions);
void UpdateDeletedItems(ActionList & actions);
+ void MarkForRescan();
// End DirActions.cpp
// Implementation in DirViewCols.cpp
afx_msg void OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI);
afx_msg void OnDelete();
afx_msg void OnUpdateDelete(CCmdUI* pCmdUI);
+ afx_msg void OnMarkedRescan();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Opções do Programa\nOptions"
ID_REFRESH "Atualizar tela\nAtualizar (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copiar todas as diferenças para o arquivo da direita\nTodos para a Direita"
ID_ALL_LEFT "Copiar todas as diferenças para o arquivo da esquerda\nTodos para a Esquerda"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Íàãëàñÿíå íà ïðîãðàìíèòå íàñòðîèêè\nÍàñòðîèêè"
ID_REFRESH "Refresh display\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Êîïèðàíå íà ðàçëèêàòà â ëåâèÿ ôàéë è ïðåäâèæâàíå êúì ñëåäâàùàòà\nÊîïèðàíå â ëÿâî è ïðåäâèæâàíå (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Êîïèðàíå íà âñè÷êè ðàçëèêè â äåñíèÿ ôàéë\nÂñè÷êî â äÿñíî"
ID_ALL_LEFT "Êîïèðàíå íà âñè÷êè ðàçëèêè â ëåâèÿ ôàéë\nÂñè÷êî â ëÿâî"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Ambdós costats... (%1 de %2)", ID_DIR_ZIP_BOTH
MENUITEM "Di&ferències... (%1 de %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "De dreta a... (%1)"
IDS_MOVE_LEFT_TO2 "D'esquerra a... (%1 de %2)"
IDS_MOVE_RIGHT_TO2 "De dreta a... (%1 de %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Especifica opcions del programa\nOpcions"
ID_REFRESH "Actualitza la visualització\nActualitza (F5)"
ID_EDIT_COPY_LINENUMBERS "Copia les línies seleccionades al Porta-retalls afegint-hi els números de línia al inici de línia"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copia la diferència a l'esquerra i avança a la següent\nCopia a l'esquerra i avança (Ctrl+Alt+Esquerra)"
ID_ALL_RIGHT "Copia totes les diferènces al fitxer de la dreta\nTot a la dreta"
ID_ALL_LEFT "Copia totes les diferènces al fitxer de l'esquerra\nTot a l'esquerra"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "É趨³ÌÐòÑ¡Ïî\nÑ¡Ïî"
ID_REFRESH "¸üÐÂÏÔʾ\n¸üР(F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "¸´ÖÆËùÓв»Í¬µ½ÓÒ±ßÎļþ\nËùÓе½ÓÒ±ß"
ID_ALL_LEFT "¸´ÖÆËùÓв»Í¬µ½×ó±ßÎļþ\nËùÓе½×ó±ß"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "¨âªÌ(&B)... (%1 ¦@ %2)", ID_DIR_ZIP_BOTH
MENUITEM "¤£¦P(&D)... (%1 ¦@ %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "¥kÃä¨ì... (%1)"
IDS_MOVE_LEFT_TO2 "¥ªÃä¨ì... (%1 ¦@ %2)"
IDS_MOVE_RIGHT_TO2 "¥kÃä¨ì... (%1 ¦@ %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "³]©wµ{¦¡¿ï¶µ\n¿ï¶µ"
ID_REFRESH "§ó·sÅã¥Ü\n§ó·s (F5)"
ID_EDIT_COPY_LINENUMBERS "½Æ»s¿ï¨úªº¦C¨ì°Å¶Kï¨Ã¥[¤J¦C¸¹©ó¦Cªº¶}ÀY"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "½Æ»s¥ªÃ䤣¦P©M¶i¶¥¨ì¤U¤@\n½Æ»s¥ªÃä©M¶i¶¥ (Ctrl+Alt+Left)"
ID_ALL_RIGHT "½Æ»s©Ò¦³¤£¦P¨ì¥kÃäÀÉ®×\n©Ò¦³¨ì¥kÃä"
ID_ALL_LEFT "½Æ»s©Ò¦³¤£¦P¨ì¥ªÃäÀÉ®×\n©Ò¦³¨ì¥ªÃä"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Nastavit mo\9enosti programu\nOptions"
ID_REFRESH "Refresh display\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Zkopírovat v\9aechny rozdíly do souboru vpravo\nAll Right"
ID_ALL_LEFT "Zkopírovat v\9aechny rozdíly do souboru vlevo\nAll Left"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Begge... (%1 af %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Forskellene... (%1 af %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Højre til... (%1)"
IDS_MOVE_LEFT_TO2 "Venstre til... (%1 af %2)"
IDS_MOVE_RIGHT_TO2 "Højre til... (%1 af %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Sæt program indstillinger\nIndstillinger"
ID_REFRESH "Opdater display\nOpdater (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Kopier forskel til venstre side og gå til næste forskel\nKopier til venstre og gå til næste (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Kopier alle forskelle til den højre fil\nAlt til højre"
ID_ALL_LEFT "Kopier alle forskelle til den venstre fil\nAlt til venstre"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM SEPARATOR
MENUITEM "Alles naar rechts kopiëren", ID_ALL_RIGHT
MENUITEM "Alles naar links kopiëren", ID_ALL_LEFT
-
END
POPUP "&Tools"
BEGIN
MENUITEM "&Beide... (%1 van %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Verschillen... (%1 van %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Van rechts naar... (%1)"
IDS_MOVE_LEFT_TO2 "Van links naar... (%1 van %2)"
IDS_MOVE_RIGHT_TO2 "Van rechts naar... (%1 van %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Programmaopties instellen\nEigenschappen"
ID_REFRESH "Beeld verversen\nVerversen (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Het verschil naar links kopiëren en verder naar het volgende verschil.\nNaar links kopiëren en volgende (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Alle verschillen naar het rechter bestand kopiëren.\nAlles naar rechts kopiëren"
ID_ALL_LEFT "Kopieer alle verschillen naar het linker bestand. \nAlles naar links kopiëren"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "les deu&x côtés... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "les di&fférences...(%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "De droite vers... (%1)"
IDS_MOVE_LEFT_TO2 "De gauche vers... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "De droite vers... (%1 of %2)"
- ID_MERGE_DELETE "Supprimer les items selectionnés pour les deux répertoires"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Modifier les options du programme\nOptions"
ID_REFRESH "Actualiser l'affichage\nActualiser (F5)"
ID_EDIT_COPY_LINENUMBERS "Copier les lignes sélectionnés vers le presse-papiers en les précédants d'un numéro de ligne"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copier la différence vers la gauche et Avancer\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copier toutes les différences vers le fichier de droite\nCopier Tout à Droite"
ID_ALL_LEFT "Copier toutes les différences vers le fichier de gauche\nCopier Tout à Gauche"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Beide... (%1 von %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Unterschiede... (%1 von %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Rechts nach... (%1)"
IDS_MOVE_LEFT_TO2 "Links nach... (%1 von %2)"
IDS_MOVE_RIGHT_TO2 "Rechts nach... (%1 von %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Nimmt Programm-Einstellungen vor.\nEinstellungen"
ID_REFRESH "Aktualisiert die Anzeige\nAktualisieren (F5)"
ID_EDIT_COPY_LINENUMBERS "Kopiert die ausgewählten Zeilen in die Zwischenablage und fügt Zeilennummern vor den Zeilenanfang."
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Kopiere Unterschied nach Links und springe zum nächsten Unterschied.\nNach links kopieren und fortschreiten (Strg+Alt+Links)"
ID_ALL_RIGHT "Kopiert alle Unterschiede in die rechte Datei.\nAlles nach rechts kopieren"
ID_ALL_LEFT "Kopiert alle Unterschiede in die linke Datei.\nAlles nach links kopieren"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Mindkét oldal... (%1 ennyibõl: %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Eltérések... (%1 ennyibõl: %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Jobbról... (%1)"
IDS_MOVE_LEFT_TO2 "Balról... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Jobbról... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "A program beállítása\nBeállítások"
ID_REFRESH "Kijezõ frissítése\nFrissítés (F5)"
ID_EDIT_COPY_LINENUMBERS "A kijelölt sorok vágólapra másolása a sorok elejéhez a sorszámokat hozzáfûzve"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Az eltérés másolása balra és ugrás tovább\nMásolás balra és Ugrás (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Az összes eltérés másolása jobbra\nMind jobbra"
ID_ALL_LEFT "Az összes eltérés másolása jobbra\nMind balra"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Entrambi... (%1 su %2)", ID_DIR_ZIP_BOTH
MENUITEM "Di&fferenze... (%1 su %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Destra in... (%1)"
IDS_MOVE_LEFT_TO2 "Sinistra in... (%1 su %2)"
IDS_MOVE_RIGHT_TO2 "Destra in... (%1 su %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
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 "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copia la differenza a sinistra e avanza alla prossima\nCopia a sinistra e avanza (Ctrl+Alt+Sinistra)"
ID_ALL_RIGHT "Copia tutte le differenze dal file di sinistra a quello di destra\nTutto a destra"
ID_ALL_LEFT "Copia tutte le differenze dal file di destra a quello di sinistra\nTutto a sinistra"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "\97¼\91¤(&B)... (%1 / %2)", ID_DIR_ZIP_BOTH
MENUITEM "\8d·\88Ù(&D)... (%1 / %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "\89E\82©\82ç\8eQ\8fÆ\90æ\82Ö... (%1)"
IDS_MOVE_LEFT_TO2 "\8d¶\82©\82ç\8eQ\8fÆ\90æ\82Ö... (%1 / %2)"
IDS_MOVE_RIGHT_TO2 "\89E\82©\82ç\8eQ\8fÆ\90æ\82Ö... (%1 / %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "\83v\83\8d\83O\83\89\83\80\83I\83v\83V\83\87\83\93\82ð\90Ý\92è\82µ\82Ü\82·\n\83I\83v\83V\83\87\83\93"
ID_REFRESH "\8dÅ\90V\82Ì\8fî\95ñ\82É\8dX\90V\82µ\82Ü\82·\n\95\\8e¦\8dX\90V (F5)"
ID_EDIT_COPY_LINENUMBERS "\91I\91ð\82³\82ê\82½\8ds\82Ì\90æ\93ª\82É\8ds\94Ô\8d\86\82ð\95t\89Á\82µ\82Ä\83N\83\8a\83b\83v\83{\81[\83h\82Ö\83R\83s\81[\82µ\82Ü\82·"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "\8d·\88Ù\82ð\8d¶\82É\83R\83s\81[\82µ\81A\8e\9f\82Ì\8d·\88Ù\82É\90i\82Ý\82Ü\82·\n\8d¶\82É\83R\83s\81[\82µ\8e\9f\82Ö (Ctrl+Alt+Left)"
ID_ALL_RIGHT "\82·\82×\82Ä\82Ì\8d·\88Ù\82ð\89E\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n\89E\82·\82×\82Ä"
ID_ALL_LEFT "\82·\82×\82Ä\82Ì\8d·\88Ù\82ð\8d¶\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n\8d¶\82·\82×\82Ä"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "¸ðµÎ(&B)... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "´Ù¸¥ ÆÄÀϸ¸(&D)... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1)"
IDS_MOVE_LEFT_TO2 "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "¿É¼ÇÀ» ¼³Á¤ÇÕ´Ï´Ù.\n¿É¼Ç"
ID_REFRESH "»õ·Î °íħ\n»õ·Î °íħ (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\n¿ÞÂÊÀ¸·Î º¹»ç - Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n¸ðµÎ ¿À¸¥ÂÊÀ¸·Î"
ID_ALL_LEFT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n¸ðµÎ ¿ÞÂÊÀ¸·Î"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Begge... (%1 av %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Forskjellene... (%1 av %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Høyre til... (%1)"
IDS_MOVE_LEFT_TO2 "Venstre til... (%1 av %2)"
IDS_MOVE_RIGHT_TO2 "Høyre til... (%1 av %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Sett programinnstillinger\nInnstillinger"
ID_REFRESH "Oppdater visning\nOppdater (F5)"
ID_EDIT_COPY_LINENUMBERS "Kopier valgte linjer til utklippstavle med linjenummer foran"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Kopier forskjell til høyre og gå videre til neste\nKopier venstre og gå videre (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Kopier alle forskjeller til den høyre filen\nAlt til høyre"
ID_ALL_LEFT "Kopier alle forskjeller til den venstre filen\nAlt til venstre"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Obie... (%1 z %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Ró¿nice... (%1 z %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Prawa na... (%1)"
IDS_MOVE_LEFT_TO2 "Lewa na... (%1 z %2)"
IDS_MOVE_RIGHT_TO2 "Prawa na... (%1 z %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Ustaw opcje programu\nOpcje"
ID_REFRESH "Od\9cwie¿ podgl¹d\nOd\9cwie¿ (F5)"
ID_EDIT_COPY_LINENUMBERS "Kopiuj wybrane linie do schowka dodaj¹c numeracjê wierszy"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Kopiuj ró¿nicê na lewo i przejd\9f do nastêpnej\nKopiuj na lewo i nastêpna (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Kopiuj wszystkie ró¿nice do prawego pliku\nWszystkie na prawo"
ID_ALL_LEFT "Kopiuj wszystkie ró¿nice do lewego pliku\nWszystkie na lewo"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Ñïðàâà â... (%1)"
IDS_MOVE_LEFT_TO2 "Ñëåâà â... (%1 èç %2)"
IDS_MOVE_RIGHT_TO2 "Ñïðàâà â... (%1 èç %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_REFRESH "Îáíîâèòü ýêðàí\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS
"Ñêîïèðîâàòü âûáðàííûå ñòðîêè â áóôåð îáìåíà, äîáàâëÿÿ â íà÷àëå ñòðîêè åå íîìåð"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Ñêîïèðîâàòü îòëè÷èå íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\nCopy Left and advance (Ctrl Alt Left)"
ID_ALL_RIGHT "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà\nAll Right"
ID_ALL_LEFT "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà\nAll Left"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Nastavi\9d mo\9enosti programu\nMo\9enosti"
ID_REFRESH "Refresh display\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_LEFT "Skopírova\9d v\9aetky rozdiely do súboru v¾avo\nV\9aetko v¾avo"
ID_ALL_RIGHT "Skopírova\9d v\9aetky rozdiely do súboru vpravo\nV\9aetko vpravo"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Ambos... (%1 de %2)", ID_DIR_ZIP_BOTH
MENUITEM "Di&ferencias... (%1 de %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Lado derecho a... (%1)"
IDS_MOVE_LEFT_TO2 "Lado izquierdo a... (%1 de %2)"
IDS_MOVE_RIGHT_TO2 "Lado derecho a... (%1 de %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Especificar propiedades de la aplicación\nConfiguración"
ID_REFRESH "Refrescar la vista\nRefrescar(F5)"
ID_EDIT_COPY_LINENUMBERS "Copiar las líneas seleccionadas al portapapeles añadiendo números de línea al principio de cada una de ellas"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copiar diferencia al lado izquierdo e ir a la siguiente\nCopiar a la izquierda y avanzar (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copiar todas las diferencias al lado derecho\nTodas a la derecha"
ID_ALL_LEFT "Copiar todas las diferencias al lado izquierdo\nTodas a la izquierda"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Båda... (%1 av %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Skillnader... (%1 av %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Höger till... (%1)"
IDS_MOVE_LEFT_TO2 "Vänster till... (%1 av %2)"
IDS_MOVE_RIGHT_TO2 "Höger till... (%1 av %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Ändrar programinställningar\nEgenskaper"
ID_REFRESH "Uppdaterar innehållet\nUppdatera (F5)"
ID_EDIT_COPY_LINENUMBERS "Kopierar valda rader till klippboken och adderar radnummer till radernas start"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Kopierar skillnad till vänster och går fram till nästa\nKopiera vänster och gå framåt (Ctrl Alt Vänster)"
ID_ALL_RIGHT "Kopierar alla skillnader till den högra filen\nKopiera allt till höger"
ID_ALL_LEFT "Kopierar alla skillnader till den vänstra filen\nKopiera allt till vänster"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Save modified files?"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
ID_OPTIONS "Set program options\nOptions"
ID_REFRESH "Refresh display\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copy all differences to the right file\nAll Right"
ID_ALL_LEFT "Copy all differences to the left file\nAll Left"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
IDS_MOVE_RIGHT_TO "Right to... (%1)"
IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)"
IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)"
- ID_MERGE_DELETE "Delete selected items from both directories"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
IDS_MALAY_MALAYSIA "Malay (Malaysian)"
IDS_MALAY_BRUNEI_DARUSSALAM "Malay (Brunei Darussalam)"
IDS_MANIPURI "Manipuri"
- IDS_NORWEGIAN_BOKMAL "Norwegian (Bokmal)"
+ IDS_NORWEGIAN_BOKMAL "Norwegian (Bokmål)"
IDS_NORWEGIAN_NYNORSK "Norwegian (Nynorsk)"
IDS_POLISH "Polski"
IDS_PORTUGUESE "Portugese"
ID_OPTIONS "Set program options\nOptions"
ID_REFRESH "Refresh display\nRefresh (F5)"
ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin"
+ ID_DIR_RESCAN "Refresh selected items"
END
// VIEW MENU (FILE TYPE)
ID_R2LNEXT "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copy all differences to the right file\nAll Right"
ID_ALL_LEFT "Copy all differences to the left file\nAll Left"
+ ID_MERGE_DELETE "Delete selected items from both directories"
END
// TOOLS MENU
2005-06-13 Kimmo
PATCH: [ 1219333 ] Wrong confirmation message when deleting unique items
Src: DirActions.cpp
+ PATCH: [ 1218661 ] Rescan selected items
+ Src: DiffItem.h DiffThread.cpp DiffThread.h DirActions.cpp DirDoc.cpp DirDoc.h
+ DirScan.cpp DirScan.h DirView.cpp DirView.h Merge.rc resource.h
+ Src/Languages: *.rc resource.h
2005-06-12 Kimmo
BUG: [ 1218133 ] German options dialog is too wide
#define ID_OPTIONS 32786
#define ID_REFRESH 32787
#define ID_EDIT_COPY_LINENUMBERS 32788
+#define ID_DIR_RESCAN 33789
#define ID_OPTIONS_SHOWIDENTICAL 32800
#define ID_OPTIONS_SHOWDIFFERENT 32801
#define ID_OPTIONS_SHOWUNIQUELEFT 32802
#define ID_R2LNEXT 32840
#define ID_ALL_RIGHT 32841
#define ID_ALL_LEFT 32842
+#define ID_MERGE_DELETE 32845
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
#define ID_FILE_OPENPROJECT 33095
-#define ID_MERGE_DELETE 33096
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33097
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 111
#endif
OSDN Git Service
