diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index bec6517f2..696962488 100755 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -2472,6 +2472,16 @@ QtWebEngine cache folder -> "%7" Cleanup web cac&he + + + You must add new account first + + + + + You must add new account first. + + @@ -5304,7 +5314,7 @@ Feedly is a secure space where you can privately organize and research the topic - + Cannot insert article filter, because current database cannot return last inserted row ID. @@ -6982,59 +6992,60 @@ Also, there are some built-in sounds. Just start typing ":" and they w StandardFeed - - Script + + +Encoding: %1 +Type: %2 +Post-processing script: %3 - Local file + Script + Local file + + + + Unknown - + Cannot save data for feed: %1 - + JSON error '%1' - + XML is not well-formed, %1 - + XML feed file format unrecognized - + Cannot move feed, detailed information was logged via debug log. - - -Encoding: %2 -Type: %3 - - - - + Cannot save feed data - + Cannot move feed diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index ebbcbc501..c4ce4dbd5 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -44,7 +44,7 @@ CREATE TABLE Feeds ( is_off INTEGER NOT NULL DEFAULT 0 CHECK (is_off >= 0 AND is_off <= 1), is_quiet INTEGER NOT NULL DEFAULT 0 CHECK (is_quiet >= 0 AND is_quiet <= 1), is_rtl INTEGER NOT NULL DEFAULT 0 CHECK (is_rtl >= 0 AND is_rtl <= 1), - add_any_datetime_articles INTEGER NOT NULL DEFAULT 1 CHECK (add_any_datetime_articles >= 0 AND add_any_datetime_articles <= 1), + add_any_datetime_articles INTEGER NOT NULL DEFAULT 0 CHECK (add_any_datetime_articles >= 0 AND add_any_datetime_articles <= 1), datetime_to_avoid BIGINT NOT NULL DEFAULT 0 CHECK (datetime_to_avoid >= 0), open_articles INTEGER NOT NULL DEFAULT 0 CHECK (open_articles >= 0 AND open_articles <= 1), account_id INTEGER NOT NULL, diff --git a/resources/sql/db_update_sqlite_5_6.sql b/resources/sql/db_update_sqlite_5_6.sql index e1703ae1d..bb6399d8f 100755 --- a/resources/sql/db_update_sqlite_5_6.sql +++ b/resources/sql/db_update_sqlite_5_6.sql @@ -14,7 +14,7 @@ CREATE TABLE Feeds ( is_off INTEGER NOT NULL DEFAULT 0 CHECK (is_off >= 0 AND is_off <= 1), is_quiet INTEGER NOT NULL DEFAULT 0 CHECK (is_quiet >= 0 AND is_quiet <= 1), is_rtl INTEGER NOT NULL DEFAULT 0 CHECK (is_rtl >= 0 AND is_rtl <= 1), - add_any_datetime_articles INTEGER NOT NULL DEFAULT 1 CHECK (add_any_datetime_articles >= 0 AND add_any_datetime_articles <= 1), + add_any_datetime_articles INTEGER NOT NULL DEFAULT 0 CHECK (add_any_datetime_articles >= 0 AND add_any_datetime_articles <= 1), datetime_to_avoid BIGINT NOT NULL DEFAULT 0 CHECK (datetime_to_avoid >= 0), open_articles INTEGER NOT NULL DEFAULT 0 CHECK (open_articles >= 0 AND open_articles <= 1), account_id INTEGER NOT NULL, diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index e895d57a8..df9fb1eaf 100644 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -341,7 +341,7 @@ void FormMain::updateAddItemMenu() { m_ui->m_menuAddItem->addAction(m_ui->m_actionAddFeedIntoSelectedItem); } else { - m_ui->m_menuAddItem->addAction(m_ui->m_actionNoActions); + m_ui->m_menuAddItem->addAction(m_ui->m_actionNoAccounts); } } diff --git a/src/librssguard/gui/dialogs/formmain.ui b/src/librssguard/gui/dialogs/formmain.ui index 66619858a..9ddea550c 100755 --- a/src/librssguard/gui/dialogs/formmain.ui +++ b/src/librssguard/gui/dialogs/formmain.ui @@ -937,6 +937,17 @@ Cleanup web cac&he + + + false + + + You must add new account first + + + You must add new account first. + +