diff -r 67cfa6e6b863 -r 7ced3733ba60 texteditor.cpp
--- a/texteditor.cpp	Tue Oct 24 15:36:38 2006 +0000
+++ b/texteditor.cpp	Mon Oct 30 12:39:37 2006 +0000
@@ -35,7 +35,7 @@
 	connect (e, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
     setCentralWidget( e );
     statusBar()->message( tr("Ready","Statusbar message"), statusbarTime);
-	setCaption(__VYM " - " +tr ("Note Editor"));
+	setCaption(__VYM " - " +tr ("Note Editor","Window caption"));
 
 
 	connect(e, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
@@ -196,11 +196,11 @@
 {
     QToolBar *tb = addToolBar ( tr("Note Actions") );
 	tb->setObjectName ("noteEditorFileActions");
-    QMenu *fileMenu = menuBar()->addMenu( tr( "&Note" ));
+    QMenu *fileMenu = menuBar()->addMenu( tr( "&Note","Menubar" ));
 
     QAction *a;
     a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Import..." ),this);
-	a->setStatusTip (tr( "Import" ) );
+	a->setStatusTip (tr( "Import","Status tip for Note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_O );
     connect( a, SIGNAL( activated() ), this, SLOT( textLoad() ) );
 	tb->addAction (a);
@@ -209,7 +209,7 @@
 
     fileMenu->addSeparator();
     a = new QAction( QPixmap(iconPath+"filesave.png" ), tr( "&Export..." ),this);
-	a->setStatusTip (tr( "Export Note (HTML)" ) );
+	a->setStatusTip (tr( "Export Note (HTML)","Status tip for Note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_S );
     connect( a, SIGNAL( activated() ), this, SLOT( textSave() ) );
 	tb->addAction (a);
@@ -217,13 +217,13 @@
 	actionFileSave=a;
 	
     a = new QAction(  QPixmap(), tr( "Export &As... (HTML)" ), this);
-	a->setStatusTip (tr( "Export Note As (HTML) " ));
+	a->setStatusTip (tr( "Export Note As (HTML) ","Status tip for Note Menu"  ));
     connect( a, SIGNAL( activated() ), this, SLOT( textSaveAs() ) );
 	fileMenu->addAction (a);
 	actionFileSaveAs=a;
 
     a = new QAction(QPixmap(), tr( "Export &As...(ASCII)" ), this);
-	a->setStatusTip ( tr( "Export Note As (ASCII) " ) );
+	a->setStatusTip ( tr( "Export Note As (ASCII) ","Status tip for note menu" ) );
 	a->setShortcut(Qt::ALT + Qt::Key_X );
     connect( a, SIGNAL( activated() ), this, SLOT( textExportAsASCII() ) );
 	fileMenu->addAction (a);
@@ -231,7 +231,7 @@
 
     fileMenu->addSeparator();
     a = new QAction( QPixmap(iconPath+"fileprint.png" ), tr( "&Print..." ),this);
-	a->setStatusTip (tr( "Print Note" ) );
+	a->setStatusTip (tr( "Print Note","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_P );
     connect( a, SIGNAL( activated() ), this, SLOT( textPrint() ) );
 	tb->addAction (a);
@@ -247,7 +247,7 @@
 
     QAction *a;
     a = new QAction(QPixmap(iconPath+"undo.png"), tr( "&Undo" ), this );
-	a->setStatusTip ( tr( "Undo" ) );
+	a->setStatusTip ( tr( "Undo","Status tip for note menu" ) );
 	a->setShortcut(Qt::CTRL + Qt::Key_Z );
     connect( a, SIGNAL( activated() ), e, SLOT( undo() ) );
 	editMenu->addAction (a);
@@ -255,7 +255,7 @@
 	actionEditUndo=a;
 	
     a = new QAction(QPixmap(iconPath+"redo.png" ), tr( "&Redo" ),this); 
-	a->setStatusTip ( tr( "Redo" ) );
+	a->setStatusTip ( tr( "Redo","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_Y );
     connect( a, SIGNAL( activated() ), e, SLOT( redo() ) );
 	editMenu->addAction (a);
@@ -264,14 +264,14 @@
 
     editMenu->addSeparator();
     a = new QAction(QPixmap(), tr( "Select and copy &all" ),this); 
-	a->setStatusTip ( tr( "Select and copy all" ) );
+	a->setStatusTip ( tr( "Select and copy all","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_A );
     connect( a, SIGNAL( activated() ), this, SLOT( editCopyAll() ) );
 	editMenu->addAction (a);
 
     editMenu->addSeparator();
     a = new QAction(QPixmap(iconPath+"editcopy.png" ), tr( "&Copy" ),this);
-	a->setStatusTip ( tr( "Copy" ) );
+	a->setStatusTip ( tr( "Copy","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_C );
     connect( a, SIGNAL( activated() ), e, SLOT( copy() ) );
 	editMenu->addAction (a);
@@ -279,7 +279,7 @@
 	actionEditCopy=a;
 	
     a = new QAction(QPixmap(iconPath+"editcut.png" ), tr( "Cu&t" ),this);
-	a->setStatusTip ( tr( "Cut" ) );
+	a->setStatusTip ( tr( "Cut","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_X );
     connect( a, SIGNAL( activated() ), e, SLOT( cut() ) );
 	editMenu->addAction (a);
@@ -287,7 +287,7 @@
 	actionEditCut=a;
 
     a = new QAction(QPixmap(iconPath+"editpaste.png" ), tr( "&Paste" ),this);
-	a->setStatusTip ( tr( "Paste" ) );
+	a->setStatusTip ( tr( "Paste","Status tip for note menu" ) );
 	a->setShortcut( Qt::CTRL + Qt::Key_V );
     connect( a, SIGNAL( activated() ), e, SLOT( paste() ) );
 	editMenu->addAction (a);
@@ -295,7 +295,7 @@
 	actionEditPaste=a;
 	
     a = new QAction( QPixmap( iconPath+"edittrash.png"), tr( "&Delete All" ), this);
-	a->setStatusTip (tr( "Delete all" ) );
+	a->setStatusTip (tr( "Delete all","Status tip for note menu" ) );
     connect( a, SIGNAL( activated() ), e, SLOT( clear() ) );
 	editMenu->addAction (a);
 	tb->addAction (a);
@@ -312,7 +312,7 @@
     QAction *a;
 
     a = new QAction( QPixmap(iconPath+"formatfixedfont.png"), tr( "&Font hint" ), Qt::ALT + Qt::Key_I, this, "fontHint" );
-	a->setStatusTip (tr( "Toggle font hint for the whole text" ) );
+	a->setStatusTip (tr( "Toggle font hint for the whole text","Status tip for note menu" ) );
 	a->setToggleAction (true);
 	a->setOn (settings.value("/noteeditor/fonts/useFixedByDefault",false).toBool() );
     connect( a, SIGNAL( activated() ), this, SLOT( toggleFonthint() ) );
@@ -429,19 +429,19 @@
 
     QAction *a;
     a = new QAction(tr( "Set &fixed font" ), this);
-	a->setStatusTip ( tr( "Set fixed font" ));
+	a->setStatusTip ( tr( "Set fixed font","Status tip for note menu" ));
     connect( a, SIGNAL( activated() ), this, SLOT( setFixedFont() ) );
 	settingsMenu->addAction (a);
 	actionSettingsFixedFont=a;
 
     a = new QAction(tr( "Set &variable font" ), this);
-	a->setStatusTip ( tr( "Set variable font" ) );
+	a->setStatusTip ( tr( "Set variable font","Status tip for note menu" ) );
     connect( a, SIGNAL( activated() ), this, SLOT( setVarFont() ) );
 	settingsMenu->addAction (a);
 	actionSettingsVarFont=a;
 
     a = new QAction(tr( "&fixed font is default" ),  this);
-	a->setStatusTip (tr( "Used fixed font by default" ) );
+	a->setStatusTip (tr( "Used fixed font by default","Status tip for note menu" ) );
 	a->setToggleAction (true);
 	// set state later in constructor...
 	settingsMenu->addAction (a);
@@ -559,9 +559,7 @@
 		if (file.exists())
 		{
 			QMessageBox mb( __VYM,
-				tr("The file ") + fn + 
-				tr(" exists already. "
-				"Do you want to overwrite it?"),
+				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
 			QMessageBox::Warning,
 			QMessageBox::Yes | QMessageBox::Default,
 			QMessageBox::Cancel | QMessageBox::Escape,
@@ -585,7 +583,7 @@
 			return;
 		}			
     }
-	statusBar()->message(tr( "Couldn't export note ") + fn, statusbarTime );
+	statusBar()->message(tr( "Couldn't export note ","dialog 'save note as'") + fn, statusbarTime );
 }
 
 
@@ -635,10 +633,8 @@
 		QFile file (fn);
 		if (file.exists())
 		{
-			QMessageBox mb( "VYM",
-				tr("The file ") + fn + 
-				tr(" exists already. "
-				"Do you want to overwrite it?"),
+			QMessageBox mb( __VYM,
+				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
 			QMessageBox::Warning,
 			QMessageBox::Yes | QMessageBox::Default,
 			QMessageBox::Cancel | QMessageBox::Escape,
@@ -673,7 +669,7 @@
     QPrinter printer;
 
     QPrintDialog *dialog = new QPrintDialog(&printer, this);
-    dialog->setWindowTitle(tr("Print Document"));
+    dialog->setWindowTitle(tr("Print Note"));
     if (dialog->exec() != QDialog::Accepted)
         return;