From 3494820ae8bd400b1ed7f12f1cd51f41fb3c5c93 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sun, 23 Dec 2007 21:45:41 +0000 Subject: [PATCH] String improvements in gconf labels and error messages as pointed out by Clytie Siddall. Those strings are invisible for almost any user anyway and can therefore be back-ported soon, too. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16704 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome/druid-merge.c | 2 +- .../schemas/apps_gnucash_dialog_commodities.schemas.in | 2 +- src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in | 2 +- src/gnome/schemas/apps_gnucash_warnings.schemas.in | 6 +++--- .../apps_gnucash_import_generic_matcher.schemas.in | 8 ++++---- src/report/report-gnome/window-report.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gnome/druid-merge.c b/src/gnome/druid-merge.c index 4ba70bc775..d45ca78dd6 100644 --- a/src/gnome/druid-merge.c +++ b/src/gnome/druid-merge.c @@ -352,7 +352,7 @@ void collision_rule_loop(QofBookMergeData *mergeData, QofBookMergeRule *rule, will allocate a new string; all of these need to be freed later. Currently this causes a lot of memory leaks. */ - buffer = g_strconcat(buffer, g_strdup_printf(_("%i:Parameter name: %s "), + buffer = g_strconcat(buffer, g_strdup_printf(_("%i: Parameter name: %s "), count, one_param->param_name), NULL); importstring = qof_book_merge_param_as_string(one_param, rule->importEnt); buffer = g_strconcat(buffer, diff --git a/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in b/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in index b87bb4897a..ed2de661b4 100644 --- a/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in +++ b/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in @@ -10,7 +10,7 @@ [namespace,symbol,name,printname,uniquename,cusip_code,fraction,quote_flag,quote_source,quote_timezone] Order of columns in the dialog - This setting contains a list of name which control the order + This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. diff --git a/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in b/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in index 3294c0954b..fb66dbbf2d 100644 --- a/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in +++ b/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in @@ -10,7 +10,7 @@ [commodity,currency,date,source,type,price] Order of columns in the dialog - This setting contains a list of name which control the order + This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. diff --git a/src/gnome/schemas/apps_gnucash_warnings.schemas.in b/src/gnome/schemas/apps_gnucash_warnings.schemas.in index 46ce0f5c9e..c9db1583b5 100644 --- a/src/gnome/schemas/apps_gnucash_warnings.schemas.in +++ b/src/gnome/schemas/apps_gnucash_warnings.schemas.in @@ -75,8 +75,8 @@ int 0 - Remove a splits from a transaction - This dialog is presented before allowing you to remove a splits from a transaction. + Remove a split from a transaction + This dialog is presented before allowing you to remove a split from a transaction. @@ -88,7 +88,7 @@ int 0 - Remove a splits from a transaction + Remove a reconciled split from a transaction This dialog is presented before allowing you to remove a reconciled split from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. diff --git a/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in b/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in index 806d8c4307..772b202f14 100644 --- a/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in +++ b/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in @@ -143,11 +143,11 @@ This field specifies the extra fee that is taken into account when matching imported transactions. In some places commercial ATMs (not belonging to a financial institution) - are installed in places like convienience store. These ATM - add its fee directly to the amount instead of showing up as + are installed in places like convenience stores. These ATMs + add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For - example, you withdraw 100$, and you are charged 101,50$ plus - Interac fees. If you manually entered that 100$, the + example, you withdraw $100, and you are charged $101,50 plus + Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match. diff --git a/src/report/report-gnome/window-report.c b/src/report/report-gnome/window-report.c index 65f797c1f7..321de184ba 100644 --- a/src/report/report-gnome/window-report.c +++ b/src/report/report-gnome/window-report.c @@ -243,7 +243,7 @@ gnc_html_options_url_cb (const char *location, const char *label, report == SCM_BOOL_F) { result->error_message = - g_strdup_printf (_("Badly report id: %s"), location); + g_strdup_printf (_("Badly-formed report id: %s"), location); return FALSE; }