r20012 - gnucash/trunk/src - Bug #628444: String improvements after string freeze is lifted

[Christian Stimming]

Author: cstim
Date: 2010-12-31 07:07:01 -0500 (Fri, 31 Dec 2010)
New Revision: 20012
Trac: http://svn.gnucash.org/trac/changeset/20012

Modified:
   gnucash/trunk/src/gnome-search/dialog-search.c
   gnucash/trunk/src/gnome/dialog-sx-editor.c
   gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
Log:
Bug #628444: String improvements after string freeze is lifted

Modified: gnucash/trunk/src/gnome/dialog-sx-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.c	2010-12-31 12:06:49 UTC (rev 20011)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.c	2010-12-31 12:07:01 UTC (rev 20012)
@@ -214,15 +214,8 @@
     if ( gnc_sxed_check_changed( sxed ) )
     {
         const char *sx_changed_msg =
-#if 1
-            _( "This SX has changed; are you "
-               "sure you want to cancel?" );
-#else
-            /* Translators: This message is currently not yet used; it
-             * will be used once the 2.4.0 string freeze is lifted. */
             _( "This Scheduled Transaction has changed; are you "
                "sure you want to cancel?" );
-#endif
         if (!gnc_verify_dialog(sxed->dialog, FALSE, "%s", sx_changed_msg))
         {
             return FALSE;

Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c	2010-12-31 12:06:49 UTC (rev 20011)
+++ gnucash/trunk/src/gnome-search/dialog-search.c	2010-12-31 12:07:01 UTC (rev 20012)
@@ -947,18 +947,6 @@
     new_item_button = glade_xml_get_widget (xml, "new_item_button");
     gtk_button_set_label (GTK_BUTTON(new_item_button),
                           type_label_to_new_button(type_label));
-#if 1
-    /* This old implementation part will be de-activated and removed
-     * once the string freeze is lifted again after 2.4.0 release. */
-    {
-        char *desc =
-            /* Translators: %s is either "item" or the name of some other
-             * item, e.g. "Customer" or "Invoice". */
-            g_strdup_printf (_("New %s"), type_label ? type_label : _("item"));
-        gtk_button_set_label (GTK_BUTTON(new_item_button), desc);
-        g_free (desc);
-    }
-#endif
 
     /* add the first criterion */
     gnc_search_dialog_add_criterion (sw);

Modified: gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balsheet-eg.scm	2010-12-31 12:06:49 UTC (rev 20011)
+++ gnucash/trunk/src/report/standard-reports/balsheet-eg.scm	2010-12-31 12:07:01 UTC (rev 20012)
@@ -274,7 +274,7 @@
 (define optname-font-family    (N_ "Font family"))
 (define opthelp-font-family    (N_ "Font definition in CSS font-family format"))
 (define optname-font-size      (N_ "Font size"))
-(define opthelp-font-size      (N_ "Font size in CSS font-size format (e.g. \"medium\" or \"10pt\""))
+(define opthelp-font-size      (N_ "Font size in CSS font-size format (e.g. \"medium\" or \"10pt\")"))
 (define optname-template-file  (N_ "Template file"))
 (define opthelp-template-file
   (N_ "The file name of the eguile template part of this report.  This file must be in your .gnucash directory, or else in its proper place within the GnuCash installation directories."))