From 19dcf011eb11d2270ba7ed0bb62a90a5c72745a4 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 22 Jan 2007 16:21:51 +0000 Subject: [PATCH] Improve wording in online banking messages; dont mention HBCI alone anymore. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15418 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/hbci/dialog-hbcitrans.c | 11 ++++-- src/import-export/hbci/druid-hbci-initial.c | 35 +++++++++-------- src/import-export/hbci/glade/hbci.glade | 40 ++++++++++---------- src/import-export/hbci/glade/hbciprefs.glade | 6 +-- src/import-export/hbci/gnc-file-aqb-import.c | 6 +-- src/import-export/hbci/gnc-hbci-getbalance.c | 24 +++++++----- src/import-export/hbci/gnc-hbci-gettrans.c | 2 +- src/import-export/hbci/gnc-hbci-transfer.c | 8 ++-- src/import-export/hbci/gnc-hbci-utils.c | 4 +- src/import-export/hbci/gnc-plugin-hbci.c | 18 ++++----- src/import-export/hbci/gncmod-hbci.c | 2 +- 11 files changed, 81 insertions(+), 75 deletions(-) diff --git a/src/import-export/hbci/dialog-hbcitrans.c b/src/import-export/hbci/dialog-hbcitrans.c index 918b313128..861fe37953 100644 --- a/src/import-export/hbci/dialog-hbcitrans.c +++ b/src/import-export/hbci/dialog-hbcitrans.c @@ -365,10 +365,13 @@ gnc_hbci_dialog_new (GtkWidget *parent, break; case SINGLE_DEBITNOTE: gtk_label_set_text (GTK_LABEL (heading_label), - /* Translators: Strings from this file are really only - * needed inside Germany (HBCI is not supported anywhere - * else). You may safely ignore strings from the - * import-export/hbci subdirectory in other countries. */ + /* Translators: Strings from this file are needed only in + * countries that have one of aqbanking's Online Banking + * techniques available. This is 'OFX DirectConnect' + * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet' + * (Switzerland). If none of these techniques are available + * in your country, you may safely ignore strings from the + * import-export/hbci subdirectory. */ _("Enter an Online Direct Debit Note")); gtk_label_set_text (GTK_LABEL (recp_name_heading), diff --git a/src/import-export/hbci/druid-hbci-initial.c b/src/import-export/hbci/druid-hbci-initial.c index 1fe9231173..f96f3db368 100644 --- a/src/import-export/hbci/druid-hbci-initial.c +++ b/src/import-export/hbci/druid-hbci-initial.c @@ -423,10 +423,10 @@ on_aqhbci_button (GtkButton *button, /* This is the point where we look for and start an external application shipped with aqhbci that contains the setup druid for - HBCI related stuff. It requires qt (but not kde). This + AqBanking related stuff. It requires qt (but not kde). This application contains the very verbose step-by-step setup wizard - for the HBCI account, and the application is shared with other - AqBanking-based financial managers that offer the HBCI features + for the AqBanking account, and the application is shared with other + AqBanking-based financial managers that offer the AqBanking features (e.g. KMyMoney). See gnucash-devel discussion here https://lists.gnucash.org/pipermail/gnucash-devel/2004-December/012351.html */ @@ -574,13 +574,13 @@ on_aqhbci_button (GtkButton *button, pid = fork(); switch (pid) { case -1: - printf("Fork call failed. Cannot start AqHBCI setup wizard."); + printf("Fork call failed. Cannot start AqBanking setup wizard."); res = -1; AB_Banking_Init (info->api); break; case 0: /* child */ execl(wizard_path, wizard_path, NULL); - printf("Fork call failed. Cannot start AqHBCI setup wizard."); + printf("Fork call failed. Cannot start AqBanking setup wizard."); _exit(0); default: /* parent */ res = 0; @@ -613,13 +613,10 @@ on_aqhbci_button (GtkButton *button, printf("on_aqhbci_button: Oops, aqhbci wizard return nonzero value: %d. The called program was \"%s\".\n", res, wizard_path); gnc_error_dialog (info->window, - /* Each of the %s is the name of the backend, e.g. "aqhbci". */ - _("The external program \"%s Setup Wizard\" returned a nonzero " - "exit code which means it has not been finished successfully. " - "The further HBCI setup can only be finished if the %s " - "Setup Wizard is run successfully. Please try to start and " - "successfully finish the %s Setup Wizard program again."), - backend_name, backend_name, backend_name); + _("The external program \"AqBanking Setup Wizard\" failed " + "to run successfully. Online Banking can only be setup " + "if this wizard has run successfully. " + "Please try running the \"AqBanking Setup Wizard\" again.")); druid_disable_next_button(info); } } else { @@ -627,10 +624,12 @@ on_aqhbci_button (GtkButton *button, gnc_error_dialog (info->window, /* Each of the %s is the name of the backend, e.g. "aqhbci". */ - _("The external program \"%s Setup Wizard\" has not been found. \n\n" - "The package aqbanking is supposed to install the program " - "\"%s-qt3-wizard\". Please check your installation of aqbanking."), - backend_name, backend_name); + _("The external program \"AqBanking Setup Wizard\" has not " + "been found. \n\n" + "The aqbanking package should include the " + "program \"qt3-wizard\". Please check your installation to " + "ensure this program is present. On some distributions this " + "may require installing additional packages.")); druid_disable_next_button(info); } g_free (backend_name); @@ -690,14 +689,14 @@ void gnc_hbci_initial_druid (void) g_object_unref(info->accountstore); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("HBCI account name"), + column = gtk_tree_view_column_new_with_attributes(_("Online Banking Account Name"), renderer, "text", ACCOUNT_LIST_COL_HBCI_NAME, NULL); gtk_tree_view_append_column(info->accountview, column); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("GnuCash account name"), + column = gtk_tree_view_column_new_with_attributes(_("GnuCash Account Name"), renderer, "text", ACCOUNT_LIST_COL_GNC_NAME, NULL); diff --git a/src/import-export/hbci/glade/hbci.glade b/src/import-export/hbci/glade/hbci.glade index 949eb55646..4413b8da0e 100644 --- a/src/import-export/hbci/glade/hbci.glade +++ b/src/import-export/hbci/glade/hbci.glade @@ -6,7 +6,7 @@ True - Initial HBCI Setup + Initial Online Banking Setup GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -31,21 +31,21 @@ True GNOME_EDGE_START - Initial HBCI Setup - This druid helps you setting up your HBCI connection with your bank. + Initial Online Banking Setup + This druid helps you setting up your Online Banking connection with your bank. -You first need to apply for HBCI access at your bank. If your bank decides to grant you HBCI access, the bank will send you a letter, containing +You first need to apply for Online Banking access at your bank. If your bank decides to grant you electronic access, they will send you a letter containing * The bank code of your bank * The user ID that identifies you to your bank -* The Internet address of your bank's HBCI server -* Information about the cryptographic public key of your bank ("Ini-Letter"). +* The Internet address of your bank's Online Banking server +* For HBCI Online Banking, information about the cryptographic public key of your bank ("Ini-Letter"). This information will be needed in the following. Press "Forward" now. -NOTE: NO WARRANTIES FOR ANYTHING. Some banks are running a poorly implemented HBCI. You should not rely on time-critical transfers through HBCI, since sometimes your bank does not give you correct feedback when a transfer has been rejected. +NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online Banking server. You should not rely on time-critical transfers through Online Banking, because sometimes the bank does not give you correct feedback when a transfer is rejected. -Press "Cancel" if you do not wish to setup any HBCI connection now. +Press "Cancel" if you do not wish to setup any Online Banking connection now. #ffffffffffff #000000000000 #9999bfbf9999 @@ -57,7 +57,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True - Start AqHBCI Wizard + Start Online Banking Wizard #ffffffffffff #9999bfbf9999 #ffffffffffff @@ -85,7 +85,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True - The Setup of your HBCI connection is handled by the external program "AqHBCI Setup Wizard". Please press the button below to start this program. + The Setup of your Online Banking connection is handled by the external program "AqBanking Setup Wizard". Please press the button below to start this program. False False GTK_JUSTIFY_LEFT @@ -114,7 +114,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True True - Start AqHBCI Wizard + Start AqBanking Wizard True GTK_RELIEF_NORMAL True @@ -142,7 +142,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True - Start AqHBCI Setup Wizard + Start AqBanking Setup Wizard False False GTK_JUSTIFY_LEFT @@ -172,7 +172,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True - Match HBCI accounts with GnuCash accounts + Match Online Banking accounts with GnuCash accounts #ffffffffffff #9999bfbf9999 #ffffffffffff @@ -220,7 +220,7 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True - Click on the line of a HBCI account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching. + Click on the line of an Online Banking account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching. False False GTK_JUSTIFY_LEFT @@ -253,10 +253,10 @@ Press "Cancel" if you do not wish to setup any HBCI connection now.

True GNOME_EDGE_FINISH - HBCI Setup Finished - Now the setup for all HBCI accounts that are matching to a GnuCash account is finished. You can now invoke HBCI actions on those accounts. + Online Banking Setup Finished + The setup for matching Online Banking accounts to GnuCash accounts is now finished. You can now invoke Online Banking actions on those accounts. -If you want to add another HBCI bank, user, or account, you can start this druid again anytime. +If you want to add another bank, user, or account, you can start this druid again anytime. Press "Apply" now. #ffffffffffff @@ -1347,7 +1347,7 @@ Press "Apply" now. 6 True - HBCI Connection Window + Online Banking Connection Window GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2081,7 +2081,7 @@ Press "Apply" now. True - HBCI Version + Online Banking Version GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2148,7 +2148,7 @@ Press "Apply" now. True - Choose a HBCI Version to use with the selected bank: + Choose an Online Banking Version to use with the selected bank: False False GTK_JUSTIFY_CENTER diff --git a/src/import-export/hbci/glade/hbciprefs.glade b/src/import-export/hbci/glade/hbciprefs.glade index 2f063f14db..430f461326 100644 --- a/src/import-export/hbci/glade/hbciprefs.glade +++ b/src/import-export/hbci/glade/hbciprefs.glade @@ -29,7 +29,7 @@ True - <b>HBCI</b> + <b>Online Banking</b> False True GTK_JUSTIFY_LEFT @@ -53,7 +53,7 @@ True - Remember the PIN for HBCI in memory during a session. + Remember the Online Banking PIN in memory during a session. True Remember _PIN True @@ -77,7 +77,7 @@ True - Activate verbose debug messages for HBCI Online Banking. + Activate verbose debug messages for Online Banking. True _Verbose debug messages True diff --git a/src/import-export/hbci/gnc-file-aqb-import.c b/src/import-export/hbci/gnc-file-aqb-import.c index fc0552cb94..b5b3c34189 100644 --- a/src/import-export/hbci/gnc-file-aqb-import.c +++ b/src/import-export/hbci/gnc-file-aqb-import.c @@ -333,7 +333,7 @@ accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *accinfo, void *user_data) { account */ data->hbci_account = gnc_hbci_get_hbci_acc (data->ab, gnc_acc); if (data->hbci_account == NULL) { - gnc_error_dialog (NULL, _("No HBCI account found for this gnucash account. These transactions will not be executed by HBCI.")); + gnc_error_dialog (NULL, _("No Online Banking account found for this gnucash account. These transactions will not be executed by Online Banking.")); } } else { @@ -385,7 +385,7 @@ translist_cb (const AB_TRANSACTION *element, void *user_data) { "of the job. It is not possible to execute this job. \n" "\n" "Most probable the bank does not support your chosen " - "job or your HBCI account does not have the permission " + "job or your Online Banking account does not have the permission " "to execute this job. More error messages might be " "visible on your console log.\n" "\n" @@ -417,7 +417,7 @@ gnc_hbci_multijob_execute(GtkWidget *parent, AB_BANKING *api, /* AB_BANKING_executeOutbox failed. */ gnc_error_dialog (GNCInteractor_dialog (interactor), "%s", - _("Executing the HBCI outbox failed. Please check the log window.")); + _("Executing the Online Banking outbox failed. Please check the log window.")); GNCInteractor_show_nodelete(interactor); g_list_foreach (job_list, multijob_cb, GNCInteractor_dialog (interactor)); diff --git a/src/import-export/hbci/gnc-hbci-getbalance.c b/src/import-export/hbci/gnc-hbci-getbalance.c index 7fc1c7f9ce..659e53b020 100644 --- a/src/import-export/hbci/gnc-hbci-getbalance.c +++ b/src/import-export/hbci/gnc-hbci-getbalance.c @@ -261,16 +261,20 @@ gnc_hbci_getbalance_finish (GtkWidget *parent, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", - /* Translators: Strings from this file are really only - * needed inside Germany (HBCI is not supported anywhere - * else). You may safely ignore strings from the - * import-export/hbci subdirectory in other countries. - */ - _("The downloaded HBCI Balance was zero.\n\n" + /* Translators: Strings from this file are needed only in + * countries that have one of aqbanking's Online Banking + * techniques available. This is 'OFX DirectConnect' + * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet' + * (Switzerland). If none of these techniques are available + * in your country, you may safely ignore strings from the + * import-export/hbci subdirectory. */ + _("The downloaded Online Banking Balance was zero.\n\n" "Either this is the correct balance, or your bank does not " - "support Balance download in this HBCI version. In the latter " - "case you should choose a higher HBCI version number in the HBCI " - "Setup. After that, try again to download the HBCI Balance.")); + "support Balance download in this Online Banking version. " + "In the latter case you should choose a different " + "Online Banking version number in the Online Banking " + "(AqBanking or HBCI) Setup. After that, try again to " + "download the Online Banking Balance.")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(GTK_WIDGET(dialog)); dialogres = FALSE; @@ -282,7 +286,7 @@ gnc_hbci_getbalance_finish (GtkWidget *parent, char *booked_str = gnc_AB_VALUE_toReadableString (booked_val); char *message1 = g_strdup_printf ( - _("Result of HBCI job: \n" + _("Result of Online Banking job: \n" "Account booked balance is %s"), booked_str); char *message2 = diff --git a/src/import-export/hbci/gnc-hbci-gettrans.c b/src/import-export/hbci/gnc-hbci-gettrans.c index b991da5548..52c9bea35c 100644 --- a/src/import-export/hbci/gnc-hbci-gettrans.c +++ b/src/import-export/hbci/gnc-hbci-gettrans.c @@ -204,7 +204,7 @@ gnc_hbci_gettrans_final(GtkWidget *parent, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", - _("The HBCI import returned no transactions " + _("The Online Banking import returned no transactions " "for the selected time period.")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(GTK_WIDGET(dialog)); diff --git a/src/import-export/hbci/gnc-hbci-transfer.c b/src/import-export/hbci/gnc-hbci-transfer.c index 686ab330f7..9005e766eb 100644 --- a/src/import-export/hbci/gnc-hbci-transfer.c +++ b/src/import-export/hbci/gnc-hbci-transfer.c @@ -137,7 +137,7 @@ gnc_hbci_maketrans (GtkWidget *parent, Account *gnc_acc, "of the job. It is not possible to execute this job. \n" "\n" "Most probable the bank does not support your chosen " - "job or your HBCI account does not have the permission " + "job or your Online Banking account does not have the permission " "to execute this job. More error messages might be " "visible on your console log.\n" "\n" @@ -247,12 +247,12 @@ gnc_hbci_maketrans_final(HBCITransDialog *td, Account *gnc_acc, switch (trans_type) { case SINGLE_DEBITNOTE: - gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Direct Debit Note")); + gnc_xfer_dialog_set_title (transdialog, _("Online Banking Direct Debit Note")); case SINGLE_INTERNAL_TRANSFER: - gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Bank-Internal Transfer")); + gnc_xfer_dialog_set_title (transdialog, _("Online Banking Bank-Internal Transfer")); case SINGLE_TRANSFER: default: - gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Transaction")); + gnc_xfer_dialog_set_title (transdialog, _("Online Banking Transaction")); } /* Amount */ diff --git a/src/import-export/hbci/gnc-hbci-utils.c b/src/import-export/hbci/gnc-hbci-utils.c index 38adc2a34e..9bf7acc7e0 100644 --- a/src/import-export/hbci/gnc-hbci-utils.c +++ b/src/import-export/hbci/gnc-hbci-utils.c @@ -315,7 +315,7 @@ gnc_hbci_Error_retry (GtkWidget *parent, int error, GNCInteractor_hide (inter); gnc_error_dialog (parent, - _("Unfortunately this HBCI job is not supported " + _("Unfortunately this Online Banking job is not supported " "by your bank or for your account. Aborting.")); return FALSE; #endif @@ -323,7 +323,7 @@ gnc_hbci_Error_retry (GtkWidget *parent, int error, if (inter) GNCInteractor_hide (inter); gnc_error_dialog (parent, - _("The server of your bank refused the HBCI connection. " + _("The server of your bank refused the Online Banking connection. " "Please try again later. Aborting.")); return FALSE; diff --git a/src/import-export/hbci/gnc-plugin-hbci.c b/src/import-export/hbci/gnc-plugin-hbci.c index af1452f0b9..3c59846e09 100644 --- a/src/import-export/hbci/gnc-plugin-hbci.c +++ b/src/import-export/hbci/gnc-plugin-hbci.c @@ -92,17 +92,17 @@ static GtkActionEntry gnc_plugin_actions [] = { { "OnlineActionsAction", NULL, N_("_Online Actions"), NULL, NULL, NULL }, /* Menu Items */ - { "HbciSetupAction", NULL, N_("_HBCI Setup..."), NULL, - N_("Initial setup of HBCI/AqBanking access"), + { "HbciSetupAction", NULL, N_("_Online Banking Setup..."), NULL, + N_("Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using AqBanking)"), G_CALLBACK (gnc_plugin_hbci_cmd_setup) }, { "HbciGetBalanceAction", NULL, N_("Get _Balance"), NULL, - N_("Get the account balance online through HBCI/AqBanking"), + N_("Get the account balance online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_get_balance) }, { "HbciGetTransAction", NULL, N_("Get _Transactions..."), NULL, - N_("Get the transactions online through HBCI/AqBanking"), + N_("Get the transactions online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_get_transactions) }, { "HbciIssueTransAction", NULL, N_("_Issue Transaction..."), NULL, - N_("Issue a new transaction online through HBCI"), + N_("Issue a new transaction online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_transaction) }, #if ((AQBANKING_VERSION_MAJOR > 1) || \ ((AQBANKING_VERSION_MAJOR == 1) && \ @@ -111,11 +111,11 @@ static GtkActionEntry gnc_plugin_actions [] = { ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ (AQBANKING_VERSION_BUILD > 2)))))) { "HbciIssueIntTransAction", NULL, N_("I_nternal Transaction..."), NULL, - N_("Issue a new bank-internal transaction online through HBCI/AqBanking"), + N_("Issue a new bank-internal transaction online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_inttransaction) }, #endif { "HbciIssueDirectDebitAction", NULL, N_("_Direct Debit..."), NULL, - N_("Issue a new direct debit note online through HBCI/AqBanking"), + N_("Issue a new direct debit note online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_direct_debit) }, /* File -> Import menu item */ @@ -132,10 +132,10 @@ static GtkActionEntry gnc_plugin_actions [] = { N_("Import a CSV file into GnuCash"), G_CALLBACK (gnc_plugin_hbci_cmd_csv_import) }, { "DtausImportSendAction", GTK_STOCK_CONVERT, N_("Import DTAUS and _send..."), NULL, - N_("Import a DTAUS file into GnuCash and send the transfers online through HBCI/AqBanking"), + N_("Import a DTAUS file into GnuCash and send the transfers online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_dtaus_importsend) }, { "CsvImportSendAction", GTK_STOCK_CONVERT, N_("Import CSV and s_end..."), NULL, - N_("Import a CSV file into GnuCash and send the transfers online through HBCI/AqBanking"), + N_("Import a CSV file into GnuCash and send the transfers online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_csv_importsend) }, }; diff --git a/src/import-export/hbci/gncmod-hbci.c b/src/import-export/hbci/gncmod-hbci.c index 40908f561a..d944b34f99 100644 --- a/src/import-export/hbci/gncmod-hbci.c +++ b/src/import-export/hbci/gncmod-hbci.c @@ -34,7 +34,7 @@ gnc_module_path(void) { char * gnc_module_description(void) { - return g_strdup("Support for HBCI protocol"); + return g_strdup("Support for Online Banking protocols"); }