Merge branch 'libcdoc' of github.com:lauris71/DigiDoc4-Client into libcdoc

# Conflicts:
#	client/dialogs/PasswordDialog.ui

Author: Lauris Kaplinski

client/dialogs/PasswordDialog.cpp

@@ -36,8 +36,10 @@ PasswordDialog::PasswordDialog(Mode mode, QWidget *parent)
 	ui->password2Line->setHidden(mode == Mode::DECRYPT);
 	ui->password2Error->hide();
 	if(mode == DECRYPT) {
+		ui->title->setText(tr("Decrypt with password"));
 		ui->passwordLabel->setText(tr("Enter password to decrypt the document"));
 		ui->ok->setText(tr("Decrypt"));
+		ui->passwordLine->setFocus();
 	}
 	auto setError = [this](LineEdit *input, QLabel *error, const QString &msg) {
 		input->setLabel(msg.isEmpty() ? QString() : QStringLiteral("error"));

client/dialogs/PasswordDialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>496</width>
-    <height>610</height>
+    <width>528</width>
+    <height>628</height>
    </rect>
   </property>
   <property name="styleSheet">
@@ -93,16 +93,16 @@ margin-left: 6px;
     <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
-    <number>24</number>
+    <number>40</number>
    </property>
    <property name="topMargin">
-    <number>24</number>
+    <number>32</number>
    </property>
    <property name="rightMargin">
-    <number>24</number>
+    <number>40</number>
    </property>
    <property name="bottomMargin">
-    <number>24</number>
+    <number>32</number>
    </property>
    <item>
     <widget class="QLabel" name="title">

client/translations/en.ts

@@ -1794,6 +1794,10 @@ ID-Card</translation>
         <source>Encrypt</source>
         <translation>Encrypt</translation>
     </message>
+    <message>
+        <source>Decrypt with password</source>
+        <translation>Decrypt with password</translation>
+    </message>
     <message>
         <source>Enter password to decrypt the document</source>
         <translation>Enter password to decrypt the document</translation>

client/translations/et.ts

@@ -1794,6 +1794,10 @@ ID-kaardiga</translation>
         <source>Encrypt</source>
         <translation>Krüpteeri</translation>
     </message>
+    <message>
+        <source>Decrypt with password</source>
+        <translation>Dekrüpteeri parooliga</translation>
+    </message>
     <message>
         <source>Enter password to decrypt the document</source>
         <translation>Sisestage parool dokumendi dekrüpteerimiseks</translation>

client/translations/ru.ts

@@ -1794,6 +1794,10 @@ ID-картой</translation>
         <source>Encrypt</source>
         <translation>Зашифровать</translation>
     </message>
+    <message>
+        <source>Decrypt with password</source>
+        <translation>Расшифровать с паролем</translation>
+    </message>
     <message>
         <source>Enter password to decrypt the document</source>
         <translation>Введите пароль для расшифровки документа</translation>