[gnote/gdrive: 43/45] Merge in master

[Aurimas Černius <aurimasc src gnome org>]

commit be597e58dd9a936d73e4d4cbb076866bc1d692bb
Merge: 4c20ed8b 87ae77cf
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Jan 6 17:02:22 2019 +0200

    Merge in master

 .gitignore                                    |    3 +
 NEWS                                          |   32 +
 configure.ac                                  |    2 +-
 gnote.doap                                    |    2 +-
 help/cs/figures/gnote-main-menu.png           |  Bin 68095 -> 0 bytes
 help/cs/figures/gnote-panel.png               |  Bin 17227 -> 0 bytes
 help/cs/figures/gnote-preferences-hotkeys.png |  Bin 39855 -> 0 bytes
 help/cs/figures/new-notebook.png              |  Bin 46377 -> 0 bytes
 help/de/figures/gnote-preferences-hotkeys.png |  Bin 40090 -> 0 bytes
 help/es/es.po                                 |  405 +-
 help/fr/figures/gnote-preferences-hotkeys.png |  Bin 33065 -> 0 bytes
 help/fr/figures/new-notebook.png              |  Bin 52032 -> 0 bytes
 help/lt/figures/gnote-preferences-hotkeys.png |  Bin 35861 -> 0 bytes
 help/lt/figures/new-notebook.png              |  Bin 39812 -> 0 bytes
 help/sv/sv.po                                 |   14 +-
 po/da.po                                      | 6185 ++++++++++++-------------
 po/es.po                                      |   47 +-
 po/id.po                                      |  140 +-
 po/pl.po                                      |   34 +-
 po/tr.po                                      |   52 +-
 src/actionmanager.cpp                         |   92 +-
 src/actionmanager.hpp                         |    6 +-
 src/gnote.cpp                                 |   19 -
 src/gnote.hpp                                 |    4 +-
 src/notewindow.cpp                            |    7 +-
 src/recentchanges.cpp                         |   10 +-
 src/synchronization/syncmanager.hpp           |   14 +-
 src/test/runner.cpp                           |    4 +-
 src/test/testnote.cpp                         |    7 +-
 src/test/testnote.hpp                         |    3 +-
 src/test/testsyncmanager.cpp                  |   17 +-
 src/test/testsyncmanager.hpp                  |    6 +-
 src/test/testtagmanager.cpp                   |   13 +-
 src/test/testtagmanager.hpp                   |    6 +-
 src/test/unit/syncmanagerutests.cpp           |  310 +-
 35 files changed, 3851 insertions(+), 3583 deletions(-)
---
diff --cc src/test/runner.cpp
index bd5afc25,df79c3c7..4f3aad18
--- a/src/test/runner.cpp
+++ b/src/test/runner.cpp
@@@ -18,14 -18,14 +18,16 @@@
   */
  
  
 +#include <giomm/init.h>
+ #include <glibmm/init.h>
  #include <UnitTest++/UnitTest++.h>
  
  int main(int /*argc*/, char ** /*argv*/)
  {
    // force certain timezone so that time tests work
    setenv("TZ", "Europe/London", 1);
+   Glib::init();
 +  Gio::init();
  
    return UnitTest::RunAllTests();
  }