closes #83

2011-06-21 06:49:48 +00:00
parent 39c34b9da0
commit 313b75fbf0
5 changed files with 38 additions and 126 deletions
--- a/swisssurfer/src/pinentry.ui
+++ b/swisssurfer/src/pinentry.ui
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>722</width>
-    <height>595</height>
+    <width>655</width>
+    <height>480</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -63,17 +63,6 @@
       <widget class="QWidget" name="page">
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
-          <widget class="QLabel" name="_status">
-           <property name="text">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
          <widget class="QLabel" name="_retries">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -93,23 +82,6 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="page_2">
        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLabel" name="_status_2">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'sans-serif'; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
         <item>
          <widget class="QLabel" name="_tries_2">
           <property name="sizePolicy">
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -338,8 +338,7 @@
    </message>
    <message>
        <location filename="browser.hxx" line="634"/>
-        <source>SwissSurfer %1 (%2)
-
+        <source>SwissSurfer
 Version: %1
 Builddate: %2
 Libraries:
@@ -349,9 +348,13 @@ qt-%5 (%6)
 openssl-%7</source>
        <oldsource>SwissSurfer %1 (%2)

+Version: %1
+Builddate: %2
+Libraries:
 %3
-Using: qt-%4
-Compiled: qt-%5</oldsource>
+%4
+qt-%5 (%6)
+openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -647,12 +650,12 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.ui" line="74"/>
        <source>%1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="122"/>
+        <location filename="pinentry.ui" line="94"/>
        <source>bad or locked certificate</source>
        <translation type="unfinished"></translation>
    </message>
@@ -661,24 +664,6 @@ Compiled: qt-%5</oldsource>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="pinentry.ui" line="105"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="68"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>QMessageBox</name>
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -312,8 +312,7 @@
    </message>
    <message>
        <location filename="browser.hxx" line="634"/>
-        <source>SwissSurfer %1 (%2)
-
+        <source>SwissSurfer
 Version: %1
 Builddate: %2
 Libraries:
@@ -323,9 +322,13 @@ qt-%5 (%6)
 openssl-%7</source>
        <oldsource>SwissSurfer %1 (%2)

+Version: %1
+Builddate: %2
+Libraries:
 %3
-Using: qt-%4
-Compiled: qt-%5</oldsource>
+%4
+qt-%5 (%6)
+openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -637,21 +640,12 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="68"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.ui" line="74"/>
        <source>%1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="122"/>
+        <location filename="pinentry.ui" line="94"/>
        <source>bad or locked certificate</source>
        <translation type="unfinished"></translation>
    </message>
@@ -660,15 +654,6 @@ p, li { white-space: pre-wrap; }
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="pinentry.ui" line="105"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>QMessageBox</name>
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -338,8 +338,7 @@
    </message>
    <message>
        <location filename="browser.hxx" line="634"/>
-        <source>SwissSurfer %1 (%2)
-
+        <source>SwissSurfer
 Version: %1
 Builddate: %2
 Libraries:
@@ -349,9 +348,13 @@ qt-%5 (%6)
 openssl-%7</source>
        <oldsource>SwissSurfer %1 (%2)

+Version: %1
+Builddate: %2
+Libraries:
 %3
-Using: qt-%4
-Compiled: qt-%5</oldsource>
+%4
+qt-%5 (%6)
+openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -647,12 +650,12 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.ui" line="74"/>
        <source>%1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="122"/>
+        <location filename="pinentry.ui" line="94"/>
        <source>bad or locked certificate</source>
        <translation type="unfinished"></translation>
    </message>
@@ -661,24 +664,6 @@ Compiled: qt-%5</oldsource>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="pinentry.ui" line="105"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="68"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>QMessageBox</name>
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -338,8 +338,7 @@
    </message>
    <message>
        <location filename="browser.hxx" line="634"/>
-        <source>SwissSurfer %1 (%2)
-
+        <source>SwissSurfer
 Version: %1
 Builddate: %2
 Libraries:
@@ -349,9 +348,13 @@ qt-%5 (%6)
 openssl-%7</source>
        <oldsource>SwissSurfer %1 (%2)

+Version: %1
+Builddate: %2
+Libraries:
 %3
-Using: qt-%4
-Compiled: qt-%5</oldsource>
+%4
+qt-%5 (%6)
+openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -647,12 +650,12 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.ui" line="74"/>
        <source>%1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.ui" line="122"/>
+        <location filename="pinentry.ui" line="94"/>
        <source>bad or locked certificate</source>
        <translation type="unfinished"></translation>
    </message>
@@ -661,24 +664,6 @@ Compiled: qt-%5</oldsource>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="pinentry.ui" line="105"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="68"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>QMessageBox</name>