Git commit c33203f1e854aaea0b1fbe159d70eaf48f26b11e by Jaroslaw Staniek.
Committed on 29/08/2018 at 22:38.
Pushed by staniek into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

# Conflicts:
#	src/core/kexipartinfo.cpp
#	src/data/org.kde.kexi.appdata.xml.cmake
#	src/migration/mdb/src/keximdb/keximigrate_mdb.json
#	src/migration/mysql/keximigrate_mysql.json
#	src/migration/postgresql/keximigrate_postgresql.json
#	src/migration/tsv/keximigrate_tsv.json
#	src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
#	src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json

M  +12   -9    src/core/kexipartinfo.cpp
M  +1    -1    src/core/kexipartinfo_p.h
M  +1    -1    src/data/org.kde.kexi.appdata.xml.cmake

https://commits.kde.org/kexi/c33203f1e854aaea0b1fbe159d70eaf48f26b11e

diff --cc src/core/kexipartinfo.cpp
index f6a1bffc7,14f656ec1..e93bd86eb
--- a/src/core/kexipartinfo.cpp
+++ b/src/core/kexipartinfo.cpp
@@@ -19,10 -19,9 +19,11 @@@
  */
  =

  #include "kexipartinfo_p.h"
--#include "kexipartmanager.h"
  #include "KexiMainWindowIface.h"
- #include <KexiStyle.h>
++#include "kexipartmanager.h"
 +#include <KexiIcon.h>
+ #include <KexiJsonTrader.h>
++#include <KexiStyle.h>
  =

  #include <KDbGlobal>
  =

diff --cc src/data/org.kde.kexi.appdata.xml.cmake
index b9522cbcb,75c8ac78f..7cd7c29ef
--- a/src/data/org.kde.kexi.appdata.xml.cmake
+++ b/src/data/org.kde.kexi.appdata.xml.cmake
@@@ -70,7 -84,7 +70,7 @@@
      <p xml:lang=3D"es">Caracter=C3=ADsticas:</p>
      <p xml:lang=3D"et">Omadused:</p>
      <p xml:lang=3D"fi">Ominaisuuksia:</p>
--    <p xml:lang=3D"fr">Fonctionnalit=C3=A9s=C2=A0:</p>
++    <p xml:lang=3D"fr">Fonctionnalit=C3=A9s :</p>
      <p xml:lang=3D"gl">Funcionalidades:</p>
      <p xml:lang=3D"ia">Characteristicas</p>
      <p xml:lang=3D"it">Funzionalit=C3=A0:</p>