From 8d04c77c29392ae2dce8efe517c50b40b5fd1895 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Sun, 5 Jun 2016 14:23:27 +0200
Subject: updated version number and translation file

---
 src/credentialsdialog.ui | 16 ++++++----------
 src/organizer_en.ts      | 14 +++++++-------
 src/version.rc           |  4 ++--
 3 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/credentialsdialog.ui b/src/credentialsdialog.ui
index 3dd9a62a..918441d8 100644
--- a/src/credentialsdialog.ui
+++ b/src/credentialsdialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>282</width>
+    <width>294</width>
     <height>156</height>
    </rect>
   </property>
@@ -25,29 +25,25 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Username</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="1">
       <widget class="QLineEdit" name="usernameEdit"/>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
+     <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Password</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="1">
       <widget class="QLineEdit" name="passwordEdit">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 9c74eb3c..ce640c35 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -211,17 +211,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="credentialsdialog.ui" line="46"/>
+        <location filename="credentialsdialog.ui" line="42"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="credentialsdialog.ui" line="64"/>
+        <location filename="credentialsdialog.ui" line="60"/>
         <source>Remember</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="credentialsdialog.ui" line="75"/>
+        <location filename="credentialsdialog.ui" line="71"/>
         <source>Never ask again</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3684,12 +3684,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1507"/>
+        <location filename="organizercore.cpp" line="1506"/>
         <source>Download?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1508"/>
+        <location filename="organizercore.cpp" line="1507"/>
         <source>A download has been started but no installed page plugin recognizes it.
 If you download anyway no information (i.e. version) will be associated with the download.
 Continue?</source>
@@ -4557,7 +4557,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="538"/>
+        <location filename="main.cpp" line="539"/>
         <source>failed to start application: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5573,7 +5573,7 @@ On Windows XP:
 <context>
     <name>UsvfsConnector</name>
     <message>
-        <location filename="usvfsconnector.cpp" line="133"/>
+        <location filename="usvfsconnector.cpp" line="135"/>
         <source>Preparing vfs</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/version.rc b/src/version.rc
index 445f7c19..34f9b7dd 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,7 +1,7 @@
 #include "Winver.h"
 
-#define VER_FILEVERSION     2,0,6
-#define VER_FILEVERSION_STR "2.0.6beta\0"
+#define VER_FILEVERSION     2,0,7
+#define VER_FILEVERSION_STR "2.0.7beta\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-- 
cgit v1.3.1