diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 6c523ea..2c49492 100755
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -86,7 +86,7 @@ if(!config.ShowPasswords)
   ChangeEchoMode();
 OnPasswordwLostFocus();
 int bits=(entry->Password.length()*8);
-Label_Bits->setText(QString::number(bits)+" Bit");
+Label_Bits->setText(tr("%1 Bit").arg(QString::number(bits)));
 if(bits>128)
   bits=128;
 Progress_Quali->setValue(100*bits/128);
diff --git a/src/dialogs/PasswordGenDlg.cpp b/src/dialogs/PasswordGenDlg.cpp
index b50e5b6..6271601 100755
--- a/src/dialogs/PasswordGenDlg.cpp
+++ b/src/dialogs/PasswordGenDlg.cpp
@@ -185,7 +185,7 @@ fclose(dev_random);
 int bits;
 if(checkBox8->isChecked())bits=length*8;
 else bits=length*7;
-Label_Bits->setText(QString::number(bits)+" Bit");
+Label_Bits->setText(tr("%1 Bit").arg(QString::number(bits)));
 if(bits>128)bits=128;
 Progress_Quali->setProgress(bits,128);
 Progress_Quali->setPercentageVisible(false);
diff --git a/src/forms/EditEntryDlg.ui b/src/forms/EditEntryDlg.ui
index 96fafda..6c68b40 100644
--- a/src/forms/EditEntryDlg.ui
+++ b/src/forms/EditEntryDlg.ui
@@ -340,7 +340,7 @@
     <item row="6" column="5" >
      <widget class="QLabel" name="Label_Bits" >
       <property name="text" >
-       <string>% Bit</string>
+       <string>%1 Bit</string>
       </property>
      </widget>
     </item>
diff --git a/src/translations/keepass-de_DE.ts b/src/translations/keepass-de_DE.ts
index 9029ebf..36aaa66 100644
--- a/src/translations/keepass-de_DE.ts
+++ b/src/translations/keepass-de_DE.ts
@@ -164,6 +164,10 @@ http://keepass.berlios.de/translation-howto.html</translation>
         <source>The number of encryption rounds have to be greater than 0.</source>
         <translation>Die Anzahl an Verschlüsselungsrunden muss mindestens Eins betragen.</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
 </context>
 <context>
     <name>CEditEntryDlg</name>
@@ -241,6 +245,10 @@ Sind Sie sicher?</translation>
         <source>Could not open file.</source>
         <translation>Datei konnte nicht geöffnet werden.</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGenPwDialog</name>
@@ -268,6 +276,10 @@ Sind Sie sicher?</translation>
         <source>Password Generator</source>
         <translation type="unfinished">Passwortgenerator</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CPasswordDialog</name>
@@ -503,7 +515,7 @@ Bitter prüfen Sie Ihre Zugriffsrechte.</translation>
     </message>
     <message>
         <source>% Bit</source>
-        <translation>% Bit</translation>
+        <translation type="obsolete">% Bit</translation>
     </message>
     <message>
         <source>Ge&amp;n.</source>
@@ -533,6 +545,10 @@ Bitter prüfen Sie Ihre Zugriffsrechte.</translation>
         <source>&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditGroupDialog</name>
diff --git a/src/translations/keepass-es_ES.ts b/src/translations/keepass-es_ES.ts
index bde2814..b081b97 100644
--- a/src/translations/keepass-es_ES.ts
+++ b/src/translations/keepass-es_ES.ts
@@ -162,6 +162,10 @@ http://keepass.berlios.de/translation-howto.html</translation>
         <source>The number of encryption rounds have to be greater than 0.</source>
         <translation>El númer de iteraciones de cifrado debe ser mayor que 0.</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Preferencias</translation>
+    </message>
 </context>
 <context>
     <name>CEditEntryDlg</name>
@@ -239,6 +243,10 @@ Are you sure?</source>
         <source>Could not open file.</source>
         <translation>No se pudo abrir el archivo.</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGenPwDialog</name>
@@ -266,6 +274,10 @@ Are you sure?</source>
         <source>Password Generator</source>
         <translation type="unfinished">Generador de Contraseña</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CPasswordDialog</name>
@@ -498,7 +510,7 @@ Please check your permissions.</source>
     </message>
     <message>
         <source>% Bit</source>
-        <translation>% Bits</translation>
+        <translation type="obsolete">% Bits</translation>
     </message>
     <message>
         <source>Ge&amp;n.</source>
@@ -528,6 +540,10 @@ Please check your permissions.</source>
         <source>&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditGroupDialog</name>
diff --git a/src/translations/keepass-fr_FR.ts b/src/translations/keepass-fr_FR.ts
index 43d4ddf..6490d17 100644
--- a/src/translations/keepass-fr_FR.ts
+++ b/src/translations/keepass-fr_FR.ts
@@ -164,6 +164,10 @@ http://keepass.berlios.de/translation-howto.html</translation>
         <source>The number of encryption rounds have to be greater than 0.</source>
         <translation>Le nombre de passes doit être supérieur à 0.</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Préférences</translation>
+    </message>
 </context>
 <context>
     <name>CEditEntryDlg</name>
@@ -241,6 +245,10 @@ En êtes-vous sûr ?</translation>
         <source>Could not open file.</source>
         <translation>Ne peut ouvrir le fichier.</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGenPwDialog</name>
@@ -268,6 +276,10 @@ En êtes-vous sûr ?</translation>
         <source>Password Generator</source>
         <translation type="unfinished">Générateur de mots de passe</translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CPasswordDialog</name>
@@ -501,7 +513,7 @@ S&apos;il vous plait vérifier vos permissions.</translation>
     </message>
     <message>
         <source>% Bit</source>
-        <translation>% Bits</translation>
+        <translation type="obsolete">% Bits</translation>
     </message>
     <message>
         <source>Ge&amp;n.</source>
@@ -531,6 +543,10 @@ S&apos;il vous plait vérifier vos permissions.</translation>
         <source>&gt;</source>
         <translation></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditGroupDialog</name>
diff --git a/src/translations/keepass-ru_RU.ts b/src/translations/keepass-ru_RU.ts
index 12d655c..54ada5c 100644
--- a/src/translations/keepass-ru_RU.ts
+++ b/src/translations/keepass-ru_RU.ts
@@ -160,6 +160,10 @@ http://keepass.berlios.de/translation-howto.html</source>
         <source>The number of encryption rounds have to be greater than 0.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CEditEntryDlg</name>
@@ -234,6 +238,10 @@ Are you sure?</source>
         <source>Could not open file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGenPwDialog</name>
@@ -261,6 +269,10 @@ Are you sure?</source>
         <source>Password Generator</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CPasswordDialog</name>
@@ -485,10 +497,6 @@ Please check your permissions.</source>
         <source>Icon:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>% Bit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Ge&amp;n.</source>
         <translation type="unfinished"></translation>
@@ -517,6 +525,10 @@ Please check your permissions.</source>
         <source>&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditGroupDialog</name>
diff --git a/src/translations/keepass-xx_XX.ts b/src/translations/keepass-xx_XX.ts
index 12d655c..54ada5c 100644
--- a/src/translations/keepass-xx_XX.ts
+++ b/src/translations/keepass-xx_XX.ts
@@ -160,6 +160,10 @@ http://keepass.berlios.de/translation-howto.html</source>
         <source>The number of encryption rounds have to be greater than 0.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CEditEntryDlg</name>
@@ -234,6 +238,10 @@ Are you sure?</source>
         <source>Could not open file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGenPwDialog</name>
@@ -261,6 +269,10 @@ Are you sure?</source>
         <source>Password Generator</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CPasswordDialog</name>
@@ -485,10 +497,6 @@ Please check your permissions.</source>
         <source>Icon:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>% Bit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Ge&amp;n.</source>
         <translation type="unfinished"></translation>
@@ -517,6 +525,10 @@ Please check your permissions.</source>
         <source>&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Bit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditGroupDialog</name>