IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

2001-05-03 Dave Peticolas <dave@krondo.com>

Browse Source 
* many files: fix spelling errors

	* src/gnome/gnc-html-guppi.c: use unsigned int for color


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4107 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-05-03 07:56:53 +00:00
parent 73a50b806c
commit 4371051fee
13 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-05-03 Dave Peticolas <dave@krondo.com>
* many files: fix spelling errors
* src/gnome/gnc-html-guppi.c: use unsigned int for color
2001-05-02 Dave Peticolas <dave@krondo.com>
* src/gnome/window-main.c: set the app's mdi mode from user prefs

2
src/FileDialog.c
View File

@ -151,7 +151,7 @@ show_book_error (GNCBackendError io_error, const char *newfile)
static gboolean
gncLockFailHandler (const char *file)
{
const char *format = _("Gnucash could not obtain the lock for\n"
const char *format = _("GnuCash could not obtain the lock for\n"
" %s.\n"
"That database may be in use by another user,\n"
"in which case you should not open the database.\n"

2
src/gnome/druid-qif-import.c
View File

@ -1234,7 +1234,7 @@ gnc_ui_qif_import_convert(QIFImportWindow * wind) {
if(retval == SCM_BOOL_F) {
gnc_error_dialog_parented(GTK_WINDOW(wind->window),
_("An error occurred while importing "
"QIF transactions into Gnucash. Your "
"QIF transactions into GnuCash. Your "
"accounts are unchanged."));
scm_unprotect_object(wind->imported_account_group);
wind->imported_account_group = SCM_BOOL_F;

46
src/gnome/glade-gnc-dialogs.c
View File

@ -49,7 +49,7 @@ create_QIF_Import_Account_Picker (void)
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, TRUE, TRUE, 0);
frame1 = gtk_frame_new (_("Select or add a Gnucash account"));
frame1 = gtk_frame_new (_("Select or add a GnuCash account"));
gtk_widget_ref (frame1);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "frame1", frame1,
(GtkDestroyNotify) gtk_widget_unref);
@ -3935,7 +3935,7 @@ create_New_Commodity_Format_Druid (void)
gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (start_page), &start_page_logo_bg_color);
gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (start_page), &start_page_title_color);
gnome_druid_page_start_set_title (GNOME_DRUID_PAGE_START (start_page), _("Import currency and stock information "));
gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("The file you are loading is from an older version of Gnucash. \nInformation about currencies, stocks, and mutual funds needs to\nbe updated for the new version. \n\nThis dialog will prompt you for some additional information about \neach currency, stock, and mutual fund that appear in your\naccounts. After you have entered this information, you can\nupdate your accounts for the new version of Gnucash.\n\nHit \"Cancel\" now to stop loading the file. "));
gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("The file you are loading is from an older version of GnuCash. \nInformation about currencies, stocks, and mutual funds needs to\nbe updated for the new version. \n\nThis dialog will prompt you for some additional information about \neach currency, stock, and mutual fund that appear in your\naccounts. After you have entered this information, you can\nupdate your accounts for the new version of GnuCash.\n\nHit \"Cancel\" now to stop loading the file. "));
finish_page = gnome_druid_page_finish_new ();
gtk_widget_ref (finish_page);
@ -4134,7 +4134,7 @@ create_QIF_Import_Druid (void)
gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (start_page), &start_page_logo_bg_color);
gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (start_page), &start_page_title_color);
gnome_druid_page_start_set_title (GNOME_DRUID_PAGE_START (start_page), _("Import QIF files"));
gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("Gnucash can import financial data from QIF (Quicken \nInterchange Format) files written by Quicken/Quickbooks,\nMS Money, Moneydance, and many other programs. \n\nThe import process has several steps. Your GnuCash\naccounts will not be changed until you click \"Finish\"\nat the end of the process. \n\nClick \"Next\" to start loading your QIF data, or \"Cancel\"\nto abort the process. "));
gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("GnuCash can import financial data from QIF (Quicken \nInterchange Format) files written by Quicken/QuickBooks,\nMS Money, Moneydance, and many other programs. \n\nThe import process has several steps. Your GnuCash\naccounts will not be changed until you click \"Finish\"\nat the end of the process. \n\nClick \"Next\" to start loading your QIF data, or \"Cancel\"\nto abort the process. "));
load_file_page = gnome_druid_page_standard_new_with_vals ("", NULL);
gtk_widget_ref (load_file_page);
@ -4377,7 +4377,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (druid_vbox13);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox13), 25);
label830 = gtk_label_new (_("On the next page, the accounts in your QIF files and any stocks or mutual funds\nyou own will be matched with Gnucash accounts. If a GnuCash account already\nexists with the same name, or a similar name and compatible type, that account\nwill be used as a match; otherwise, GnuCash will create a new account with the\nsame name and type as the QIF account. If you do not like the suggested\nGnucash account, click to change it.\n\nNote that Gnucash will be creating many accounts that did not exist on your\nother personal finance program, including a separate account for each stock\nyou own, separate accounts for the brokerage commissions, special \"Equity\"\naccounts (subaccounts of Retained Earnings, by default) which are the source\nof your opening balances, etc. All of these accounts will appear on the next \npage so you can change them if you want to, but it is safe to leave them alone.\n"));
label830 = gtk_label_new (_("On the next page, the accounts in your QIF files and any stocks or mutual funds\nyou own will be matched with GnuCash accounts. If a GnuCash account already\nexists with the same name, or a similar name and compatible type, that account\nwill be used as a match; otherwise, GnuCash will create a new account with the\nsame name and type as the QIF account. If you do not like the suggested\nGnuCash account, click to change it.\n\nNote that GnuCash will be creating many accounts that did not exist on your\nother personal finance program, including a separate account for each stock\nyou own, separate accounts for the brokerage commissions, special \"Equity\"\naccounts (subaccounts of Retained Earnings, by default) which are the source\nof your opening balances, etc. All of these accounts will appear on the next \npage so you can change them if you want to, but it is safe to leave them alone.\n"));
gtk_widget_ref (label830);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label830", label830,
(GtkDestroyNotify) gtk_widget_unref);
@ -4394,7 +4394,7 @@ create_QIF_Import_Druid (void)
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (account_match_page), &account_match_page_bg_color);
gnome_druid_page_standard_set_logo_bg_color (GNOME_DRUID_PAGE_STANDARD (account_match_page), &account_match_page_logo_bg_color);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (account_match_page), &account_match_page_title_color);
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (account_match_page), _("Match QIF accounts with Gnucash accounts"));
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (account_match_page), _("Match QIF accounts with GnuCash accounts"));
druid_vbox3 = GNOME_DRUID_PAGE_STANDARD (account_match_page)->vbox;
gtk_widget_ref (druid_vbox3);
@ -4429,7 +4429,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (label834);
gtk_clist_set_column_widget (GTK_CLIST (account_page_list), 0, label834);
label835 = gtk_label_new (_("Gnucash account name"));
label835 = gtk_label_new (_("GnuCash account name"));
gtk_widget_ref (label835);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label835", label835,
(GtkDestroyNotify) gtk_widget_unref);
@ -4459,7 +4459,7 @@ create_QIF_Import_Druid (void)
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (category_doc_page), &category_doc_page_bg_color);
gnome_druid_page_standard_set_logo_bg_color (GNOME_DRUID_PAGE_STANDARD (category_doc_page), &category_doc_page_logo_bg_color);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (category_doc_page), &category_doc_page_title_color);
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (category_doc_page), _("Income and expense categories"));
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (category_doc_page), _("Income and Expense categories"));
druid_vbox18 = GNOME_DRUID_PAGE_STANDARD (category_doc_page)->vbox;
gtk_widget_ref (druid_vbox18);
@ -4468,7 +4468,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (druid_vbox18);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox18), 25);
label840 = gtk_label_new (_("Gnucash uses separate Income and Expense accounts rather than categories\nto classify your transactions. Each of the categories in your QIF file will be \nconverted to a Gnucash account. \n\nOn the next page, you will have an opportunity to look at the suggested matches\nbetween QIF categories and Gnucash accounts. You may change matches \nthat you do not like by clicking on the line containing the category name.\n\nIf you change your mind later, you can reorganize the account structure safely\nwithin GnuCash."));
label840 = gtk_label_new (_("GnuCash uses separate Income and Expense accounts rather than categories\nto classify your transactions. Each of the categories in your QIF file will be \nconverted to a GnuCash account. \n\nOn the next page, you will have an opportunity to look at the suggested matches\nbetween QIF categories and GnuCash accounts. You may change matches \nthat you do not like by clicking on the line containing the category name.\n\nIf you change your mind later, you can reorganize the account structure safely\nwithin GnuCash."));
gtk_widget_ref (label840);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label840", label840,
(GtkDestroyNotify) gtk_widget_unref);
@ -4485,7 +4485,7 @@ create_QIF_Import_Druid (void)
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (category_match_page), &category_match_page_bg_color);
gnome_druid_page_standard_set_logo_bg_color (GNOME_DRUID_PAGE_STANDARD (category_match_page), &category_match_page_logo_bg_color);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (category_match_page), &category_match_page_title_color);
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (category_match_page), _("Match QIF categories with Gnucash accounts"));
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (category_match_page), _("Match QIF categories with GnuCash accounts"));
druid_vbox4 = GNOME_DRUID_PAGE_STANDARD (category_match_page)->vbox;
gtk_widget_ref (druid_vbox4);
@ -4520,7 +4520,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (label837);
gtk_clist_set_column_widget (GTK_CLIST (category_page_list), 0, label837);
label838 = gtk_label_new (_("Gnucash account name"));
label838 = gtk_label_new (_("GnuCash account name"));
gtk_widget_ref (label838);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label838", label838,
(GtkDestroyNotify) gtk_widget_unref);
@ -4559,7 +4559,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (druid_vbox39);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox39), 25);
label847707 = gtk_label_new (_("QIF files dowloaded from banks and other financial institutions may not have\ninformation about Accounts and Categories which would allow them to be\ncorrectly assigned to Gnucash accounts. \n\nIn the following page, you will see the text that appears in the Payee and \nMemo fields of transactions with no QIF Account or Category. By default\nthese transactions are assigned to the 'Unspecified' account in Gnucash. \nIf you select a different account, it will be remembered for future QIF \nfiles. "));
label847707 = gtk_label_new (_("QIF files downloaded from banks and other financial institutions may not have\ninformation about Accounts and Categories which would allow them to be\ncorrectly assigned to GnuCash accounts. \n\nIn the following page, you will see the text that appears in the Payee and \nMemo fields of transactions with no QIF Account or Category. By default\nthese transactions are assigned to the 'Unspecified' account in GnuCash.\nIf you select a different account, it will be remembered for future QIF \nfiles. "));
gtk_widget_ref (label847707);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label847707", label847707,
(GtkDestroyNotify) gtk_widget_unref);
@ -4576,7 +4576,7 @@ create_QIF_Import_Druid (void)
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (memo_match_page), &memo_match_page_bg_color);
gnome_druid_page_standard_set_logo_bg_color (GNOME_DRUID_PAGE_STANDARD (memo_match_page), &memo_match_page_logo_bg_color);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (memo_match_page), &memo_match_page_title_color);
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (memo_match_page), _("Match payees/memos to Gnucash accounts"));
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (memo_match_page), _("Match payees/memos to GnuCash accounts"));
druid_vbox40 = GNOME_DRUID_PAGE_STANDARD (memo_match_page)->vbox;
gtk_widget_ref (druid_vbox40);
@ -4611,7 +4611,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (label847708);
gtk_clist_set_column_widget (GTK_CLIST (memo_page_list), 0, label847708);
label847709 = gtk_label_new (_("Gnucash account name"));
label847709 = gtk_label_new (_("GnuCash account name"));
gtk_widget_ref (label847709);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label847709", label847709,
(GtkDestroyNotify) gtk_widget_unref);
@ -4690,7 +4690,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (druid_vbox17);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox17), 25);
label833 = gtk_label_new (_("In the next pages, you will be asked to provide information about stocks, \nmutual funds, and other tradable commodities that appear in the QIF file(s)\nyou are importing. Gnucash requires more information about tradable \ncommodities than the QIF format can represent. \n\nEach stock, mutual fund, or other commodity must have a type, which is the \nexchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds, \netc), a full name, and an abbreviation.\n\nCheck to see if there is an existing Type that is appropriate; if not, you can\nenter a new Type name by hand in the box. Make sure that the abbreviation\nyou enter matches the ticker symbol used for the commodity on the exchange\nor listing for its type. \n"));
label833 = gtk_label_new (_("In the next pages, you will be asked to provide information about stocks, \nmutual funds, and other tradable commodities that appear in the QIF file(s)\nyou are importing. GnuCash requires more information about tradable \ncommodities than the QIF format can represent. \n\nEach stock, mutual fund, or other commodity must have a type, which is the \nexchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds, \netc), a full name, and an abbreviation.\n\nCheck to see if there is an existing Type that is appropriate; if not, you can\nenter a new Type name by hand in the box. Make sure that the abbreviation\nyou enter matches the ticker symbol used for the commodity on the exchange\nor listing for its type."));
gtk_widget_ref (label833);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label833", label833,
(GtkDestroyNotify) gtk_widget_unref);
@ -4716,7 +4716,7 @@ create_QIF_Import_Druid (void)
gtk_widget_show (druid_vbox34);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox34), 5);
label847694 = gtk_label_new (_("If you are importing a QIF file downloaded from a bank or other financial\ninstitution, some of the information in the QIF file may duplicate information\nalready in your GnuCash accounts. GnuCash will try to detect duplicates \nof existing transactions. \n\nOn the next page, you will be asked to confirm that an existing transaction\nmatches an imported transaction. Imported transactions are shown on the\nleft side of the page, and possible matches for the selected left-hand\ntransaction are shown to the right. There may be several old transactions \nthat could match an imported transaction; you will be able to select the \ncorrect one by clicking in the \"Dup?\" column of the correct transaction.\n\nYou can control the rules used by GnuCash to find duplicate transcations \nin the \"QIF Import\" section of the GnuCash Preferences dialog.\n\nClick \"Next\" to find duplicate transactions. "));
label847694 = gtk_label_new (_("If you are importing a QIF file downloaded from a bank or other financial\ninstitution, some of the information in the QIF file may duplicate information\nalready in your GnuCash accounts. GnuCash will try to detect duplicates \nof existing transactions. \n\nOn the next page, you will be asked to confirm that an existing transaction\nmatches an imported transaction. Imported transactions are shown on the\nleft side of the page, and possible matches for the selected left-hand\ntransaction are shown to the right. There may be several old transactions \nthat could match an imported transaction; you will be able to select the \ncorrect one by clicking in the \"Dup?\" column of the correct transaction.\n\nYou can control the rules used by GnuCash to find duplicate transactions \nin the \"QIF Import\" section of the GnuCash Preferences dialog.\n\nClick \"Next\" to find duplicate transactions. "));
gtk_widget_ref (label847694);
gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Druid), "label847694", label847694,
(GtkDestroyNotify) gtk_widget_unref);
@ -4862,8 +4862,8 @@ create_QIF_Import_Druid (void)
gnome_druid_page_finish_set_logo_bg_color (GNOME_DRUID_PAGE_FINISH (end_page), &end_page_logo_bg_color);
gnome_druid_page_finish_set_title_color (GNOME_DRUID_PAGE_FINISH (end_page), &end_page_title_color);
gnome_druid_page_finish_set_text_color (GNOME_DRUID_PAGE_FINISH (end_page), &end_page_text_color);
gnome_druid_page_finish_set_title (GNOME_DRUID_PAGE_FINISH (end_page), _("Update your Gnucash accounts"));
gnome_druid_page_finish_set_text (GNOME_DRUID_PAGE_FINISH (end_page), _("Click \"Finish\" to import data from the staging area and update\nyour Gnucash accounts. The account and category matching\ninformation you have entered will be saved and used for\ndefaults the next time you use the QIF import facility. \n\nClick \"Back\" to review your account and category matchings,\nto change currency and security settings for new accounts, \nor to add more files to the staging area.\n\nClick \"Cancel\" to abort the QIF import process."));
gnome_druid_page_finish_set_title (GNOME_DRUID_PAGE_FINISH (end_page), _("Update your GnuCash accounts"));
gnome_druid_page_finish_set_text (GNOME_DRUID_PAGE_FINISH (end_page), _("Click \"Finish\" to import data from the staging area and update\nyour GnuCash accounts. The account and category matching\ninformation you have entered will be saved and used for\ndefaults the next time you use the QIF import facility. \n\nClick \"Back\" to review your account and category matchings,\nto change currency and security settings for new accounts, \nor to add more files to the staging area.\n\nClick \"Cancel\" to abort the QIF import process."));
gtk_signal_connect (GTK_OBJECT (qif_import_druid), "cancel",
GTK_SIGNAL_FUNC (gnc_ui_qif_import_cancel_cb),
@ -5509,10 +5509,13 @@ create_Help_Window (void)
GtkWidget *help_html_vbox;
GtkWidget *statusbar_hbox;
GtkWidget *help_statusbar;
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new ();
Help_Window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_object_set_data (GTK_OBJECT (Help_Window), "Help_Window", Help_Window);
gtk_window_set_title (GTK_WINDOW (Help_Window), _("Gnucash Help"));
gtk_window_set_title (GTK_WINDOW (Help_Window), _("GnuCash Help"));
vbox90 = gtk_vbox_new (FALSE, 0);
gtk_widget_ref (vbox90);
@ -5593,7 +5596,7 @@ create_Help_Window (void)
gtk_widget_show (label847666);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook3), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook3), 0), label847666);
frame37 = gtk_frame_new (_("Search Gnucash Help"));
frame37 = gtk_frame_new (_("Search GnuCash Help"));
gtk_widget_ref (frame37);
gtk_object_set_data_full (GTK_OBJECT (Help_Window), "frame37", frame37,
(GtkDestroyNotify) gtk_widget_unref);
@ -5608,7 +5611,7 @@ create_Help_Window (void)
gtk_container_add (GTK_CONTAINER (frame37), vbox91);
gtk_container_set_border_width (GTK_CONTAINER (vbox91), 3);
label849 = gtk_label_new (_("Type a single term into the box\nand hit 'search'. At the moment,\nthis search engine supports NO \ncomplex searches, just single\nwords.\n"));
label849 = gtk_label_new (_("Search Term:"));
gtk_widget_ref (label849);
gtk_object_set_data_full (GTK_OBJECT (Help_Window), "label849", label849,
(GtkDestroyNotify) gtk_widget_unref);
@ -5623,6 +5626,7 @@ create_Help_Window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (help_search_entry);
gtk_box_pack_start (GTK_BOX (vbox91), help_search_entry, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, help_search_entry, _("Type a single term into the box and hit 'search'. At the moment, this search engine does not support complex searches, just single words."), NULL);
hbox80 = gtk_hbox_new (TRUE, 0);
gtk_widget_ref (hbox80);
@ -5709,6 +5713,8 @@ create_Help_Window (void)
GTK_SIGNAL_FUNC (gnc_help_window_search_help_button_cb),
Help_Window);
gtk_object_set_data (GTK_OBJECT (Help_Window), "tooltips", tooltips);
return Help_Window;
}

67
src/gnome/gnc-dialogs.glade
View File

@ -98,7 +98,7 @@
<widget>
<class>GtkFrame</class>
<name>frame1</name>
<label>Select or add a Gnucash account</label>
<label>Select or add a GnuCash account</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
@ -5740,14 +5740,14 @@ Daily (365)
<last_modification_time>Fri, 11 Aug 2000 21:12:16 GMT</last_modification_time>
</signal>
<title>Import currency and stock information </title>
<text>The file you are loading is from an older version of Gnucash.
<text>The file you are loading is from an older version of GnuCash.
Information about currencies, stocks, and mutual funds needs to
be updated for the new version.
This dialog will prompt you for some additional information about
each currency, stock, and mutual fund that appear in your
accounts. After you have entered this information, you can
update your accounts for the new version of Gnucash.
update your accounts for the new version of GnuCash.
Hit &quot;Cancel&quot; now to stop loading the file. </text>
<title_color>255,255,255</title_color>
@ -5819,8 +5819,8 @@ Click &quot;Back&quot; to review your currency selections.</text>
<last_modification_time>Tue, 06 Feb 2001 17:04:30 GMT</last_modification_time>
</signal>
<title>Import QIF files</title>
<text>Gnucash can import financial data from QIF (Quicken
Interchange Format) files written by Quicken/Quickbooks,
<text>GnuCash can import financial data from QIF (Quicken
Interchange Format) files written by Quicken/QuickBooks,
MS Money, Moneydance, and many other programs.
The import process has several steps. Your GnuCash
@ -6350,13 +6350,13 @@ of the QIF import process. </label>
<class>GtkLabel</class>
<name>label830</name>
<label>On the next page, the accounts in your QIF files and any stocks or mutual funds
you own will be matched with Gnucash accounts. If a GnuCash account already
you own will be matched with GnuCash accounts. If a GnuCash account already
exists with the same name, or a similar name and compatible type, that account
will be used as a match; otherwise, GnuCash will create a new account with the
same name and type as the QIF account. If you do not like the suggested
Gnucash account, click to change it.
GnuCash account, click to change it.
Note that Gnucash will be creating many accounts that did not exist on your
Note that GnuCash will be creating many accounts that did not exist on your
other personal finance program, including a separate account for each stock
you own, separate accounts for the brokerage commissions, special &quot;Equity&quot;
accounts (subaccounts of Retained Earnings, by default) which are the source
@ -6399,7 +6399,7 @@ page so you can change them if you want to, but it is safe to leave them alone.
<data>QIF_Import_Druid</data>
<last_modification_time>Tue, 06 Feb 2001 17:09:37 GMT</last_modification_time>
</signal>
<title>Match QIF accounts with Gnucash accounts</title>
<title>Match QIF accounts with GnuCash accounts</title>
<title_color>255,255,255</title_color>
<background_color>153,191,153</background_color>
<logo_background_color>255,255,255</logo_background_color>
@ -6463,7 +6463,7 @@ page so you can change them if you want to, but it is safe to leave them alone.
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label835</name>
<label>Gnucash account name</label>
<label>GnuCash account name</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
@ -6521,7 +6521,7 @@ page so you can change them if you want to, but it is safe to leave them alone.
<data>QIF_Import_Druid</data>
<last_modification_time>Tue, 06 Feb 2001 17:10:35 GMT</last_modification_time>
</signal>
<title>Income and expense categories</title>
<title>Income and Expense categories</title>
<title_color>255,255,255</title_color>
<background_color>153,191,154</background_color>
<logo_background_color>255,255,255</logo_background_color>
@ -6542,12 +6542,12 @@ page so you can change them if you want to, but it is safe to leave them alone.
<widget>
<class>GtkLabel</class>
<name>label840</name>
<label>Gnucash uses separate Income and Expense accounts rather than categories
<label>GnuCash uses separate Income and Expense accounts rather than categories
to classify your transactions. Each of the categories in your QIF file will be
converted to a Gnucash account.
converted to a GnuCash account.
On the next page, you will have an opportunity to look at the suggested matches
between QIF categories and Gnucash accounts. You may change matches
between QIF categories and GnuCash accounts. You may change matches
that you do not like by clicking on the line containing the category name.
If you change your mind later, you can reorganize the account structure safely
@ -6588,7 +6588,7 @@ within GnuCash.</label>
<data>QIF_Import_Druid</data>
<last_modification_time>Tue, 06 Feb 2001 17:12:18 GMT</last_modification_time>
</signal>
<title>Match QIF categories with Gnucash accounts</title>
<title>Match QIF categories with GnuCash accounts</title>
<title_color>255,255,255</title_color>
<background_color>154,191,154</background_color>
<logo_background_color>255,255,255</logo_background_color>
@ -6652,7 +6652,7 @@ within GnuCash.</label>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label838</name>
<label>Gnucash account name</label>
<label>GnuCash account name</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
@ -6731,13 +6731,13 @@ within GnuCash.</label>
<widget>
<class>GtkLabel</class>
<name>label847707</name>
<label>QIF files dowloaded from banks and other financial institutions may not have
<label>QIF files downloaded from banks and other financial institutions may not have
information about Accounts and Categories which would allow them to be
correctly assigned to Gnucash accounts.
correctly assigned to GnuCash accounts.
In the following page, you will see the text that appears in the Payee and
Memo fields of transactions with no QIF Account or Category. By default
these transactions are assigned to the 'Unspecified' account in Gnucash.
Memo fields of transactions with no QIF Account or Category. By default
these transactions are assigned to the 'Unspecified' account in GnuCash.
If you select a different account, it will be remembered for future QIF
files. </label>
<justify>GTK_JUSTIFY_LEFT</justify>
@ -6776,7 +6776,7 @@ files. </label>
<data>QIF_Import_Druid</data>
<last_modification_time>Fri, 09 Feb 2001 16:39:58 GMT</last_modification_time>
</signal>
<title>Match payees/memos to Gnucash accounts</title>
<title>Match payees/memos to GnuCash accounts</title>
<title_color>255,255,255</title_color>
<background_color>153,191,154</background_color>
<logo_background_color>255,255,255</logo_background_color>
@ -6840,7 +6840,7 @@ files. </label>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label847709</name>
<label>Gnucash account name</label>
<label>GnuCash account name</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
@ -7013,7 +7013,7 @@ mutual funds in the imported data.</label>
<name>label833</name>
<label>In the next pages, you will be asked to provide information about stocks,
mutual funds, and other tradable commodities that appear in the QIF file(s)
you are importing. Gnucash requires more information about tradable
you are importing. GnuCash requires more information about tradable
commodities than the QIF format can represent.
Each stock, mutual fund, or other commodity must have a type, which is the
@ -7023,8 +7023,7 @@ etc), a full name, and an abbreviation.
Check to see if there is an existing Type that is appropriate; if not, you can
enter a new Type name by hand in the box. Make sure that the abbreviation
you enter matches the ticker symbol used for the commodity on the exchange
or listing for its type.
</label>
or listing for its type.</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
@ -7088,7 +7087,7 @@ transaction are shown to the right. There may be several old transactions
that could match an imported transaction; you will be able to select the
correct one by clicking in the &quot;Dup?&quot; column of the correct transaction.
You can control the rules used by GnuCash to find duplicate transcations
You can control the rules used by GnuCash to find duplicate transactions
in the &quot;QIF Import&quot; section of the GnuCash Preferences dialog.
Click &quot;Next&quot; to find duplicate transactions. </label>
@ -7338,9 +7337,9 @@ Click &quot;Next&quot; to find duplicate transactions. </label>
<data>QIF_Import_Druid</data>
<last_modification_time>Tue, 06 Feb 2001 17:16:05 GMT</last_modification_time>
</signal>
<title>Update your Gnucash accounts</title>
<title>Update your GnuCash accounts</title>
<text>Click &quot;Finish&quot; to import data from the staging area and update
your Gnucash accounts. The account and category matching
your GnuCash accounts. The account and category matching
information you have entered will be saved and used for
defaults the next time you use the QIF import facility.
@ -8115,7 +8114,7 @@ Click &quot;Cancel&quot; to abort the QIF import process.</text>
<widget>
<class>GtkWindow</class>
<name>Help Window</name>
<title>Gnucash Help</title>
<title>GnuCash Help</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
@ -8249,7 +8248,7 @@ Click &quot;Cancel&quot; to abort the QIF import process.</text>
<widget>
<class>GtkFrame</class>
<name>frame37</name>
<label>Search Gnucash Help</label>
<label>Search GnuCash Help</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@ -8263,12 +8262,7 @@ Click &quot;Cancel&quot; to abort the QIF import process.</text>
<widget>
<class>GtkLabel</class>
<name>label849</name>
<label>Type a single term into the box
and hit 'search'. At the moment,
this search engine supports NO
complex searches, just single
words.
</label>
<label>Search Term:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>7.45058e-09</xalign>
@ -8285,6 +8279,7 @@ words.
<widget>
<class>GtkEntry</class>
<name>help_search_entry</name>
<tooltip>Type a single term into the box and hit 'search'. At the moment, this search engine does not support complex searches, just single words.</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>

20
src/gnome/gnc-html-guppi.c
View File

@ -772,16 +772,16 @@ GtkWidget *
gnc_html_embedded_scatter(gnc_html * parent,
int w, int h, GHashTable * params) {
struct guppi_chart_data * chart = gnc_guppi_chart_data_new();
GuppiObject * scatter = NULL;
GuppiObject * title = NULL;
GtkArg arglist[8];
int argind=0;
char * param;
int datasize;
int color;
double * x_data=NULL;
double * y_data=NULL;
char * gtitle = NULL;
GuppiObject * scatter = NULL;
GuppiObject * title = NULL;
GtkArg arglist[8];
int argind=0;
char * param;
int datasize;
unsigned int color;
double * x_data=NULL;
double * y_data=NULL;
char * gtitle = NULL;
chart->parent = parent;

2
src/gnome/new-user-interface.c
View File

@ -637,7 +637,7 @@ create_addAccountCancelDialog (void)
GtkWidget *dialog_action_area1;
GtkWidget *newAccountCancelDialog_OKButton;
addAccountCancelDialog = gnome_dialog_new (_("Cancelling"), NULL);
addAccountCancelDialog = gnome_dialog_new (_("Canceling"), NULL);
gtk_widget_set_name (addAccountCancelDialog, "addAccountCancelDialog");
gtk_object_set_data (GTK_OBJECT (addAccountCancelDialog), "addAccountCancelDialog", addAccountCancelDialog);
GTK_WINDOW (addAccountCancelDialog)->type = GTK_WINDOW_DIALOG;

2
src/gnome/new-user.glade
View File

@ -785,7 +785,7 @@
<widget>
<class>GnomeDialog</class>
<name>addAccountCancelDialog</name>
<title>Cancelling</title>
<title>Canceling</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>True</modal>

2
src/gnome/print-session.c
View File

@ -83,7 +83,7 @@ gnc_print_session_done(PrintSession * ps) {
void
gnc_print_session_print(PrintSession * ps) {
GtkWidget * dialog =
gnome_print_dialog_new(_("Print Gnucash Document"), 0);
gnome_print_dialog_new(_("Print GnuCash Document"), 0);
int button = gnome_dialog_run(GNOME_DIALOG(dialog));
switch(button) {

2
src/register/splitreg.c
View File

@ -229,7 +229,7 @@ configAction (SplitRegister *reg)
xaccAddComboCellMenuItem (reg->actionCell, _("Int"));
/* Long Term Capital Gains */
xaccAddComboCellMenuItem (reg->actionCell, _("LTCG"));
/* Short Term Captial Gains */
/* Short Term Capital Gains */
xaccAddComboCellMenuItem (reg->actionCell, _("STCG"));
xaccAddComboCellMenuItem (reg->actionCell, _("Income"));
xaccAddComboCellMenuItem (reg->actionCell, _("Dist")); /* Distribution */

4
src/scm/command-line.scm
View File

@ -205,13 +205,13 @@
'boolean
gnc:load-user-config-if-needed
#f
(N_ "Load the user configuation"))
(N_ "Load the user configuration"))
(list "load-system-config"
'boolean
gnc:load-system-config-if-needed
#f
(N_ "Load the system configuation"))
(N_ "Load the system configuration"))
(list "rpc-server"
'boolean

8
src/scm/report-utilities.scm
View File

@ -103,15 +103,15 @@
(cons 'asset (_ "Assets"))
(cons 'liability (_ "Liabilities"))
(cons 'stock (_ "Stocks"))
(cons 'mutual-fund (_ "Mutual-Funds"))
(cons 'mutual-fund (_ "Mutual Funds"))
(cons 'currency (_ "Currencies"))
(cons 'income (_ "Income"))
(cons 'expense (_ "Expenses"))
(cons 'equity (_ "Equities"))
(cons 'checking (_ "Checkings"))
(cons 'checking (_ "Checking"))
(cons 'savings (_ "Savings"))
(cons 'money-market (_ "Money-Market"))
(cons 'credit-line (_ "Credit-Lines")))
(cons 'money-market (_ "Money Market"))
(cons 'credit-line (_ "Credit Lines")))
type))
;; Returns the depth of the current account hierarchy, that is, the

6
src/scm/report/taxtxf.scm
View File

@ -100,7 +100,7 @@
(gnc:register-tax-option
(gnc:make-multichoice-option
gnc:pagename-general (N_ "Alternate Period")
"c" (N_ "Overide or modify From: & To:")
"c" (N_ "Override or modify From: & To:")
(if after-tax-day 'from-to 'last-year)
(list (list->vector
(list 'from-to (N_ "Use From - To") (N_ "Use From - To period")))
@ -812,7 +812,7 @@
(generate-tax-or-txf
(_ "Taxable Income / Deductible Expenses")
(_ "This report shows your Taxable Income and \
Deductable Expenses.")
Deductible Expenses.")
report-obj
#t))
'export-thunk (lambda (report-obj)
@ -822,7 +822,7 @@ Deductable Expenses.")
(generate-tax-or-txf
(_ "Taxable Income / Deductible Expenses")
(_ "This page shows your Taxable Income and \
Deductable Expenses.")
Deductible Expenses.")
report-obj
#f)
#f)