[Gnucash-changes] r12920 - gnucash/trunk/src/import-export - Do
some HIG cleanup. Remove extraneous newline characters from
David Hampton
hampton at cvs.gnucash.org
Sat Jan 21 11:30:50 EST 2006
Author: hampton
Date: 2006-01-21 11:30:50 -0500 (Sat, 21 Jan 2006)
New Revision: 12920
Trac: http://svn.gnucash.org/trac/changeset/12920
Modified:
gnucash/trunk/src/import-export/binary-import/binary-import.glade
gnucash/trunk/src/import-export/hbci/glade/hbci.glade
gnucash/trunk/src/import-export/import-provider-format.glade
gnucash/trunk/src/import-export/qif-import/qif.glade
Log:
Do some HIG cleanup. Remove extraneous newline characters from
strings.
Modified: gnucash/trunk/src/import-export/binary-import/binary-import.glade
===================================================================
--- gnucash/trunk/src/import-export/binary-import/binary-import.glade 2006-01-21 14:54:54 UTC (rev 12919)
+++ gnucash/trunk/src/import-export/binary-import/binary-import.glade 2006-01-21 16:30:50 UTC (rev 12920)
@@ -29,16 +29,11 @@
<property name="visible">True</property>
<property name="position">GNOME_EDGE_START</property>
<property name="title" translatable="yes">Import currency and stock information </property>
- <property name="text" translatable="yes">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.
+ <property name="text" translatable="yes">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.
+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.
-Hit "Cancel" now to stop loading the file. </property>
+Hit "Cancel" now to stop loading the file.</property>
<property name="title_color">#ffffffffffff</property>
<property name="text_color">#000000000000</property>
<property name="background_color">#9999bfbf9999</property>
@@ -53,8 +48,7 @@
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
<property name="title" translatable="yes">Update your accounts with the new information</property>
- <property name="text" translatable="yes">Click "Finish" to update your accounts to use the new
-information you have entered.
+ <property name="text" translatable="yes">Click "Finish" to update your accounts to use the new information you have entered.
Click "Cancel" to cancel the file-loading process.
Modified: gnucash/trunk/src/import-export/hbci/glade/hbci.glade
===================================================================
--- gnucash/trunk/src/import-export/hbci/glade/hbci.glade 2006-01-21 14:54:54 UTC (rev 12919)
+++ gnucash/trunk/src/import-export/hbci/glade/hbci.glade 2006-01-21 16:30:50 UTC (rev 12920)
@@ -1510,30 +1510,30 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="close_button">
+ <widget class="GtkButton" id="abort_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-close</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
</widget>
</child>
-
<child>
- <widget class="GtkButton" id="abort_button">
+ <widget class="GtkButton" id="close_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
</widget>
</child>
+
</widget>
<packing>
<property name="padding">0</property>
@@ -1879,30 +1879,30 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="ok_button">
+ <widget class="GtkButton" id="cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">1</property>
+ <property name="response_id">2</property>
</widget>
</child>
-
<child>
- <widget class="GtkButton" id="cancel_button">
+ <widget class="GtkButton" id="ok_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">2</property>
+ <property name="response_id">1</property>
</widget>
</child>
+
</widget>
<packing>
<property name="padding">0</property>
@@ -2242,30 +2242,30 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button2">
+ <widget class="GtkButton" id="button4">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
</widget>
</child>
-
<child>
- <widget class="GtkButton" id="button4">
+ <widget class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
</widget>
</child>
+
</widget>
<packing>
<property name="padding">0</property>
Modified: gnucash/trunk/src/import-export/import-provider-format.glade
===================================================================
--- gnucash/trunk/src/import-export/import-provider-format.glade 2006-01-21 14:54:54 UTC (rev 12919)
+++ gnucash/trunk/src/import-export/import-provider-format.glade 2006-01-21 16:30:50 UTC (rev 12920)
@@ -36,20 +36,14 @@
<child>
<widget class="GtkLabel" id="inst_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and
-year components of a date are printed. In most cases, it is possible
-to automatically determine which format is in use in a particular file.
-However, in the file you have just imported there exist more than one
-possible format that fits the data.
+ <property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and year components of a date are printed. In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data.
-Please select a date format for the file. QIF files created by European
-software are likely to be in "d-m-y" or day-month-year format, where
-US QIF files are likely to be "m-d-y" or month-year-day.
+Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-year-day.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -138,7 +132,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
Modified: gnucash/trunk/src/import-export/qif-import/qif.glade
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif.glade 2006-01-21 14:54:54 UTC (rev 12919)
+++ gnucash/trunk/src/import-export/qif-import/qif.glade 2006-01-21 16:30:50 UTC (rev 12920)
@@ -207,16 +207,11 @@
<property name="visible">True</property>
<property name="position">GNOME_EDGE_START</property>
<property name="title" translatable="yes">Import QIF files</property>
- <property name="text" translatable="yes">GnuCash can import financial data from QIF (Quicken
-Interchange Format) files written by Quicken/QuickBooks,
-MS Money, Moneydance, and many other programs.
+ <property name="text" translatable="yes">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
-accounts will not be changed until you click "Finish"
-at the end of the process.
+The import process has several steps. Your GnuCash accounts will not be changed until you click "Finish" at the end of the process.
-Click "Forward" to start loading your QIF data, or "Cancel"
-to abort the process. </property>
+Click "Forward" to start loading your QIF data, or "Cancel" to abort the process. </property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
</widget>
</child>
@@ -239,17 +234,14 @@
<child>
<widget class="GtkLabel" id="label822">
<property name="visible">True</property>
- <property name="label" translatable="yes">Please select a file to load. When you click "Forward", the file will be loaded
-and analyzed. You may need to answer some questions about the account(s)
-in the file.
+ <property name="label" translatable="yes">Please select a file to load. When you click "Forward", the file will be loaded and analyzed. You may need to answer some questions about the account(s) in the file.
-You will have the opportunity to load as many files as you wish, so don't
-worry if your data is in multiple files.
+You will have the opportunity to load as many files as you wish, so don't worry if your data is in multiple files.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -270,27 +262,6 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="label821">
- <property name="visible">True</property>
- <property name="label" translatable="yes">QIF Filename:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkEntry" id="qif_filename_entry">
<property name="visible">True</property>
<property name="can_default">True</property>
@@ -357,20 +328,14 @@
<child>
<widget class="GtkLabel" id="label841">
<property name="visible">True</property>
- <property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and
-year components of a date are printed. In most cases, it is possible
-to automatically determine which format is in use in a particular file.
-However, in the file you have just imported there exist more than one
-possible format that fits the data.
+ <property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and year components of a date are printed. In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data.
-Please select a date format for the file. QIF files created by European
-software are likely to be in "d-m-y" or day-month-year format, where
-US QIF files are likely to be "m-d-y" or month-year-day.
+Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-year-day.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -450,7 +415,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -487,17 +452,14 @@
<child>
<widget class="GtkLabel" id="label823">
<property name="visible">True</property>
- <property name="label" translatable="yes">The QIF file that you just loaded appears to contain transactions for just
-one account, but the file does not specify a name for that account.
+ <property name="label" translatable="yes">The QIF file that you just loaded appears to contain transactions for just one account, but the file does not specify a name for that account.
-Please enter a name for the account. If the file was exported from another
-accounting program, you should use the same account name that was used
-in that program.
+Please enter a name for the account. If the file was exported from another accounting program, you should use the same account name that was used in that program.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -607,68 +569,40 @@
<property name="spacing">4</property>
<child>
- <widget class="GtkFrame" id="frame33">
+ <widget class="GtkScrolledWindow" id="scrolledwindow10">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow10">
+ <widget class="GtkCList" id="selected_file_list">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="can_focus">True</property>
+ <property name="n_columns">1</property>
+ <property name="column_widths">80</property>
+ <property name="selection_mode">GTK_SELECTION_SINGLE</property>
+ <property name="show_titles">False</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <signal name="select_row" handler="gnc_ui_qif_import_select_loaded_file_cb"/>
<child>
- <widget class="GtkCList" id="selected_file_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_columns">1</property>
- <property name="column_widths">80</property>
- <property name="selection_mode">GTK_SELECTION_SINGLE</property>
- <property name="show_titles">False</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <signal name="select_row" handler="gnc_ui_qif_import_select_loaded_file_cb"/>
-
- <child>
- <widget class="GtkLabel" id="label827">
- <property name="label" translatable="yes">labe82l7</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <widget class="GtkLabel" id="label827">
+ <property name="label" translatable="yes">labe82l7</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
-
- <child>
- <widget class="GtkLabel" id="label847715">
- <property name="visible">True</property>
- <property name="label" translatable="yes">QIF Files</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -680,15 +614,13 @@
<child>
<widget class="GtkLabel" id="label816">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click "Load another file" if you have more data to import at this time.
-Do this if you have saved your accounts to separate QIF files.
+ <property name="label" translatable="yes">Click "Load another file" if you have more data to import at this time. Do this if you have saved your accounts to separate QIF files.
-Click "Forward" to finish loading files and move to the next step
-of the QIF import process. </property>
+Click "Forward" to finish loading files and move to the next step of the QIF import process. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -703,43 +635,33 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox68">
+ <widget class="GtkHButtonBox" id="hbox68">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkButton" id="button69">
+ <widget class="GtkButton" id="button70">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Load another file</property>
+ <property name="label" translatable="yes">Unload selected file</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="gnc_ui_qif_import_load_another_cb"/>
+ <signal name="clicked" handler="gnc_ui_qif_import_unload_file_cb"/>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
<child>
- <widget class="GtkButton" id="button70">
+ <widget class="GtkButton" id="button69">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Unload selected file</property>
+ <property name="label" translatable="yes">Load another file</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="gnc_ui_qif_import_unload_file_cb"/>
+ <signal name="clicked" handler="gnc_ui_qif_import_load_another_cb"/>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
</widget>
<packing>
@@ -771,24 +693,14 @@
<child>
<widget class="GtkLabel" id="label830">
<property name="visible">True</property>
- <property name="label" translatable="yes">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
-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.
+ <property name="label" translatable="yes">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 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.
-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 "Equity"
-accounts (subaccounts of Retained Earnings, by default) which are the source
-of your opening balances, etc. All of these accounts will appear on the next
-page so you can change them if you want to, but it is safe to leave them alone.
+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 "Equity" accounts (subaccounts of Retained Earnings, by default) which are the source of your opening balances, etc. All of these accounts will appear on the next page so you can change them if you want to, but it is safe to leave them alone.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -902,7 +814,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -938,20 +850,15 @@
<child>
<widget class="GtkLabel" id="label840">
<property name="visible">True</property>
- <property name="label" translatable="yes">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.
+ <property name="label" translatable="yes">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.
-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
-that you do not like by clicking on the line containing the category name.
+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 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
-within GnuCash.</property>
+If you change your mind later, you can reorganize the account structure safely within GnuCash.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1101,19 +1008,13 @@
<child>
<widget class="GtkLabel" id="label847707">
<property name="visible">True</property>
- <property name="label" translatable="yes">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.
+ <property name="label" translatable="yes">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.
-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.
-If you select a different account, it will be remembered for future QIF
-files. </property>
+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. If you select a different account, it will be remembered for future QIF files. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1242,16 +1143,14 @@
<child>
<widget class="GtkLabel" id="label831">
<property name="visible">True</property>
- <property name="label" translatable="yes">The QIF importer cannot currently handle multi-currency QIF files. All the
-accounts in the QIF file(s) you are importing must be denominated in the
-same currency. This limitation should be removed soon.
+ <property name="label" translatable="yes">The QIF importer cannot currently handle multi-currency QIF files. All the accounts in the QIF file(s) you are importing must be denominated in the same currency. This limitation should be removed soon.
Select the currency to use for transactions imported from your QIF files:
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1327,12 +1226,11 @@
<child>
<widget class="GtkLabel" id="label832">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click "Forward" to enter information about stocks and
-mutual funds in the imported data.</property>
+ <property name="label" translatable="yes">Click "Forward" to enter information about stocks and mutual funds in the imported data.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1370,23 +1268,15 @@
<child>
<widget class="GtkLabel" id="label833">
<property name="visible">True</property>
- <property name="label" translatable="yes">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
-commodities than the QIF format can represent.
+ <property name="label" translatable="yes">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 commodities than the QIF format can represent.
-Each stock, mutual fund, or other commodity must have a type, which is the
-exchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds,
-etc), a full name, and an abbreviation.
+Each stock, mutual fund, or other commodity must have a type, which is the exchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds, 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.</property>
+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.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1422,26 +1312,17 @@
<child>
<widget class="GtkLabel" id="label847694">
<property name="visible">True</property>
- <property name="label" translatable="yes">If you are importing a QIF file downloaded from a bank or other financial
-institution, some of the information in the QIF file may duplicate information
-already in your GnuCash accounts. GnuCash will try to detect duplicates
-of existing transactions.
+ <property name="label" translatable="yes">If you are importing a QIF file downloaded from a bank or other financial institution, some of the information in the QIF file may duplicate information already in your GnuCash accounts. GnuCash will try to detect duplicates of existing transactions.
-On the next page, you will be asked to confirm that an existing transaction
-matches an imported transaction. Imported transactions are shown on the
-left side of the page, and possible matches for the selected left-hand
-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 "Dup?" column of the correct transaction.
+On the next page, you will be asked to confirm that an existing transaction matches an imported transaction. Imported transactions are shown on the left side of the page, and possible matches for the selected left-hand 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 "Dup?" column of the correct transaction.
-You can control the rules used by GnuCash to find duplicate transactions
-in the "QIF Import" section of the GnuCash Preferences dialog.
+You can control the rules used by GnuCash to find duplicate transactions in the "QIF Import" section of the GnuCash Preferences dialog.
Click "Forward" to find duplicate transactions. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1713,14 +1594,9 @@
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
<property name="title" translatable="yes">Update your GnuCash accounts</property>
- <property name="text" translatable="yes">Click "Finish" to import data from the staging area and update
-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.
+ <property name="text" translatable="yes">Click "Finish" to import data from the staging area and update 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.
-Click "Back" to review your account and category matchings,
-to change currency and security settings for new accounts,
-or to add more files to the staging area.
+Click "Back" to review your account and category matchings, to change currency and security settings for new accounts, or to add more files to the staging area.
Click "Cancel" to abort the QIF import process.</property>
<signal name="finish" handler="gnc_ui_qif_import_finish_cb"/>
More information about the gnucash-changes
mailing list