[Gnucash-changes] r13046 - gnucash/trunk - Remove extraneous carriage returns from text that will be put into a

David Hampton hampton at cvs.gnucash.org
Sun Jan 29 22:13:29 EST 2006


Author: hampton
Date: 2006-01-29 22:13:28 -0500 (Sun, 29 Jan 2006)
New Revision: 13046
Trac: http://svn.gnucash.org/trac/changeset/13046

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/business/business-gnome/dialog-billterms.c
   gnucash/trunk/src/business/business-gnome/dialog-customer.c
   gnucash/trunk/src/business/business-gnome/dialog-order.c
   gnucash/trunk/src/business/business-gnome/dialog-vendor.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
   gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
   gnucash/trunk/src/engine/cap-gains.c
   gnucash/trunk/src/gnome-utils/dialog-account.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.c
   gnucash/trunk/src/gnome-utils/dialog-transfer.c
   gnucash/trunk/src/gnome-utils/gnc-file.c
   gnucash/trunk/src/gnome-utils/gnc-html.c
   gnucash/trunk/src/gnome/dialog-commodities.c
   gnucash/trunk/src/gnome/dialog-scheduledxaction.c
   gnucash/trunk/src/gnome/dialog-sx-from-trans.c
   gnucash/trunk/src/gnome/dialog-sxsincelast.c
   gnucash/trunk/src/gnome/druid-acct-period.c
   gnucash/trunk/src/gnome/druid-stock-split.c
   gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
   gnucash/trunk/src/gnome/window-reconcile.c
   gnucash/trunk/src/import-export/binary-import/druid-commodity.c
   gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/trunk/src/import-export/import-commodity-matcher.c
   gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
   gnucash/trunk/src/register/ledger-core/split-register.c
   gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
Remove extraneous carriage returns from text that will be put into a
GtkLabel (since labels know how to wrap text).


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/ChangeLog	2006-01-30 03:13:28 UTC (rev 13046)
@@ -1,5 +1,8 @@
 2006-01-29  David Hampton  <hampton at employees.org>
 
+	* various: Remove extraneous carriage returns from text that will
+	be put into a GtkLabel (since labels know how to wrap text).
+
 	* src/report/stylesheets/stylesheet-fancy.scm : Dave Herman's
 	patch to suppresses extraneous entries table entries in reports
 	when there are no files specified for the "logo pix" file or the

Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -287,7 +287,7 @@
     }
     if (gncBillTermLookupByName (btw->book, name)) {
       message = g_strdup_printf(_(
-			 "You must provide a unique name for this Billing Term.\n"
+			 "You must provide a unique name for this Billing Term. "
 			 "Your choice \"%s\" is already in use."), name);
       gnc_error_dialog (nbt->dialog, "%s", message);
       g_free (message);

Modified: gnucash/trunk/src/business/business-gnome/dialog-customer.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-customer.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-gnome/dialog-customer.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -265,7 +265,7 @@
 
   /* Check for valid company name */
   if (check_entry_nonempty (cw->dialog, cw->company_entry,
-		   _("You must enter a company name.\n"
+		   _("You must enter a company name. "
 		     "If this customer is an individual (and not a company) "
 		     "you should set the \"company name\" and \"contact name\" "
 		     "the same.")))

Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -284,8 +284,8 @@
      * close this order!
      */
 
-    message = _("This order contains entries that have not been invoiced.\n"
-		"Are you sure you want to close it out before\n"
+    message = _("This order contains entries that have not been invoiced. "
+		"Are you sure you want to close it out before "
 		"you invoice all the entries?");
 
     if (gnc_verify_dialog (ow->dialog, FALSE, message) == FALSE)

Modified: gnucash/trunk/src/business/business-gnome/dialog-vendor.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -202,7 +202,7 @@
 
   /* Check for valid company name */
   if (check_entry_nonempty (vw->dialog, vw->company_entry,
-		   _("You must enter a company name.\n"
+		   _("You must enter a company name. "
 		     "If this vendor is an individual (and not a company) "
 		     "you should set the \"company name\" and \"contact name\" "
 		     "the same.")))

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -80,8 +80,8 @@
 gnc_entry_ledger_get_account_by_name (GncEntryLedger *ledger, BasicCell * bcell,
 				      const char *name, gboolean *new)
 {
-  const char *placeholder = _("The account %s does not allow transactions.\n");
-  const char *missing = _("The account %s does not exist.\n"
+  const char *placeholder = _("The account %s does not allow transactions.");
+  const char *missing = _("The account %s does not exist. "
 			  "Would you like to create it?");
   char *fullname;
   ComboCell *cell = (ComboCell *) bcell;

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -373,7 +373,7 @@
       break;
 
     {
-      const char *format = _("The tax table %s does not exist.\n"
+      const char *format = _("The tax table %s does not exist. "
                              "Would you like to create it?");
       if (!gnc_verify_dialog (ledger->parent, TRUE, format, name))
         break;
@@ -588,7 +588,7 @@
 				       GncEntryLedger *ledger,
 				       gboolean dontask)
 {
-  const char *message = _("The current entry has been changed.\n"
+  const char *message = _("The current entry has been changed. "
 			  "Would you like to save it?");
   VirtualLocation virt_loc;
   

Modified: gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -105,7 +105,7 @@
     }
     if (gncTaxTableLookupByName (ttw->book, name)) {
       message = g_strdup_printf(_(
-			 "You must provide a unique name for this Tax Table.\n"
+			 "You must provide a unique name for this Tax Table. "
 			 "Your choice \"%s\" is already in use."), name);
       gnc_error_dialog (ntt->dialog, "%s", message);
       g_free (message);
@@ -592,7 +592,7 @@
     return;
 
   if (g_list_length (gncTaxTableGetEntries (ttw->current_table)) <= 1) {
-    char *message = _("You cannot remove the last entry from the tax table.\n"
+    char *message = _("You cannot remove the last entry from the tax table. "
 		      "Try deleting the tax table if you want to do that.");
     gnc_error_dialog (ttw->dialog, message);
     return;

Modified: gnucash/trunk/src/engine/cap-gains.c
===================================================================
--- gnucash/trunk/src/engine/cap-gains.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/engine/cap-gains.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -239,9 +239,9 @@
     xaccAccountSetType (acc, INCOME);
     xaccAccountSetDescription (acc, _("Realized Gain/Loss"));
     xaccAccountSetNotes (acc, 
-         _("Realized Gains or Losses from\n"
-           "Commodity or Trading Accounts\n"
-           "that haven't been recorded elsewhere.\n"));
+         _("Realized Gains or Losses from "
+           "Commodity or Trading Accounts "
+           "that haven't been recorded elsewhere."));
 
     /* Hang the account off the root. */
     xaccGroupInsertAccount (root, acc);

Modified: gnucash/trunk/src/gnome/dialog-commodities.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-commodities.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/dialog-commodities.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -123,8 +123,8 @@
 
   if (!can_delete)
   {
-    const char *message = _("That commodity is currently used by\n"
-                            "at least one of your accounts. You may\n"
+    const char *message = _("That commodity is currently used by "
+                            "at least one of your accounts. You may "
                             "not delete it.");
 
     gnc_warning_dialog (cd->dialog, message);

Modified: gnucash/trunk/src/gnome/dialog-scheduledxaction.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-scheduledxaction.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/dialog-scheduledxaction.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -825,7 +825,7 @@
                      && !gnc_verify_dialog( sxed->dialog, FALSE,
 					    "%s",
 					    _("The Scheduled Transaction Editor "
-					      "cannot automatically\nbalance "
+					      "cannot automatically balance "
 					      "this transaction. "
 					      "Should it still be "
 					      "entered?") ) ) {
@@ -870,7 +870,7 @@
                 if ( nameHasChanged && nameExists ) {
                         const char *sx_has_existing_name_msg =
                                 _( "A Scheduled Transaction with the "
-                                   "name \"%s\" already exists.\n"
+                                   "name \"%s\" already exists. "
                                    "Are you sure you want to name "
                                    "this one the same?" );
                         if ( ! gnc_verify_dialog( sxed->dialog, FALSE,
@@ -897,7 +897,7 @@
 
                 if ( (ttVarCount > 0) && autocreateState ) {
                         gnc_warning_dialog( sxed->dialog,
-					    _("Scheduled Transactions with variables\n"
+					    _("Scheduled Transactions with variables "
 					      "cannot be automatically created.") );
                         return FALSE;
                 }
@@ -906,7 +906,7 @@
                  * only valid if there's actually a transaction to create. */
                 if ( autocreateState && splitCount == 0 ) {
                         gnc_warning_dialog( sxed->dialog,
-                                            _("Scheduled Transactions without a template\n"
+                                            _("Scheduled Transactions without a template "
                                               "transaction cannot be automatically created.") );
                         return FALSE;
                 }
@@ -980,7 +980,7 @@
                          && (g_date_compare( &nextDate, &endDate ) > 0)) ) {
                         const char *invalid_sx_check_msg =
                                 _( "You have attempted to create a Scheduled "
-                                   "Transaction which will never run.\nDo you "
+                                   "Transaction which will never run. Do you "
                                    "really want to do this?" );
                         if ( ! gnc_verify_dialog( sxed->dialog, FALSE,
 						  invalid_sx_check_msg) ) {
@@ -1782,7 +1782,7 @@
         GList *sel, *sxList, *beingEditedList, *l;
         SchedXactionDialog *sxd;
         char *beingEditedMessage =
-          _( "The following transactions are presently being edited;\n"
+          _( "The following transactions are presently being edited; "
              "are you sure you want to delete them?" );
         char *confirmMessage =
           _( "Delete the selected Scheduled Transactions?" );
@@ -2127,7 +2127,7 @@
         SplitRegister *reg;
         const char *message =
                 _("The current template transaction "
-                  "has been changed.\n"
+                  "has been changed. "
                   "Would you like to record the changes?");
         
         reg = gnc_ledger_display_get_split_register (sxed->ledger);

Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -267,7 +267,7 @@
           && !gnc_verify_dialog( (gncUIWidget)sxfti->dialog,
                                  FALSE, "%s",
                                  _("The Scheduled Transaction Editor "
-                                   "cannot automatically\nbalance "
+                                   "cannot automatically balance "
                                    "this transaction. "
                                    "Should it still be "
                                    "entered?") ) ) {
@@ -563,7 +563,7 @@
 
     if ( sx_error == SXFTD_ERRNO_UNBALANCED_XACTION ) {
             gnc_error_dialog( gnc_ui_get_toplevel(), 
-                              _( "The Scheduled Transaction is unbalanced.\n"
+                              _( "The Scheduled Transaction is unbalanced. "
                                  "You are strongly encouraged to correct this situation." ) );
     }
     book = gnc_get_current_book ();
@@ -806,7 +806,7 @@
           {
                   gnc_error_dialog( gnc_ui_get_toplevel(),
                                     _( "Cannot create a Scheduled Transaction "
-                                       "from a Transaction currently\n"
+                                       "from a Transaction currently "
                                        "being edited. Please Enter the "
                                        "Transaction before Scheduling." ) );
                   sxftd_close( sxfti, TRUE );

Modified: gnucash/trunk/src/gnome/dialog-sxsincelast.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sxsincelast.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/dialog-sxsincelast.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -420,9 +420,9 @@
     gnc_info_dialog
       (NULL,
        ngettext 
-       ("There are no Scheduled Transactions to be entered at this time.\n"
+       ("There are no Scheduled Transactions to be entered at this time. "
         "(%d transaction automatically created)",
-        "There are no Scheduled Transactions to be entered at this time.\n"
+        "There are no Scheduled Transactions to be entered at this time. "
         "(%d transactions automatically created)",
         -(ret)),
        -(ret));
@@ -1435,7 +1435,7 @@
         sxSinceLastData *sxsld = (sxSinceLastData*)ud;
         char *lastrun_cancel_check_msg =
           _( "Cancelling the Since-Last-Run dialog "
-             "will revert all changes.\n"
+             "will revert all changes. "
              "Are you sure you want to lose all "
              "Scheduled Transaction changes?" );
 
@@ -3536,8 +3536,8 @@
                 userMsg = g_string_sized_new( 128 );
                 g_string_printf( userMsg,
                                  "You cannot skip instances of "
-                                 "Scheduled Transactions.\n"
-                                 "The following instances of \"%s\"\n"
+                                 "Scheduled Transactions. "
+                                 "The following instances of \"%s\" "
                                  "must be selected as well:\n\n",
                                  xaccSchedXactionGetName( rt->sx ) );
                 g_list_foreach( badList, create_bad_reminders_msg, userMsg );

Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/druid-acct-period.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -286,7 +286,7 @@
   period_text = 
     _("You have asked for a book to be created.  This book "
       "will contain all transactions up to midnight %s "
-      "(for a total of %d transactions spread over %d accounts).\n"
+      "(for a total of %d transactions spread over %d accounts). "
       "Click on 'Next' to create this book. "
       "Click on 'Back' to adjust the dates.");
   str = g_strdup_printf (period_text, close_date_str, ntrans, nacc);

Modified: gnucash/trunk/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/druid-stock-split.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/druid-stock-split.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -310,7 +310,7 @@
   if (!gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (info->price_edit)))
   {
     gnc_parse_error_dialog (info,
-                            _("You must either enter a valid price\n"
+                            _("You must either enter a valid price "
                               "or leave it blank."));
     return TRUE;
   }
@@ -357,7 +357,7 @@
   if (!gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (info->cash_edit)))
   {
     gnc_parse_error_dialog (info,
-                            _("You must either enter a valid cash amount\n"
+                            _("You must either enter a valid cash amount "
                               "or leave it blank."));
     return TRUE;
   }
@@ -378,7 +378,7 @@
     account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(info->income_tree));
     if (!account)
     {
-      const char *message = _("You must select an income account\n"
+      const char *message = _("You must select an income account "
                               "for the cash distribution.");
       gnc_error_dialog (info->window, message);
       return TRUE;
@@ -387,7 +387,7 @@
     account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(info->asset_tree));
     if (!account)
     {
-      const char *message = _("You must select an asset account\n"
+      const char *message = _("You must select an asset account "
                               "for the cash distribution.");
       gnc_error_dialog (info->window, message);
       return TRUE;

Modified: gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -426,9 +426,9 @@
     gnc_info_dialog (GTK_WIDGET(&window->gtk_window), ngettext
 		     /* Translators: %d is the number of transactions. This is a
 			ngettext(3) message. */
-		     ("There are no Scheduled Transactions to be entered at this time.\n"
+		     ("There are no Scheduled Transactions to be entered at this time. "
 		      "(%d transaction automatically created)",
-		      "There are no Scheduled Transactions to be entered at this time.\n"
+		      "There are no Scheduled Transactions to be entered at this time. "
 		      "(%d transactions automatically created)",
 		      -(ret)),
 		     -(ret));

Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome/window-reconcile.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -2029,7 +2029,7 @@
 
   if (!gnc_numeric_zero_p (recnRecalculateBalance(recnData)))
   {
-    const char *message = _("The account is not balanced.\n"
+    const char *message = _("The account is not balanced. "
                             "Are you sure you want to finish?");
     if (!gnc_verify_dialog (recnData->window, FALSE, message))
       return;
@@ -2121,7 +2121,7 @@
   if (changed)
   {
     const char *message = _("You have made changes to this reconcile "
-                            "window.\nAre you sure you want to cancel?");
+                            "window. Are you sure you want to cancel?");
     if (!gnc_verify_dialog(recnData->window, FALSE, message))
       return;
   }

Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -963,7 +963,7 @@
       if (!transfer)
       {
         const char *message = _("You must select a transfer account or choose"
-                                "\nthe opening balances equity account.");
+                                " the opening balances equity account.");
         gnc_error_dialog(aw->dialog, message);
 	LEAVE(" ");
         return;

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -477,7 +477,7 @@
       gnc_ui_select_commodity_destroy (w);
     } else {
       gnc_warning_dialog (dialog,
-			 _("You must select a commodity.\n"
+			 _("You must select a commodity. "
 			   "To create a new one, click \"New\""));
     }
     break;
@@ -1175,7 +1175,7 @@
   else {
     gnc_warning_dialog(w->dialog,
 		       _("You must enter a non-empty \"Full name\", "
-			 "\"Symbol/abbreviation\",\n"
+			 "\"Symbol/abbreviation\", "
 			 "and \"Type\" for the commodity."));
     return FALSE;
   }

Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -1359,8 +1359,8 @@
   {
     if ((from_account == NULL) || (to_account == NULL))
     {
-      const char *message = _("You must specify an account to transfer from,\n"
-			      "or to, or both, for this transaction.\n"
+      const char *message = _("You must specify an account to transfer from, "
+			      "or to, or both, for this transaction. "
 			      "Otherwise, it will not be recorded.");
       gnc_error_dialog(xferData->dialog, message);
       LEAVE("bad account");
@@ -1380,7 +1380,7 @@
 	xaccAccountGetPlaceholder(to_account))
     {
       const char *placeholder_format =
-	_("The account %s\ndoes not allow transactions.\n");
+	_("The account %s does not allow transactions.");
       char *name;
 
       if (xaccAccountGetPlaceholder(from_account))

Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -882,7 +882,7 @@
   /* oops ... file already exists ... ask user what to do... */
   if (qof_session_save_may_clobber_data (new_session))
   {
-    const char *format = _("The file \n    %s\n already exists.\n"
+    const char *format = _("The file %s already exists. "
                            "Are you sure you want to overwrite it?");
 
     /* if user says cancel, we should break out */
@@ -1073,7 +1073,7 @@
   /* oops ... file already exists ... ask user what to do... */
   if (qof_session_save_may_clobber_data (new_session))
   {
-    const char *format = _("The file \n    %s\n already exists.\n"
+    const char *format = _("The file %s already exists. "
                            "Are you sure you want to overwrite it?");
 
     /* if user says cancel, we should break out */

Modified: gnucash/trunk/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/gnome-utils/gnc-html.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -602,8 +602,8 @@
       if (!safe_strcmp (type, URL_TYPE_SECURE)) {
 	if(!https_allowed()) {
 	  gnc_error_dialog( html->window,
-                            _("Secure HTTP access is disabled.\n"
-                              "You can enable it in the Network section of\n"
+                            _("Secure HTTP access is disabled. "
+                              "You can enable it in the Network section of "
                               "the Preferences dialog."));
 	  break;
 	}
@@ -611,8 +611,8 @@
 
       if(!http_allowed()) {
 	gnc_error_dialog( html->window,
-                          _("Network HTTP access is disabled.\n"
-                            "You can enable it in the Network section of\n"
+                          _("Network HTTP access is disabled. "
+                            "You can enable it in the Network section of "
                             "the Preferences dialog."));
       } else {
 	char *fullurl;
@@ -1061,8 +1061,8 @@
       if (!safe_strcmp (type, URL_TYPE_SECURE)) {
 	if(!https_allowed()) {
 	  gnc_error_dialog( html->window,
-                            _("Secure HTTP access is disabled.\n"
-                              "You can enable it in the Network section of\n"
+                            _("Secure HTTP access is disabled. "
+                              "You can enable it in the Network section of "
                               "the Preferences dialog."));
 	  break;
 	}
@@ -1071,8 +1071,8 @@
       if (safe_strcmp (type, URL_TYPE_FILE)) {
 	if(!http_allowed()) {
 	  gnc_error_dialog( html->window,
-                            _("Network HTTP access is disabled.\n"
-                              "You can enable it in the Network section of\n"
+                            _("Network HTTP access is disabled. "
+                              "You can enable it in the Network section of "
                               "the Preferences dialog."));
 	  break;
 	}

Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.c
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -266,8 +266,8 @@
 
   info_label = 
     gtk_label_new(_("Pick the type of the currency or security. For "
-                    "national currencies, \nuse \"CURRENCY\". "
-                    "Enter a new type in the box if the ones in the\n"
+                    "national currencies, use \"CURRENCY\". "
+                    "Enter a new type in the box if the ones in the "
                     "pick list are inappropriate."));
 
   gtk_label_set_justify (GTK_LABEL(info_label), GTK_JUSTIFY_LEFT);
@@ -288,7 +288,7 @@
 
   info_label = 
     gtk_label_new(_("Enter a descriptive name for the currency or stock, "
-                    "such as \n\"US Dollar\" or \"Red Hat Stock\""));
+                    "such as \"US Dollar\" or \"Red Hat Stock\""));
 
   gtk_label_set_justify (GTK_LABEL(info_label), GTK_JUSTIFY_LEFT);
   gtk_box_pack_start(GTK_BOX(top_vbox), info_label, TRUE, TRUE, 0);
@@ -307,7 +307,7 @@
 
   info_label = 
     gtk_label_new(_("Enter the ticker symbol (such as \"RHAT\"), "
-                    "national currency symbol \n(such as \"USD\"), or "
+                    "national currency symbol (such as \"USD\"), or "
                     "other unique abbreviation for the name."));
 
   gtk_label_set_justify (GTK_LABEL(info_label), GTK_JUSTIFY_LEFT);
@@ -326,7 +326,7 @@
   gtk_box_pack_start(GTK_BOX(top_vbox), temp, FALSE, FALSE, 5);
 
   next_label = gtk_label_new(_("Click \"Next\" to accept the information "
-                               "and move \nto the next currency or stock."));
+                               "and move to the next currency or stock."));
   gtk_label_set_justify (GTK_LABEL(next_label), GTK_JUSTIFY_LEFT);
   gtk_box_pack_start(GTK_BOX(top_vbox), next_label, TRUE, TRUE, 0);
 
@@ -407,7 +407,7 @@
      (strlen(new_name) == 0) ||
      (strlen(new_mnemonic) == 0)) {
     gnc_warning_dialog(cd->window,
-		       _("You must put values for the type, name,\n"
+		       _("You must put values for the type, name, "
 			 "and abbreviation of the currency/stock."));
 
     return TRUE;

Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -155,8 +155,7 @@
 
   return gnc_verify_dialog
     (parent, TRUE,
-     _("The file %s does not exist. \n"
-"Would you like to create it now?"), 
+     _("The file %s does not exist. Would you like to create it now?"),
      filename ? filename : _("(null)"));
 }
 
@@ -169,10 +168,8 @@
   if (!dirtest) {
     gnc_error_dialog
       (GTK_WIDGET (parent), 
-       _("The directory for file\n"
-"%s\n"
-"does not exist. \n"
-"Please choose another place for this file."), 
+       _("The directory for file %s does not exist. "
+	 "Please choose another place for this file."), 
        filename ? filename : _("(null)"));
     return FALSE;
   }

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -298,7 +298,7 @@
     GNCInteractor_hide (inter);
     gnc_error_dialog
       (parent,
-       _("Unfortunately you entered a wrong PIN for too many times.\n"
+       _("Unfortunately you entered a wrong PIN for too many times. "
 	 "Your chip card is therefore destroyed. Aborting."));
     return FALSE;
   case AB_ERROR_FILE_NOT_FOUND:

Modified: gnucash/trunk/src/import-export/import-commodity-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-commodity-matcher.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/import-export/import-commodity-matcher.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -110,10 +110,14 @@
 
   if(retval==NULL && auto_create != 0)
     {
+      const gchar *message = 
+        _("Please select a commodity to match the following exchange "
+	  "specific code. Please note that the exchange code of the "
+	  "commodity you select will be overwritten.");
       retval=gnc_ui_select_commodity_modal_full(NULL,
 						NULL,
 						DIAG_COMM_ALL,
-						_("Please select a commodity to match the following exchange specific code.\nPlease note that the exchange code of the commodity you select will be overwritten.\n"),
+						message,
 						exchange_code,
 						default_fullname,
 						default_mnemonic);

Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -447,13 +447,13 @@
   /* check a few error conditions before we get started */
   if(strlen(path_to_load) == 0) {
     /* stay here if no file specified */
-    gnc_error_dialog(wind->window, _("Please select a file to load.\n"));
+    gnc_error_dialog(wind->window, _("Please select a file to load."));
     return TRUE;
   }
   else if ((strlen(path_to_load) > 0) && access(path_to_load, R_OK) < 0) {
     /* stay here if bad file */
     gnc_error_dialog(wind->window, 
-		     _("File not found or read permission denied.\n"
+		     _("File not found or read permission denied. "
 		       "Please select another file."));
     return TRUE;
   }
@@ -465,7 +465,7 @@
     if(scm_call_2(qif_file_loaded, scm_filename, wind->imported_files)
        == SCM_BOOL_T) {
       gnc_error_dialog(wind->window,
-                                _("That QIF file is already loaded.\n"
+                                _("That QIF file is already loaded. "
                                   "Please select another file."));
       return TRUE;
     }
@@ -492,7 +492,7 @@
        (SCM_CAR(load_return) == SCM_BOOL_T)) {
       const gchar *warn_str = SCM_STRING_CHARS(SCM_CADR(load_return));
       gnc_warning_dialog(GTK_WIDGET(wind->window),
-			 _("QIF file load warning:\n%s"),
+			 _("QIF file load warning: %s"),
 			 warn_str ? warn_str : "(null)");
     }
 
@@ -507,7 +507,7 @@
               (SCM_CAR(load_return) != SCM_BOOL_T))) {
       const gchar *warn_str = SCM_STRING_CHARS(SCM_CADR(load_return));
       gnc_error_dialog(wind->window,
-		       _("QIF file load failed:\n%s"),
+		       _("QIF file load failed: %s"),
 		       warn_str ? warn_str : "(null)");
 
       imported_files = 
@@ -575,7 +575,7 @@
           (SCM_CAR(parse_return) != SCM_BOOL_T))) {
         const gchar *warn_str = SCM_STRING_CHARS(SCM_CDADR(parse_return));
         gnc_error_dialog(wind->window,
-			 _("QIF file parse failed:\n%s"),
+			 _("QIF file parse failed: %s"),
 			 warn_str ? warn_str : "(null)");
 
         imported_files = 

Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/register/ledger-core/split-register.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -726,7 +726,7 @@
 
   if (cursor_class == CURSOR_CLASS_SPLIT)
   {
-    const char *message = _("You are about to overwrite an existing split.\n"
+    const char *message = _("You are about to overwrite an existing split. "
                             "Are you sure you want to do that?");
     gboolean result;
 
@@ -758,7 +758,7 @@
   else
   {
     const char *message = _("You are about to overwrite an existing "
-                            "transaction.\n"
+                            "transaction. "
                             "Are you sure you want to do that?");
     gboolean result;
 
@@ -1517,8 +1517,8 @@
 gnc_split_register_get_account_by_name (SplitRegister *reg, BasicCell * bcell,
 					const char *name, gboolean *refresh)
 {
-  const char *placeholder = _("The account %s does not allow transactions.\n");
-  const char *missing = _("The account %s does not exist.\n"
+  const char *placeholder = _("The account %s does not allow transactions.");
+  const char *missing = _("The account %s does not exist. "
 			  "Would you like to create it?");
   char *fullname;
   ComboCell *cell = (ComboCell *) bcell;
@@ -1729,7 +1729,7 @@
     GList *radio_list = NULL;
     const char *title = _("Recalculate Transaction");
     const char *message = _("The values entered for this transaction "
-                            "are inconsistent.\nWhich value would you "
+                            "are inconsistent. Which value would you "
                             "like to have recalculated?");
 
     if (shares_changed)

Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2006-01-30 02:59:43 UTC (rev 13045)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2006-01-30 03:13:28 UTC (rev 13046)
@@ -1206,7 +1206,7 @@
 
         if (rc == 0)
         {
-                const char *format = _("The file \n    %s\n already exists.\n"
+                const char *format = _("The file %s already exists. "
                                        "Are you sure you want to overwrite it?");
 
                 if (!gnc_verify_dialog (NULL, FALSE, format, filepath)) {
@@ -1278,8 +1278,8 @@
 
         if (!result)
         {
-                const char *fmt = _("Could not open the file\n"
-                                    "     %s\n%s");
+                const char *fmt = _("Could not open the file %s. "
+				    "The error is: %s");
                 gnc_error_dialog( NULL, fmt, filepath ? filepath : "(null)",
                                   strerror (errno) ? strerror (errno) : "" );
         }



More information about the gnucash-changes mailing list