r14608 - gnucash/branches/2.0 - Improve wording for XML data file import druid. bug#342727.
Christian Stimming
cstim at cvs.gnucash.org
Tue Aug 8 05:47:33 EDT 2006
Author: cstim
Date: 2006-08-08 05:47:32 -0400 (Tue, 08 Aug 2006)
New Revision: 14608
Trac: http://svn.gnucash.org/trac/changeset/14608
Modified:
gnucash/branches/2.0/ChangeLog
gnucash/branches/2.0/src/gnome-utils/druid-gnc-xml-import.c
gnucash/branches/2.0/src/gnome-utils/glade/druid-gnc-xml-import.glade
Log:
Improve wording for XML data file import druid. bug#342727.
Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog 2006-08-08 09:39:12 UTC (rev 14607)
+++ gnucash/branches/2.0/ChangeLog 2006-08-08 09:47:32 UTC (rev 14608)
@@ -1,3 +1,8 @@
+2006-08-08 Christian Stimming <stimming at tuhh.de>
+
+ * src/gnome-utils/druid-gnc-xml-import.c: Improve wording for XML
+ data file import druid. bug#342727.
+
2006-08-07 Christian Stimming <stimming at tuhh.de>
* po/hu.po: Updated Hungarian translation by Sulyok Péter
Modified: gnucash/branches/2.0/src/gnome-utils/druid-gnc-xml-import.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/druid-gnc-xml-import.c 2006-08-08 09:39:12 UTC (rev 14607)
+++ gnucash/branches/2.0/src/gnome-utils/druid-gnc-xml-import.c 2006-08-08 09:47:32 UTC (rev 14608)
@@ -186,21 +186,27 @@
GncXmlImportData *data);
static const gchar *encodings_doc_string = N_(
- "The file you tried to load does not specify an encoding, so GnuCash is "
- "unable to unambiguously interpret it. This is typical for files created with "
- "GnuCash prior to 2.0.\n\n"
- "On the next page you will be asked to select the best looking decoded string "
- "for every ambiguous word GnuCash found while trying to open your file. "
- "Therefore GnuCash has guessed what encodings you might have used. So "
- "probably everything will look just fine and you can simply click "
- "'Forward'.\n\n"
- "If it does not work for you, try to change the default encoding at the top. "
- "Maybe you even have to edit the list of encodings by clicking on the button "
- "in the top right corner.\n\n"
- "The page is not overly complicated, just take the time until you feel "
- "comfortable with it. You can always come back and read this message again.");
+ "The file you are trying to load is from an older version of "
+ "GnuCash. The file format in the older versions was missing the "
+ "detailed specification of the character encoding being used. This "
+ "means the text in your data file could be read in multiple ambiguous "
+ "ways. This ambiguity cannot be resolved automatically, but the new "
+ "GnuCash 2.0.0 file format will include all necessary specifications so "
+ "that you do not have to go through this step again."
+ "\n\n"
+ "GnuCash will try to guess the correct character encoding for your data "
+ "file. On the next page GnuCash will show the resulting texts when "
+ "using this guess. You have to check whether the words look as "
+ "expected. Either everything looks fine and you can simply press "
+ "'Forward'. Or the words contain unexpected characters, in which "
+ "case you should select different character encodings to see "
+ "different results. You may have to edit the list of character "
+ "encodings by clicking on the respective button."
+ "\n\n"
+ "Press 'Forward' now to select the correct character encoding for "
+ "your data file.");
-static const gchar *encodings_doc_page_title = N_("Missing file encoding");
+static const gchar *encodings_doc_page_title = N_("Ambiguous character encoding");
static const gchar *finish_convert_string = N_(
"The file has been loaded successfully. If you click 'Apply' it will be saved "
Modified: gnucash/branches/2.0/src/gnome-utils/glade/druid-gnc-xml-import.glade
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/glade/druid-gnc-xml-import.glade 2006-08-08 09:39:12 UTC (rev 14607)
+++ gnucash/branches/2.0/src/gnome-utils/glade/druid-gnc-xml-import.glade 2006-08-08 09:47:32 UTC (rev 14608)
@@ -5,7 +5,7 @@
<requires lib="gnome"/>
<widget class="GtkDialog" id="GnuCash XML Import Dialog">
- <property name="title" translatable="yes">GnuCash XML Import Druid</property>
+ <property name="title" translatable="yes">GnuCash Datafile Import Druid</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">False</property>
@@ -350,7 +350,7 @@
<child>
<widget class="GnomeDruidPageStandard" id="loaded_files_page">
<property name="visible">True</property>
- <property name="title" translatable="yes">GnuCash XML files you have loaded</property>
+ <property name="title" translatable="yes">GnuCash data files you have loaded</property>
<signal name="prepare" handler="gxi_loaded_files_prepare_cb" last_modification_time="Thu, 30 Mar 2006 22:20:01 GMT"/>
<signal name="next" handler="gxi_loaded_files_next_cb" last_modification_time="Thu, 30 Mar 2006 23:20:21 GMT"/>
@@ -394,7 +394,7 @@
<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 GnuCash files.
-Click "Forward" to finish loading files and move to the next step of the GnuCash XML import process.</property>
+Click "Forward" to finish loading files and move to the next step of the GnuCash Datafile import process.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -679,7 +679,7 @@
<widget class="GnomeDruidPageEdge" id="end_page">
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
- <property name="title" translatable="yes">Finish GnuCash XML Import</property>
+ <property name="title" translatable="yes">Finish GnuCash Datafile Import</property>
<property name="text">finish placeholder</property>
<signal name="finish" handler="gxi_end_finish_cb" last_modification_time="Thu, 30 Mar 2006 05:00:17 GMT"/>
</widget>
More information about the gnucash-changes
mailing list