IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Geert Janssens 2018-08-08 15:52:51 +02:00
commit d69d1f6a32
16 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guile-hackers.txt
View File

@ -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.

2
gnucash/gnome-utils/dialog-options.c
View File

@ -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.") );

2
gnucash/gnome/gnc-budget-view.c
View File

@ -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",

4
gnucash/gschemas/org.gnucash.gschema.xml.in
View File

@ -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>
@ -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">

2
gnucash/gtkbuilder/dialog-preferences.glade
View File

@ -791,7 +791,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: &amp;quot;colon&amp;quot; &amp;quot;slash&amp;quot;, &amp;quot;backslash&amp;quot;, &amp;quot;dash&amp;quot; and &amp;quot;period&amp;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: &amp;quot;colon&amp;quot;, &amp;quot;slash&amp;quot;, &amp;quot;backslash&amp;quot;, &amp;quot;dash&amp;quot; and &amp;quot;period&amp;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>

2
gnucash/import-export/aqb/gnc-file-aqb-import.c
View File

@ -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

2
gnucash/import-export/csv-exp/assistant-csv-export.c
View File

@ -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_(

2
gnucash/report/business-reports/receipt.scm
View File

@ -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)

2
gnucash/report/jqplot/jquery.jqplot.js
View File

@ -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

2
gnucash/report/jqplot/plugins/jqplot.barRenderer.js
View File

@ -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.
//////

2
gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
View File

@ -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.

2
gnucash/report/report-system/eguile-utilities.scm
View File

@ -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)))

4
gnucash/report/standard-reports/budget-barchart.scm
View File

@ -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* (

2
gnucash/report/standard-reports/budget.scm
View File

@ -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)

2
libgnucash/app-utils/calculation/fin.c
View File

@ -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:
*

2
libgnucash/app-utils/guile-util.h
View File

@ -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,