From f990299ddb0e77a84efab13a98e54cef76cab4a3 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Mon, 30 Jan 2006 03:13:28 +0000 Subject: [PATCH] Remove extraneous carriage returns from text that will be put into a GtkLabel (since labels know how to wrap text). git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13046 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 3 +++ src/business/business-gnome/dialog-billterms.c | 2 +- src/business/business-gnome/dialog-customer.c | 2 +- src/business/business-gnome/dialog-order.c | 4 ++-- src/business/business-gnome/dialog-vendor.c | 2 +- src/business/business-ledger/gncEntryLedger.c | 4 ++-- .../business-ledger/gncEntryLedgerControl.c | 4 ++-- src/business/dialog-tax-table/dialog-tax-table.c | 4 ++-- src/engine/cap-gains.c | 6 +++--- src/gnome-utils/dialog-account.c | 2 +- src/gnome-utils/dialog-commodity.c | 4 ++-- src/gnome-utils/dialog-transfer.c | 6 +++--- src/gnome-utils/gnc-file.c | 4 ++-- src/gnome-utils/gnc-html.c | 16 ++++++++-------- src/gnome/dialog-commodities.c | 4 ++-- src/gnome/dialog-scheduledxaction.c | 14 +++++++------- src/gnome/dialog-sx-from-trans.c | 6 +++--- src/gnome/dialog-sxsincelast.c | 10 +++++----- src/gnome/druid-acct-period.c | 2 +- src/gnome/druid-stock-split.c | 8 ++++---- src/gnome/gnc-plugin-basic-commands.c | 4 ++-- src/gnome/window-reconcile.c | 4 ++-- .../binary-import/druid-commodity.c | 12 ++++++------ src/import-export/hbci/druid-hbci-utils.c | 9 +++------ src/import-export/hbci/gnc-hbci-utils.c | 2 +- src/import-export/import-commodity-matcher.c | 6 +++++- src/import-export/qif-import/druid-qif-import.c | 12 ++++++------ src/register/ledger-core/split-register.c | 10 +++++----- src/report/report-gnome/gnc-plugin-page-report.c | 6 +++--- 29 files changed, 88 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index da0595c9bc..194e490b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-29 David Hampton + * 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 diff --git a/src/business/business-gnome/dialog-billterms.c b/src/business/business-gnome/dialog-billterms.c index 9858b75a22..9a28904f0f 100644 --- a/src/business/business-gnome/dialog-billterms.c +++ b/src/business/business-gnome/dialog-billterms.c @@ -287,7 +287,7 @@ new_billterm_ok_cb (NewBillTerm *nbt) } 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); diff --git a/src/business/business-gnome/dialog-customer.c b/src/business/business-gnome/dialog-customer.c index c7e4670eaa..28fa5509a0 100644 --- a/src/business/business-gnome/dialog-customer.c +++ b/src/business/business-gnome/dialog-customer.c @@ -265,7 +265,7 @@ gnc_customer_window_ok_cb (GtkWidget *widget, gpointer data) /* 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."))) diff --git a/src/business/business-gnome/dialog-order.c b/src/business/business-gnome/dialog-order.c index ce9cb9ecb0..75af81aaf2 100644 --- a/src/business/business-gnome/dialog-order.c +++ b/src/business/business-gnome/dialog-order.c @@ -284,8 +284,8 @@ gnc_order_window_close_order_cb (GtkWidget *widget, gpointer data) * 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) diff --git a/src/business/business-gnome/dialog-vendor.c b/src/business/business-gnome/dialog-vendor.c index 6429ca9c14..37aa6b1b15 100644 --- a/src/business/business-gnome/dialog-vendor.c +++ b/src/business/business-gnome/dialog-vendor.c @@ -202,7 +202,7 @@ gnc_vendor_window_ok_cb (GtkWidget *widget, gpointer data) /* 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."))) diff --git a/src/business/business-ledger/gncEntryLedger.c b/src/business/business-ledger/gncEntryLedger.c index 4d005852ee..43180fd09c 100644 --- a/src/business/business-ledger/gncEntryLedger.c +++ b/src/business/business-ledger/gncEntryLedger.c @@ -80,8 +80,8 @@ Account * 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; diff --git a/src/business/business-ledger/gncEntryLedgerControl.c b/src/business/business-ledger/gncEntryLedgerControl.c index 19b244d40c..c115e3358e 100644 --- a/src/business/business-ledger/gncEntryLedgerControl.c +++ b/src/business/business-ledger/gncEntryLedgerControl.c @@ -373,7 +373,7 @@ static gboolean gnc_entry_ledger_traverse (VirtualLocation *p_new_virt_loc, 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 @@ gnc_entry_ledger_check_close_internal (GtkWidget *parent, 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; diff --git a/src/business/dialog-tax-table/dialog-tax-table.c b/src/business/dialog-tax-table/dialog-tax-table.c index 59885557d7..158f1d8f64 100644 --- a/src/business/dialog-tax-table/dialog-tax-table.c +++ b/src/business/dialog-tax-table/dialog-tax-table.c @@ -105,7 +105,7 @@ new_tax_table_ok_cb (NewTaxTable *ntt) } 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 @@ tax_table_delete_entry_cb (GtkButton *button, TaxTableWindow *ttw) 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; diff --git a/src/engine/cap-gains.c b/src/engine/cap-gains.c index 38c82dfe8a..d071b3c649 100644 --- a/src/engine/cap-gains.c +++ b/src/engine/cap-gains.c @@ -239,9 +239,9 @@ GetOrMakeLotOrphanAccount (AccountGroup *root, gnc_commodity * currency) 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); diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 53d204d256..74a096576a 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -963,7 +963,7 @@ gnc_new_account_ok (AccountWindow *aw) 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; diff --git a/src/gnome-utils/dialog-commodity.c b/src/gnome-utils/dialog-commodity.c index 11ade3d323..7fadd22bb5 100644 --- a/src/gnome-utils/dialog-commodity.c +++ b/src/gnome-utils/dialog-commodity.c @@ -477,7 +477,7 @@ gnc_ui_select_commodity_response_cb (GtkDialog * dialog, gint response, gpointer 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 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w) 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; } diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c index bcd8ca7052..4240e13a58 100644 --- a/src/gnome-utils/dialog-transfer.c +++ b/src/gnome-utils/dialog-transfer.c @@ -1359,8 +1359,8 @@ gnc_xfer_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data) { 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 @@ gnc_xfer_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data) 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)) diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c index ac275a9c1a..6df23e5dc6 100644 --- a/src/gnome-utils/gnc-file.c +++ b/src/gnome-utils/gnc-file.c @@ -882,7 +882,7 @@ gnc_file_export_file(const char * newfile) /* 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 @@ gnc_file_save_as (void) /* 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 */ diff --git a/src/gnome-utils/gnc-html.c b/src/gnome-utils/gnc-html.c index d23091e857..56e7e0b90f 100644 --- a/src/gnome-utils/gnc-html.c +++ b/src/gnome-utils/gnc-html.c @@ -602,8 +602,8 @@ gnc_html_load_to_stream(gnc_html * html, GtkHTMLStream * handle, 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 @@ gnc_html_load_to_stream(gnc_html * html, GtkHTMLStream * handle, 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 @@ gnc_html_show_url(gnc_html * html, URLType type, 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 @@ gnc_html_show_url(gnc_html * html, URLType type, 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; } diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c index 1b70ecd836..6721750e8e 100644 --- a/src/gnome/dialog-commodities.c +++ b/src/gnome/dialog-commodities.c @@ -123,8 +123,8 @@ remove_clicked (CommoditiesDialog *cd) 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); diff --git a/src/gnome/dialog-scheduledxaction.c b/src/gnome/dialog-scheduledxaction.c index 873207abf8..b908e51f56 100644 --- a/src/gnome/dialog-scheduledxaction.c +++ b/src/gnome/dialog-scheduledxaction.c @@ -825,7 +825,7 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) && !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 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) 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 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) 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 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) * 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 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) && (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 @@ delete_button_clicked( GtkButton *b, gpointer d ) 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 @@ gnc_sxed_reg_check_close(SchedXactionEditorDialog *sxed) 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); diff --git a/src/gnome/dialog-sx-from-trans.c b/src/gnome/dialog-sx-from-trans.c index 888439c35f..57deaa9b13 100644 --- a/src/gnome/dialog-sx-from-trans.c +++ b/src/gnome/dialog-sx-from-trans.c @@ -267,7 +267,7 @@ sxftd_add_template_trans(SXFromTransInfo *sxfti) && !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 @@ sxftd_ok_clicked(SXFromTransInfo *sxfti) 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_sx_create_from_trans( Transaction *trans ) { 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 ); diff --git a/src/gnome/dialog-sxsincelast.c b/src/gnome/dialog-sxsincelast.c index 7de4e6202d..3cc87c2495 100644 --- a/src/gnome/dialog-sxsincelast.c +++ b/src/gnome/dialog-sxsincelast.c @@ -420,9 +420,9 @@ gnc_sx_sxsincelast_book_opened (void) 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 @@ cancel_check( GnomeDruidPage *druid_page, 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 @@ inform_or_add( sxSinceLastData *sxsld, reminderTuple *rt, gboolean okFlag, 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 ); diff --git a/src/gnome/druid-acct-period.c b/src/gnome/druid-acct-period.c index e1e98b6f2f..bbc2868202 100644 --- a/src/gnome/druid-acct-period.c +++ b/src/gnome/druid-acct-period.c @@ -286,7 +286,7 @@ show_book_details (AcctPeriodInfo *info) 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); diff --git a/src/gnome/druid-stock-split.c b/src/gnome/druid-stock-split.c index 7bc780fc98..f9b2ecd690 100644 --- a/src/gnome/druid-stock-split.c +++ b/src/gnome/druid-stock-split.c @@ -310,7 +310,7 @@ gnc_stock_split_druid_details_next (GnomeDruidPage *druidpage, 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 @@ gnc_stock_split_druid_cash_next (GnomeDruidPage *druidpage, 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 @@ gnc_stock_split_druid_cash_next (GnomeDruidPage *druidpage, 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 @@ gnc_stock_split_druid_cash_next (GnomeDruidPage *druidpage, 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; diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c index 3fbff6fdb8..7b986b1826 100644 --- a/src/gnome/gnc-plugin-basic-commands.c +++ b/src/gnome/gnc-plugin-basic-commands.c @@ -426,9 +426,9 @@ gnc_main_window_cmd_actions_since_last_run (GtkAction *action, GncMainWindowActi 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)); diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 6f3129c0ee..e9623d4e4a 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -2029,7 +2029,7 @@ recnFinishCB (GtkWidget *w, gpointer data) 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 @@ recnCancelCB (GtkWidget *w, gpointer data) 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; } diff --git a/src/import-export/binary-import/druid-commodity.c b/src/import-export/binary-import/druid-commodity.c index 30d57dae0c..fc8d069f1b 100644 --- a/src/import-export/binary-import/druid-commodity.c +++ b/src/import-export/binary-import/druid-commodity.c @@ -266,8 +266,8 @@ make_commodity_druid_page(gnc_commodity * comm) 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 @@ make_commodity_druid_page(gnc_commodity * comm) 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 @@ make_commodity_druid_page(gnc_commodity * comm) 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 @@ make_commodity_druid_page(gnc_commodity * comm) 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 @@ gnc_ui_commodity_druid_comm_check_cb(GnomeDruidPage * page, gpointer druid, (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; diff --git a/src/import-export/hbci/druid-hbci-utils.c b/src/import-export/hbci/druid-hbci-utils.c index 1c199c2d12..dbb56341ed 100644 --- a/src/import-export/hbci/druid-hbci-utils.c +++ b/src/import-export/hbci/druid-hbci-utils.c @@ -155,8 +155,7 @@ gnc_verify_exist_or_new_file (GtkWidget *parent, const char *filename) 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 @@ gnc_test_dir_exist_error (GtkWindow *parent, const char *filename) 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; } diff --git a/src/import-export/hbci/gnc-hbci-utils.c b/src/import-export/hbci/gnc-hbci-utils.c index b58804819c..579a5a6057 100644 --- a/src/import-export/hbci/gnc-hbci-utils.c +++ b/src/import-export/hbci/gnc-hbci-utils.c @@ -298,7 +298,7 @@ gnc_hbci_Error_retry (GtkWidget *parent, int error, 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: diff --git a/src/import-export/import-commodity-matcher.c b/src/import-export/import-commodity-matcher.c index 19206f2cf4..0d75634293 100755 --- a/src/import-export/import-commodity-matcher.c +++ b/src/import-export/import-commodity-matcher.c @@ -110,10 +110,14 @@ gnc_commodity * gnc_import_select_commodity(char * exchange_code, 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); diff --git a/src/import-export/qif-import/druid-qif-import.c b/src/import-export/qif-import/druid-qif-import.c index 48cd37dcc3..8e5c65b2f7 100644 --- a/src/import-export/qif-import/druid-qif-import.c +++ b/src/import-export/qif-import/druid-qif-import.c @@ -447,13 +447,13 @@ gnc_ui_qif_import_load_file_next_cb(GnomeDruidPage * page, /* 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 @@ gnc_ui_qif_import_load_file_next_cb(GnomeDruidPage * page, 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 @@ gnc_ui_qif_import_load_file_next_cb(GnomeDruidPage * page, (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 @@ gnc_ui_qif_import_load_file_next_cb(GnomeDruidPage * page, (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 @@ gnc_ui_qif_import_load_file_next_cb(GnomeDruidPage * page, (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 = diff --git a/src/register/ledger-core/split-register.c b/src/register/ledger-core/split-register.c index 35903bfbca..4ae652ee43 100644 --- a/src/register/ledger-core/split-register.c +++ b/src/register/ledger-core/split-register.c @@ -726,7 +726,7 @@ gnc_split_register_paste_current (SplitRegister *reg) 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 @@ gnc_split_register_paste_current (SplitRegister *reg) 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 @@ Account * 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 @@ gnc_split_register_auto_calc (SplitRegister *reg, Split *split) 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) diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/src/report/report-gnome/gnc-plugin-page-report.c index 1146d2e391..cbc3d720f1 100644 --- a/src/report/report-gnome/gnc-plugin-page-report.c +++ b/src/report/report-gnome/gnc-plugin-page-report.c @@ -1206,7 +1206,7 @@ gnc_get_export_filename (SCM choice) 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 @@ gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report 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) : "" ); }