Various i18n string improvements.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12041 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome/dialog-price-edit-db.c

@@ -146,10 +146,6 @@ gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data)
   PricesDialog *pdb_dialog = data;
   GList *price_list;
   gint length;
-  const char *message_sg = N_("Are you sure you want to delete the %d "
-			      "selected price?");
-  const char *message_pl = N_("Are you sure you want to delete the %d "
-			      "selected prices?");
 
   ENTER(" ");
   price_list = gnc_tree_view_price_get_selected_prices(pdb_dialog->price_tree);
@@ -160,7 +156,13 @@ gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data)
 
   length = g_list_length(price_list);
   if (gnc_verify_dialog (pdb_dialog->dialog, TRUE,
-			 ngettext(message_sg, message_pl, length), length))
+			 /* Translators: %d is the number of prices. This is a
+			    ngettext(3) message. */
+			 ngettext("Are you sure you want to delete the %d "
+				  "selected price?",
+				  "Are you sure you want to delete the %d "
+				  "selected prices?", length),
+			 length))
   {
     GNCBook *book = gnc_get_current_book ();
     GNCPriceDB *pdb = gnc_book_get_pricedb (book);

src/register/ledger-core/split-register-control.c

@@ -1536,11 +1536,11 @@ gnc_split_register_recn_cell_confirm (char old_flag, gpointer data)
 {
   SplitRegister *reg = data;
   gint response;
+  const gchar *title = _("Mark split as unreconciled?");
   const gchar *message =
-    _("<b>Mark split as unreconciled?</b>\n\n"
+    _("You are about to mark a reconciled split as unreconciled.  Doing "
-      "You are about to mark a reconciled split as unreconciled.  Doing "
       "so might make future reconciliation difficult!  Continue "
-      "with this change?\n");
+      "with this change?");
 
   if (old_flag != YREC)
     return TRUE;
@@ -1549,7 +1549,8 @@ gnc_split_register_recn_cell_confirm (char old_flag, gpointer data)
   response = gnc_warning_remember_dialog(gnc_split_register_get_parent(reg),
 					 "mark_split_unreconciled",
 					 "_Unreconcile", GTK_STOCK_CANCEL,
-					 message);
+					 "<b>%s</b>\n\n%s\n",
+					 title, message);
 
   return (response == GTK_RESPONSE_YES);
 }

src/report/standard-reports/account-summary.scm

@@ -175,10 +175,10 @@
       "c" opthelp-bottom-behavior
       'summarize
       (list (vector 'summarize
-		    (N_ "Recursive balance")
+		    (N_ "Recursive Balance")
 		    (N_ "Show the total balance, including balances in subaccounts, of any account at the depth limit"))
 	    (vector 'flatten
-		    (N_ "Raise accounts")
+		    (N_ "Raise Accounts")
 		    (N_ "Shows accounts deeper than the depth limit at the depth limit"))
 	    (vector 'truncate
 		    (N_ "Omit Accounts")

src/report/standard-reports/equity-statement.scm

@@ -319,10 +319,7 @@
     (gnc:html-document-set-title! 
      doc (sprintf #f
 		  (string-append "%s %s "
-				 (N_ "For Period Covering")
+				 (N_ "For Period Covering %s to %s"))
-				 " %s "
-				 (N_ "to")
-				 " %s")
 		  company-name report-title
                   (gnc:print-date start-date-printable)
                   (gnc:print-date end-date-tp)))
@@ -387,12 +384,10 @@
 	       (terse-period? #t)
 	       (period-for (if terse-period?
 			       (string-append " " (N_ "for Period"))
-			       (string-append
+			       (sprintf #f (string-append ", " (N_ "%s to %s"))
-				", "
+					(gnc:print-date start-date-printable)
-				(gnc:print-date start-date-printable) " "
+					(gnc:print-date end-date-tp))
-				(N_ "to") " "
+			       ))
-				(gnc:print-date end-date-tp)
-				)))
 	       )
 	  
 	  ;; a helper to add a line to our report

src/report/standard-reports/income-statement.scm

@@ -468,10 +468,7 @@
     (gnc:html-document-set-title! 
      doc (sprintf #f
 		  (string-append "%s %s "
-				 (N_ "For Period Covering")
+				 (N_ "For Period Covering %s to %s"))
-				 " %s "
-				 (N_ "to")
-				 " %s")
 		  company-name report-title
                   (gnc:print-date start-date-printable)
                   (gnc:print-date end-date-tp)))
@@ -506,12 +503,9 @@
 	       (terse-period? #t)
 	       (period-for (if terse-period?
 			       (string-append " " (N_ "for Period"))
-			       (string-append
+			       (sprintf #f (string-append ", " (N_ "%s to %s"))
-				", "
+					(gnc:print-date start-date-printable)
-				(gnc:print-date start-date-printable) " "
+					(gnc:print-date end-date-tp))
-				(N_ "to") " "
-				(gnc:print-date end-date-tp)
-				)
 			       )
 			   )
 	       )

src/report/standard-reports/trial-balance.scm

@@ -386,12 +386,10 @@
 	 (terse-period? #t)
 	 (period-for (if terse-period?
 			 (string-append " " (N_ "for Period"))
-			 (string-append
+			 (sprintf #f (string-append ", " (N_ "%s to %s"))
-			  ", "
+				  (gnc:print-date start-date-printable)
-			  (gnc:print-date start-date-printable) " "
+				  (gnc:print-date end-date-tp))
-			  (N_ "to") " "
+			 ))
-			  (gnc:print-date end-date-tp)
-			  )))
 	 )
     
     (gnc:html-document-set-title! 
@@ -400,10 +398,7 @@
 		      company-name report-title
 		      (gnc:print-date end-date-tp))
 	     (sprintf #f (string-append "%s %s "
-					(N_ "For Period Covering")
+					(N_ "For Period Covering %s to %s"))
-					" %s "
-					(N_ "to")
-					" %s")
 		      company-name report-title
 		      (gnc:print-date start-date-printable)
 		      (gnc:print-date end-date-tp))
@@ -652,7 +647,7 @@
 		   "th" (N_ "CREDIT")))
 		 (row (append
 		       (list (gnc:make-html-table-cell/markup
-			      "total-label-cell" (N_ "Account Title")))
+			      "total-label-cell" (N_ "Account Name")))
 		       (gnc:html-make-empty-cells (- account-cols 1))
 		       (list debit-cell)
 		       (list credit-cell))