IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Anomena i desa el fitxer de la dreta"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Àx¦s¥kÃäÀɮ׬°"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Gem højre fil som"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Bewaar rechter bestand als"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Enregistrer le fichier de droite sous"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Speichere rechte Datei unter"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Jobb oldali fájl mentése más néven"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Salva il file di destra con nome"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "\96¼\91O\82ð\95t\82¯\82Ä\89E\91¤\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Lagre høyre fil som"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Zachowaj prawy plik jako"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Guardar lado derecho como"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Spara höger fil som"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
#define ID_TOOLS_CUSTOMIZECOLUMNS 32864
#define ID_TOOLS_GENERATEPATCH 32865
#define ID_TOOLS_FILTERS 32866
+#define ID_TOOLS_LOADCONFIG 32867
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
IDS_SAVE_RIGHT_AS "Save Right File As"
END
+// Editing/Merging file
+STRINGTABLE
+BEGIN
+ IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
+END
+
// VSS
STRINGTABLE
BEGIN
}
/**
+ * @brief Sanity check difference.
+ *
+ * Checks that lines in difference are inside difference in both files.
+ * If file is edited, lines added or removed diff lines get out of sync and
+ * merging fails miserably.
+ *
+ * @param [in] dr Difference to check.
+ * @return TRUE if difference lines match, FALSE otherwise.
+ */
+BOOL CMergeDoc::SanityCheckDiff(DIFFRANGE dr)
+{
+ int cd_dbegin = dr.dbegin0;
+ int cd_dend = dr.dend0;
+ DWORD dwLeftFlags = m_ltBuf.GetLineFlags(cd_dend);
+ DWORD dwRightFlags = m_rtBuf.GetLineFlags(cd_dend);
+
+ // Optimization - check last line first so we don't need to
+ // check whole diff for obvious cases
+ if (!(dwLeftFlags & LF_WINMERGE_FLAGS) ||
+ !(dwRightFlags & LF_WINMERGE_FLAGS))
+ {
+ return FALSE;
+ }
+
+ for (int line = cd_dbegin; line < cd_dend; line++)
+ {
+ dwLeftFlags = m_ltBuf.GetLineFlags(cd_dend);
+ dwRightFlags = m_rtBuf.GetLineFlags(cd_dend);
+ if (!(dwLeftFlags & LF_WINMERGE_FLAGS) ||
+ !(dwRightFlags & LF_WINMERGE_FLAGS))
+ {
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+/**
* @brief Copy selected (=current) difference from from side to side.
* @param [in] bSrcLeft Source side from which diff is copied
* @param [in] bCurrentLeft Currently active view (where cursor is)
if (curDiff!=-1)
{
DIFFRANGE cd = {0};
- m_diffList.GetDiff(curDiff, cd);
+ VERIFY(m_diffList.GetDiff(curDiff, cd));
CDiffTextBuffer& sbuf = bSrcLeft? m_ltBuf:m_rtBuf;
CDiffTextBuffer& dbuf = bSrcLeft? m_rtBuf:m_ltBuf;
BOOL bSrcWasMod = sbuf.IsModified();
int cd_dbegin = bSrcLeft? cd.dbegin0:cd.dbegin1;
int cd_dend = bSrcLeft? cd.dend0:cd.dend1;
int cd_blank = bSrcLeft? cd.blank0:cd.blank1;
+ BOOL bInSync = SanityCheckDiff(cd);
+
+ if (bInSync == FALSE)
+ {
+ AfxMessageBox(IDS_VIEWS_OUTOFSYNC, MB_ICONSTOP);
+ return;
+ }
// If we remove whole diff from current view, we must fix cursor
// position first. Normally we would move to end of previous line,
BOOL Undo();
void CopyAllList(bool bSrcLeft, bool bCurrentLeft);
void CopyMultipleList(bool bSrcLeft, bool bCurrentLeft, int firstDiff, int lastDiff);
+ BOOL SanityCheckDiff(DIFFRANGE dr);
void ListCopy(bool bSrcLeft, bool bCurrentLeft, bool bGroupWithPrevious = false);
BOOL TrySaveAs(CString &strPath, int &nLastErrorCode, CString & sError,
BOOL bLeft, PackingInfo * pInfoTempUnpacker);
+2005-06-01 Kimmo
+ PATCH: [ 1210059 ] Sanity check difference before merging it
+ Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
+ Src/Languages: *.rc resource.h
+
2005-05-31 Perry
PATCH: [ 1206727 ] decouple codepage module from options files
Src: codepage.cpp codepage.h MainFrm.cpp MainFrm.h
#define IDS_VSSFOLDER_AND_FILE_NOMATCH 17268
#define IDS_VSS_NODATABASES 17269
#define IDS_VSS_ERRORFROM 17270
+#define IDS_VIEWS_OUTOFSYNC 17300
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600
#define ID_DIR_COPY_LEFT_TO_BROWSE 17601
#define ID_DIR_COPY_RIGHT_TO_LEFT 17602
OSDN Git Service
