diff --git a/resources/graphics/Faenza/actions/64/document-edit.png b/resources/graphics/Faenza/actions/64/document-edit.png
new file mode 100755
index 000000000..dfa585630
Binary files /dev/null and b/resources/graphics/Faenza/actions/64/document-edit.png differ
diff --git a/resources/icons.qrc b/resources/icons.qrc
index 6a56a573d..4c1509a08 100644
--- a/resources/icons.qrc
+++ b/resources/icons.qrc
@@ -4,6 +4,7 @@
./graphics/Faenza/actions/64/back.png
./graphics/Faenza/actions/64/call-start.png
./graphics/Faenza/actions/64/dialog-yes.png
+ ./graphics/Faenza/actions/64/document-edit.png
./graphics/Faenza/actions/64/document-export.png
./graphics/Faenza/actions/64/document-import.png
./graphics/Faenza/actions/64/document-new.png
diff --git a/resources/initial_feeds/feeds-en.opml b/resources/initial_feeds/feeds-en.opml
index 1a56a21ba..e04bef0d2 100644
--- a/resources/initial_feeds/feeds-en.opml
+++ b/resources/initial_feeds/feeds-en.opml
@@ -7,7 +7,6 @@
-
diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
index 07e7c054d..3ec1fbe5e 100644
--- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
+++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
@@ -19,7 +19,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
m_ui->m_lblTestResult->label()->setWordWrap(true);
m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
"of feeds will be probably much slower and may time-out often."));
- m_ui->m_lblDescription->setText(tr("Note that at least version %1 is required.").arg(OWNCLOUD_MIN_VERSION));
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your ownCloud account"));
m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your ownCloud account"));
m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your ownCloud server, without any API path"));
@@ -41,7 +40,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
GuiUtilities::setLabelAsNotice(*m_ui->m_lblLimitMessages, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblServerSideUpdateInformation, false);
- GuiUtilities::setLabelAsNotice(*m_ui->m_lblDescription, false);
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_spinLimitMessages);
diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui
index ca8303762..abad18e63 100644
--- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui
+++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui
@@ -16,21 +16,48 @@
-
-
-
+
-
+
+
-
+
+
+ URL
+
+
+ m_txtUrl
+
+
+
+ -
+
+
+
+
+ -
Force execution of server-side update when updating feeds from RSS Guard
- -
+
-
+
+
+
+
+
+ true
+
+
+
+ -
Limit number of downloaded messages per feed
- -
+
-
@@ -52,31 +79,17 @@
- -
-
-
-
-
-
- &Test setup
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
-
-
+ -
+
+
+
+
+
+ true
+
+
- -
+
-
Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.
@@ -127,52 +140,42 @@
- -
-
+
-
+
-
-
+
- URL
-
-
- m_txtUrl
+ &Test setup
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
- -
-
-
-
+
-
+
+
+ Qt::Vertical
-
- true
+
+
+ 20
+ 40
+
-
-
- -
-
-
-
-
-
- true
-
-
-
- -
-
-
-
-
-
- true
-
-
+