mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
Merge branch falkon:master into master
This commit is contained in:
commit
d4e0835680
|
@ -10,7 +10,7 @@ msgstr ""
|
||||||
"PO-Revision-Date: 2020-12-29 14:44+0100\n"
|
"PO-Revision-Date: 2020-12-29 14:44+0100\n"
|
||||||
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
||||||
"Language-Team: French <kde-francophone@kde.org>\n"
|
"Language-Team: French <kde-francophone@kde.org>\n"
|
||||||
"Language: fr\n"
|
"Language: fr_FR\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
|
@ -10,7 +10,7 @@ msgstr ""
|
||||||
"PO-Revision-Date: 2020-12-29 14:45+0100\n"
|
"PO-Revision-Date: 2020-12-29 14:45+0100\n"
|
||||||
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
||||||
"Language-Team: French <kde-francophone@kde.org>\n"
|
"Language-Team: French <kde-francophone@kde.org>\n"
|
||||||
"Language: fr\n"
|
"Language: fr_FR\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
|
@ -10,7 +10,7 @@ msgstr ""
|
||||||
"PO-Revision-Date: 2020-12-29 14:38+0100\n"
|
"PO-Revision-Date: 2020-12-29 14:38+0100\n"
|
||||||
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
||||||
"Language-Team: French <kde-francophone@kde.org>\n"
|
"Language-Team: French <kde-francophone@kde.org>\n"
|
||||||
"Language: fr\n"
|
"Language: fr_FR\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
|
@ -10,7 +10,7 @@ msgstr ""
|
||||||
"PO-Revision-Date: 2020-12-29 14:37+0100\n"
|
"PO-Revision-Date: 2020-12-29 14:37+0100\n"
|
||||||
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
"Last-Translator: Xavier Besnard <xavier.besnard@neuf.fr>\n"
|
||||||
"Language-Team: French <kde-francophone@kde.org>\n"
|
"Language-Team: French <kde-francophone@kde.org>\n"
|
||||||
"Language: fr\n"
|
"Language: fr_FR\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
|
@ -29,7 +29,6 @@ UserAgentManager::UserAgentManager(QObject* parent)
|
||||||
, m_usePerDomainUserAgent(false)
|
, m_usePerDomainUserAgent(false)
|
||||||
{
|
{
|
||||||
m_defaultUserAgent = mApp->webProfile()->httpUserAgent();
|
m_defaultUserAgent = mApp->webProfile()->httpUserAgent();
|
||||||
m_defaultUserAgent.replace(QRegularExpression(QSL("(QtWebEngine/[^\\s]+)")), QSL("Falkon/%1 \\1").arg(QString::fromLatin1(Qz::VERSION)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void UserAgentManager::loadSettings()
|
void UserAgentManager::loadSettings()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user