diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts
index 120957f45..cd04da399 100644
--- a/localization/rssguard_lt.ts
+++ b/localization/rssguard_lt.ts
@@ -3775,11 +3775,11 @@ Vilkaduobės:
Height or rows in feed list (-1 = default height)
-
+ Eilučių aukštis kanalų sąraše (-1 = numatytasis aukštis)
Height or rows in message list (-1 = default height)
-
+ Eilučių aukštis žinučių sąraše (-1 = numatytasis aukštis)
diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts
index d925cfcf5..e82ed1829 100644
--- a/localization/rssguard_pt.ts
+++ b/localization/rssguard_pt.ts
@@ -3772,11 +3772,11 @@ Os autores deste aplicativo NÃO são responsáveis pela perda de dados.
Height or rows in feed list (-1 = default height)
-
+ Altura ou linhas na lista de feeds (-1: altura padrão)
Height or rows in message list (-1 = default height)
-
+ Altura ou linhas na lista de mensagens (-1: altura padrão)
diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts
index 3df96a3d6..829415a70 100644
--- a/localization/rssguard_sv.ts
+++ b/localization/rssguard_sv.ts
@@ -3770,11 +3770,11 @@ Utvecklaren av detta program, är INTE ansvarig för förlorad data.
Height or rows in feed list (-1 = default height)
-
+ Höjd eller rader i flödeslistan (-1 = standardhöjd)
Height or rows in message list (-1 = default height)
-
+ Höjd eller rader i meddelandelistan (-1 = standardhöjd)
diff --git a/resources/binaries b/resources/binaries
index ae7084718..4a01edaec 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit ae7084718c41afc01919779e58cd449e0eebd401
+Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8
diff --git a/rssguard.pro b/rssguard.pro
index 538710ec4..5bb9ad350 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -181,16 +181,7 @@ win32 {
}
}
-DISTFILES += resources/scripts/uncrustify/uncrustify.cfg \
- resources/android/AndroidManifest.xml \
- resources/android/gradle/wrapper/gradle-wrapper.jar \
- resources/android/gradlew \
- resources/android/res/values/libs.xml \
- resources/android/build.gradle \
- resources/android/gradle/wrapper/gradle-wrapper.properties \
- resources/android/gradlew.bat
-
-#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/resources/android
+DISTFILES += resources/scripts/uncrustify/uncrustify.cfg
MOC_DIR = $$OUT_PWD/moc
RCC_DIR = $$OUT_PWD/rcc
@@ -463,7 +454,9 @@ SOURCES += src/core/feeddownloader.cpp \
src/gui/treeviewcolumnsmenu.cpp \
src/miscellaneous/externaltool.cpp
-OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm
+mac {
+ OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm
+}
FORMS += src/gui/toolbareditor.ui \
src/network-web/downloaditem.ui \
diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp
index 6e8ecf805..a94ae839e 100755
--- a/src/gui/systemtrayicon.cpp
+++ b/src/gui/systemtrayicon.cpp
@@ -79,7 +79,7 @@ void SystemTrayIcon::onActivated(const QSystemTrayIcon::ActivationReason& reason
}
bool SystemTrayIcon::isSystemTrayAvailable() {
- return QSystemTrayIcon::isSystemTrayAvailable();
+ return QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages();
}
bool SystemTrayIcon::isSystemTrayActivated() {
diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp
index b7e2bf893..ba181f754 100755
--- a/src/miscellaneous/databasefactory.cpp
+++ b/src/miscellaneous/databasefactory.cpp
@@ -731,7 +731,7 @@ QSqlDatabase DatabaseFactory::sqliteConnection(const QString& connection_name, D
qPrintable(database.lastError().text()));
}
else {
- qDebug("In-memory SQLite database connection seems to be established.");
+ qDebug("In-memory SQLite database connection '%s' seems to be established.", qPrintable(connection_name));
}
return database;