From 4762dbf4293cf915faa6161247442e74b422e85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Thu, 13 Jul 2006 22:58:55 +0000 Subject: [PATCH] String fixes that have been delayed due to the string freeze. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14493 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 13 +++++++++++++ doc/tip_of_the_day.list.in | 2 +- lib/libqof/backend/file/qsf-backend.c | 4 ++-- src/gnome-search/search.glade | 2 +- src/gnome-utils/druid-gnc-xml-import.c | 4 ++-- src/gnome-utils/glade/preferences.glade | 14 +++++++------- src/gnome-utils/gnc-file.c | 2 +- src/gnome/gnc-plugin-page-account-tree.c | 2 +- src/gnome/gnc-plugin-page-register.c | 2 +- src/gnome/schemas/apps_gnucash_general.schemas.in | 4 ++-- src/import-export/import-provider-format.glade | 2 +- src/report/report-system/report.scm | 4 ++-- 12 files changed, 34 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a04550bc3..3d71392bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2006-07-13 Andreas Köhler + * doc/tip_of_the_day.list.in: + * lib/libqof/backend/file/qsf-backend.c: + * src/gnome-search/search.glade: + * src/gnome-utils/druid-gnc-xml-import.c: + * src/gnome-utils/glade/preferences.glade: + * src/gnome-utils/gnc-file.c: + * src/gnome/schemas/apps_gnucash_general.schemas.in: + * src/gnome/gnc-plugin-page-account-tree.c: + * src/gnome/gnc-plugin-page-register.c: + * src/import-export/import-provider-format.glade: + * src/report/report-system/report.scm: String fixes that have + been delayed due to the string freeze. + * src/gnome/glade/account.glade: In the account dialog, do not expand the upper left entries when the window is resized. Automatic scrollbars for the notes field. diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.in index 88a4cc0a77..383ca88107 100644 --- a/doc/tip_of_the_day.list.in +++ b/doc/tip_of_the_day.list.in @@ -30,7 +30,7 @@ mouse button brings up the transaction menu options.") N_( "To enter multiple-split transactions such as a paycheck with \ multiple deductions, click the Split button in the tool bar. \ -Alternatively, in the View -> Style menu, you can choose the register \ +Alternatively, in the View menu, you can choose the register \ style Auto-Split Ledger or Transaction Journal.") N_( "As you enter amounts in the register, you can use the GnuCash \ diff --git a/lib/libqof/backend/file/qsf-backend.c b/lib/libqof/backend/file/qsf-backend.c index 8234628d1c..cf75600f6e 100644 --- a/lib/libqof/backend/file/qsf-backend.c +++ b/lib/libqof/backend/file/qsf-backend.c @@ -117,9 +117,9 @@ qsf_get_config(QofBackend *be) g_free(option); option = g_new0(QofBackendOption, 1); option->option_name = QSF_ENCODING; - option->description = _("Encoding string to use when writing the XML file."); + option->description = _("String encoding to use when writing the XML file."); option->tooltip = _("QSF defaults to UTF-8. Other encodings are supported by " - "passing the encoding string in this option."); + "passing the string encoding in this option."); option->type = KVP_TYPE_STRING; option->value = (gpointer)params->encoding; qof_backend_prepare_option(be, option); diff --git a/src/gnome-search/search.glade b/src/gnome-search/search.glade index a093928bab..1093f6a023 100644 --- a/src/gnome-search/search.glade +++ b/src/gnome-search/search.glade @@ -77,7 +77,7 @@ True - _New item ... + _New item... True False GTK_JUSTIFY_LEFT diff --git a/src/gnome-utils/druid-gnc-xml-import.c b/src/gnome-utils/druid-gnc-xml-import.c index 35fe984c53..8afd9c8b94 100644 --- a/src/gnome-utils/druid-gnc-xml-import.c +++ b/src/gnome-utils/druid-gnc-xml-import.c @@ -689,7 +689,7 @@ gxi_parse_file (GncXmlImportData *data) qof_session_begin (session, data->filename, TRUE, FALSE); io_err = qof_session_get_error (session); if (io_err != ERR_BACKEND_NO_ERR) { - message = _("The file could not be reopen."); + message = _("The file could not be reopened."); goto cleanup_parse_file; } @@ -708,7 +708,7 @@ gxi_parse_file (GncXmlImportData *data) goto cleanup_parse_file; } else if (io_err != ERR_FILEIO_NO_ENCODING) { /* another error, cannot handle this here */ - message = _("The file could not be reopen."); + message = _("The file could not be reopened."); goto cleanup_parse_file; } diff --git a/src/gnome-utils/glade/preferences.glade b/src/gnome-utils/glade/preferences.glade index 6131997242..c156a8c11c 100644 --- a/src/gnome-utils/glade/preferences.glade +++ b/src/gnome-utils/glade/preferences.glade @@ -978,7 +978,7 @@ True - The character that will be used between components of an account name. Legal values are any single non-alphanumeric unicode character, or any of the following strings: "colon" "slash", "backslash", "dash" and "period". + 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". True True True @@ -1180,7 +1180,7 @@ True - 31.07.05 + 31.07.2005 False False GTK_JUSTIFY_LEFT @@ -1204,7 +1204,7 @@ True - 31/07/05 + 31/07/2005 False False GTK_JUSTIFY_LEFT @@ -1228,7 +1228,7 @@ True - 07/31/05 + 07/31/2005 False False GTK_JUSTIFY_LEFT @@ -1300,7 +1300,7 @@ True - Use the date format comon in continental Europe. + Use the date format common in continental Europe. True _Europe: True @@ -3078,9 +3078,9 @@ True - Display toolbar items with the text label beside the icon. Labels are only shown for the most frequently used items. + Display toolbar items with the text label beside the icon. Labels are only shown for the most important items. True - Text besi_de icons + Priority text besi_de icons True GTK_RELIEF_NORMAL True diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c index 28ffd5c681..0ec1540dcf 100644 --- a/src/gnome-utils/gnc-file.c +++ b/src/gnome-utils/gnc-file.c @@ -437,7 +437,7 @@ show_session_error (QofBackendError io_error, break; case ERR_FILEIO_WRITE_ERROR: - fmt = _("Could not write to file %s Check that you have " + fmt = _("Could not write to file %s. Check that you have " "permission to write to this file and that " "there is sufficient space to create it."); gnc_error_dialog(parent, fmt, newfile); diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index c3daf03370..fb6947d2a0 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -188,7 +188,7 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = { { "ScrubAction", NULL, N_("Check & Repair A_ccount"), NULL, N_("Check for and repair unbalanced transactions and orphan splits " "in this account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub) }, - { "ScrubSubAction", NULL, N_("Check & Repair Su_baccount"), NULL, + { "ScrubSubAction", NULL, N_("Check & Repair Su_baccounts"), NULL, N_("Check for and repair unbalanced transactions and orphan splits " "in this account and its subaccounts"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub_sub) }, diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index 11888a6126..7e60e8b464 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -241,7 +241,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = N_("Move to the blank transaction at the bottom of the register"), G_CALLBACK (gnc_plugin_page_register_cmd_blank_transaction) }, { "EditExchangeRateAction", NULL, N_("Edit E_xchange Rate"), NULL, - N_("Exit the exchange rate for the current transaction"), + N_("Edit the exchange rate for the current transaction"), G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) }, { "JumpTransactionAction", GNC_STOCK_JUMP_TO, N_("_Jump"), NULL, N_("Jump to the corresponding transaction in the other account"), diff --git a/src/gnome/schemas/apps_gnucash_general.schemas.in b/src/gnome/schemas/apps_gnucash_general.schemas.in index ae8b4c4e5a..d85a360b0f 100644 --- a/src/gnome/schemas/apps_gnucash_general.schemas.in +++ b/src/gnome/schemas/apps_gnucash_general.schemas.in @@ -335,7 +335,7 @@ Show horizontal borders in a register - Show horizontal borders between cells in a register. If active + Show horizontal borders between rows in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked. @@ -351,7 +351,7 @@ Show vertical borders in a register - Show vertical borders between cells in a register. If active + Show vertical borders between columns in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked. diff --git a/src/import-export/import-provider-format.glade b/src/import-export/import-provider-format.glade index 989606d00c..6b830f3154 100644 --- a/src/import-export/import-provider-format.glade +++ b/src/import-export/import-provider-format.glade @@ -38,7 +38,7 @@ True The QIF file format does not specify which order the day, month, and year components of a date are printed. In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data. -Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-year-day. +Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-day-year. False False diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm index 10fb353df4..3c88284b76 100644 --- a/src/report/report-system/report.scm +++ b/src/report/report-system/report.scm @@ -98,8 +98,8 @@ (hash-set! *gnc:_report-templates_* (gnc:report-template-name report-rec) report-rec) (begin - (gnc:error "Refusing to add custom report with the same name as an existing report.") - (gnc:error "Please edit your saved-reports file and delete the section for: " name) + (gnc:error (_ "Refusing to add custom report with the same name as an existing report.")) + (gnc:error (_ "Please edit your saved-reports file and delete the section for: " name)) ))) (gnc:warn "gnc:define-report: bad report"))))