diff -r 6783e13bb05d -r 0b048b6bb6f4 mainwindow.cpp
--- a/mainwindow.cpp	Sat Apr 09 22:50:08 2005 +0000
+++ b/mainwindow.cpp	Thu Apr 21 19:14:38 2005 +0000
@@ -16,7 +16,7 @@
 
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <typeinfo>
 
 #include "version.h"
@@ -842,9 +842,9 @@
 	branchContextMenu->insertSeparator();	
 	actionEditLoadImage->addTo( branchContextMenu );
 	branchContextMenu->insertSeparator();	
-	actionEditCopy->addTo( branchContextMenu );
-	actionEditCut->addTo( branchContextMenu );
-	actionEditPaste->addTo( branchContextMenu );
+	//actionEditCopy->addTo( branchContextMenu );
+	//actionEditCut->addTo( branchContextMenu );
+	//actionEditPaste->addTo( branchContextMenu );
 	branchContextMenu->insertSeparator();	
 	actionGroupFormatFrameTypes->addTo( branchContextMenu );
 
@@ -852,12 +852,12 @@
 	// This will be populated "on demand" in MapEditor::updateActions
 	branchContextMenu->insertSeparator();	
 	branchLinksContextMenu =new QPopupMenu (this);
-	branchContextMenu->insertItem (tr("Goto Link"),branchLinksContextMenu);
-	connect( branchLinksContextMenu, SIGNAL( activated(int) ), this, SLOT( editFollowLink(int ) ) );
+	branchContextMenu->insertItem (tr("Goto XLink"),branchLinksContextMenu);
+	connect( branchLinksContextMenu, SIGNAL( activated(int) ), this, SLOT( editFollowXLink(int ) ) );
 	
 	branchLinksContextMenuDup =new QPopupMenu (this);
-	branchContextMenu->insertItem (tr("Edit Link"),branchLinksContextMenuDup);
-	connect( branchLinksContextMenuDup, SIGNAL( activated(int) ), this, SLOT( editEditLink(int ) ) );
+	branchContextMenu->insertItem (tr("Edit XLink"),branchLinksContextMenuDup);
+	connect( branchLinksContextMenuDup, SIGNAL( activated(int) ), this, SLOT( editEditXLink(int ) ) );
 
 	// Context menu for floatimage
 	floatimageContextMenu =new QPopupMenu (this);
@@ -1135,8 +1135,7 @@
 		if (!QFile(fn).exists() )
 		{
 			QMessageBox mb( "VYM",
-				tr("The map") + fn + 
-				tr(" does not exist.\n Do you want to create a new one?"),
+				tr("This map does not exist:\n  ")+fn+tr("\nDo you want to create a new one?"),
 				QMessageBox::Question,
 				QMessageBox::Yes ,
 				QMessageBox::Cancel | QMessageBox::Default,
@@ -1994,16 +1993,16 @@
 		currentMapEditor()->toggleFloatExport();
 }
 
-void Main::editFollowLink(int item)
+void Main::editFollowXLink(int item)
 {
 	if (currentMapEditor())
-		currentMapEditor()->followLink(branchLinksContextMenu->indexOf(item));
+		currentMapEditor()->followXLink(branchLinksContextMenu->indexOf(item));
 }
 
-void Main::editEditLink(int item)
+void Main::editEditXLink(int item)
 {
 	if (currentMapEditor())
-		currentMapEditor()->editLink(branchLinksContextMenuDup->indexOf(item));
+		currentMapEditor()->editXLink(branchLinksContextMenuDup->indexOf(item));
 }
 
 void Main::formatSelectColor()