[Gnucash-changes] r12133 - gnucash/trunk/src/gnome - String i18n improvements.

[Christian Stimming]

Author: cstim
Date: 2005-12-05 16:27:36 -0500 (Mon, 05 Dec 2005)
New Revision: 12133
Trac: http://svn.gnucash.org/trac/changeset/12133

Modified:
   gnucash/trunk/src/gnome/druid-acct-period.c
   gnucash/trunk/src/gnome/glade/merge.glade
Log:
String i18n improvements.

Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c	2005-12-05 20:39:34 UTC (rev 12132)
+++ gnucash/trunk/src/gnome/druid-acct-period.c	2005-12-05 21:27:36 UTC (rev 12133)
@@ -218,7 +218,7 @@
     _("The earliest transaction date found in this book is %s.\n"
       "Based on the selection made above, this book will be split\n"
       "into %d books.  Click on 'Next' to start closing the\n"
-      "earliest book.\n");
+      "earliest book.");
 
   /* Pull info from widget, push into freq spec */
   gnc_frequency_save_state (info->period_menu, info->period, &info->closing_date);
@@ -276,7 +276,7 @@
       "will contain all transactions up to midnight %s\n"
       "(for a total of %d transactions spread over %d accounts).\n"
       "Click on 'Next' to create this book.\n"
-      "Click on 'Back' to adjust the dates.\n");
+      "Click on 'Back' to adjust the dates.");
 
   qof_print_date_dmy_buff (close_date_str, MAX_DATE_LENGTH, 
                            g_date_get_day(&info->closing_date),

Modified: gnucash/trunk/src/gnome/glade/merge.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/merge.glade	2005-12-05 20:39:34 UTC (rev 12132)
+++ gnucash/trunk/src/gnome/glade/merge.glade	2005-12-05 21:27:36 UTC (rev 12133)
@@ -30,24 +30,15 @@
 	  <property name="visible">True</property>
 	  <property name="position">GNOME_EDGE_START</property>
 	  <property name="title" translatable="yes">Merge Account Hierarchy Setup</property>
-	  <property name="text" translatable="yes">This druid will merge your new hierarchy into the currently open 
-GnuCash file.
+	  <property name="text" translatable="yes">This druid will merge your new hierarchy into the currently open GnuCash file.
 
-You will be asked how to proceed if some accounts clash with the
-account tree in your existing GnuCash data file.
+You will be asked how to proceed if some accounts clash with the account tree in your existing GnuCash data file.
 
-There is NO way to undo this operation! Please ensure you 
-have a backup of your file BEFORE continuing! You will be 
-given the option to cancel the merge at all stages until the 
-final merge operation. Once you click Finish, the new 
-account tree will be committed to your current data file.
+There is NO way to undo this operation! Please ensure you have a backup of your file BEFORE continuing! You will be given the option to cancel the merge at all stages until the final merge operation. Once you click Finish, the new account tree will be committed to your current data file.
 
-There is currently no currency or price support in the merge 
-operation, the new accounts will inherit any default currency
- or you can change the currency after the merge is complete.
+There is currently no currency or price support in the merge operation, the new accounts will inherit any default currency or you can change the currency after the merge is complete.
 
-Click 'Cancel'  if you do not wish to merge your new 
-account types now.</property>
+Click 'Cancel'  if you do not wish to merge your new account types now.</property>
 	  <property name="title_color">#ffffffffffff</property>
 	  <property name="text_color">#000000000000</property>
 	  <property name="background_color">#191919197070</property>
@@ -203,14 +194,11 @@
 		      <child>
 			<widget class="GtkLabel" id="Static">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">You have three choices for each collision.
-The import object can be allowed to overwrite the target - use this to update your existing book.
-The import object can be ignored - use this if the import is a duplicate of an object in the existing book.
-The import object can be created as a new object in the existing book.</property>
+			  <property name="label" translatable="yes">You have three choices for each collision: 1. The import object can be allowed to overwrite the target - use this to update your existing book. 2. The import object can be ignored - use this if the import is a duplicate of an object in the existing book. 3. The import object can be created as a new object in the existing book.</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>
@@ -305,14 +293,13 @@
 	  <property name="visible">True</property>
 	  <property name="position">GNOME_EDGE_FINISH</property>
 	  <property name="title" translatable="yes">Commit Merged Account Hierachy to data file</property>
-	  <property name="text" translatable="yes">Press `Finish' to merge your new accounts into the current GnuCash file.
+	  <property name="text" translatable="yes">Press `Apply' to merge your new accounts into the current GnuCash file.
 
 Press `Back' to review your selections.
 
 Press `Cancel' to close this dialog without creating any new accounts.
 
-REMEMBER: There is no way to undo this final operation!
-Make sure you have a backup before clicking Finish.</property>
+REMEMBER: There is no way to undo this final operation! Make sure you have a backup before clicking Finish.</property>
 	  <property name="title_color">#ffffffffffff</property>
 	  <property name="text_color">#000000000000</property>
 	  <property name="background_color">#191919197070</property>