diff --git a/ChangeLog b/ChangeLog index 5e5c799adafba326a1445ae8458ceecaa420f10f..f2c93ee093f2b231e67c6a51b6e92f2d533dcc68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Changes from Konversation 1.7.5 to 1.7.6: +Konversation v1.7.6 is a small translation update & bugfix release fixing +the build with Qt >= 5.13 and polishing the configuration dialog a bit. + +* Fixed loading of nick icon theme to deal with multiple copies +* Fixed configuration dialogs to have consistent indentation of + subordinate options as well as spacings between labels & fields +* Fixed building against Qt 5.15. +* Fixed building against Qt 5.13. + Changes from Konversation 1.7.4 to 1.7.5: Konversation v1.7.5 is a small bugfix release fixing the build with Qt 5.11. diff --git a/data/org.kde.konversation.appdata.xml b/data/org.kde.konversation.appdata.xml index ee86bd78b58e962eec0cc9f1a5498fddfcd90cb7..53ec0ca9bc9030cd634bc743ac2f62ad249df0bf 100644 --- a/data/org.kde.konversation.appdata.xml +++ b/data/org.kde.konversation.appdata.xml @@ -579,6 +579,7 @@ + diff --git a/src/commit.h b/src/commit.h index c07bdb53f8aff6bea71e5b8750d11f902744ab59..0c97feb4540ddc835696a81d822f5021fec77c9e 100644 --- a/src/commit.h +++ b/src/commit.h @@ -1,4 +1,4 @@ // This COMMIT number is added to version string to be used as "patch level" #ifndef COMMIT -#define COMMIT 5027 +#define COMMIT 5028 #endif diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp index 45d4f88e1985e1456b4030b3dca3de860ae6f265..e6dffbd9ffe503adc44c08c838a86f4045e2ca46 100644 --- a/src/irc/inputfilter.cpp +++ b/src/irc/inputfilter.cpp @@ -285,7 +285,7 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma else { // Do not internationalize the below version string - reply = QString(QStringLiteral("Konversation %1 (C) 2002-2018 by the Konversation team")) + reply = QString(QStringLiteral("Konversation %1 Copyright 2002-2020 by the Konversation team")) .arg(QStringLiteral(KONVI_VERSION)); } diff --git a/src/main.cpp b/src/main.cpp index 6c96a6bc9ccc45e396c6a99b6fff260911b0bcf9..da4c3e833b23f8eb64d3537f4f396b6c9cc42b4f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) KONVI_VERSION, i18n("A user-friendly IRC client"), KAboutLicense::GPL, - i18n("(C) 2002-2018 by the Konversation team"), + i18n("Copyright 2002-%1 by the Konversation team", QStringLiteral("2020")), i18n("Konversation is a client for the Internet Relay Chat (IRC) protocol.\n\n" "Meet friends on the net, make new acquaintances and lose yourself in talk about your favorite subject."), QStringLiteral("https://konversation.kde.org/")); diff --git a/src/version.h b/src/version.h index c399698c4ae38d386ad35d1524d516e91d960d7a..4c5db214fb53a0b0300e66e87c409c862faa6b5d 100644 --- a/src/version.h +++ b/src/version.h @@ -1,3 +1,3 @@ #ifndef KONVI_VERSION -#define KONVI_VERSION "1.7.5" +#define KONVI_VERSION "1.7.6" #endif