From 3ac7f92900fc97082154d745e1ec07f6b6ee9592 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sun, 27 Oct 2002 23:05:31 +0000 Subject: [PATCH] More translation/i18n work. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7409 57a11ea4-9604-0410-9ed3-97b8803252fd --- po/de.po | 54 +++++++++++++++----- src/import-export/hbci/gnc-hbci-getbalance.c | 21 +++++--- src/import-export/hbci/gnc-hbci-gettrans.c | 8 +-- src/import-export/hbci/gnc-hbci-transfer.c | 1 + 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/po/de.po b/po/de.po index 5eb4080d1f..9412fe8bf2 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnucash 1.7\n" -"POT-Creation-Date: 2002-10-27 23:28+0100\n" -"PO-Revision-Date: 2002-10-27 23:38+0100\n" +"POT-Creation-Date: 2002-10-27 23:56+0100\n" +"PO-Revision-Date: 2002-10-28 00:01+0100\n" "Last-Translator: Christian Stimming \n" "Language-Team: DE\n" "MIME-Version: 1.0\n" @@ -1818,7 +1818,7 @@ msgstr "_Buchen..." #: src/gnome/glade/stocks.glade.h:1 src/import-export/generic-import.glade.h:1 #: src/import-export/hbci/glade/hbci.glade.h:6 #: src/import-export/hbci/gnc-hbci-gettrans.c:303 -#: src/import-export/hbci/gnc-hbci-transfer.c:172 +#: src/import-export/hbci/gnc-hbci-transfer.c:173 #: src/import-export/qif-import/qif.glade.h:1 #: src/register/ledger-core/split-register-model.c:191 msgid "Account" @@ -4647,7 +4647,7 @@ msgstr "In Arbeit..." #: intl-scm/guile-strings.c:85 intl-scm/guile-strings.c:672 #: src/engine/Account.c:2161 src/import-export/hbci/glade/hbci.glade.h:13 #: src/import-export/hbci/gnc-hbci-gettrans.c:304 -#: src/import-export/hbci/gnc-hbci-transfer.c:173 +#: src/import-export/hbci/gnc-hbci-transfer.c:174 msgid "Bank" msgstr "Bank" @@ -5183,6 +5183,26 @@ msgid "" "Warning: Ofx investment transactions require two accounts." msgstr "" +#. %s is either 'noted balance' or 'booked balance'. %s is the amount. +#: src/import-export/hbci/gnc-hbci-getbalance.c:152 +#, c-format +msgid "" +"Result of HBCI job: \n" +"Account %s is %s\n" +"Reconcile account now?" +msgstr "" +"Ergebnis des HBCI Auftrag:\n" +"%s des Kontos ist %s\n" +"Konto jetzt abgleichen?" + +#: src/import-export/hbci/gnc-hbci-getbalance.c:155 +msgid "noted balance" +msgstr "Vorgemerkter Saldo" + +#: src/import-export/hbci/gnc-hbci-getbalance.c:155 +msgid "booked balance" +msgstr "Gebuchter Saldo" + #: src/import-export/hbci/glade/hbcipass.glade.h:1 msgid "Confirm Password:" msgstr "Passwort bestätigen:" @@ -5809,7 +5829,8 @@ msgid "" "user '%s' at bank '%s'." msgstr "" "Bitte die PIN für \n" -"Benutzer '%s' der Bank '%s' eingeben." +"Benutzer '%s' \n" +"der Bank '%s' eingeben." #: src/import-export/hbci/hbci-interaction.c:186 #, c-format @@ -6029,11 +6050,11 @@ msgstr "Lokales System aktualisieren" msgid "Closing connection" msgstr "Verbindung schließen" -#: src/import-export/hbci/gnc-hbci-transfer.c:111 +#: src/import-export/hbci/gnc-hbci-transfer.c:112 msgid "Online HBCI Direct Debit Note" msgstr "Online-Auftrag Einzellastschrift" -#: src/import-export/hbci/gnc-hbci-transfer.c:114 +#: src/import-export/hbci/gnc-hbci-transfer.c:115 msgid "Online HBCI Transaction" msgstr "Online-Auftrag Einzelüberweisung" @@ -6810,7 +6831,9 @@ msgstr "Die gew msgid "" "The selected transaction and it's splits will be added to the appropriate " "account(s) and will be marked as reconciled." -msgstr "Der gewählte Geschäftsvorgang und seine Buchungen werden zum Konto hinzugefügt und als abgeglichen markiert." +msgstr "" +"Der gewählte Geschäftsvorgang und seine Buchungen werden zum Konto " +"hinzugefügt und als abgeglichen markiert." #: src/import-export/generic-import.glade.h:22 msgid "The selected transaction will be ignored" @@ -6819,7 +6842,9 @@ msgstr "Die gew #: src/import-export/generic-import.glade.h:23 msgid "" "The selected transaction will replace the selected match AND ALL IT'S SPLITS" -msgstr "Die gewählte Buchung wird den passenden Geschäftsvorgang ersetzen, INCLUSIVE aller Gegenbuchungen" +msgstr "" +"Die gewählte Buchung wird den passenden Geschäftsvorgang ersetzen, INCLUSIVE " +"aller Gegenbuchungen" #: src/import-export/generic-import.glade.h:25 msgid "be added as a new transaction" @@ -6938,7 +6963,6 @@ msgid "Select Default" msgstr "Voreinstellung" #: src/gnome-utils/dialog-options.c:1367 -#, fuzzy msgid "Defaults" msgstr "Voreinstellung" @@ -6955,18 +6979,20 @@ msgid "Select pixmap" msgstr "Bild auswählen" #: src/gnome-utils/dialog-commodity.c:130 -#, fuzzy msgid "" "\n" "Please select a commodity to match:" -msgstr "Sie müssen eine Datei angeben, die geladen werden soll\n" +msgstr "" +"\n" +"Geben Sie eine Währung/Aktie an, die passt:" #: src/gnome-utils/dialog-commodity.c:134 -#, fuzzy msgid "" "\n" "Commodity: " -msgstr "Währung/Aktie:" +msgstr "" +"\n" +"Währung/Aktie: " #: src/gnome-utils/dialog-commodity.c:139 msgid "" diff --git a/src/import-export/hbci/gnc-hbci-getbalance.c b/src/import-export/hbci/gnc-hbci-getbalance.c index dece2fe564..9bac4b2e70 100644 --- a/src/import-export/hbci/gnc-hbci-getbalance.c +++ b/src/import-export/hbci/gnc-hbci-getbalance.c @@ -20,6 +20,7 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ +#include "config.h" #include "gnc-hbci-getbalance.h" #include @@ -104,7 +105,7 @@ gnc_hbci_getbalance (GtkWidget *parent, Account *gnc_acc) /* HBCI_API_executeOutbox failed. */ return; } - + { const HBCI_AccountBalance *acc_bal; const HBCI_Balance *bal1, *bal2; @@ -141,14 +142,22 @@ gnc_hbci_getbalance (GtkWidget *parent, Account *gnc_acc) choose1 = (timespec_cmp (&ts1, &ts2) == 1); val = HBCI_Balance_value (choose1 ? bal1 : bal2); - - dialogres = gnc_verify_dialog_parented + + { + char *str = HBCI_Value_toReadableString (val); + dialogres = gnc_verify_dialog_parented (parent, TRUE, - "Result of HBCI job: \nAccount %s balance is %g\nReconcile account now?", - (choose1 ? "noted" : "booked"), - HBCI_Value_getValue (val)); + /* %s is either 'noted balance' or 'booked balance'. %s is the amount. */ + _("Result of HBCI job: \n" + "Account %s is %s\n" + "Reconcile account now?"), + (choose1 ? _("noted balance") : _("booked balance")), + str); + free (str); + } + GNCInteractor_hide (interactor); if (dialogres) recnWindowWithBalance (parent, gnc_acc, diff --git a/src/import-export/hbci/gnc-hbci-gettrans.c b/src/import-export/hbci/gnc-hbci-gettrans.c index e47704e03c..28cdf2adcc 100644 --- a/src/import-export/hbci/gnc-hbci-gettrans.c +++ b/src/import-export/hbci/gnc-hbci-gettrans.c @@ -104,7 +104,6 @@ gnc_hbci_gettrans (GtkWidget *parent, Account *gnc_acc) /* Execute a GetTransactions job. */ HBCI_OutboxJobGetTransactions *trans_job; HBCI_OutboxJob *job; - HBCI_Error *err; Timespec last_timespec, until_timespec; time_t now = time(NULL), time_convert; struct tm tm; @@ -162,7 +161,7 @@ gnc_hbci_gettrans (GtkWidget *parent, Account *gnc_acc) /* HBCI_API_executeOutbox failed. */ HBCI_Date_delete (from_date); HBCI_Date_delete (to_date); - return NULL; + return; } HBCI_Date_delete (from_date); @@ -179,11 +178,12 @@ gnc_hbci_gettrans (GtkWidget *parent, Account *gnc_acc) data.gnc_acc = gnc_acc; trans_list = HBCI_OutboxJobGetTransactions_transactions (trans_job); - printf("Got %d transactions.\n", + printf("gnc_hbci_gettrans: Got %d transactions.\n", list_HBCI_Transaction_size(trans_list)); list_HBCI_Transaction_foreach (trans_list, trans_list_cb, &data); } + GNCInteractor_hide (interactor); /* Clean up behind ourself. */ /*HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);*/ } @@ -217,7 +217,7 @@ static void *trans_list_cb (const HBCI_Transaction *h_trans, tt1 = HBCI_Date_to_time_t (HBCI_Transaction_date(h_trans)); tt2 = HBCI_Date_to_time_t (HBCI_Transaction_valutaDate(h_trans)); - printf("Date? %s ValutaDate? %s", ctime(&tt1), ctime(&tt2)); + /*printf("Date? %s ValutaDate? %s", ctime(&tt1), ctime(&tt2));*/ /*tm1 = HBCI_Date_to_tm (HBCI_Transaction_date(h_trans)); tm2 = HBCI_Date_to_tm (HBCI_Transaction_valutaDate(h_trans)); printf("Date asc %s ValutaDate asc %s", asctime(&tm1), asctime(&tm2));*/ diff --git a/src/import-export/hbci/gnc-hbci-transfer.c b/src/import-export/hbci/gnc-hbci-transfer.c index b219f375b6..c5be3e62c8 100644 --- a/src/import-export/hbci/gnc-hbci-transfer.c +++ b/src/import-export/hbci/gnc-hbci-transfer.c @@ -98,6 +98,7 @@ gnc_hbci_maketrans (GtkWidget *parent, Account *gnc_acc, if (!h_trans) return; + GNCInteractor_hide (interactor); { /* HBCI Transaction has finished, so now open the gnucash transaction dialog and fill in all values. */