diff --git a/translations/passwordmanager_de_DE.ts b/translations/passwordmanager_de_DE.ts
index 56d4d35..ce18166 100644
--- a/translations/passwordmanager_de_DE.ts
+++ b/translations/passwordmanager_de_DE.ts
@@ -44,6 +44,16 @@
         <source>Recently opened files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="214"/>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="220"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="234"/>
         <source>&amp;Tools</source>
@@ -69,11 +79,21 @@
         <source>&amp;Open ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="276"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="285"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="288"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="297"/>
         <source>&amp;About</source>
@@ -84,16 +104,31 @@
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="318"/>
         <source>&amp;New ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="321"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="330"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="333"/>
+        <source>Ctrl+Shift+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="342"/>
         <source>Change &amp;password ...</source>
@@ -104,11 +139,27 @@
         <source>&amp;Add new account</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="354"/>
+        <source>Ctrl+Shift+A</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="363"/>
         <source>Sa&amp;ve as ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="366"/>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="375"/>
+        <location filename="../gui/mainwindow.ui" line="378"/>
+        <source>Remove selected entry</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="387"/>
         <source>&amp;Insert field</source>
@@ -179,57 +230,6 @@
         <source>&amp;hide always</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="214"/>
-        <source>?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="220"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="276"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="288"/>
-        <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="321"/>
-        <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="333"/>
-        <source>Ctrl+Shift+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="354"/>
-        <source>Ctrl+Shift+A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="366"/>
-        <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="375"/>
-        <location filename="../gui/mainwindow.ui" line="378"/>
-        <source>Remove selected entry</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="308"/>
         <source>A simple password store using AES-256-CBC encryption via OpenSSL.</source>
@@ -240,6 +240,12 @@
         <source>Select a password list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="329"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
+        <source>Password Manager files (*.pwmgr);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="356"/>
         <source>Undo stack</source>
@@ -257,6 +263,16 @@
         <source>The file you want to load seems to be very big. Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="399"/>
+        <source>Opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="400"/>
+        <source>Enter the password to open the file &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="405"/>
         <location filename="../gui/mainwindow.cpp" line="406"/>
@@ -329,22 +345,6 @@ OpenSSL error queue: %1</source>
         <source>The password list has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="399"/>
-        <source>Opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="329"/>
-        <location filename="../gui/mainwindow.cpp" line="656"/>
-        <source>Password Manager files (*.pwmgr);;All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="400"/>
-        <source>Enter the password to open the file &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="754"/>
         <source>The backup file couldn&apos;t be created because in IO error occured: %1</source>
@@ -516,6 +516,11 @@ OpenSSL error queue: %1</source>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="1168"/>
+        <source>Copy for 5 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="1170"/>
         <source>Paste</source>
@@ -531,11 +536,6 @@ OpenSSL error queue: %1</source>
         <source>The selection is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="1168"/>
-        <source>Copy for 5 seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QtGui::PasswordGeneratorDialog</name>
@@ -623,6 +623,26 @@ OpenSSL error: %1</source>
         <source>setting field name »%1« to »%2«</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/undocommands.cpp" line="91"/>
+        <source>setting value of empty field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/undocommands.cpp" line="93"/>
+        <source>setting value of »%1« field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/undocommands.cpp" line="99"/>
+        <source>setting type of »%1« field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/undocommands.cpp" line="102"/>
+        <source>setting field property in row »%1«</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <location filename="../gui/undocommands.cpp" line="134"/>
         <source>insertion of %1 row(s) before row %2</source>
@@ -647,26 +667,6 @@ OpenSSL error: %1</source>
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <location filename="../gui/undocommands.cpp" line="91"/>
-        <source>setting value of empty field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/undocommands.cpp" line="93"/>
-        <source>setting value of »%1« field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/undocommands.cpp" line="99"/>
-        <source>setting type of »%1« field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/undocommands.cpp" line="102"/>
-        <source>setting field property in row »%1«</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/undocommands.cpp" line="247"/>
         <source>setting entry name to »%1«</source>
diff --git a/translations/passwordmanager_en_US.ts b/translations/passwordmanager_en_US.ts
index 5f9dbc6..cfebc94 100644
--- a/translations/passwordmanager_en_US.ts
+++ b/translations/passwordmanager_en_US.ts
@@ -44,6 +44,16 @@
         <source>Recently opened files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="214"/>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="220"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="234"/>
         <source>&amp;Tools</source>
@@ -69,11 +79,21 @@
         <source>&amp;Open ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="276"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="285"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="288"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="297"/>
         <source>&amp;About</source>
@@ -84,16 +104,31 @@
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="318"/>
         <source>&amp;New ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="321"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="330"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="333"/>
+        <source>Ctrl+Shift+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="342"/>
         <source>Change &amp;password ...</source>
@@ -104,11 +139,27 @@
         <source>&amp;Add new account</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="354"/>
+        <source>Ctrl+Shift+A</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="363"/>
         <source>Sa&amp;ve as ...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="366"/>
+        <source>Ctrl+Shift+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="375"/>
+        <location filename="../gui/mainwindow.ui" line="378"/>
+        <source>Remove selected entry</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="387"/>
         <source>&amp;Insert field</source>
@@ -179,57 +230,6 @@
         <source>&amp;hide always</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="214"/>
-        <source>?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="220"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="276"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="288"/>
-        <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="321"/>
-        <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="333"/>
-        <source>Ctrl+Shift+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="354"/>
-        <source>Ctrl+Shift+A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="366"/>
-        <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.ui" line="375"/>
-        <location filename="../gui/mainwindow.ui" line="378"/>
-        <source>Remove selected entry</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="308"/>
         <source>A simple password store using AES-256-CBC encryption via OpenSSL.</source>
@@ -240,6 +240,12 @@
         <source>Select a password list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="329"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
+        <source>Password Manager files (*.pwmgr);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="356"/>
         <source>Undo stack</source>
@@ -257,6 +263,16 @@
         <source>The file you want to load seems to be very big. Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="399"/>
+        <source>Opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="400"/>
+        <source>Enter the password to open the file &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="405"/>
         <location filename="../gui/mainwindow.cpp" line="406"/>
@@ -329,22 +345,6 @@ OpenSSL error queue: %1</source>
         <source>The password list has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="399"/>
-        <source>Opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="329"/>
-        <location filename="../gui/mainwindow.cpp" line="656"/>
-        <source>Password Manager files (*.pwmgr);;All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="400"/>
-        <source>Enter the password to open the file &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="754"/>
         <source>The backup file couldn&apos;t be created because in IO error occured: %1</source>
@@ -497,8 +497,8 @@ OpenSSL error queue: %1</source>
         <location filename="../gui/mainwindow.cpp" line="1153"/>
         <source>Remove field(s)</source>
         <translation type="unfinished">
-            <numerusform>Remove field</numerusform>
-            <numerusform>Remove fields</numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message>
@@ -516,6 +516,11 @@ OpenSSL error queue: %1</source>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="1168"/>
+        <source>Copy for 5 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="1170"/>
         <source>Paste</source>
@@ -531,11 +536,6 @@ OpenSSL error queue: %1</source>
         <source>The selection is empty.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="1168"/>
-        <source>Copy for 5 seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QtGui::PasswordGeneratorDialog</name>
@@ -623,30 +623,6 @@ OpenSSL error: %1</source>
         <source>setting field name »%1« to »%2«</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location filename="../gui/undocommands.cpp" line="134"/>
-        <source>insertion of %1 row(s) before row %2</source>
-        <translation>
-            <numerusform>insertion of %1 row before row %2</numerusform>
-            <numerusform>insertion of %1 rows before row %2</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../gui/undocommands.cpp" line="165"/>
-        <source>removal of row %1</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../gui/undocommands.cpp" line="167"/>
-        <source>removal of the rows %1 to %2</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
         <location filename="../gui/undocommands.cpp" line="91"/>
         <source>setting value of empty field</source>
@@ -667,6 +643,30 @@ OpenSSL error: %1</source>
         <source>setting field property in row »%1«</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location filename="../gui/undocommands.cpp" line="134"/>
+        <source>insertion of %1 row(s) before row %2</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../gui/undocommands.cpp" line="165"/>
+        <source>removal of row %1</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../gui/undocommands.cpp" line="167"/>
+        <source>removal of the rows %1 to %2</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
         <location filename="../gui/undocommands.cpp" line="247"/>
         <source>setting entry name to »%1«</source>
@@ -690,25 +690,25 @@ OpenSSL error: %1</source>
     <message numerus="yes">
         <location filename="../gui/undocommands.cpp" line="353"/>
         <source>insertion of %1 entry/entries</source>
-        <translation>
-            <numerusform>insertion of %1 entry</numerusform>
-            <numerusform>insertion of %1 entries</numerusform>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location filename="../gui/undocommands.cpp" line="385"/>
         <source>removal of %1 entry/entries</source>
-        <translation>
-            <numerusform>removal of %1 entry</numerusform>
-            <numerusform>removal of %1 entries</numerusform>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location filename="../gui/undocommands.cpp" line="415"/>
         <source>move of %1 entry/entries</source>
-        <translation>
-            <numerusform>move of %1 entry</numerusform>
-            <numerusform>move of %1 entries</numerusform>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
 </context>