fixed bug #1634718,

applied patch #1626541,
added czech translation,
lupdate for all translations

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

src/forms/EditEntryDlg.ui

@@ -14,8 +14,8 @@
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -28,13 +28,16 @@
   </property>
   <property name="maximumSize" >
    <size>
-    <width>500</width>
-    <height>526</height>
+    <width>16777215</width>
+    <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle" >
    <string>Edit Entry</string>
   </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
   <property name="modal" >
    <bool>true</bool>
   </property>
@@ -51,7 +54,7 @@
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType" >
-      <enum>QSizePolicy::Fixed</enum>
+      <enum>QSizePolicy::Minimum</enum>
      </property>
      <property name="sizeHint" >
       <size>

src/forms/SettingsDlg.ui

@@ -62,7 +62,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex" >
-      <number>4</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
@@ -198,16 +198,6 @@
          </item>
         </layout>
        </item>
-       <item>
-        <widget class="QCheckBox" name="CheckBox_ShowPasswords" >
-         <property name="text" >
-          <string>Sh&amp;ow passwords in plain text by default</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+O</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QCheckBox" name="checkBox_EnableBookmarkMenu" >
          <property name="text" >
@@ -685,6 +675,46 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="sizePolicy" >
+          <sizepolicy>
+           <hsizetype>5</hsizetype>
+           <vsizetype>1</vsizetype>
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title" >
+          <string>Show passwords in plain text in:</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="CheckBox_ShowPasswords" >
+            <property name="text" >
+             <string>Edit Entry Dialog</string>
+            </property>
+            <property name="shortcut" >
+             <string>Alt+O</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="CheckBox_ShowPasswords_PasswordDlg" >
+            <property name="text" >
+             <string>Key Dialogs</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer>
          <property name="orientation" >
@@ -917,7 +947,6 @@
  <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>tabWidget4</tabstop>
-  <tabstop>CheckBox_ShowPasswords</tabstop>
   <tabstop>ButtonColor1</tabstop>
   <tabstop>ButtonTextColor</tabstop>
   <tabstop>ButtonColor2</tabstop>