gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ebdebb0a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/54dae108 (commit)
	from  https://github.com/Gnucash/gnucash/commit/18aff5d1 (commit)



commit ebdebb0a5bb5422a0f05c37df930c05da58b9c8d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 19:01:21 2019 +0200

    Clarify the translation remark for the gnucash-icon

diff --git a/gnucash/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in
index 2d1596db1..654479303 100644
--- a/gnucash/gnome/gnucash.desktop.in.in
+++ b/gnucash/gnome/gnucash.desktop.in.in
@@ -6,7 +6,7 @@ Name=GnuCash
 GenericName=Finance Management
 Comment=Manage your finances, accounts, and investments
 Exec=gnucash %f
-# Icon file name, do not translate or use "gnucash-icon" as msgstr
+# Icon file name, do not translate unless you also provide a localized icon file. Alternatively use the English "gnucash-icon" as msgstr
 Icon=gnucash-icon
 StartupNotify=true
 Terminal=false

commit 54dae108a6281d22aaff6e3035f23002c2c5508b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 18:57:45 2019 +0200

    Properly mark the renamed appdata.xml.in.in for translation

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 7c2aff7fd..91a03466a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -73,7 +73,7 @@ function(make_gnucash_potfiles)
   file (GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp
     ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in.in
-    ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.appdata.xml.in
+    ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.appdata.xml.in.in
     ${CMAKE_SOURCE_DIR}/*.keys.in ${CMAKE_SOURCE_DIR}/*.scm
     ${CMAKE_SOURCE_DIR}/*/qofbookslots.h
   )
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09ca6360d..61f879b4f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -89,6 +89,7 @@ gnucash/gnome/gnc-plugin-register2.c
 gnucash/gnome/gnc-plugin-register.c
 gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
+gnucash/gnome/gnucash.appdata.xml.in.in
 gnucash/gnome/gnucash.desktop.in.in
 gnucash/gnome/reconcile-view.c
 gnucash/gnome/search-owner.c



Summary of changes:
 gnucash/gnome/gnucash.desktop.in.in | 2 +-
 po/CMakeLists.txt                   | 2 +-
 po/POTFILES.in                      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)