[gnote/tabbed: 34/34] Merge branch 'master' into 'tabbed'

[Aurimas Černius <aurimasc src gnome org>]

commit 2ef3cb60fa34055395a5eb81872e896d26aaf5df
Merge: 7d93b00e 38e3c83d
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Dec 12 15:16:51 2021 +0000

    Merge branch 'master' into 'tabbed'
    
    # Conflicts:
    #   src/mainwindow.cpp

 .gitlab-ci.yml                      |    2 +-
 NEWS                                |   25 +
 README                              |   12 +-
 data/org.gnome.Gnote.appdata.xml.in |   25 +-
 help/LINGUAS                        |    2 +
 help/ca/ca.po                       | 2793 ++++++++++++++++++++++++
 help/da/da.po                       | 4071 ++++++++++++++++++-----------------
 help/es/es.po                       |  251 ++-
 help/id/id.po                       | 2817 ++++++++++++++++++++++++
 help/lt/lt.po                       |   93 +-
 meson.build                         |    2 +-
 po/cs.po                            | 1507 ++++++-------
 po/da.po                            |  589 ++---
 po/de.po                            | 1803 ++++++++--------
 po/es.po                            |  948 ++++----
 po/hu.po                            | 1696 +++++++--------
 po/ja.po                            |   87 +-
 po/lt.po                            | 1523 ++++++-------
 po/oc.po                            | 2228 +++++++++++--------
 po/ro.po                            |  532 ++---
 po/sr.po                            | 1524 ++++++-------
 po/zh_CN.po                         |  342 +--
 src/recentchanges.cpp               |    1 -
 23 files changed, 14627 insertions(+), 8246 deletions(-)
---
diff --cc src/recentchanges.cpp
index eef70342,34ef6d4f..f27e87a6
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@@ -337,11 -258,10 +337,10 @@@ namespace gnote 
      m_search_box->set_hexpand(false);
      m_search_box->attach(*m_search_entry, 0, 0, 1, 1);
      m_search_box->set_halign(Gtk::ALIGN_CENTER);
-     m_search_box->show();
  
 -    auto content = dynamic_cast<Gtk::Grid*>(m_embed_box.get_parent());
 +    auto content = dynamic_cast<Gtk::Grid*>(m_embed_book.get_parent());
      if(content) {
 -      content->attach_next_to(*m_search_box, m_embed_box, Gtk::POS_TOP);
 +      content->attach_next_to(*m_search_box, m_embed_book, Gtk::POS_TOP);
      }
      else {
        ERR_OUT(_("Parent of embed box is not a Gtk::Grid, please report a bug!"));