gnucash maint: Housekeeping - reduce the number of PACKAGE and VERSION related cmake variables

Geert Janssens gjanssens at code.gnucash.org
Fri Jan 17 12:15:36 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/d8a304c2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/aa961846 (commit)



commit d8a304c2c94a4f0d6c4167cfc1bf6e7f7e84d0cf
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Jan 17 16:28:56 2020 +0100

    Housekeeping - reduce the number of PACKAGE and VERSION related cmake variables
    
    This starts by setting the gnucash version number in the 'project' call.
    This will result in a number of variables set by cmake. The remainder
    of this commit is to reuse the auto-generated
    PROJECT_NAME, PROJECT_VERSION, PROJECT_VERSION_MAJOR
    PROJECT_VERSION_MINOR, PROJECT_VERSION_PATCH and PROJECT_VERSION_TWEAK
    instead of all the various instances of PACKAGE, GNUCASH_MAJOR_VERSION
    and so on.
    
    One parameter is worth mentioning - GETTEXT_PACKAGE
    GnuCash is not using this directly (any more) but it has to be set before
    including gi18n-lib.h.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd0b77d2..a1e58c77d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,22 +2,18 @@
 
 cmake_minimum_required (VERSION 3.5)
 
-project (gnucash)
+project (gnucash
+    VERSION 3.8
+)
 
 enable_testing()
 
 # Version number of gnucash
-set (GNUCASH_MAJOR_VERSION 3)
-set (GNUCASH_MINOR_VERSION 8)
-set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
 set (GNUCASH_LATEST_STABLE_SERIES 3.x)
 
-set (PACKAGE gnucash)
 set (PACKAGE_NAME GnuCash)
-set (PACKAGE_VERSION 3.8)
 set (PACKAGE_BUGREPORT "https://bugs.gnucash.org")
-set (PACKAGE_TARNAME ${PACKAGE})
-set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+set (PACKAGE_STRING "${PACKAGE_NAME} ${PROJECT_VERSION}")
 set (PACKAGE_URL "https://www.gnucash.org/")
 
 # Change this in development versions when changing anything that
@@ -25,8 +21,6 @@ set (PACKAGE_URL "https://www.gnucash.org/")
 
 set (GNUCASH_RESAVE_VERSION "19920")
 
-set(GETTEXT_PACKAGE "gnucash")
-
 # Clear cache variables that will be filled later during the cmake run
 unset(dist_generated CACHE)
 unset(dist_generated_depends CACHE)
@@ -672,8 +666,6 @@ install(FILES ${gnucash_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
 # Create config.h
 
-set (GETTEXT_PACKAGE "gnucash")
-
 if (WIN32)
 if (MINGW)
 set (HAVE_SCANF_LLD 1)
@@ -828,7 +820,7 @@ dist_add_generated (${BUILDING_FROM_VCS} ChangeLog)
 
 ############################ BEGIN MAKE DIST #################
 
-set(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
+set(PACKAGE_PREFIX "${PROJECT_NAME}-${PROJECT_VERSION}")
 set(DIST_FILE "${PACKAGE_PREFIX}.tar")
 
 set(toplvl_DIST_local ${gnucash_DOCS}
@@ -962,10 +954,6 @@ endif()
 # ############################################################
 # Package creation rules
 
-set(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
-set(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
-set(CPACK_PACKAGE_VERSION "${VERSION}")
-
 if(UNIX)
   set(CPACK_GENERATOR "TGZ")
 endif(UNIX)
diff --git a/common/config.h.cmake.in b/common/config.h.cmake.in
index 7a2ca2f51..b66ae22a0 100644
--- a/common/config.h.cmake.in
+++ b/common/config.h.cmake.in
@@ -24,8 +24,8 @@
 /* Using GDK Quartz (not X11) */
 #cmakedefine GDK_QUARTZ
 
-/* Name of our gettext-domain */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+/* Name of our gettext-domain, needed for gi18n-lib.h */
+#define GETTEXT_PACKAGE "@PROJECT_NAME@"
 
 /* Cocoa/Nexstep/GnuStep framework */
 #cmakedefine GNC_PLATFORM_COCOA 1
@@ -57,18 +57,6 @@
 /* Most recent stable GnuCash series */
 #define GNUCASH_LATEST_STABLE_SERIES "@GNUCASH_LATEST_STABLE_SERIES@"
 
-/* GnuCash Major version number */
-#define GNUCASH_MAJOR_VERSION @GNUCASH_MAJOR_VERSION@
-
-/* GnuCash Micro version number */
-#define GNUCASH_MICRO_VERSION @GNUCASH_MICRO_VERSION@
-
-/* GnuCash Minor version number */
-#define GNUCASH_MINOR_VERSION @GNUCASH_MINOR_VERSION@
-
-/* GnuCash Nano version number */
-#define GNUCASH_NANO_VERSION @GNUCASH_NANO_VERSION@
-
 /* GnuCash earliest compatible databaseversion number */
 #define GNUCASH_RESAVE_VERSION @GNUCASH_RESAVE_VERSION@
 
@@ -270,9 +258,6 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
-/* Name of package */
-#define PACKAGE "@PACKAGE@"
-
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
 
@@ -282,14 +267,26 @@
 /* Define to the full name and version of this package. */
 #define PACKAGE_STRING "@PACKAGE_STRING@"
 
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
-
 /* Define to the home page for this package. */
 #define PACKAGE_URL "@PACKAGE_URL@"
 
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
+/* Name of project */
+#define PROJECT_NAME "@PROJECT_NAME@"
+
+/* Version number of package */
+#define PROJECT_VERSION "@PROJECT_VERSION@"
+
+/* GnuCash Major version number */
+#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+
+/* GnuCash Micro version number */
+#define PROJECT_VERSION_MICRO @PROJECT_VERSION_PATCH@
+
+/* GnuCash Minor version number */
+#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
+
+/* GnuCash Nano version number */
+#define PROJECT_VERSION_NANO @PROJECT_VERSION_TWEAK@
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -333,9 +330,6 @@
 #endif
 
 
-/* Version number of package */
-#define VERSION "@VERSION@"
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/gnucash/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c
index bb05fcf14..cf0072816 100644
--- a/gnucash/gnome-utils/gnc-embedded-window.c
+++ b/gnucash/gnome-utils/gnc-embedded-window.c
@@ -342,7 +342,7 @@ gnc_embedded_window_new (const gchar *action_group_name,
 
     /* Create menu and toolbar information */
     priv->action_group = gtk_action_group_new (action_group_name);
-    gtk_action_group_set_translation_domain(priv->action_group, GETTEXT_PACKAGE);
+    gtk_action_group_set_translation_domain(priv->action_group, PROJECT_NAME);
     gtk_action_group_add_actions (priv->action_group, action_entries,
                                   n_action_entries, user_data);
     gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 1372142d6..f7e62c3c4 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -3154,7 +3154,7 @@ gnc_main_window_merge_actions (GncMainWindow *window,
     priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
     entry = g_new0 (MergedActionEntry, 1);
     entry->action_group = gtk_action_group_new (group_name);
-    gtk_action_group_set_translation_domain (entry->action_group, GETTEXT_PACKAGE);
+    gtk_action_group_set_translation_domain (entry->action_group, PROJECT_NAME);
     gtk_action_group_add_actions (entry->action_group, actions, n_actions, data);
     if (toggle_actions != NULL && n_toggle_actions > 0)
     {
@@ -3604,7 +3604,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
 
     /* Create menu and toolbar information */
     priv->action_group = gtk_action_group_new ("MainWindowActions");
-    gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE);
+    gtk_action_group_set_translation_domain (priv->action_group, PROJECT_NAME);
     gtk_action_group_add_actions (priv->action_group, gnc_menu_actions,
                                   gnc_menu_n_actions, window);
     gtk_action_group_add_toggle_actions (priv->action_group,
diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
index c0e6cc88a..bc7bbbc3a 100644
--- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c
+++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
@@ -424,7 +424,7 @@ gnc_plugin_menu_additions_add_to_window (GncPlugin *plugin,
     per_window.window = window;
     per_window.ui_manager = window->ui_merge;
     per_window.group = gtk_action_group_new ("MenuAdditions" );
-    gtk_action_group_set_translation_domain (per_window.group, GETTEXT_PACKAGE);
+    gtk_action_group_set_translation_domain (per_window.group, PROJECT_NAME);
     per_window.merge_id = gtk_ui_manager_new_merge_id(window->ui_merge);
     gtk_ui_manager_insert_action_group(window->ui_merge, per_window.group, 0);
 
diff --git a/gnucash/gnome-utils/gnc-plugin-page.c b/gnucash/gnome-utils/gnc-plugin-page.c
index 792c8bd92..d757f3a53 100644
--- a/gnucash/gnome-utils/gnc-plugin-page.c
+++ b/gnucash/gnome-utils/gnc-plugin-page.c
@@ -997,7 +997,7 @@ gnc_plugin_page_create_action_group (GncPluginPage *page, const gchar *group_nam
 
     priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page);
     group = gtk_action_group_new(group_name);
-    gtk_action_group_set_translation_domain(group, GETTEXT_PACKAGE);
+    gtk_action_group_set_translation_domain(group, PROJECT_NAME);
     priv->action_group = group;
     return group;
 }
diff --git a/gnucash/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in
index 9b251188d..a6161cb74 100644
--- a/gnucash/gnome/gnucash.desktop.in.in
+++ b/gnucash/gnome/gnucash.desktop.in.in
@@ -14,6 +14,6 @@ Categories=Office;Finance;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=GnuCash
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-Version=@PROJECT_VERSION@
 X-GNOME-DocPath=gnucash/gnucash.xml
 X-GNOME-FullName=GnuCash Finance Management
diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index cf8ab1eb0..22e2cbb53 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -1765,7 +1765,7 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
 
         action_group = gtk_action_group_new ("ReconcileWindowActions");
         recnData->action_group = action_group;
-        gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
+        gtk_action_group_set_translation_domain(action_group, PROJECT_NAME);
         gtk_action_group_add_actions (action_group, recnWindow_actions,
                                       recnWindow_n_actions, recnData);
         action =
diff --git a/gnucash/gnome/window-reconcile2.c b/gnucash/gnome/window-reconcile2.c
index 27e8dba32..0b367d6c9 100644
--- a/gnucash/gnome/window-reconcile2.c
+++ b/gnucash/gnome/window-reconcile2.c
@@ -1705,7 +1705,7 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account,
 
         action_group = gtk_action_group_new ("ReconcileWindowActions");
         recnData->action_group = action_group;
-        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+        gtk_action_group_set_translation_domain (action_group, PROJECT_NAME);
         gtk_action_group_add_actions (action_group, recnWindow2_actions,
                                       recnWindow2_n_actions, recnData);
         action =
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index c08ecbd8f..63722e60e 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -438,7 +438,7 @@ gnc_parse_command_line(int *argc, char ***argv)
     GError *error = NULL;
     GOptionContext *context = g_option_context_new (_("- GnuCash, accounting for personal and small business finance"));
 
-    g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+    g_option_context_add_main_entries (context, options, PROJECT_NAME);
     g_option_context_add_group (context, gtk_get_option_group(FALSE));
     if (!g_option_context_parse (context, argc, argv, &error))
     {
@@ -882,11 +882,11 @@ main(int argc, char ** argv)
         setlocale (LC_ALL, "C");
       }
 #endif
-    bindtextdomain(GETTEXT_PACKAGE, localedir);
+    bindtextdomain(PROJECT_NAME, localedir);
     bindtextdomain("iso_4217", localedir); // For win32 to find currency name translations
     bind_textdomain_codeset("iso_4217", "UTF-8");
-    textdomain(GETTEXT_PACKAGE);
-    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(PROJECT_NAME);
+    bind_textdomain_codeset(PROJECT_NAME, "UTF-8");
     g_free(localedir);
 
     gnc_parse_command_line(&argc, &argv);
diff --git a/gnucash/gnucash.rc.in b/gnucash/gnucash.rc.in
index c48867223..80fc8d176 100644
--- a/gnucash/gnucash.rc.in
+++ b/gnucash/gnucash.rc.in
@@ -3,8 +3,8 @@
 APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
 
 1 VERSIONINFO
- FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@,0,0
- PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@,0,0
+ FILEVERSION     @PROJECT_VERSION_MAJOR@, at PROJECT_VERSION_MINOR@,0,0
+ PRODUCTVERSION  @PROJECT_VERSION_MAJOR@, at PROJECT_VERSION_MINOR@,0,0
  FILEFLAGSMASK   0x3fL
  FILEFLAGS       0x0L
  FILEOS          VOS__WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "GnuCash Development Team"
       VALUE "FileDescription", "GnuCash Program File"
-      VALUE "FileVersion", "@VERSION@"
+      VALUE "FileVersion", "@PROJECT_VERSION@"
       VALUE "InternalName", "gnucash"
       VALUE "LegalCopyright", "©2018 GnuCash Development Team, Licence: GPL v2.0 or later"
       VALUE "OriginalFilename", "gnucash.exe"
       VALUE "ProductName", "GnuCash Free Finance Manager"
-      VALUE "ProductVersion", "@VERSION@"
+      VALUE "ProductVersion", "@PROJECT_VERSION@"
     END
   END
 
diff --git a/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
index 78480bb4d..9bc12664b 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.business" path="/org/gnucash/dialogs/business/">
     <child name="customer-search" schema="org.gnucash.dialogs.business.customer-search"/>
     <child name="employee-search" schema="org.gnucash.dialogs.business.employee-search"/>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
index 9ca5dc8d5..89f2de242 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.checkprinting" path="/org/gnucash/dialogs/print-checks/">
     <key name="check-format-guid" type="s">
       <default>''</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
index 1bcd2a6f0..83eda98f6 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.commodities" path="/org/gnucash/dialogs/commodities/">
     <key name="include-iso" type="b">
       <default>false</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
index 32f8c7062..7a69d4fe3 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.export.csv" path="/org/gnucash/dialogs/export/csv/">
     <key name="last-geometry" type="(iiii)">
       <default>(-1,-1,-1,-1)</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
index 7736671e2..b5529f902 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs" path="/org/gnucash/dialogs/">
     <child name="account" schema="org.gnucash.dialogs.account"/>
     <child name="imap-editor" schema="org.gnucash.dialogs.imap-editor"/>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
index f05002bcd..ed71e4752 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.import.csv" path="/org/gnucash/dialogs/import/csv/">
     <key name="last-geometry" type="(iiii)">
       <default>(-1,-1,-1,-1)</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
index b9c75ae1e..dd483ea13 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic/">
     <key name="enable-skip" type="b">
       <default>true</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
index 14f2cb14c..fb5d8630b 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.import.qif" path="/org/gnucash/dialogs/import/qif/">
     <key name="default-status-notcleared" type="b">
       <default>true</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
index c2b84bd16..400bf185e 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.reconcile" path="/org/gnucash/dialogs/reconcile/">
     <key name="check-cleared" type="b">
       <default>true</default>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
index d5c8a6135..6fbfd4c4b 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.sxs" path="/org/gnucash/dialogs/scheduled-trans/">
     <child name="since-last-run" schema="org.gnucash.dialogs.sxs.since-last-run"/>
     <child name="transaction-editor" schema="org.gnucash.dialogs.sxs.transaction-editor"/>
diff --git a/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
index 4e40a606f..27ba1b27d 100644
--- a/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.totd" path="/org/gnucash/dialogs/tip-of-the-day/">
     <key name="current-tip" type="i">
       <default>0</default>
diff --git a/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in b/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
index 1a69fae6a..e4191bc40 100644
--- a/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.general.finance-quote" path="/org/gnucash/general/finance-quote/">
     <key name="alphavantage-api-key" type="s">
       <default>''</default>
diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
index 5ac217e0d..d35bc7d5a 100644
--- a/gnucash/gschemas/org.gnucash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash" path="/org/gnucash/">
     <child name="general" schema="org.gnucash.general"/>
     <child name="dev" schema="org.gnucash.dev"/>
diff --git a/gnucash/gschemas/org.gnucash.history.gschema.xml.in b/gnucash/gschemas/org.gnucash.history.gschema.xml.in
index 94f2844b7..65ecefa89 100644
--- a/gnucash/gschemas/org.gnucash.history.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.history.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.history" path="/org/gnucash/history/">
     <key name="maxfiles" type="i">
       <default>4</default>
diff --git a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
index 1e1effc22..fd404c18f 100644
--- a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.warnings" path="/org/gnucash/warnings/">
     <child name="permanent" schema="org.gnucash.warnings.permanent"/>
     <child name="temporary" schema="org.gnucash.warnings.temporary"/>
diff --git a/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in b/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
index 28f6405ad..21bbc2555 100644
--- a/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.window.pages.account-tree.summary" path="/org/gnucash/window/pages/account-tree/summary/">
     <key name="grand-total" type="b">
       <default>true</default>
diff --git a/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in b/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
index 0bcf7545a..e8c97ba0d 100644
--- a/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.window.pages" path="/org/gnucash/window/pages/account-tree/">
     <key name="account-code-visible" type="b">
       <default>false</default>
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index fbdc19307..4e965fa35 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -169,7 +169,7 @@ gnc_AB_BANKING_new(void)
         registration was requested and is managed by cstim). The function call was
         introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
         AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
-        AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PACKAGE_VERSION);
+        AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PROJECT_VERSION);
 #endif
 
 #ifndef AQBANKING6
diff --git a/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in b/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
index 4eccf0f59..65ab38c87 100644
--- a/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
+++ b/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.ab-initial" path="/org/gnucash/dialogs/ab-initial/">
     <key name="last-geometry" type="(iiii)">
       <default>(-1,-1,-1,-1)</default>
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 373c4633e..33a4cd1c1 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -2079,7 +2079,7 @@ CsvImpTransAssist::assist_summary_page_prepare ()
     // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
     bl::generator gen;
     gen.add_messages_path(gnc_path_get_localedir());
-    gen.add_messages_domain(GETTEXT_PACKAGE);
+    gen.add_messages_domain(PROJECT_NAME);
 
     auto text = std::string("<span size=\"medium\"><b>");
     try
diff --git a/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in b/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
index ec19ec463..5cbaa1edc 100644
--- a/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
+++ b/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="@PROJECT_NAME@">
   <schema id="org.gnucash.dialogs.import.ofx" path="/org/gnucash/dialogs/import/ofx/">
     <key name="last-path" type="s">
       <default>''</default>
diff --git a/libgnucash/app-utils/gnc-gsettings.c b/libgnucash/app-utils/gnc-gsettings.c
index 9c144aa7c..dcadf5b81 100644
--- a/libgnucash/app-utils/gnc-gsettings.c
+++ b/libgnucash/app-utils/gnc-gsettings.c
@@ -885,7 +885,7 @@ void gnc_gsettings_version_upgrade (void)
     /* Use versioning to ensure this routine will only sync once for each
      * superseded setting */
     int old_maj_min = gnc_gsettings_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_VERSION);
-    int cur_maj_min = GNUCASH_MAJOR_VERSION * 100 + GNUCASH_MINOR_VERSION;
+    int cur_maj_min = PROJECT_VERSION_MAJOR * 100 + PROJECT_VERSION_MINOR;
 
     /* Migrate preferences from gconf to gsettings */
     if (!gnc_gsettings_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE))
diff --git a/libgnucash/backend/xml/sixtp-utils.cpp b/libgnucash/backend/xml/sixtp-utils.cpp
index 12ecd8748..a1527f3bc 100644
--- a/libgnucash/backend/xml/sixtp-utils.cpp
+++ b/libgnucash/backend/xml/sixtp-utils.cpp
@@ -36,7 +36,7 @@ extern "C"
 #include <time.h>
 #include <errno.h>
 
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
 #ifndef HAVE_STRPTIME
 #include "strptime.h"
 #endif
diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index ac46d4227..22d57c776 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -591,7 +591,7 @@ static std::string migrate_gnc_datahome()
 
     bl::generator gen;
     gen.add_messages_path(gnc_path_get_datadir());
-    gen.add_messages_domain(PACKAGE);
+    gen.add_messages_domain(PROJECT_NAME);
 
     std::stringstream migration_msg;
     migration_msg.imbue(gnc_get_locale());
@@ -737,7 +737,7 @@ static std::string migrate_gnc_datahome()
 #if defined G_OS_WIN32 ||defined MAC_INTEGRATION
 constexpr auto path_package = PACKAGE_NAME;
 #else
-constexpr auto path_package = PACKAGE;
+constexpr auto path_package = PROJECT_NAME;
 #endif
 
 // Initialize the user's config directory for gnucash
diff --git a/libgnucash/core-utils/gnc-prefs.c b/libgnucash/core-utils/gnc-prefs.c
index d59e91f63..94785a8fb 100644
--- a/libgnucash/core-utils/gnc-prefs.c
+++ b/libgnucash/core-utils/gnc-prefs.c
@@ -116,7 +116,7 @@ gnc_prefs_set_file_retention_days(gint days)
 guint
 gnc_prefs_get_long_version()
 {
-     return GNUCASH_MAJOR_VERSION * 1000000 + GNUCASH_MINOR_VERSION;
+     return PROJECT_VERSION_MAJOR * 1000000 + PROJECT_VERSION_MINOR;
 }
 
 gulong gnc_prefs_register_cb (const char *group,
diff --git a/libgnucash/core-utils/gnc-version.c b/libgnucash/core-utils/gnc-version.c
index eaa93c5b3..8a1005d04 100644
--- a/libgnucash/core-utils/gnc-version.c
+++ b/libgnucash/core-utils/gnc-version.c
@@ -34,7 +34,7 @@
 
 const char *gnc_version(void)
 {
-    return VERSION;
+    return PROJECT_VERSION;
 }
 
 const char *gnc_build_id(void)
@@ -64,5 +64,5 @@ const char *gnc_vcs_rev_date(void)
 
 const int gnc_gnucash_major_version(void)
 {
-    return GNUCASH_MAJOR_VERSION;
+    return PROJECT_VERSION_MAJOR;
 }
diff --git a/libgnucash/core-utils/test/test-userdata-dir-invalid-home.c b/libgnucash/core-utils/test/test-userdata-dir-invalid-home.c
index b28f3f334..b81d52133 100644
--- a/libgnucash/core-utils/test/test-userdata-dir-invalid-home.c
+++ b/libgnucash/core-utils/test/test-userdata-dir-invalid-home.c
@@ -42,19 +42,19 @@ usr_confpath_strings strs2[] =
 {
     {
         0, "gnc_build_userdata_path",
-        PACKAGE
+        PROJECT_NAME
     },
     {
         1, "gnc_build_book_path",
-        PACKAGE G_DIR_SEPARATOR_S "books"
+        PROJECT_NAME G_DIR_SEPARATOR_S "books"
     },
     {
         2, "gnc_build_translog_path",
-        PACKAGE G_DIR_SEPARATOR_S "translog"
+        PROJECT_NAME G_DIR_SEPARATOR_S "translog"
     },
     {
         3, "gnc_build_data_path",
-        PACKAGE G_DIR_SEPARATOR_S "data"
+        PROJECT_NAME G_DIR_SEPARATOR_S "data"
     },
     { 0, NULL, NULL },
 };
diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c
index 8eb2c4b43..c42b0249b 100644
--- a/libgnucash/core-utils/test/test-userdata-dir.c
+++ b/libgnucash/core-utils/test/test-userdata-dir.c
@@ -62,7 +62,7 @@ usr_confpath_strings strs2[] =
 #if defined G_OS_WIN32 ||defined MAC_INTEGRATION
 const char *path_package = PACKAGE_NAME;
 #else
-const char *path_package = PACKAGE;
+const char *path_package = PROJECT_NAME;
 #endif
 
 
diff --git a/libgnucash/doc/design/CMakeLists.txt b/libgnucash/doc/design/CMakeLists.txt
index b9dec7e65..4a35ebe79 100644
--- a/libgnucash/doc/design/CMakeLists.txt
+++ b/libgnucash/doc/design/CMakeLists.txt
@@ -22,8 +22,8 @@ set(UPDATED_MONTH "${CURRENT_MONTH} ${CURRENT_YEAR}")
 set(VERSION_TEXI_IN
   "@set UPDATED ${UPDATED}
 @set UPDATED-MONTH ${UPDATED_MONTH}
- at set EDITION ${VERSION}
- at set VERSION ${VERSION}
+ at set EDITION ${PROJECT_VERSION}
+ at set VERSION ${PROJECT_VERSION}
 ")
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.texi ${VERSION_TEXI_IN})
diff --git a/libgnucash/engine/gncAddress.h b/libgnucash/engine/gncAddress.h
index 012932c98..e5c16a914 100644
--- a/libgnucash/engine/gncAddress.h
+++ b/libgnucash/engine/gncAddress.h
@@ -55,7 +55,7 @@ up to you to pass a suitable entity.
 #define GNC_ADDRESS_H_
 
 #include "qof.h"
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
 #include "gncBusiness.h"
 #endif
 
diff --git a/libgnucash/engine/gncBillTerm.h b/libgnucash/engine/gncBillTerm.h
index d2ccded1a..5554db364 100644
--- a/libgnucash/engine/gncBillTerm.h
+++ b/libgnucash/engine/gncBillTerm.h
@@ -35,7 +35,7 @@ typedef struct _gncBillTerm GncBillTerm;
 typedef struct _gncBillTermClass GncBillTermClass;
 
 #include "qof.h"
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
 #include "gncBusiness.h"
 #endif
 #define GNC_ID_BILLTERM       "gncBillTerm"
diff --git a/libgnucash/engine/gncCustomer.c b/libgnucash/engine/gncCustomer.c
index 13ec64c82..3b5b1df31 100644
--- a/libgnucash/engine/gncCustomer.c
+++ b/libgnucash/engine/gncCustomer.c
@@ -37,7 +37,7 @@
 #include "gncAddressP.h"
 #include "gncBillTermP.h"
 #include "gncInvoice.h"
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
 #include "gncBusiness.h"
 #endif
 
diff --git a/libgnucash/engine/gncEntry.h b/libgnucash/engine/gncEntry.h
index a45d83b27..6cce6aef9 100644
--- a/libgnucash/engine/gncEntry.h
+++ b/libgnucash/engine/gncEntry.h
@@ -49,7 +49,7 @@ typedef enum
 
 typedef GList AccountValueList;
 
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
 #include "gncBusiness.h"
 #endif
 #include "gncInvoice.h"
diff --git a/libgnucash/engine/gncJob.c b/libgnucash/engine/gncJob.c
index 715363ab8..d7a966c86 100644
--- a/libgnucash/engine/gncJob.c
+++ b/libgnucash/engine/gncJob.c
@@ -576,7 +576,7 @@ gboolean gncJobRegister (void)
         { JOB_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, (QofSetterFunc)gncJobSetActive },
         { JOB_REFERENCE, QOF_TYPE_STRING, (QofAccessFunc)gncJobGetReference, (QofSetterFunc)gncJobSetReference },
         { JOB_RATE, QOF_TYPE_NUMERIC, (QofAccessFunc)gncJobGetRate, (QofSetterFunc)gncJobSetRate },
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
         { JOB_OWNER, GNC_ID_OWNER, (QofAccessFunc)gncJobGetOwner, NULL },
 #else
         { JOB_OWNER, QOF_TYPE_CHOICE, (QofAccessFunc)qofJobGetOwner, (QofSetterFunc)qofJobSetOwner },
@@ -597,7 +597,7 @@ gboolean gncJobRegister (void)
     }
 
     qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
-#ifdef GNUCASH_MAJOR_VERSION
+#ifdef PROJECT_VERSION_MAJOR
     qofJobGetOwner(NULL);
     qofJobSetOwner(NULL, NULL);
 #endif
diff --git a/libgnucash/engine/qof-backend.cpp b/libgnucash/engine/qof-backend.cpp
index e1a646feb..4357367a1 100644
--- a/libgnucash/engine/qof-backend.cpp
+++ b/libgnucash/engine/qof-backend.cpp
@@ -109,7 +109,7 @@ QofBackend::register_backend(const char* directory, const char* module_name)
     g_free (fullpath);
     if (!backend)
     {
-        PINFO ("%s: %s\n", PACKAGE, g_module_error ());
+        PINFO ("%s: %s\n", PROJECT_NAME, g_module_error ());
         return false;
     }
     void (*module_init_func)(void);
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 056a5c1aa..4c20e145a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -149,9 +149,9 @@ if(BUILDING_FROM_VCS)
            -D TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
            -D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
            -D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
-           -D PACKAGE=${PACKAGE}
+           -D PROJECT_NAME=${PROJECT_NAME}
            -D PACKAGE_NAME=${PACKAGE_NAME}
-           -D PACKAGE_VERSION=${PACKAGE_VERSION}
+           -D PROJECT_VERSION=${PROJECT_VERSION}
            -D XGETTEXT=${XGETTEXT}
            -P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake
         DEPENDS ${gnucash_pot_depends}
diff --git a/po/Makevars b/po/Makevars
index 13fee66eb..d717e3784 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = $(PROJECT_NAME)
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/po/glossary/txt-to-pot.sh b/po/glossary/txt-to-pot.sh
index a1f7345c4..873601488 100755
--- a/po/glossary/txt-to-pot.sh
+++ b/po/glossary/txt-to-pot.sh
@@ -23,17 +23,17 @@ then
 	exit 1;
 fi
 
-# Note: Line 3: PACKAGE and probably a few other variables are hardcoded
+# Note: Line 3: PROJECT and probably a few other variables are hardcoded
 cat <<!
 # SOME DESCRIPTIVE TITLE. (Glossary)
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR THE PROJECT'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the GnuCash package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
diff --git a/po/gnucash-pot.cmake b/po/gnucash-pot.cmake
index be104b29f..7edee3df9 100644
--- a/po/gnucash-pot.cmake
+++ b/po/gnucash-pot.cmake
@@ -1,8 +1,8 @@
 execute_process(
     COMMAND ${XGETTEXT} --add-comments=Translators
                         --directory=${TOP_SRC_DIR}
-                        --default-domain=${PACKAGE}
-                        --output=${PACKAGE}.pot
+                        --default-domain=${PROJECT_NAME}
+                        --output=${PROJECT_NAME}.pot
                         --files-from=${PO_SRC_DIR}/POTFILES.in
                         --from-code=UTF-8
                         --flag=g_strdup_printf:1:c-format
@@ -30,7 +30,7 @@ execute_process(
                         --keyword=translate:1,2,3t
                         --keyword=translate:1c,2,3,4t
                         --package-name=${PACKAGE_NAME}
-                        --package-version=${PACKAGE_VERSION}
+                        --package-version=${PROJECT_VERSION}
                         --msgid-bugs-address=https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash&component=Translations
   WORKING_DIRECTORY ${PO_BIN_DIR}
   RESULT_VARIABLE GNUCASH_POT_RESULT
diff --git a/po/mni at bengali.po b/po/mni at bengali.po
index 6bed015a0..0aeb29caa 100644
--- a/po/mni at bengali.po
+++ b/po/mni at bengali.po
@@ -1,6 +1,6 @@
 # GNUCash translations for Manipuri language using Bengali Script"
 # Copyright (C) 2015.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the GnuCash package.
 # Chandrakant Dhutadmal <cpdhutadmal at yahoo.com>, 2015.
 #
 msgid ""
diff --git a/po/ne.po b/po/ne.po
index 2e921a8cb..5020baac6 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,5 +1,5 @@
 # translation of gnucash2.ne.po to Nepali
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the GnuCash package.
 # Copyright (C) YEAR Gnumatic, Inc.
 # Pawan Chitrakar <pchitrakar at gmail.com>, 2006.
 # Jyotshna Shrestha <jyotshna at mpp.org.np>, 2006.



Summary of changes:
 CMakeLists.txt                                     | 22 +++--------
 common/config.h.cmake.in                           | 44 ++++++++++------------
 gnucash/gnome-utils/gnc-embedded-window.c          |  2 +-
 gnucash/gnome-utils/gnc-main-window.c              |  4 +-
 gnucash/gnome-utils/gnc-plugin-menu-additions.c    |  2 +-
 gnucash/gnome-utils/gnc-plugin-page.c              |  2 +-
 gnucash/gnome/gnucash.desktop.in.in                |  2 +-
 gnucash/gnome/window-reconcile.c                   |  2 +-
 gnucash/gnome/window-reconcile2.c                  |  2 +-
 gnucash/gnucash-bin.c                              |  8 ++--
 gnucash/gnucash.rc.in                              |  8 ++--
 .../org.gnucash.dialogs.business.gschema.xml.in    |  2 +-
 ...rg.gnucash.dialogs.checkprinting.gschema.xml.in |  2 +-
 .../org.gnucash.dialogs.commodities.gschema.xml.in |  2 +-
 .../org.gnucash.dialogs.export.csv.gschema.xml.in  |  2 +-
 .../gschemas/org.gnucash.dialogs.gschema.xml.in    |  2 +-
 .../org.gnucash.dialogs.import.csv.gschema.xml.in  |  2 +-
 ...g.gnucash.dialogs.import.generic.gschema.xml.in |  2 +-
 .../org.gnucash.dialogs.import.qif.gschema.xml.in  |  2 +-
 .../org.gnucash.dialogs.reconcile.gschema.xml.in   |  2 +-
 .../org.gnucash.dialogs.sxs.gschema.xml.in         |  2 +-
 .../org.gnucash.dialogs.totd.gschema.xml.in        |  2 +-
 ...rg.gnucash.general.finance-quote.gschema.xml.in |  2 +-
 gnucash/gschemas/org.gnucash.gschema.xml.in        |  2 +-
 .../gschemas/org.gnucash.history.gschema.xml.in    |  2 +-
 .../gschemas/org.gnucash.warnings.gschema.xml.in   |  2 +-
 ...nucash.window.pages.account.tree.gschema.xml.in |  2 +-
 .../org.gnucash.window.pages.gschema.xml.in        |  2 +-
 gnucash/import-export/aqb/gnc-ab-utils.c           |  2 +-
 .../org.gnucash.dialogs.import.hbci.gschema.xml.in |  2 +-
 .../csv-imp/assistant-csv-trans-import.cpp         |  2 +-
 .../org.gnucash.dialogs.import.ofx.gschema.xml.in  |  2 +-
 libgnucash/app-utils/gnc-gsettings.c               |  2 +-
 libgnucash/backend/xml/sixtp-utils.cpp             |  2 +-
 libgnucash/core-utils/gnc-filepath-utils.cpp       |  4 +-
 libgnucash/core-utils/gnc-prefs.c                  |  2 +-
 libgnucash/core-utils/gnc-version.c                |  4 +-
 .../test/test-userdata-dir-invalid-home.c          |  8 ++--
 libgnucash/core-utils/test/test-userdata-dir.c     |  2 +-
 libgnucash/doc/design/CMakeLists.txt               |  4 +-
 libgnucash/engine/gncAddress.h                     |  2 +-
 libgnucash/engine/gncBillTerm.h                    |  2 +-
 libgnucash/engine/gncCustomer.c                    |  2 +-
 libgnucash/engine/gncEntry.h                       |  2 +-
 libgnucash/engine/gncJob.c                         |  4 +-
 libgnucash/engine/qof-backend.cpp                  |  2 +-
 po/CMakeLists.txt                                  |  4 +-
 po/Makevars                                        |  2 +-
 po/glossary/txt-to-pot.sh                          |  6 +--
 po/gnucash-pot.cmake                               |  6 +--
 po/mni at bengali.po                                  |  2 +-
 po/ne.po                                           |  2 +-
 52 files changed, 93 insertions(+), 111 deletions(-)



More information about the gnucash-changes mailing list