From 5043a7675de56f7d3a06e516acb26a6aacfbd429 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Apr 2018 07:16:55 +0200 Subject: [PATCH 1/6] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- linux/applications/org.kde.falkon.desktop | 1 + src/lib/data/breeze-fallback/index.theme | 1 + src/plugins/PIM/metadata.desktop | 1 + themes/linux/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 5 files changed, 5 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index ce16a1fb4..f51c48ba5 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -11,6 +11,7 @@ Name[en_GB]=Falkon Name[es]=Falkon Name[fi]=Falkon Name[fr]=Falkon +Name[gl]=Falkon Name[id]=Falkon Name[it]=Falkon Name[nl]=Falkon diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index 0fded5748..a2a5e311c 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -11,6 +11,7 @@ Name[en_GB]=Breeze Name[es]=Brisa Name[fi]=Breeze Name[fr]=Breeze +Name[gl]=Breeze Name[id]=Breeze Name[it]=Brezza Name[nl]=Breeze diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index 969e97f9a..96936aa3b 100644 --- a/src/plugins/PIM/metadata.desktop +++ b/src/plugins/PIM/metadata.desktop @@ -9,6 +9,7 @@ Name[en_GB]=PIM Name[es]=PIM Name[fi]=Henkilökohtainen ajanhallinta Name[fr]=PIM +Name[gl]=PIM Name[id]=PIM Name[it]=PIM Name[nl]=PIM diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index b4ceb5fe1..3f38420f1 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Linux Name[en_GB]=Linux Name[es]=Linux Name[fi]=Linux +Name[gl]=Linux Name[id]=Linux Name[it]=Linux Name[nl]=Linux diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 3d7f3fc74..e61e4609d 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Windows Name[en_GB]=Windows Name[es]=Windows Name[fi]=Windows +Name[gl]=Xanelas Name[id]=Windows Name[it]=Windows Name[nl]=Windows From 33172fcdbe7af5968ad76eaa4537c7b6d72f5125 Mon Sep 17 00:00:00 2001 From: Razi Alavizadeh Date: Thu, 26 Apr 2018 13:50:05 +0430 Subject: [PATCH 2/6] QzToolsTest: Close the opened test file before trying to remove it --- autotests/qztoolstest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/autotests/qztoolstest.cpp b/autotests/qztoolstest.cpp index 5d705f6c9..923bd86db 100644 --- a/autotests/qztoolstest.cpp +++ b/autotests/qztoolstest.cpp @@ -314,6 +314,7 @@ void QzToolsTest::copyRecursivelyTest() QFile file(testDir + "-copy/dir1/dir1_2/file1.txt"); file.open(QFile::ReadOnly); QCOMPARE(file.readAll(), QByteArray("test")); + file.close(); // Copy to target that already exists QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy"), false); From 19e2c4ed767f3fff1cc7b769dc24be91d013b71a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 Apr 2018 06:14:01 +0200 Subject: [PATCH 3/6] GIT_SILENT made messages (after extraction) --- linux/appdata/org.kde.falkon.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/appdata/org.kde.falkon.appdata.xml b/linux/appdata/org.kde.falkon.appdata.xml index d37abeefc..83670b215 100644 --- a/linux/appdata/org.kde.falkon.appdata.xml +++ b/linux/appdata/org.kde.falkon.appdata.xml @@ -88,6 +88,7 @@

Falkon har alla standardfunktioner man kan förvänta sig av en webbläsare. Det omfattar bokmärken, historik (båda också i sidorad) och flikar. Förutom det, kan man hantera RSS-kanaler med en inbyggd RSS-läsare, blockera reklam med ett inbyggt insticksprogram för reklamblockering, blockera Flash-innehåll med Click2Flash och redigera den lokala certifikatdatabasen för certifikatutfärdare med en SSL-hanterare.

У Falkon ви знайдете усі можливості типової програми для перегляду інтернету. Передбачено можливість користування закладками, журналом перегляду (ці дві можливості реалізовано і на бічній панелі) та вкладками. Крім того ви можете отримувати подачі новин RSS за допомогою вбудованого засобу читання RSS, блокувати рекламні повідомлення за допомогою вбудованого додатка блокування реклами, блокувати включення Flash за допомогою додатка Click2Flash та редагувати локальну базу сертифікатів CA за допомогою засобу керування даними SSL.

xxFalkon has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a built-in AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL manager.xx

+

Falkon 包含所有浏览器的高级功能，包括书签、历史、侧边栏和标签页。您可以通过内置的 RSS 阅读器管理 RSS 资源，通过内置的 AdBlock 插件屏蔽广告，通过 Click2Flash 屏蔽 Flash 内容，通过 SSL 管理器编辑本地 CA 认证数据库。

From a8c662281df98d1a6d81d70eb631012a3481a798 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 Apr 2018 07:18:56 +0200 Subject: [PATCH 4/6] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/plugins/ImageFinder/metadata.desktop | 2 ++ src/plugins/KWalletPasswords/metadata.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/ImageFinder/metadata.desktop b/src/plugins/ImageFinder/metadata.desktop index d7c649a2f..005a97380 100644 --- a/src/plugins/ImageFinder/metadata.desktop +++ b/src/plugins/ImageFinder/metadata.desktop @@ -2,6 +2,7 @@ Name=ImageFinder Name[ca]=ImageFinder Name[ca@valencia]=ImageFinder +Name[cs]=ImageFinder Name[de]=Bildersuche Name[en_GB]=ImageFinder Name[es]=Buscador de imágenes @@ -16,6 +17,7 @@ Name[x-test]=xxImageFinderxx Comment=Provides context menu with reverse image search engine support Comment[ca]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges Comment[ca@valencia]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges +Comment[cs]=Poskytuje kontextovou nabídku pro nástroj pro vyhledávání obrázků Comment[en_GB]=Provides context menu with reverse image search engine support Comment[es]=Proporciona un menú de contexto con implementación de búsqueda inversa de imágenes Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index 088056a68..f213d644c 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -2,6 +2,7 @@ Name=KWallet Passwords Name[ca]=Contrasenyes del KWallet Name[ca@valencia]=Contrasenyes del KWallet +Name[cs]=Hesla Kwallet Name[de]=KWallet-Passwörter Name[en_GB]=KWallet Passwords Name[es]=Contraseñas de KWallet @@ -16,6 +17,7 @@ Name[x-test]=xxKWallet Passwordsxx Comment=Provides support for storing passwords in KWallet Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet +Comment[cs]=Poskytuje podporu pro ukládání hesel v Kwallet Comment[en_GB]=Provides support for storing passwords in KWallet Comment[es]=Implementa el almacenamiento de contraseñas en KWallet Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet From d55d0715071855d1f634de2911c016278b859a5d Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 29 Apr 2018 10:05:55 +0200 Subject: [PATCH 5/6] VerticalTabs: Don't force open sidebar when opening new window Only automatically open the sidebar after the plugin is enabled from Preferences. BUG: 393629 FIXED-IN: 3.0.1 --- src/plugins/VerticalTabs/verticaltabsplugin.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp index 5c271618e..732092544 100644 --- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp +++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp @@ -71,6 +71,9 @@ void VerticalTabsPlugin::init(InitState state, const QString &settingsPath) const auto windows = mApp->windows(); for (BrowserWindow *window : windows) { mainWindowCreated(window); + if (window->sideBarManager()->activeSideBar().isEmpty()) { + window->sideBarManager()->showSideBar(QSL("VerticalTabs")); + } } } } @@ -187,9 +190,7 @@ QString VerticalTabsPlugin::styleSheet() const void VerticalTabsPlugin::mainWindowCreated(BrowserWindow *window) { - if (window->sideBarManager()->activeSideBar().isEmpty()) { - window->sideBarManager()->showSideBar(QSL("VerticalTabs")); - } + Q_UNUSED(window) setTabBarVisible(!m_replaceTabBar); } From bc26e9377ca8d22e81c9234e4f876d204d50ab24 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 29 Apr 2018 12:49:55 +0200 Subject: [PATCH 6/6] VerticalTabs: Preserve exapnded state of items inside collapsed parent BUG: 393567 FIXED-IN: 3.0.1 --- src/plugins/VerticalTabs/tabtreeview.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/VerticalTabs/tabtreeview.cpp b/src/plugins/VerticalTabs/tabtreeview.cpp index 625fa6cde..b830f1919 100644 --- a/src/plugins/VerticalTabs/tabtreeview.cpp +++ b/src/plugins/VerticalTabs/tabtreeview.cpp @@ -324,14 +324,14 @@ bool TabTreeView::viewportEvent(QEvent *event) void TabTreeView::initView() { // Restore expanded state - expandAll(); - QModelIndex index = model()->index(0, 0); - while (index.isValid()) { - WebTab *tab = index.data(TabModel::WebTabRole).value(); - if (tab) { - setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool()); - } - index = indexBelow(index); + for (int i = 0; i < model()->rowCount(); ++i) { + const QModelIndex index = model()->index(i, 0); + reverseTraverse(index, [this](const QModelIndex &index) { + WebTab *tab = index.data(TabModel::WebTabRole).value(); + if (tab) { + setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool()); + } + }); } m_initializing = false;