fixed custom icons issue

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@91 b624d157-de02-0410-bad0-e51aec6abb33

changelog

@@ -2,9 +2,11 @@
     0.2.2
 ---------------
 -fixed crash when parsing config file under Win32
--fixed loss of entry icons when saving a database which 
+-fixed loss of entry icons when saving a database which was not created 
- was not created with KeePassX (no KPX_CUSTOM_ICONS metastream)
+ with KeePassX (no KPX_CUSTOM_ICONS metastream)
-
+-when canceling the file dialog for the opening of an existing database a already
+ openend database will not longer be closed
+-same for the creation of a new database
 
 ---------------
     0.2.1
@@ -15,7 +17,8 @@
 -when saving an attachment the original filename is adopted by the file dialog
 -fixed strange sorting behavior of entries (Bug #7083)
 -sorting by dates now works as expected
--the 'Expires' column and the detailed entry view now also show the string 'never' for entries which don't expire
+-the 'Expires' column and the detailed entry view now also show the string 'never' 
+ for entries which don't expire
 -entry view now gets updated after changing the column setup
 -added menu entry to change the size of the toolbar icons
 ---------------

src/PwManager.cpp

@@ -769,6 +769,20 @@ if(!file->isOpen()){
 	}
 }
 
+
+/*	This is only a fix for a bug in the implementation of the metastream creation
+	in KeePassX 0.2.1. to restore lost icons.
+	It should be removed after a while.
+	--------------------------------------------------*/
+	for(int i=0;i<Groups.size();i++){
+		if(Groups[i].ImageID<BUILTIN_ICONS)
+			Groups[i].OldImgID=Groups[i].ImageID;}
+	for(int i=0;i<Entries.size();i++){
+		if(Entries[i].ImageID<BUILTIN_ICONS)
+			Entries[i].OldImgID=Entries[i].ImageID;}
+/*  --------------------------------------------------*/
+
+
 unsigned int FileSize;
 
 QList<CEntry*> MetaStreams;

src/dialogs/SettingsDlg.cpp

@@ -29,8 +29,8 @@
 #include "SettingsDlg.h"
 
 
-CSettingsDlg::CSettingsDlg(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+CSettingsDlg::CSettingsDlg(QWidget* parent)
-: QDialog(parent,name, modal,fl)
+: QDialog(parent,Qt::Dialog)
 {
 setupUi(this);
 connect(ButtonOK, SIGNAL( clicked() ), this, SLOT( OnOK() ) );

src/dialogs/SettingsDlg.h

@@ -28,7 +28,7 @@ class CSettingsDlg : public QDialog, public Ui_SettingsDialog
   Q_OBJECT
 
 public:
-  CSettingsDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
+  CSettingsDlg(QWidget* parent /*, Qt::WFlags fl*/);
   ~CSettingsDlg();
 
 public slots:

src/forms/SettingsDlg.ui

@@ -27,6 +27,9 @@
   <property name="windowTitle" >
    <string>Settings</string>
   </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
   <widget class="QPushButton" name="ButtonCancel" >
    <property name="geometry" >
     <rect>
@@ -541,22 +544,6 @@
       </item>
      </layout>
     </widget>
-    <widget class="QCheckBox" name="CheckBox_OpenLast" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>20</y>
-       <width>521</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="text" >
-      <string>Remember last opend file</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+Ö</string>
-     </property>
-    </widget>
     <widget class="QCheckBox" name="CheckBox_RememberLastKey" >
      <property name="geometry" >
       <rect>
@@ -570,6 +557,22 @@
       <string>Remember last key type and location</string>
      </property>
     </widget>
+    <widget class="QCheckBox" name="CheckBox_OpenLast" >
+     <property name="geometry" >
+      <rect>
+       <x>10</x>
+       <y>20</y>
+       <width>521</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="text" >
+      <string>Remember last opened file</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+Ö</string>
+     </property>
+    </widget>
    </widget>
   </widget>
  </widget>

src/mainwindow.cpp

@@ -344,12 +344,12 @@ return true;
 
 
 void KeepassMainWindow::OnFileNew(){
-if(FileOpen)
- if(!closeDatabase())return;
 CPasswordDialog dlg(this,"PasswordDlg",true,false,true);
 dlg.setCaption("New Database");
-db=new PwDatabase();
 if(dlg.exec()==1){
+	if(FileOpen)
+		if(!closeDatabase())return;
+	db=new PwDatabase();
 	db->newDatabase();
 	if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){
 		if(!db->createKeyFile(dlg.keyfile)){
@@ -374,15 +374,14 @@ if(dlg.exec()==1){
 	FileOpen=true;
 	setupDatabaseConnections(db);
 }
-else delete db;
 }
 
 void KeepassMainWindow::OnFileOpen(){
-if(FileOpen)
- if(!closeDatabase())return;
 QString filename=QFileDialog::getOpenFileName(this,tr("Open Database..."),QDir::homePath(),"*.kdb");
 if(filename!=QString()){
- openDatabase(filename);
+	if(FileOpen)
+ 		if(!closeDatabase())return;
+	openDatabase(filename);
 }
 }
 
@@ -1000,7 +999,7 @@ SearchResults.clear();
 
 
 void KeepassMainWindow::OnExtrasSettings(){
-CSettingsDlg dlg(this,"SettingsDlg");
+CSettingsDlg dlg(this);
 dlg.exec();
 EntryView->setAlternatingRowColors(config.AlternatingRowColors);
 CGroup::UI_ExpandByDefault=config.ExpandGroupTree;

src/translations/keepass-de_DE.ts

@@ -3,7 +3,7 @@
     <name></name>
     <message>
         <source>Could not open file (FileError=%1)</source>
-        <translation>Datei konnte nicht geöffnet werden. (FileError=%1)</translation>
+        <translation type="obsolete">Datei konnte nicht geöffnet werden. (FileError=%1)</translation>
     </message>
 </context>
 <context>
@@ -655,6 +655,13 @@ Bitter prüfen Sie Ihre Zugriffsrechte.</translation>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>Export_Txt</name>
+    <message>
+        <source>Could not open file (FileError=%1)</source>
+        <translation>Datei konnte nicht geöffnet werden. (FileError=%1)</translation>
+    </message>
+</context>
 <context>
     <name>GenPwDlg</name>
     <message>
@@ -1015,15 +1022,15 @@ die Änderungen speichern?</translation>
     </message>
     <message>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
         <source>Import from...</source>
-        <translation>Importieren aus...</translation>
+        <translation type="obsolete">Importieren aus...</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ansicht</translation>
+        <translation type="obsolete">Ansicht</translation>
     </message>
     <message>
         <source>Columns</source>
@@ -1031,43 +1038,43 @@ die Änderungen speichern?</translation>
     </message>
     <message>
         <source>Extras</source>
-        <translation>Extras</translation>
+        <translation type="obsolete">Extras</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation>Hilfe</translation>
+        <translation type="obsolete">Hilfe</translation>
     </message>
     <message>
         <source>New Database...</source>
-        <translation>Neue Datenbank...</translation>
+        <translation type="obsolete">Neue Datenbank...</translation>
     </message>
     <message>
         <source>Open Database...</source>
-        <translation>Datenbank öffnen...</translation>
+        <translation type="obsolete">Datenbank öffnen...</translation>
     </message>
     <message>
         <source>Close Database</source>
-        <translation>Datenbank schließen</translation>
+        <translation type="obsolete">Datenbank schließen</translation>
     </message>
     <message>
         <source>Save Database</source>
-        <translation>Datenbank speichern</translation>
+        <translation type="obsolete">Datenbank speichern</translation>
     </message>
     <message>
         <source>Save Database As...</source>
-        <translation>Datenbank speichern unter...</translation>
+        <translation type="obsolete">Datenbank speichern unter...</translation>
     </message>
     <message>
         <source>Database Settings...</source>
-        <translation>Datenbankeinstellungen...</translation>
+        <translation type="obsolete">Datenbankeinstellungen...</translation>
     </message>
     <message>
         <source>Change Master Key...</source>
-        <translation>Hauptschlüssel ändern...</translation>
+        <translation type="obsolete">Hauptschlüssel ändern...</translation>
     </message>
     <message>
         <source>Exit</source>
-        <translation>Beenden</translation>
+        <translation type="obsolete">Beenden</translation>
     </message>
     <message>
         <source>PwManager File (*.pwm)</source>
@@ -1187,15 +1194,15 @@ die Änderungen speichern?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Einstellungen...</translation>
+        <translation type="obsolete">Einstellungen...</translation>
     </message>
     <message>
         <source>About...</source>
-        <translation>Über...</translation>
+        <translation type="obsolete">Über...</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation type="obsolete">Bearbeiten</translation>
     </message>
     <message>
         <source>Show Statusbar</source>
@@ -1203,11 +1210,11 @@ die Änderungen speichern?</translation>
     </message>
     <message>
         <source>Export to...</source>
-        <translation>Exportieren nach...</translation>
+        <translation type="obsolete">Exportieren nach...</translation>
     </message>
     <message>
         <source>KeePassX Handbook...</source>
-        <translation>KeePassX Handbuch...</translation>
+        <translation type="obsolete">KeePassX Handbuch...</translation>
     </message>
     <message>
         <source>Plain Text (*.txt)</source>
@@ -1241,6 +1248,78 @@ die Änderungen speichern?</translation>
         <source>28x28</source>
         <translation></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">Datei</translation>
+    </message>
+    <message>
+        <source>&amp;Import from...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Export to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xtras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Database &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Database Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change &amp;Master Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;KeePassX Handbook...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordDlg</name>
@@ -1664,7 +1743,7 @@ Stellen Sie sicher, dass Sie Schreibzugriff auf &apos;~/.keepass&apos; haben.</t
     </message>
     <message>
         <source>Remember last opend file</source>
-        <translation>Zuletzt geöffnete Datei beim Starten öffnen</translation>
+        <translation type="obsolete">Zuletzt geöffnete Datei beim Starten öffnen</translation>
     </message>
     <message>
         <source>Browser Command:</source>
@@ -1690,6 +1769,10 @@ Stellen Sie sicher, dass Sie Schreibzugriff auf &apos;~/.keepass&apos; haben.</t
         <source>Mounting Root:</source>
         <translation>Datenträgerwurzelverzeichnis:</translation>
     </message>
+    <message>
+        <source>Remember last opened file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SimplePasswordDialog</name>

src/translations/keepass-es_ES.ts

@@ -3,7 +3,7 @@
     <name></name>
     <message>
         <source>Could not open file (FileError=%1)</source>
-        <translation>No se pudo abrir el archivo (FileError=%1)</translation>
+        <translation type="obsolete">No se pudo abrir el archivo (FileError=%1)</translation>
     </message>
 </context>
 <context>
@@ -642,6 +642,13 @@ Please check your permissions.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Export_Txt</name>
+    <message>
+        <source>Could not open file (FileError=%1)</source>
+        <translation type="unfinished">No se pudo abrir el archivo (FileError=%1)</translation>
+    </message>
+</context>
 <context>
     <name>GenPwDlg</name>
     <message>
@@ -1002,15 +1009,15 @@ to save the changes?</source>
     </message>
     <message>
         <source>File</source>
-        <translation>Archivo</translation>
+        <translation type="obsolete">Archivo</translation>
     </message>
     <message>
         <source>Import from...</source>
-        <translation>Importar desde...</translation>
+        <translation type="obsolete">Importar desde...</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
         <source>Columns</source>
@@ -1018,43 +1025,43 @@ to save the changes?</source>
     </message>
     <message>
         <source>Extras</source>
-        <translation>Preferencias</translation>
+        <translation type="obsolete">Preferencias</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation>Ayuda</translation>
+        <translation type="obsolete">Ayuda</translation>
     </message>
     <message>
         <source>New Database...</source>
-        <translation>Nueva Base de Datos...</translation>
+        <translation type="obsolete">Nueva Base de Datos...</translation>
     </message>
     <message>
         <source>Open Database...</source>
-        <translation>Abrir Base de Datos...</translation>
+        <translation type="obsolete">Abrir Base de Datos...</translation>
     </message>
     <message>
         <source>Close Database</source>
-        <translation>Cerrar Base de Datos</translation>
+        <translation type="obsolete">Cerrar Base de Datos</translation>
     </message>
     <message>
         <source>Save Database</source>
-        <translation>Guardar Base de Datos</translation>
+        <translation type="obsolete">Guardar Base de Datos</translation>
     </message>
     <message>
         <source>Save Database As...</source>
-        <translation>Guardar Base de Datos Como...</translation>
+        <translation type="obsolete">Guardar Base de Datos Como...</translation>
     </message>
     <message>
         <source>Database Settings...</source>
-        <translation>Preferencias de Base de Datos...</translation>
+        <translation type="obsolete">Preferencias de Base de Datos...</translation>
     </message>
     <message>
         <source>Change Master Key...</source>
-        <translation>Cambiar Clave Maestra...</translation>
+        <translation type="obsolete">Cambiar Clave Maestra...</translation>
     </message>
     <message>
         <source>Exit</source>
-        <translation>Salir</translation>
+        <translation type="obsolete">Salir</translation>
     </message>
     <message>
         <source>PwManager File (*.pwm)</source>
@@ -1174,15 +1181,15 @@ to save the changes?</source>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Preferencias...</translation>
+        <translation type="obsolete">Preferencias...</translation>
     </message>
     <message>
         <source>About...</source>
-        <translation>Acerca de...</translation>
+        <translation type="obsolete">Acerca de...</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editar</translation>
+        <translation type="obsolete">Editar</translation>
     </message>
     <message>
         <source>Show Statusbar</source>
@@ -1190,11 +1197,11 @@ to save the changes?</source>
     </message>
     <message>
         <source>Export to...</source>
-        <translation>Exportar a...</translation>
+        <translation type="obsolete">Exportar a...</translation>
     </message>
     <message>
         <source>KeePassX Handbook...</source>
-        <translation>Manual de KeePassX...</translation>
+        <translation type="obsolete">Manual de KeePassX...</translation>
     </message>
     <message>
         <source>Plain Text (*.txt)</source>
@@ -1228,6 +1235,78 @@ to save the changes?</source>
         <source>28x28</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import from...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Export to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xtras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Database &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Database Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change &amp;Master Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;KeePassX Handbook...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordDlg</name>
@@ -1650,7 +1729,7 @@ Asegúrese de tener acceso para escritura en &apos;~/.keepass&apos;.</translatio
     </message>
     <message>
         <source>Remember last opend file</source>
-        <translation>Recordar último archivo abierto</translation>
+        <translation type="obsolete">Recordar último archivo abierto</translation>
     </message>
     <message>
         <source>Browser Command:</source>
@@ -1676,6 +1755,10 @@ Asegúrese de tener acceso para escritura en &apos;~/.keepass&apos;.</translatio
         <source>Mounting Root:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Remember last opened file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SimplePasswordDialog</name>

src/translations/keepass-fr_FR.ts

@@ -3,7 +3,7 @@
     <name></name>
     <message>
         <source>Could not open file (FileError=%1)</source>
-        <translation>Ne peut ouvrir le fichier (FileError=%1)</translation>
+        <translation type="obsolete">Ne peut ouvrir le fichier (FileError=%1)</translation>
     </message>
 </context>
 <context>
@@ -662,6 +662,13 @@ S&apos;il vous plait, vérifier vos permissions.</translation>
         <translation>&gt;</translation>
     </message>
 </context>
+<context>
+    <name>Export_Txt</name>
+    <message>
+        <source>Could not open file (FileError=%1)</source>
+        <translation type="unfinished">Ne peut ouvrir le fichier (FileError=%1)</translation>
+    </message>
+</context>
 <context>
     <name>GenPwDlg</name>
     <message>
@@ -1022,15 +1029,15 @@ Désirez-vous enregistrer le changement ?</translation>
     </message>
     <message>
         <source>File</source>
-        <translation>Fichier</translation>
+        <translation type="obsolete">Fichier</translation>
     </message>
     <message>
         <source>Import from...</source>
-        <translation>Importer d&apos;un...</translation>
+        <translation type="obsolete">Importer d&apos;un...</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Affichage</translation>
+        <translation type="obsolete">Affichage</translation>
     </message>
     <message>
         <source>Columns</source>
@@ -1038,43 +1045,43 @@ Désirez-vous enregistrer le changement ?</translation>
     </message>
     <message>
         <source>Extras</source>
-        <translation>Extras</translation>
+        <translation type="obsolete">Extras</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation>Aide</translation>
+        <translation type="obsolete">Aide</translation>
     </message>
     <message>
         <source>New Database...</source>
-        <translation>Nouvelle BD...</translation>
+        <translation type="obsolete">Nouvelle BD...</translation>
     </message>
     <message>
         <source>Open Database...</source>
-        <translation>Ouvrir une BD...</translation>
+        <translation type="obsolete">Ouvrir une BD...</translation>
     </message>
     <message>
         <source>Close Database</source>
-        <translation>Fermer la BD</translation>
+        <translation type="obsolete">Fermer la BD</translation>
     </message>
     <message>
         <source>Save Database</source>
-        <translation>Enregistrer la BD</translation>
+        <translation type="obsolete">Enregistrer la BD</translation>
     </message>
     <message>
         <source>Save Database As...</source>
-        <translation>Enregistrer la BD sous...</translation>
+        <translation type="obsolete">Enregistrer la BD sous...</translation>
     </message>
     <message>
         <source>Database Settings...</source>
-        <translation>Paramétrage de la BD...</translation>
+        <translation type="obsolete">Paramétrage de la BD...</translation>
     </message>
     <message>
         <source>Change Master Key...</source>
-        <translation>Changer la clé maitresse...</translation>
+        <translation type="obsolete">Changer la clé maitresse...</translation>
     </message>
     <message>
         <source>Exit</source>
-        <translation>Quitter</translation>
+        <translation type="obsolete">Quitter</translation>
     </message>
     <message>
         <source>PwManager File (*.pwm)</source>
@@ -1194,15 +1201,15 @@ Désirez-vous enregistrer le changement ?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Préférences...</translation>
+        <translation type="obsolete">Préférences...</translation>
     </message>
     <message>
         <source>About...</source>
-        <translation>À propos...</translation>
+        <translation type="obsolete">À propos...</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Édition</translation>
+        <translation type="obsolete">Édition</translation>
     </message>
     <message>
         <source>Show Statusbar</source>
@@ -1210,11 +1217,11 @@ Désirez-vous enregistrer le changement ?</translation>
     </message>
     <message>
         <source>Export to...</source>
-        <translation>Exporter vers...</translation>
+        <translation type="obsolete">Exporter vers...</translation>
     </message>
     <message>
         <source>KeePassX Handbook...</source>
-        <translation>Le manuel de KeePassX...</translation>
+        <translation type="obsolete">Le manuel de KeePassX...</translation>
     </message>
     <message>
         <source>Plain Text (*.txt)</source>
@@ -1248,6 +1255,78 @@ Désirez-vous enregistrer le changement ?</translation>
         <source>28x28</source>
         <translation></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import from...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Export to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xtras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Database &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Database Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change &amp;Master Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;KeePassX Handbook...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordDlg</name>
@@ -1671,7 +1750,7 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
     </message>
     <message>
         <source>Remember last opend file</source>
-        <translation>Se souvenir du dernier fichier ouvert</translation>
+        <translation type="obsolete">Se souvenir du dernier fichier ouvert</translation>
     </message>
     <message>
         <source>Browser Command:</source>
@@ -1697,6 +1776,10 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
         <source>Mounting Root:</source>
         <translation>Point de montage:</translation>
     </message>
+    <message>
+        <source>Remember last opened file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SimplePasswordDialog</name>

src/translations/keepass-ru_RU.ts

@@ -1,10 +1,6 @@
 <!DOCTYPE TS><TS>
 <context>
     <name></name>
-    <message>
-        <source>Could not open file (FileError=%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AboutDlg</name>
@@ -614,6 +610,13 @@ Please check your permissions.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Export_Txt</name>
+    <message>
+        <source>Could not open file (FileError=%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GenPwDlg</name>
     <message>
@@ -968,62 +971,10 @@ to save the changes?</source>
         <source>KeePassX</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import from...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Extras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Database...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Database...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Database As...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Master Key...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>PwManager File (*.pwm)</source>
         <translation type="unfinished"></translation>
@@ -1140,30 +1091,10 @@ to save the changes?</source>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Export to...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KeePassX Handbook...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Plain Text (*.txt)</source>
         <translation type="unfinished"></translation>
@@ -1196,6 +1127,78 @@ to save the changes?</source>
         <source>28x28</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import from...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Export to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xtras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Database &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Database Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change &amp;Master Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;KeePassX Handbook...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordDlg</name>
@@ -1614,10 +1617,6 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
         <source>&amp;Other</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Remember last opend file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Browser Command:</source>
         <translation type="unfinished"></translation>
@@ -1642,6 +1641,10 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
         <source>Mounting Root:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Remember last opened file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SimplePasswordDialog</name>

src/translations/keepass-xx_XX.ts

@@ -1,10 +1,6 @@
 <!DOCTYPE TS><TS>
 <context>
     <name></name>
-    <message>
-        <source>Could not open file (FileError=%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AboutDlg</name>
@@ -614,6 +610,13 @@ Please check your permissions.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Export_Txt</name>
+    <message>
+        <source>Could not open file (FileError=%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GenPwDlg</name>
     <message>
@@ -968,62 +971,10 @@ to save the changes?</source>
         <source>KeePassX</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import from...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Extras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Database...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Database...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Database As...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Master Key...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>PwManager File (*.pwm)</source>
         <translation type="unfinished"></translation>
@@ -1140,30 +1091,10 @@ to save the changes?</source>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Export to...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KeePassX Handbook...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Plain Text (*.txt)</source>
         <translation type="unfinished"></translation>
@@ -1196,6 +1127,78 @@ to save the changes?</source>
         <source>28x28</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Import from...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Export to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xtras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Database &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Database Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change &amp;Master Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;KeePassX Handbook...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordDlg</name>
@@ -1614,10 +1617,6 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
         <source>&amp;Other</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Remember last opend file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Browser Command:</source>
         <translation type="unfinished"></translation>
@@ -1642,6 +1641,10 @@ Make sure you have write access to &apos;~/.keepass&apos;.</source>
         <source>Mounting Root:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Remember last opened file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SimplePasswordDialog</name>

todo

@@ -1,2 +1 @@
-- remember selection states after add/remove actions
+- no taskbar entry for modal dialog under gnome?
-- menu 'View': option for toolbar icons size