2002-11-08 Christian Stimming <stimming@tuhh.de>

* src/gnome/window-register.c (regWindowLedger): Fix menu
	extension setup by moving it after gnc_register_setup_menu.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7455 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2002-11-08 22:42:52 +00:00
parent c9de06c292
commit b66a65968e
7 changed files with 52 additions and 44 deletions

View File

@ -1,3 +1,8 @@
2002-11-08 Christian Stimming <stimming@tuhh.de>
* src/gnome/window-register.c (regWindowLedger): Fix menu
extension setup by moving it after gnc_register_setup_menu.
2002-11-07 David Hampton <hampton@employees.org> 2002-11-07 David Hampton <hampton@employees.org>
* src/engine/iso-4217-currencies.scm: Added a bunch of currencies. #95405 * src/engine/iso-4217-currencies.scm: Added a bunch of currencies. #95405

View File

@ -8,8 +8,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnucash 1.7\n" "Project-Id-Version: gnucash 1.7\n"
"POT-Creation-Date: 2002-11-06 19:14+0100\n" "POT-Creation-Date: 2002-11-08 23:24+0100\n"
"PO-Revision-Date: 2002-11-06 19:30+0100\n" "PO-Revision-Date: 2002-11-08 23:42+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: DE\n" "Language-Team: DE\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1353,7 +1353,7 @@ msgstr "
msgid "Register date ranges" msgid "Register date ranges"
msgstr "Datumbereich des Kassenberichts" msgstr "Datumbereich des Kassenberichts"
#: src/gnome/glade/register.glade.h:48 src/gnome/gnc-split-reg.c:951 #: src/gnome/glade/register.glade.h:48 src/gnome/gnc-split-reg.c:947
msgid "Remove Transaction Splits" msgid "Remove Transaction Splits"
msgstr "Gegenbuchungen entfernen" msgstr "Gegenbuchungen entfernen"
@ -1951,7 +1951,7 @@ msgstr "Suche "
#: src/gnome/glade/find.glade.h:25 #: src/gnome/glade/find.glade.h:25
msgid "Find Transactions" msgid "Find Transactions"
msgstr "Geschäftsvorgänge finden" msgstr "Geschäftsvorgänge suchen"
#: src/gnome/glade/find.glade.h:26 #: src/gnome/glade/find.glade.h:26
msgid "Find securities transactions of:" msgid "Find securities transactions of:"
@ -2980,11 +2980,11 @@ msgstr ""
"Änderungen rückgängig gemacht. Sind Sie sicher, daß Sie alle\n" "Änderungen rückgängig gemacht. Sind Sie sicher, daß Sie alle\n"
"Änderungen in den Terminierten Buchungen verwerfen wollen?" "Änderungen in den Terminierten Buchungen verwerfen wollen?"
#: src/gnome/gnc-split-reg.c:699 #: src/gnome/gnc-split-reg.c:695
msgid "<No information>" msgid "<No information>"
msgstr "<keine Informationen>" msgstr "<keine Informationen>"
#: src/gnome/gnc-split-reg.c:826 #: src/gnome/gnc-split-reg.c:822
#: src/register/ledger-core/split-register-control.c:1054 #: src/register/ledger-core/split-register-control.c:1054
#: src/register/ledger-core/split-register.c:496 #: src/register/ledger-core/split-register.c:496
msgid "" msgid ""
@ -2994,13 +2994,13 @@ msgstr ""
"Die aktuelle Buchung wurde verändert.\n" "Die aktuelle Buchung wurde verändert.\n"
"Soll sie gespeichert werden?" "Soll sie gespeichert werden?"
#: src/gnome/gnc-split-reg.c:953 #: src/gnome/gnc-split-reg.c:949
msgid "Are you sure you want to remove the Splits of this transaction?" msgid "Are you sure you want to remove the Splits of this transaction?"
msgstr "" msgstr ""
"Sind Sie sicher, dass Sie die Gegenbuchungen dieses Geschäftsvorgangs " "Sind Sie sicher, dass Sie die Gegenbuchungen dieses Geschäftsvorgangs "
"entfernen wollen?" "entfernen wollen?"
#: src/gnome/gnc-split-reg.c:956 #: src/gnome/gnc-split-reg.c:952
msgid "" msgid ""
"You would be modifying a transaction with reconciled splits!\n" "You would be modifying a transaction with reconciled splits!\n"
"This is not a good idea as it will cause your reconciled balance to be off." "This is not a good idea as it will cause your reconciled balance to be off."
@ -3008,7 +3008,7 @@ msgstr ""
"Sie würden einen Geschäftsvorgang mit abgeglichenen Buchungen\n" "Sie würden einen Geschäftsvorgang mit abgeglichenen Buchungen\n"
"ändern. Ihr abgeglichener Saldo könnte dadurch fehlerhaft werden." "ändern. Ihr abgeglichener Saldo könnte dadurch fehlerhaft werden."
#: src/gnome/gnc-split-reg.c:1049 #: src/gnome/gnc-split-reg.c:1045
#, c-format #, c-format
msgid "" msgid ""
"Are you sure you want to delete\n" "Are you sure you want to delete\n"
@ -3022,7 +3022,7 @@ msgstr ""
" %s \n" " %s \n"
"löschen wollen?" "löschen wollen?"
#: src/gnome/gnc-split-reg.c:1051 #: src/gnome/gnc-split-reg.c:1047
msgid "" msgid ""
"You would be deleting a reconciled split!\n" "You would be deleting a reconciled split!\n"
"This is not a good idea as it will cause your reconciled balance to be off." "This is not a good idea as it will cause your reconciled balance to be off."
@ -3030,20 +3030,20 @@ msgstr ""
"Sie würden eine abgeglichene Buchung löschen! Das würde bewirken, daß\n" "Sie würden eine abgeglichene Buchung löschen! Das würde bewirken, daß\n"
"Ihr Saldo nicht mehr abgeglichen ist." "Ihr Saldo nicht mehr abgeglichen ist."
#: src/gnome/gnc-split-reg.c:1059 #: src/gnome/gnc-split-reg.c:1055
msgid "(no memo)" msgid "(no memo)"
msgstr "(kein Buchungstext)" msgstr "(kein Buchungstext)"
#: src/gnome/gnc-split-reg.c:1062 #: src/gnome/gnc-split-reg.c:1058
msgid "(no description)" msgid "(no description)"
msgstr "(Keine Beschreibung)" msgstr "(Keine Beschreibung)"
#: src/gnome/gnc-split-reg.c:1095 #: src/gnome/gnc-split-reg.c:1091
msgid "Are you sure you want to delete the current transaction?" msgid "Are you sure you want to delete the current transaction?"
msgstr "" msgstr ""
"Sind Sie sicher, dass Sie den aktuellen Geschäftsvorgang löschen wollen?" "Sind Sie sicher, dass Sie den aktuellen Geschäftsvorgang löschen wollen?"
#: src/gnome/gnc-split-reg.c:1097 #: src/gnome/gnc-split-reg.c:1093
msgid "" msgid ""
"You would be deleting a transaction with reconciled splits!\n" "You would be deleting a transaction with reconciled splits!\n"
"This is not a good idea as it will cause your reconciled balance to be off." "This is not a good idea as it will cause your reconciled balance to be off."
@ -3052,31 +3052,31 @@ msgstr ""
"Buchungen löschen würden. Dies bedeutet, daß ihr abgeglichener Saldo\n" "Buchungen löschen würden. Dies bedeutet, daß ihr abgeglichener Saldo\n"
"verändert wird." "verändert wird."
#: src/gnome/gnc-split-reg.c:1779 #: src/gnome/gnc-split-reg.c:1775
msgid "Present:" msgid "Present:"
msgstr "Aktueller Wert:" msgstr "Aktueller Wert:"
#: src/gnome/gnc-split-reg.c:1780 #: src/gnome/gnc-split-reg.c:1776
msgid "Future:" msgid "Future:"
msgstr "Zukünftiger Wert:" msgstr "Zukünftiger Wert:"
#: src/gnome/gnc-split-reg.c:1781 #: src/gnome/gnc-split-reg.c:1777
msgid "Cleared:" msgid "Cleared:"
msgstr "Bestätigt:" msgstr "Bestätigt:"
#: src/gnome/gnc-split-reg.c:1782 #: src/gnome/gnc-split-reg.c:1778
msgid "Reconciled:" msgid "Reconciled:"
msgstr "Abgeglichen:" msgstr "Abgeglichen:"
#: src/gnome/gnc-split-reg.c:1786 #: src/gnome/gnc-split-reg.c:1782
msgid "Shares:" msgid "Shares:"
msgstr "Anteile:" msgstr "Anteile:"
#: src/gnome/gnc-split-reg.c:1787 #: src/gnome/gnc-split-reg.c:1783
msgid "Current Value:" msgid "Current Value:"
msgstr "Aktueller Wert:" msgstr "Aktueller Wert:"
#: src/gnome/gnc-split-reg.c:2014 #: src/gnome/gnc-split-reg.c:2010
msgid "" msgid ""
"This account may not be edited. If you want\n" "This account may not be edited. If you want\n"
"to edit transactions in this register, please\n" "to edit transactions in this register, please\n"
@ -3088,7 +3088,7 @@ msgstr ""
"\"Konto Eigenschaften\" und deaktivieren Sie die Option\n" "\"Konto Eigenschaften\" und deaktivieren Sie die Option\n"
"\"Platzhalter-Konto\"." "\"Platzhalter-Konto\"."
#: src/gnome/gnc-split-reg.c:2021 #: src/gnome/gnc-split-reg.c:2017
msgid "" msgid ""
"One of the sub-accounts selected may not be\n" "One of the sub-accounts selected may not be\n"
"edited. If you want to edit transactions in\n" "edited. If you want to edit transactions in\n"
@ -3102,7 +3102,7 @@ msgstr ""
"Dialogfenster \"Konto Eigenschaften\" des Unterkontos und deaktivieren\n" "Dialogfenster \"Konto Eigenschaften\" des Unterkontos und deaktivieren\n"
"Sie die Option \"Platzhalter-Konto\"." "Sie die Option \"Platzhalter-Konto\"."
#: src/gnome/gnc-split-reg.c:2045 #: src/gnome/gnc-split-reg.c:2041
#, c-format #, c-format
msgid "%s [Read-Only]" msgid "%s [Read-Only]"
msgstr "%s [Nur-Lesen]" msgstr "%s [Nur-Lesen]"
@ -3368,7 +3368,7 @@ msgstr "Finanzrechner"
#: src/gnome/window-main.c:945 #: src/gnome/window-main.c:945
msgid "_Find Transactions" msgid "_Find Transactions"
msgstr "Geschäftsvorgänge _finden" msgstr "Geschäftsvorgänge _suchen"
#: src/gnome/window-main.c:946 #: src/gnome/window-main.c:946
msgid "Find transactions with a search" msgid "Find transactions with a search"
@ -4043,7 +4043,7 @@ msgstr "Irgendeins der Kriterien wird erf
#: src/gnome-search/dialog-search.c:859 #: src/gnome-search/dialog-search.c:859
#, c-format #, c-format
msgid "New %s" msgid "New %s"
msgstr "%s neu" msgstr "Neuer %s"
#: src/gnome-search/dialog-search.c:859 #: src/gnome-search/dialog-search.c:859
msgid "item" msgid "item"
@ -4175,7 +4175,7 @@ msgstr "Suchkriterium"
#: src/gnome-search/search.glade.h:10 #: src/gnome-search/search.glade.h:10
msgid "Search for items where" msgid "Search for items where"
msgstr "Nach Einträgen suchen, wo" msgstr "Nach Einträgen suchen, für die gilt:"
#: src/gnome-search/search.glade.h:11 #: src/gnome-search/search.glade.h:11
msgid "Search for..." msgid "Search for..."
@ -6261,7 +6261,7 @@ msgstr "Vereine QIF-Kategorien mit Gnucash Konten"
#: src/import-export/qif-import/qif.glade.h:85 #: src/import-export/qif-import/qif.glade.h:85
msgid "Match duplicate transactions" msgid "Match duplicate transactions"
msgstr "Doppelte Geschäftsvorgänge finden" msgstr "Doppelte Geschäftsvorgänge suchen"
#: src/import-export/qif-import/qif.glade.h:86 #: src/import-export/qif-import/qif.glade.h:86
msgid "Match payees/memos to GnuCash accounts" msgid "Match payees/memos to GnuCash accounts"
@ -6725,7 +6725,7 @@ msgstr "Die Gegenbuchung(en) des gew
#: src/import-export/generic-import.glade.h:19 #: src/import-export/generic-import.glade.h:19
msgid "The selected downloaded transaction should:" msgid "The selected downloaded transaction should:"
msgstr "Die importieren Buchungen sollen folgendermaßen behandelt werden:" msgstr "Mit den importierten Buchungen folgendermaßen verfahren:"
#: src/import-export/generic-import.glade.h:20 #: src/import-export/generic-import.glade.h:20
msgid "The selected match will be marked as reconciled" msgid "The selected match will be marked as reconciled"
@ -6752,19 +6752,19 @@ msgstr ""
#: src/import-export/generic-import.glade.h:25 #: src/import-export/generic-import.glade.h:25
msgid "be added as a new transaction" msgid "be added as a new transaction"
msgstr "als neuer Geschäftsvorgang hinzugefügt" msgstr "Als neuer Geschäftsvorgang hinzufügen"
#: src/import-export/generic-import.glade.h:26 #: src/import-export/generic-import.glade.h:26
msgid "be ignored" msgid "be ignored"
msgstr "ignoriert" msgstr "Ignorieren"
#: src/import-export/generic-import.glade.h:27 #: src/import-export/generic-import.glade.h:27
msgid "reconcile the selected match" msgid "reconcile the selected match"
msgstr "passenden Geschäftsvorgang abgleichen" msgstr "Passenden Geschäftsvorgang abgleichen"
#: src/import-export/generic-import.glade.h:28 #: src/import-export/generic-import.glade.h:28
msgid "replace the selected match" msgid "replace the selected match"
msgstr "passenden Geschäftsvorgang ersetzen" msgstr "Passenden Geschäftsvorgang ersetzen"
#: src/gnome-utils/dialog-account.c:420 #: src/gnome-utils/dialog-account.c:420
msgid "Could not create opening balance." msgid "Could not create opening balance."
@ -13245,18 +13245,18 @@ msgstr "Kunden"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2638 intl-scm/guile-strings.c:2640 #: intl-scm/guile-strings.c:2638 intl-scm/guile-strings.c:2640
msgid "Find Customer" msgid "Find Customer"
msgstr "Kunde finden" msgstr "Kunde suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2646 intl-scm/guile-strings.c:2648 #: intl-scm/guile-strings.c:2646 intl-scm/guile-strings.c:2648
msgid "Find Invoice" msgid "Find Invoice"
msgstr "Rechnung finden" msgstr "Rechnung suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2654 intl-scm/guile-strings.c:2656 #: intl-scm/guile-strings.c:2654 intl-scm/guile-strings.c:2656
#: intl-scm/guile-strings.c:2684 intl-scm/guile-strings.c:2686 #: intl-scm/guile-strings.c:2684 intl-scm/guile-strings.c:2686
msgid "Find Job" msgid "Find Job"
msgstr "Auftrag finden" msgstr "Auftrag suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2662 #: intl-scm/guile-strings.c:2662
@ -13266,7 +13266,7 @@ msgstr "Zulieferer"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2668 intl-scm/guile-strings.c:2670 #: intl-scm/guile-strings.c:2668 intl-scm/guile-strings.c:2670
msgid "Find Vendor" msgid "Find Vendor"
msgstr "Zulieferer finden" msgstr "Zulieferer suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2672 intl-scm/guile-strings.c:2674 #: intl-scm/guile-strings.c:2672 intl-scm/guile-strings.c:2674
@ -13276,7 +13276,7 @@ msgstr "Neue Rechnung"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2676 intl-scm/guile-strings.c:2678 #: intl-scm/guile-strings.c:2676 intl-scm/guile-strings.c:2678
msgid "Find Bill" msgid "Find Bill"
msgstr "Rechnung finden" msgstr "Rechnung suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2692 intl-scm/guile-strings.c:2986 #: intl-scm/guile-strings.c:2692 intl-scm/guile-strings.c:2986
@ -13311,7 +13311,7 @@ msgstr "Mitarbeiter"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2710 intl-scm/guile-strings.c:2712 #: intl-scm/guile-strings.c:2710 intl-scm/guile-strings.c:2712
msgid "Find Employee" msgid "Find Employee"
msgstr "Mitarbeiter finden" msgstr "Mitarbeiter suchen"
#. src/business/business-gnome/business-gnome.scm #. src/business/business-gnome/business-gnome.scm
#: intl-scm/guile-strings.c:2714 intl-scm/guile-strings.c:2716 #: intl-scm/guile-strings.c:2714 intl-scm/guile-strings.c:2716

View File

@ -820,9 +820,6 @@ regWindowLedger( GNCLedgerDisplay *ledger )
/* libglade should do this next line */ /* libglade should do this next line */
GNOME_APP(register_window)->menubar = glade_xml_get_widget( xml, "gnc_register_menubar" ); GNOME_APP(register_window)->menubar = glade_xml_get_widget( xml, "gnc_register_menubar" );
gnc_extensions_menu_setup_with_data( GNOME_APP(register_window),
WINDOW_NAME_REGISTER,
regData );
gnc_reg_set_window_name( regData ); gnc_reg_set_window_name( regData );
@ -859,8 +856,11 @@ regWindowLedger( GNCLedgerDisplay *ledger )
GTK_SIGNAL_FUNC( gnc_register_help_changed_cb ), GTK_SIGNAL_FUNC( gnc_register_help_changed_cb ),
regData ); regData );
/* The menu bar */ /* The menu bar. Menu extension setup needs to come *after* that. */
gnc_register_setup_menu_widgets( regData, xml ); gnc_register_setup_menu_widgets( regData, xml );
gnc_extensions_menu_setup_with_data( GNOME_APP(register_window),
WINDOW_NAME_REGISTER,
regData );
/* The tool bar */ /* The tool bar */
{ {

View File

@ -274,6 +274,7 @@ gnc_hbci_trans (GtkWidget *parent,
/* HBCI_API_executeOutbox failed. */ /* HBCI_API_executeOutbox failed. */
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog));
HBCI_Transaction_delete (trans); HBCI_Transaction_delete (trans);
HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);
return NULL; return NULL;
} }
@ -283,6 +284,7 @@ gnc_hbci_trans (GtkWidget *parent,
} }
HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog));
return trans; return trans;
} }

View File

@ -163,6 +163,7 @@ gnc_hbci_getbalance (GtkWidget *parent, Account *gnc_acc)
free (str); free (str);
} }
HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);
GNCInteractor_hide (interactor); GNCInteractor_hide (interactor);
if (dialogres) if (dialogres)
recnWindowWithBalance (parent, recnWindowWithBalance (parent,

View File

@ -185,7 +185,7 @@ gnc_hbci_gettrans (GtkWidget *parent, Account *gnc_acc)
GNCInteractor_hide (interactor); GNCInteractor_hide (interactor);
/* Clean up behind ourself. */ /* Clean up behind ourself. */
/*HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);*/ HBCI_API_clearQueueByStatus (api, HBCI_JOB_STATUS_DONE);
} }
} }

View File

@ -38,7 +38,7 @@
#include "dialog-pass.h" #include "dialog-pass.h"
#define PREF_TAB_ONLINE_BANKING "Online Banking & Importing" #define PREF_TAB_ONLINE_BANKING N_("Online Banking & Importing")
/** Adds the interactor and progressmonitor classes to the api. */ /** Adds the interactor and progressmonitor classes to the api. */