From fd8df09db6efc9d3d9554d77e579b9b18b6bbc37 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 6 Jan 2006 22:09:16 +0000 Subject: [PATCH] String i18n cleanup: manual linebreaks removed git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12275 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/hbci/gnc-hbci-getbalance.c | 17 ++++++------ src/import-export/hbci/gnc-hbci-transfer.c | 12 ++++----- src/import-export/hbci/gnc-hbci-utils.c | 28 ++++---------------- 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/import-export/hbci/gnc-hbci-getbalance.c b/src/import-export/hbci/gnc-hbci-getbalance.c index bd79927c74..e72edbf220 100644 --- a/src/import-export/hbci/gnc-hbci-getbalance.c +++ b/src/import-export/hbci/gnc-hbci-getbalance.c @@ -254,16 +254,17 @@ gnc_hbci_getbalance_finish (GtkWidget *parent, | GTK_DIALOG_DESTROY_WITH_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" - "Either this is the correct balance, or your bank does not \n" - "support Balance download in this HBCI version. In the latter \n" - "case you should choose a higher HBCI version number in the HBCI \n" - "Setup. After that, try again to download the HBCI Balance.\n")); + _("The downloaded HBCI 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.")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(GTK_WIDGET(dialog)); dialogres = FALSE; @@ -276,7 +277,7 @@ gnc_hbci_getbalance_finish (GtkWidget *parent, char *message1 = g_strdup_printf ( _("Result of HBCI job: \n" - "Account booked balance is %s\n"), + "Account booked balance is %s"), booked_str); char *message2 = ((noted_value == 0.0) ? @@ -287,14 +288,14 @@ gnc_hbci_getbalance_finish (GtkWidget *parent, noted_val)); if (gnc_numeric_equal(value, reconc_balance)) { - const char *message3 = _("The booked balance is identical to the current \n" + const char *message3 = _("The booked balance is identical to the current " "reconciled balance of the account."); dialog = gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - "%s%s\n%s", + "%s\n%s\n%s", message1, message2, message3); 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 d671ec3d49..121a39c4fa 100644 --- a/src/import-export/hbci/gnc-hbci-transfer.c +++ b/src/import-export/hbci/gnc-hbci-transfer.c @@ -129,12 +129,12 @@ gnc_hbci_maketrans (GtkWidget *parent, Account *gnc_acc, (parent, FALSE, "%s", - _("The backend found an error during the preparation \n" + _("The backend found an error during the preparation " "of the job. It is not possible to execute this job. \n" "\n" - "Most probable the bank does not support your chosen \n" - "job or your HBCI account does not have the permission \n" - "to execute this job. More error messages might be \n" + "Most probable the bank does not support your chosen " + "job or your HBCI account does not have the permission " + "to execute this job. More error messages might be " "visible on your console log.\n" "\n" "Do you want to enter the job again?"))) @@ -212,8 +212,8 @@ void maketrans_save_templates(GtkWidget *parent, Account *gnc_acc, (parent, FALSE, "%s", - _("You have changed the list of online transfer templates,\n" - "but you cancelled the transfer dialog.\n" + _("You have changed the list of online transfer templates, " + "but you cancelled the transfer dialog. " "Do you nevertheless want to store the changes?"))) { GList *kvp_list = gnc_trans_templ_kvp_glist_from_glist (template_list); /*printf ("Now having %d templates. List: '%s'\n", diff --git a/src/import-export/hbci/gnc-hbci-utils.c b/src/import-export/hbci/gnc-hbci-utils.c index 1a0071f045..c8825aa099 100644 --- a/src/import-export/hbci/gnc-hbci-utils.c +++ b/src/import-export/hbci/gnc-hbci-utils.c @@ -324,14 +324,14 @@ gnc_hbci_Error_retry (GtkWidget *parent, int error, return FALSE; case AB_ERROR_NO_CARD: return gnc_verify_dialog (parent, - TRUE, - _("No chip card has been found in the chip card reader.\n" - "Do you want to try again?")); + TRUE, + _("No chip card has been found in the chip card reader. " + "Do you want to try again?")); case AB_ERROR_JOB_NOT_SUPPORTED: GNCInteractor_hide (inter); gnc_error_dialog (parent, - _("Unfortunately this HBCI job is not supported \n" + _("Unfortunately this HBCI job is not supported " "by your bank or for your account. Aborting.")); return FALSE; #endif @@ -339,27 +339,9 @@ gnc_hbci_Error_retry (GtkWidget *parent, int error, GNCInteractor_hide (inter); gnc_error_dialog (parent, - _("The server of your bank refused the HBCI connection.\n" + _("The server of your bank refused the HBCI connection. " "Please try again later. Aborting.")); return FALSE; -#if 0 - case AB_ERROR_MEDIUM: - gnc_error_dialog - (parent, - _("There was an error when loading the plugin for your security medium \n" - "(see log window). Probably the versions of your currently installed \n" - "OpenHBCI library and of the plugin do not match. In that case you need \n" - "to recompile and reinstall the plugin again. Aborting now.")); - GNCInteractor_hide (inter); - return FALSE; - case AB_ERROR_BAD_MEDIUM: - gnc_error_dialog - (parent, - _("Your security medium is not supported. No appropriate plugin \n" - "has been found for that medium. Aborting.")); - GNCInteractor_hide (inter); - return FALSE; -#endif default: return FALSE;