Merge branch 'maint'

CMakeLists.txt

@@ -98,7 +98,9 @@ set(LOCALEDIR ${DATAROOTDIR}/locale CACHE STRING "locale-dependent data")
 set(GNC_HELPDIR ${DATADIR} CACHE STRING "where to store help files")
 set(DATADIRNAME share)
 set(GNC_SYSTEM_XDG_DATA_DIRS /usr/local/share /usr/share)
-set(GNC_DBD_DIR ${CMAKE_PREFIX_LIBDIR}/dbd CACHE PATH "specify location of libdbi drivers")
+if (NOT DEFINED GNC_DBD_DIR)
+  set(GNC_DBD_DIR $ENV{GNC_DBD_DIR} CACHE PATH "Hint for location of libdbi-drivers.")
+endif()
 set(PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
 set(TEST_MYSQL_URL "" CACHE STRING "MySQL database URL for testing")
 set(TEST_PGSQL_URL "" CACHE STRING "PgSQL database URL for testing")
@@ -433,11 +435,11 @@ set(PKG_CONFIG_EXECUTABLE ${GNC_PKG_CONFIG_EXE})
 # libdbi
 find_path (LIBDBI_INCLUDE_PATH dbi/dbi.h)
 find_library (LIBDBI_LIBRARY dbi)
-find_library (LIBDBI_DRIVERS_DIR
+find_library (LIBDBI_DRIVERS
   NAMES dbdmysql dbdpgsql dbdsqlite3 NAMES_PER_DIR
   PATH_SUFFIXES dbd libdbi-drivers/dbd
-  HINTS LIBDBI_LIBRARY
-  PATHS GNC_DBD_DIR
+  HINTS ${LIBDBI_LIBRARY}
+  PATHS ${GNC_DBD_DIR}
   DOC "Libdbi Drivers Directory")
 if (WITH_SQL)
   if (NOT LIBDBI_INCLUDE_PATH)
@@ -447,10 +449,10 @@ if (WITH_SQL)
     message (SEND_ERROR "Library libdbi was not found")
   endif()
   set(HAVE_DBI_DBI_H 1)
-  if (NOT LIBDBI_DRIVERS_DIR)
+  if (NOT LIBDBI_DRIVERS)
     message (SEND_ERROR "No libdbi drivers found, SQL tests will fail.")
   else()
-    get_filename_component(drivers_dir ${LIBDBI_DRIVERS_DIR} DIRECTORY)
+    get_filename_component(drivers_dir ${LIBDBI_DRIVERS} DIRECTORY)
     set(LIBDBI_DRIVERS_DIR ${drivers_dir} CACHE FILEPATH "Directory containing the libdbi driver modules." FORCE)
   endif()
 endif()

data/accounts/de_CH/acctchrt_kmu.gnucash-xea

@@ -1332,7 +1332,7 @@ Dies ist der Grundplan gemäss offiziellem Plan.
   <act:parent type="new">4f942372d53b486e985f0524ef484a48</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Reserven und Jahresgewinn oder Jahresverlus</act:name>
+  <act:name>Reserven und Jahresgewinn oder Jahresverlust</act:name>
   <act:id type="new">35e6318959294d84994376047bef94a7</act:id>
   <act:type>EQUITY</act:type>
   <act:commodity>

gnucash/gnome/gnc-split-reg.c

@@ -2622,10 +2622,11 @@ gnc_split_reg_determine_read_only( GNCSplitReg *gsr )
         reg = gnc_ledger_display_get_split_register( gsr->ledger );
         if(reg->mismatched_commodities)
         {
-            string = _("This account may not be edited because its"
-                       " subaccounts have mismatched commodities or currencies."
-                       "You need to open each account individually to "
-                       "edit transactions.");
+            string = _("The transactions of this account may not be edited "
+                       "because its subaccounts have mismatched commodities "
+                       "or currencies.\n"
+                       "You need to open each account individually to edit "
+                       "transactions.");
         }
         else
         {
@@ -2636,19 +2637,19 @@ gnc_split_reg_determine_read_only( GNCSplitReg *gsr )
                 return;
 
             case PLACEHOLDER_THIS:
-                string = _("This account may not be edited. If you want "
-                                 "to edit transactions in this register, please "
-                                 "open the account options and turn off the "
-                                 "placeholder checkbox.");
+                string = _("The transactions of this account may not be edited.\n"
+                           "If you want to edit transactions in this register, "
+                           "please open the account options and turn off the "
+                           "placeholder checkbox.");
                 break;
 
             default:
-                string = _("One of the sub-accounts selected may not be "
-                                 "edited. If you want to edit transactions in "
-                                 "this register, please open the sub-account "
-                                 "options and turn off the placeholder checkbox. "
-                                 "You may also open an individual account instead "
-                                 "of a set of accounts.");
+                string = _("The transactions in one of the selected "
+                           "sub-accounts may not be edited.\n"
+                           "If you want to edit transactions in this register, please open "
+                           "the sub-account options and turn off the placeholder checkbox.\n"
+                           "You may also open an individual account instead "
+                           "of a set of accounts.");
                 break;
             }
         }

gnucash/report/reports/standard/account-summary.scm

@@ -321,6 +321,7 @@
      doc (string-append
           company-name " " report-title " "
           (if sx?
+              ;; Translators: This is part of the report title, which is capitalzed in English, but not all other languages
               (format #f (_ "For Period Covering ~a to ~a")
                       (qof-print-date from-date)
                       (qof-print-date to-date))