gnucash maint: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Wed Aug 8 09:58:48 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/de2a1e9e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d69d1f6a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2b0b3d4f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4c8b07c0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f9700ba9 (commit)
	from  https://github.com/Gnucash/gnucash/commit/239ee679 (commit)



commit de2a1e9e6793575c1f9dbce41d1c484bd96200ff
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Aug 8 15:58:38 2018 +0200

    A few updates to the guile hacking document

diff --git a/doc/guile-hackers.txt b/doc/guile-hackers.txt
index d759382..df53925 100644
--- a/doc/guile-hackers.txt
+++ b/doc/guile-hackers.txt
@@ -33,10 +33,6 @@ either end.  Guile supports a superset of R4RS (the Scheme standard).
 For initial experimentation, you can  use Guile as an interactive Scheme 
 shell to play around with the system.  
 
-SLIB is a library for Scheme implementations (including guile)
-that implements a large collection of useful data structures
-and algorithms.
-
 FIXME: Starting gnucash as a guile shell. .. 
 
 While the Guile documentation (in info format) explains
@@ -50,18 +46,6 @@ FAQs, online copies of the Scheme standard (which is actually
 quite readable and useful), and pointers to web tutorials
 and other resources.   
 
-g-wrap
-------
-
-Note: gwrap has been replaced by swig and dropped completely in
-SVN-trunk on 2006-10-20 and for gnucash-2.2.0.
-
-(Old info: g-wrap is the tool used to automate the wrapping of C
-functions to make them callable from the guile code.  g-wrap is
-now maintained by Rob Browning and is available from
-ftp://ftp.gnucash.org/pub/g-wrap )
-
-
 Garbage collection:
 -------------------
 
@@ -97,14 +81,10 @@ use it.
 The moral of this story is that if you need to have the C side ferret
 away a scheme item for later, you must also keep at least one
 reference to that item on the guile side until the C side is finished
-with it.  I believe that the guile people have recently come up with a
-nice general solution to this problem, but until that's generally
-available, there are a number of ways you can solve this.
-
-If nothing else, you can just create a global hash on the guile side,
-place the object in question in the hash table, and then have the
-C-side delete that item from the hash when it's finished with it.
+with it.
 
+You can protect an object using scm_gc_protect_object. When you're done
+with it you can release it using scm_gc_unprotect_object.
 
 Guile Interrupts:
 -----------------

commit d69d1f6a32a57ff34f4e80df2e32902719f0c8c8
Merge: 239ee67 2b0b3d4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Aug 8 15:52:51 2018 +0200

    Merge branch 'maint' of https://github.com/yurchor/gnucash into maint


commit 2b0b3d4fce4e2f41e0e6857d5812a1dbc723b02c
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Tue Aug 7 16:25:37 2018 +0300

    Fix more minor typos
    
    Signed-off-by: Yuri Chornoivan <yurchor at ukr.net>

diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index da5c14a..2d1c600 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -639,7 +639,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
     {
         book_currency_data->default_gain_loss_account_text =
                     gtk_label_new( _("Because no accounts have " \
-                        "been set up yet,you will need to return to this " \
+                        "been set up yet, you will need to return to this " \
                         "dialog (via File->Properties), after account setup, " \
                         "if you want to set a default gain/loss account.") );
 
diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
index 53edc3c..9dd28a6 100644
--- a/gnucash/gschemas/org.gnucash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.gschema.xml.in
@@ -72,7 +72,7 @@
     </key>
     <key name="migrate-prefs-done" type="b">
       <default>false</default>
-      <summary>Tool to migrate preferences from old backend (CGonf) to new one (GSettings) has run successfully.</summary>
+      <summary>Tool to migrate preferences from old backend (GConf) to new one (GSettings) has run successfully.</summary>
       <description>GnuCash switched to another backend to store user preferences between 2.4 and 2.6. To smooth the transition, most preferences will be migrated the first time a 2.6 version of GnuCash is run. This migration should only run once. This preference keeps track whether or not this migration tool has run successfully.</description>
     </key>
     <key name="retain-type-never" type="b">
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
index a39090c..81d278f 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.c
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.c
@@ -88,7 +88,7 @@ static const gchar *finish_trans_string = N_(
 
 static const gchar *finish_trans_search_gl_string = N_(
             /* Translators: %s is the file name string. */
-            "When you click 'Apply', the transactions will be exported to the file '%s.\n\n"
+            "When you click 'Apply', the transactions will be exported to the file '%s'.\n\n"
             "You can also verify your selections by clicking on 'Back' or 'Cancel' to Abort Export.\n");
 
 static const gchar *start_tree_string = N_(

commit 4c8b07c0fa76b6179fc6e606e5393e056f03426b
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Thu Aug 2 15:40:00 2018 +0300

    More minor fixes
    
    Signed-off-by: Yuri Chornoivan <yurchor at ukr.net>

diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
index 8d924c0..53edc3c 100644
--- a/gnucash/gschemas/org.gnucash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.gschema.xml.in
@@ -18,7 +18,7 @@
     <key name="account-separator" type="s">
       <default>'colon'</default>
       <summary>Character to use as separator between account names</summary>
-      <description>This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: "colon" "slash", "backslash", "dash" and "period".</description>
+      <description>This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: "colon", "slash", "backslash", "dash" and "period".</description>
     </key>
     <key name="assoc-head" type="s">
       <default>''</default>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 58dfc66..f3cc770 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -825,7 +825,7 @@
                         <property name="can_focus">True</property>
                         <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup">The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: &quot;colon&quot; &quot;slash&quot;, &quot;backslash&quot;, &quot;dash&quot; and &quot;period&quot;.</property>
+                        <property name="tooltip_markup">The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: &quot;colon&quot;, &quot;slash&quot;, &quot;backslash&quot;, &quot;dash&quot; and &quot;period&quot;.</property>
                         <property name="tooltip_text" translatable="yes">The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: "colon" "slash", "backslash", "dash" and "period".</property>
                         <property name="invisible_char">●</property>
                         <property name="primary_icon_activatable">False</property>
diff --git a/gnucash/import-export/aqb/gnc-file-aqb-import.c b/gnucash/import-export/aqb/gnc-file-aqb-import.c
index 16cc8d3..b8af4b7 100644
--- a/gnucash/import-export/aqb/gnc-file-aqb-import.c
+++ b/gnucash/import-export/aqb/gnc-file-aqb-import.c
@@ -331,7 +331,7 @@ gnc_file_aqbanking_import(GtkWindow *parent,
                 if (num_jobs == 0)
                 {
                     gnc_info_dialog(parent,
-                                    _("No jobs to be send.")
+                                    _("No jobs to be sent.")
                                    );
                 }
                 else

commit f9700ba98d6af93be7fbccbf88f03025b7188660
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Fri Jul 27 14:23:15 2018 +0300

    Fix minor typos

diff --git a/doc/guile-hackers.txt b/doc/guile-hackers.txt
index e5397da..d759382 100644
--- a/doc/guile-hackers.txt
+++ b/doc/guile-hackers.txt
@@ -33,7 +33,7 @@ either end.  Guile supports a superset of R4RS (the Scheme standard).
 For initial experimentation, you can  use Guile as an interactive Scheme 
 shell to play around with the system.  
 
-SLIB is a a library for Scheme implementations (including guile)
+SLIB is a library for Scheme implementations (including guile)
 that implements a large collection of useful data structures
 and algorithms.
 
diff --git a/gnucash/gnome/gnc-budget-view.c b/gnucash/gnome/gnc-budget-view.c
index 4059775..cf6f357 100644
--- a/gnucash/gnome/gnc-budget-view.c
+++ b/gnucash/gnome/gnc-budget-view.c
@@ -424,7 +424,7 @@ gbv_create_widget(GncBudgetView *view)
     // Totals scroll window
     priv->totals_scroll_window = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(priv->totals_scroll_window),
-                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); // horzontal/vertical
+                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); // horizontal/vertical
 
     h_adj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(priv->totals_scroll_window));
     g_signal_connect(G_OBJECT(h_adj), "value-changed",
diff --git a/gnucash/report/business-reports/receipt.scm b/gnucash/report/business-reports/receipt.scm
index 2af29f7..7aea766 100644
--- a/gnucash/report/business-reports/receipt.scm
+++ b/gnucash/report/business-reports/receipt.scm
@@ -256,7 +256,7 @@
   'name (N_ "Receipt")
   'report-guid "7eb3df21073d4c33920a0257da15fba5"
   'menu-name (N_ "Receipt")
-  'menu-tip (N_ "Display a customer invoice as receipt, cash vousher")
+  'menu-tip (N_ "Display a customer invoice as receipt, cash voucher")
   'menu-path (list gnc:menuname-business-reports)
   'options-generator options-generator
   'renderer report-renderer)
diff --git a/gnucash/report/jqplot/jquery.jqplot.js b/gnucash/report/jqplot/jquery.jqplot.js
index 30e776b..f88459c 100644
--- a/gnucash/report/jqplot/jquery.jqplot.js
+++ b/gnucash/report/jqplot/jquery.jqplot.js
@@ -1221,7 +1221,7 @@
         // Alpha channel transparency of shadow.  0 = transparent.
         this.shadowAlpha = '0.1';
         // prop: breakOnNull
-        // Wether line segments should be be broken at null value.
+        // Wether line segments should be broken at null value.
         // False will join point on either side of line.
         this.breakOnNull = false;
         // prop: markerRenderer
diff --git a/gnucash/report/jqplot/plugins/jqplot.barRenderer.js b/gnucash/report/jqplot/plugins/jqplot.barRenderer.js
index 9001178..aa3b758 100644
--- a/gnucash/report/jqplot/plugins/jqplot.barRenderer.js
+++ b/gnucash/report/jqplot/plugins/jqplot.barRenderer.js
@@ -116,7 +116,7 @@
         //////
         // This is probably wrong here.
         // After going back and forth on wether renderer should be the thing
-        // or extend the thing, it seems that it it best if it is a property
+        // or extend the thing, it seems that it is best if it is a property
         // on the thing.  This should be something that is commonized 
         // among series renderers in the future.
         //////
diff --git a/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js b/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
index 1a7e517..f483768 100644
--- a/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
+++ b/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
@@ -100,7 +100,7 @@
         // Multiplier the bubble size if autoscaleBubbles is true.
         this.autoscaleMultiplier = 1.0;
         // prop: autoscalePointsFactor
-        // Factor which decreases bubble size based on how many bubbles on on the chart.
+        // Factor which decreases bubble size based on how many bubbles are on the chart.
         // 0 means no adjustment for number of bubbles.  Negative values will decrease
         // size of bubbles as more bubbles are added.  Values between 0 and -0.2
         // should work well.
diff --git a/gnucash/report/report-system/eguile-utilities.scm b/gnucash/report/report-system/eguile-utilities.scm
index 5d6a9fd..25a91d8 100644
--- a/gnucash/report/report-system/eguile-utilities.scm
+++ b/gnucash/report/report-system/eguile-utilities.scm
@@ -88,7 +88,7 @@
 ; explicit lambda and has the list expression all the way at the end).
 (define-syntax for
   (syntax-rules (for in => do hash)
-		; Multiple variables and and equal number of lists (in
+		; Multiple variables and equal number of lists (in
 		; parenthesis). e.g.:
 		;
 		;   (for (a b) in (lsta lstb) do (display (+ a b)))
diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm
index 4bb7ed4..acb14df 100644
--- a/gnucash/report/standard-reports/budget-barchart.scm
+++ b/gnucash/report/standard-reports/budget-barchart.scm
@@ -132,9 +132,9 @@
 
 ;; For each period in the budget:
 ;; Retrieve the budgeted running sum and actual running sum
-;; for bac chart.
+;; for bar chart.
 ;;
-;; Create bar and and values
+;; Create bar and values
 ;;
 (define (gnc:chart-create-budget-actual budget acct running-sum chart-type width height report-start-time report-end-time)
   (let* (
diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm
index fb1d969..66a6d87 100644
--- a/gnucash/report/standard-reports/budget.scm
+++ b/gnucash/report/standard-reports/budget.scm
@@ -136,7 +136,7 @@
                                 (list->vector
                                  (list 'manual
                                        (N_ "Manual period selection")
-                                       (N_ "Explicitly select period valud with spinner below")))))
+                                       (N_ "Explicitly select period value with spinner below")))))
           (ui-use-periods #f)
           (ui-start-period-type 'current)
           (ui-end-period-type 'next)
diff --git a/libgnucash/app-utils/calculation/fin.c b/libgnucash/app-utils/calculation/fin.c
index a651a24..37bb185 100644
--- a/libgnucash/app-utils/calculation/fin.c
+++ b/libgnucash/app-utils/calculation/fin.c
@@ -653,7 +653,7 @@
  *
  *   For those cases where a yearly summary only is desired, it is not
  *   necessary to compute each transaction for each payment period,
- *   rather the PV may be be computed for the beginning of each year,
+ *   rather the PV may be computed for the beginning of each year,
  *   PV[yr], and the FV computed for the end of the year, FV[yr]. The
  *   interest paid during the year is the computed as:
  *
diff --git a/libgnucash/app-utils/guile-util.h b/libgnucash/app-utils/guile-util.h
index f95d38e..1624349 100644
--- a/libgnucash/app-utils/guile-util.h
+++ b/libgnucash/app-utils/guile-util.h
@@ -84,7 +84,7 @@ char * gnc_get_credit_string(GNCAccountType account_type);
 typedef struct _Process Process;
 
 /** Wraps g_spawn_async_with_pipes minimally.  Use gnc_process_get_fd to access
- *  the file descriptors to the child.  To close them them and free the memory
+ *  the file descriptors to the child.  To close them and free the memory
  *  allocated for the process once it has exited, call gnc_detach_process.
  *
  *  @param argl A list of null-terminated strings used as arguments for spawning,



Summary of changes:
 doc/guile-hackers.txt                              | 26 +++-------------------
 gnucash/gnome-utils/dialog-options.c               |  2 +-
 gnucash/gnome/gnc-budget-view.c                    |  2 +-
 gnucash/gschemas/org.gnucash.gschema.xml.in        |  4 ++--
 gnucash/gtkbuilder/dialog-preferences.glade        |  2 +-
 gnucash/import-export/aqb/gnc-file-aqb-import.c    |  2 +-
 .../import-export/csv-exp/assistant-csv-export.c   |  2 +-
 gnucash/report/business-reports/receipt.scm        |  2 +-
 gnucash/report/jqplot/jquery.jqplot.js             |  2 +-
 .../report/jqplot/plugins/jqplot.barRenderer.js    |  2 +-
 .../report/jqplot/plugins/jqplot.bubbleRenderer.js |  2 +-
 gnucash/report/report-system/eguile-utilities.scm  |  2 +-
 .../report/standard-reports/budget-barchart.scm    |  4 ++--
 gnucash/report/standard-reports/budget.scm         |  2 +-
 libgnucash/app-utils/calculation/fin.c             |  2 +-
 libgnucash/app-utils/guile-util.h                  |  2 +-
 16 files changed, 20 insertions(+), 40 deletions(-)



More information about the gnucash-changes mailing list