Lang sync.

This commit is contained in:
Martin Rotter 2017-10-16 07:11:17 +02:00
parent 3619250ae2
commit 339dd9c16d
7 changed files with 13 additions and 20 deletions

View File

@ -3775,11 +3775,11 @@ Vilkaduobės:
</message> </message>
<message> <message>
<source>Height or rows in feed list (-1 = default height)</source> <source>Height or rows in feed list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Eilučių aukštis kanalų sąraše (-1 = numatytasis aukštis)</translation>
</message> </message>
<message> <message>
<source>Height or rows in message list (-1 = default height)</source> <source>Height or rows in message list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Eilučių aukštis žinučių sąraše (-1 = numatytasis aukštis)</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -3772,11 +3772,11 @@ Os autores deste aplicativo NÃO são responsáveis pela perda de dados.</transl
</message> </message>
<message> <message>
<source>Height or rows in feed list (-1 = default height)</source> <source>Height or rows in feed list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Altura ou linhas na lista de feeds (-1: altura padrão)</translation>
</message> </message>
<message> <message>
<source>Height or rows in message list (-1 = default height)</source> <source>Height or rows in message list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Altura ou linhas na lista de mensagens (-1: altura padrão)</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -3770,11 +3770,11 @@ Utvecklaren av detta program, är INTE ansvarig för förlorad data.</translatio
</message> </message>
<message> <message>
<source>Height or rows in feed list (-1 = default height)</source> <source>Height or rows in feed list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Höjd eller rader i flödeslistan (-1 = standardhöjd)</translation>
</message> </message>
<message> <message>
<source>Height or rows in message list (-1 = default height)</source> <source>Height or rows in message list (-1 = default height)</source>
<translation type="unfinished"/> <translation>Höjd eller rader i meddelandelistan (-1 = standardhöjd)</translation>
</message> </message>
</context> </context>
<context> <context>

@ -1 +1 @@
Subproject commit ae7084718c41afc01919779e58cd449e0eebd401 Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8

View File

@ -181,16 +181,7 @@ win32 {
} }
} }
DISTFILES += resources/scripts/uncrustify/uncrustify.cfg \ 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
MOC_DIR = $$OUT_PWD/moc MOC_DIR = $$OUT_PWD/moc
RCC_DIR = $$OUT_PWD/rcc RCC_DIR = $$OUT_PWD/rcc
@ -463,7 +454,9 @@ SOURCES += src/core/feeddownloader.cpp \
src/gui/treeviewcolumnsmenu.cpp \ src/gui/treeviewcolumnsmenu.cpp \
src/miscellaneous/externaltool.cpp src/miscellaneous/externaltool.cpp
OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm mac {
OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm
}
FORMS += src/gui/toolbareditor.ui \ FORMS += src/gui/toolbareditor.ui \
src/network-web/downloaditem.ui \ src/network-web/downloaditem.ui \

View File

@ -79,7 +79,7 @@ void SystemTrayIcon::onActivated(const QSystemTrayIcon::ActivationReason& reason
} }
bool SystemTrayIcon::isSystemTrayAvailable() { bool SystemTrayIcon::isSystemTrayAvailable() {
return QSystemTrayIcon::isSystemTrayAvailable(); return QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages();
} }
bool SystemTrayIcon::isSystemTrayActivated() { bool SystemTrayIcon::isSystemTrayActivated() {

View File

@ -731,7 +731,7 @@ QSqlDatabase DatabaseFactory::sqliteConnection(const QString& connection_name, D
qPrintable(database.lastError().text())); qPrintable(database.lastError().text()));
} }
else { 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; return database;