diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index 3bd9e6cba..db2caaeac 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -466,12 +466,12 @@ version by clicking this popup notification. DiscoveredFeedsModel - + Title Title - + Type @@ -1556,93 +1556,93 @@ QtWebEngine cache folder -> "%7" Add new category - + Category name is ok. Category name is ok. - + Category name is too short. Category name is too short. - + Description is empty. Description is empty. - + The description is ok. The description is ok. - + Select icon file for the category Select icon file for the category - + Images (%1) - + Select icon Select icon - + Cancel Cancel - + Look in: Label to describe the folder for icon file selection dialog. Look in: - + Icon name: Icon name: - + Icon type: Icon type: - + Category title Category title - + Set title for your category. Set title for your category. - + Category description Category description - + Set description for your category. Set description for your category. - + Icon selection Icon selection - + Load icon from file... Load icon from file... - + Use default icon from icon theme @@ -1794,42 +1794,57 @@ QtWebEngine cache folder -> "%7" - + Discovered feeds - + Target parent folder - + Select parent item for your feed. - - Close && &advanced mode + + Select &all + + + + + &Unselect all + + + + + Add single feed with advanced details + + + + + &Import checked feeds - Import selected feeds + Switch to &advanced mode - + Close this dialog and display dialog for adding individual feeds with advanced options. - + URL is valid. - + URL is NOT valid. @@ -3219,27 +3234,27 @@ You have to restart manually. FormTtRssFeedDetails - + Feed added Feed added - + General General - + Network - + Feed was added, obtaining new tree of feeds now. - + API returned error code %1 @@ -3563,54 +3578,54 @@ You can install it now. GmailNetworkFactory - + Click this to login again. Error is: '%1' - + Click this to login again. - + No subject - + Gmail: authentication error - + failed to download list of labels - + failed to download IDs of e-mail messages - + Gmail: authorization denied - - + + you are not logged in - + failed to get metadata - - + + Login @@ -3889,28 +3904,28 @@ Login tokens expiration: %2 - + Inoreader: authentication error - + Click this to login again. Error is: '%1' - + Inoreader: authorization denied - + Click this to login again. - - + + Login @@ -5477,35 +5492,35 @@ List of supported readers: - - - + + + XML is not well-formed, %1 - + not an ATOM feed - + JSON error '%1' - + not a JSON feed - + not an RDF feed - + not a RSS feed @@ -7471,17 +7486,17 @@ Also, you can post-process generated feed data with yet another script if you wi Error when loading initial feeds - + Fetch metadata Fetch metadata - + Export feeds Export feeds - + Import feeds Import feeds @@ -7506,22 +7521,22 @@ Also, you can post-process generated feed data with yet another script if you wi Cannot add feed because another critical operation is ongoing. - + Cannot add category Cannot add category - + Cannot add category because another critical operation is ongoing. Cannot add category because another critical operation is ongoing. - + Import was completely successful. - + Some feeds/categories were not imported due to error, check debug log for more details. @@ -8155,122 +8170,122 @@ Last login on: %4 WebFactory - + Web engine settings - + Auto-load images - + JS enabled - + JS can open popup windows - + JS can access clipboard - + Hyperlinks can get focus - + Local storage enabled - + Local content can access remote URLs - + XSS auditing enabled - + Spatial navigation enabled - + Local content can access local files - + Hyperlink auditing enabled - + Animate scrolling - + Error pages enabled - + Plugins enabled - + Fullscreen enabled - + Screen capture enabled - + WebGL enabled - + Accelerate 2D canvas - + Print element backgrounds - + Allow running insecure content - + Allow geolocation on insecure origins - + Web cache is going to be cleared - + Do you really want to clear web cache? @@ -8285,37 +8300,37 @@ Last login on: %4 - + JS can activate windows - + Show scrollbars - + Media playback with gestures - + WebRTC uses only public interfaces - + JS can paste from clipboard - + DNS prefetch enabled - + PDF viewer enabled diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index a574b3ee3..fb277c675 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -51,7 +51,7 @@ else USE_QT6="ON" QTPATH="$(pwd)/Qt" - QTVERSION="6.5.2" + QTVERSION="6.6.0" QTBIN="$QTPATH/$QTVERSION/$QTOS/bin" # Install "aqtinstall" from its master branch to have latest code. diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 47399ad24..adcf2a4c8 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -24,16 +24,16 @@ if ($use_qt5 -eq "ON") { $qt_version = "5.15.2" } else { - $qt_version = "6.5.2" + $qt_version = "6.6.0" } $is_qt_6 = $qt_version.StartsWith("6") -$maria_version = "10.6.15" +$maria_version = "11.1.2" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_output = "maria.zip" -$cmake_version = "3.27.6" +$cmake_version = "3.27.7" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_output = "cmake.zip" diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp index 8d7c10008..ad64c4fe1 100644 --- a/src/librssguard/services/standard/standardserviceroot.cpp +++ b/src/librssguard/services/standard/standardserviceroot.cpp @@ -186,7 +186,7 @@ QList StandardServiceRoot::obtainNewMessages(Feed* feed, {}, networkProxy()); - qDebugNN << "etag:" << network_result.m_headers["ETag"]; + // qDebugNN << "etag:" << network_result.m_headers["ETag"]; if (network_result.m_networkError != QNetworkReply::NetworkError::NoError) { qWarningNN << LOGSEC_CORE << "Error" << QUOTE_W_SPACE(network_result.m_networkError)