r16735 - gnucash/branches/2.2/src - [r16704] String improvements in gconf labels and error messages as pointed out by Clytie Siddall.

[Christian Stimming]

Author: cstim
Date: 2007-12-26 17:12:53 -0500 (Wed, 26 Dec 2007)
New Revision: 16735
Trac: http://svn.gnucash.org/trac/changeset/16735

Modified:
   gnucash/branches/2.2/src/gnome/druid-merge.c
   gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in
   gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in
   gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_warnings.schemas.in
   gnucash/branches/2.2/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in
   gnucash/branches/2.2/src/report/report-gnome/window-report.c
Log:
[r16704] 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.

Modified: gnucash/branches/2.2/src/gnome/druid-merge.c
===================================================================
--- gnucash/branches/2.2/src/gnome/druid-merge.c	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/gnome/druid-merge.c	2007-12-26 22:12:53 UTC (rev 16735)
@@ -352,7 +352,7 @@
 		   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, 

Modified: gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in
===================================================================
--- gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in	2007-12-26 22:12:53 UTC (rev 16735)
@@ -10,7 +10,7 @@
       <default>[namespace,symbol,name,printname,uniquename,cusip_code,fraction,quote_flag,quote_source,quote_timezone]</default>
       <locale name="C">
         <short>Order of columns in the dialog</short>
-        <long>This setting contains a list of name which control the order
+        <long>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.</long>

Modified: gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in
===================================================================
--- gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in	2007-12-26 22:12:53 UTC (rev 16735)
@@ -10,7 +10,7 @@
       <default>[commodity,currency,date,source,type,price]</default>
       <locale name="C">
         <short>Order of columns in the dialog</short>
-        <long>This setting contains a list of name which control the order
+        <long>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.</long>

Modified: gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_warnings.schemas.in
===================================================================
--- gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_warnings.schemas.in	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/gnome/schemas/apps_gnucash_warnings.schemas.in	2007-12-26 22:12:53 UTC (rev 16735)
@@ -75,8 +75,8 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-        <short>Remove a splits from a transaction</short>
-        <long>This dialog is presented before allowing you to remove a splits from a transaction.</long>
+        <short>Remove a split from a transaction</short>
+        <long>This dialog is presented before allowing you to remove a split from a transaction.</long>
       </locale>
     </schema>
 
@@ -88,7 +88,7 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-        <short>Remove a splits from a transaction</short>
+        <short>Remove a reconciled split from a transaction</short>
         <long>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.</long>
       </locale>
     </schema>

Modified: gnucash/branches/2.2/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in
===================================================================
--- gnucash/branches/2.2/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in	2007-12-26 22:12:53 UTC (rev 16735)
@@ -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.

Modified: gnucash/branches/2.2/src/report/report-gnome/window-report.c
===================================================================
--- gnucash/branches/2.2/src/report/report-gnome/window-report.c	2007-12-26 22:12:43 UTC (rev 16734)
+++ gnucash/branches/2.2/src/report/report-gnome/window-report.c	2007-12-26 22:12:53 UTC (rev 16735)
@@ -243,7 +243,7 @@
         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;
     }