Improve translator comments, remove an unneeded MsgId

Mostly avoid some unwanted comments, fix typos ...

doc/tip_of_the_day.list.in

@@ -1,6 +1,10 @@
  N_( "The GnuCash online manual has lots of helpful information. \
 You can access the manual under the Help menu.")
 
+ N_( "The GnuCash developers are easy to contact. As well \
+as several mailing lists, you can chat to them live on IRC! \
+Join them on #gnucash at irc.gnome.org")
+
  N_( "You can easily import your existing financial data from Quicken, \
 MS Money or other programs that export QIF files or OFX files. In the \
 File menu, click on the sub-menu Import and click on QIF or OFX file, \
@@ -88,9 +92,13 @@ you can choose the monthly basic frequency and then set 'Every \
 registers after midnight, to get the new date as default for new \
 transactions. It is not necessary to restart GnuCash.")
 
- N_( "The GnuCash developers are easy to contact. As well \
-as several mailing lists, you can chat to them live on IRC! \
-Join them on #gnucash at irc.gnome.org")
+ N_( "To search through all your transactions, start a search (Edit -> \
+Find...) from the main accounts hierarchy page. To limit your search \
+to a single account, start the search from that account's register.")
+
+ N_( "To visually compare on screen the contents of 2 tabs, \
+in one of the tabs, select Window -> New Window with Page \
+from the menu to duplicate that tab in a new window.")
 
  N_( "There is a theory that if ever anyone discovers what \
 the Universe is for and why it is here, it will instantly \
@@ -99,10 +107,4 @@ inexplicable.\n\
 There is another theory that this has already happened.\n\n\
 Douglas Adams, \"The Restaurant at the End of the Universe\"")
 
- N_( "To search through all your transactions, start a search (Edit -> \
-Find...) from the main accounts hierarchy page. To limit your search \
-to a single account, start the search from that account's register.")
-
- N_( "To visually compare on screen the contents of 2 tabs, \
-in one of the tabs, select Window -> New Window with Page \
-from the menu to duplicate that tab in a new window.")
+/* Douglas Adams should be the last tip. Insert new tips in front of it. */

src/engine/Recurrence.c

@@ -747,7 +747,9 @@ recurrenceListToCompactString(GList *rs)
         {
             //g_warning("nth weekday not handled");
             //g_string_printf(buf, "@fixme: nth weekday not handled");
-            g_string_printf(buf, "%s", _("Monthly"));
+        	/* (keep the line break below to avoid a translator comment) */
+            g_string_printf(buf,
+            		"%s", _("Monthly"));
             if (multiplier > 1)
             {
                 /* translators: %u is the recurrence multiplier. */

src/gnome-search/dialog-search.c

@@ -1447,7 +1447,9 @@ gnc_search_dialog_test (void)
         display = get_display_list (GNC_ID_SPLIT);
 
 /* FIXME: All this does is leak. */
-    gnc_search_dialog_create (GNC_ID_SPLIT, _("Find Transaction"),
+/*      (keep the line break below to avoid a translator comment) */
+    gnc_search_dialog_create (GNC_ID_SPLIT,
+                  _("Find Transaction"),
 			      params, display,
 			      NULL, NULL, buttons, NULL, NULL, NULL, NULL,
 			      NULL, NULL);

src/gnome-utils/gnc-period-select.c

@@ -66,7 +66,7 @@ static GtkComboBoxClass *parent_class;
 
 const gchar *start_strings[GNC_ACCOUNTING_PERIOD_LAST] =
 {
-    /* CY Strings */
+    /* CY (current year) Strings */
     N_("Today"),
     N_("Start of this month"),
     N_("Start of previous month"),
@@ -75,14 +75,14 @@ const gchar *start_strings[GNC_ACCOUNTING_PERIOD_LAST] =
     N_("Start of this year"),
     N_("Start of previous year"),
 
-    /* FY Strings */
+    /* FY (fiscal year) Strings */
     N_("Start of this accounting period"),
     N_("Start of previous accounting period"),
 };
 
 const gchar *end_strings[GNC_ACCOUNTING_PERIOD_LAST] =
 {
-    /* CY Strings */
+    /* CY (current year) Strings */
     N_("Today"),
     N_("End of this month"),
     N_("End of previous month"),
@@ -91,7 +91,7 @@ const gchar *end_strings[GNC_ACCOUNTING_PERIOD_LAST] =
     N_("End of this year"),
     N_("End of previous year"),
 
-    /* FY Strings */
+    /* FY (fiscal year) Strings */
     N_("End of this accounting period"),
     N_("End of previous accounting period"),
 };

src/gnome-utils/gnc-splash.c

@@ -90,8 +90,8 @@ gnc_show_splash_screen (void)
 #ifdef GNUCASH_SCM
     /* Development version */
     /* Translators: 1st %s is the GnuCash version (eg 2.4.11);
-                    2nd %s is the scm type (svn/svk/git/bzr);
-                    3rd %s is the scm revision number;
+                    2nd %s is the vcs type (svn/svk/git/bzr);
+                    3rd %s is the vcs revision number;
                     4th %s is the build date */
     ver_string = g_strdup_printf(_("Version: GnuCash-%s %s (rev %s built %s)"),
                                  VERSION, GNUCASH_SCM, GNUCASH_SCM_REV,
@@ -99,7 +99,7 @@ gnc_show_splash_screen (void)
 #else
     /* Dist Tarball */
     /* Translators: 1st %s is the GnuCash version (eg 2.4.11);
-                    2nd %s is the scm (svn/svk/git/bzr) revision number;
+                    2nd %s is the vcs (svn/svk/git/bzr) revision number;
                     3rd %s is the build date */
     ver_string = g_strdup_printf(_("Version: GnuCash-%s (rev %s built %s)"),
                                  VERSION, GNUCASH_SCM_REV, GNUCASH_BUILD_DATE);

src/gnome-utils/gtkbuilder/dialog-preferences.glade

@@ -47,7 +47,7 @@
       </row>
       <row>
         <col id="0" translatable="yes">Locale</col>
-        <col id="1" translatable="yes">(dummy)</col>
+        <col id="1" comments="Because it will be overwritten no translation is reqired">(dummy)</col>
       </row>
     </data>
   </object>

src/gnome/dialog-print-check.c

@@ -1508,11 +1508,12 @@ read_one_check_directory(PrintCheckDialog *pcd, GtkListStore *store,
                       _("There is a duplicate check format file."));
             gtk_message_dialog_format_secondary_text
             (GTK_MESSAGE_DIALOG(dialog),
-             /* Translators: %1$s is the type of the first check
-              * format (user defined or application defined); %2$s
-              * is the filename of that format; %3$s the type of
-              * the other check format; and %4$s the filename of
-              * that other format. */
+             /* Translators:
+              * %1$s is the type of the first check format
+              *  (user defined or application defined);
+              * %2$s is the filename of that format;
+              * %3$s the type of the other check format; and
+              * %4$s the filename of that other format.      */
              _("The GUIDs in the %s check format file '%s' and "
                "the %s check format file '%s' match."),
              existing->group, existing->filename,

src/html/gnc-html-webkit.c

@@ -1146,7 +1146,7 @@ impl_webkit_print( GncHtml* self, const gchar* jobname, gboolean export_pdf )
         gchar *export_dirname = NULL;
         gchar* basename;
 
-        // Before we save the PDF file, we always as the user for the export
+        // Before we save the PDF file, we always ask the user for the export
         // file name. We will store the chosen directory in the gtk print settings
         // as well.
         dialog = gtk_file_chooser_dialog_new (_("Export to PDF File"),

src/import-export/aqb/dialog-ab-trans.c

@@ -362,7 +362,7 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
                              * needed only in countries that have one of
                              * aqbanking's Online Banking techniques
                              * available. This is 'OFX DirectConnect'
-                             * (U.S. and others), 'HBCI' (in Germany),
+                             * (U.S. and others), 'HBCI' (Germany),
                              * or 'YellowNet' (Switzerland). If none of
                              * these techniques are available in your
                              * country, you may safely ignore strings

src/import-export/aqb/gnc-plugin-aqbanking.c

@@ -115,7 +115,9 @@ static GtkActionEntry gnc_plugin_actions [] =
         G_CALLBACK(gnc_plugin_ab_cmd_issue_transaction)
     },
     {
-        "ABIssueSepaTransAction", NULL, N_("_Issue SEPA Transaction..."), NULL,
+        "ABIssueSepaTransAction", NULL,
+		/* Translators: https://en.wikipedia.org/wiki/Single_Euro_Payments_Area */
+		N_("_Issue SEPA Transaction..."), NULL,
         N_("Issue a new international European (SEPA) transaction online through Online Banking"),
         G_CALLBACK(gnc_plugin_ab_cmd_issue_sepatransaction)
     },
@@ -137,7 +139,10 @@ static GtkActionEntry gnc_plugin_actions [] =
 
     /* File -> Import menu item */
     {
-        "Mt940ImportAction", GTK_STOCK_CONVERT, N_("Import _MT940"), NULL,
+        "Mt940ImportAction", GTK_STOCK_CONVERT,
+		/* Translators: Message types MTxxxx are exchange formats used by the SWIFT network
+		   https://en.wikipedia.org/wiki/Society_for_Worldwide_Interbank_Financial_Telecommunication */
+		N_("Import _MT940"), NULL,
         N_("Import a MT940 file into GnuCash"),
         G_CALLBACK(gnc_plugin_ab_cmd_mt940_import)
     },
@@ -147,7 +152,10 @@ static GtkActionEntry gnc_plugin_actions [] =
         G_CALLBACK(gnc_plugin_ab_cmd_mt942_import)
     },
     {
-        "DtausImportAction", GTK_STOCK_CONVERT, N_("Import _DTAUS"), NULL,
+        "DtausImportAction", GTK_STOCK_CONVERT,
+		/* Translators: DTAUS is a traditional german exchange format.
+           https://de.wikipedia.org/wiki/Datentr%C3%A4geraustauschverfahren */
+		N_("Import _DTAUS"), NULL,
         N_("Import a DTAUS file into GnuCash"),
         G_CALLBACK(gnc_plugin_ab_cmd_dtaus_import)
     },

src/import-export/import-main-matcher.c

@@ -460,19 +460,27 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
     g_object_unref(store);
 
-    /* Add the columns */
-    add_text_column(view, _("Date"), DOWNLOADED_COL_DATE);
+    /* Add the columns *
+     * (keep the line break below to avoid a translator comment) */
+    add_text_column(view,
+    		        _("Date"), DOWNLOADED_COL_DATE);
     column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
     gtk_tree_view_column_set_visible(column, show_account);
     add_text_column(view, _("Amount"), DOWNLOADED_COL_AMOUNT);
     add_text_column(view, _("Description"), DOWNLOADED_COL_DESCRIPTION);
     add_text_column(view, _("Memo"), DOWNLOADED_COL_MEMO);
-    add_toggle_column(view, _("A"), DOWNLOADED_COL_ACTION_ADD,
+    add_toggle_column(view,
+                      /* toggle column: add new transaction */
+                      _("A"), DOWNLOADED_COL_ACTION_ADD,
                       G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
-    column = add_toggle_column(view, _("U+R"), DOWNLOADED_COL_ACTION_UPDATE,
+    column = add_toggle_column(view,
+            /* toggle column: update existing transaction & mark it reconciled */
+            _("U+R"), DOWNLOADED_COL_ACTION_UPDATE,
                                G_CALLBACK(gnc_gen_trans_update_toggled_cb), info);
     gtk_tree_view_column_set_visible(column, show_update);
-    add_toggle_column(view, _("R"), DOWNLOADED_COL_ACTION_CLEAR,
+    add_toggle_column(view,
+            /* toggle column: mark existing transaction reconciled */
+            _("R"), DOWNLOADED_COL_ACTION_CLEAR,
                       G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info);
 
     /* The last column has multiple renderers */

src/import-export/ofx/gnc-ofx-import.c

@@ -896,6 +896,7 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data)
                 break;
             case OFX_CMA :
                 default_type = ACCT_TYPE_NONE;
+                /* Cash Management Account */
                 account_type_name = _("Unknown OFX CMA account");
                 break;
             case OFX_CREDITCARD :

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

@@ -241,6 +241,7 @@ gnc_split_register_get_num_label (VirtualLocation virt_loc,
     {
     case RECEIVABLE_REGISTER:
     case PAYABLE_REGISTER:
+        /* Column label for Invoice IDs in A/P & A/R accounts */
         return _("Ref");
     default:
         return _("Num");

src/report/business-reports/balsheet-eg.scm

@@ -506,9 +506,12 @@
              (and opt-omit-zb-accts?)
                   ;(> (accrec-depth accrec) 1))
              ;; Reason 1: zero Imbalance a/c
-             (string-prefix? (_ "Imbalance") (xaccAccountGetName (accrec-account accrec)))
+             ;; The line break in the next expressions will suppress comments as translator comments.
+             (string-prefix?
+               (_ "Imbalance") (xaccAccountGetName (accrec-account accrec)))
              ;; Reason 2: zero Orphan a/c
-             (string-prefix? (_ "Orphan") (xaccAccountGetName (accrec-account accrec))))))
+             (string-prefix?
+               (_ "Orphan") (xaccAccountGetName (accrec-account accrec))))))
 
     (define (flattened-acc-depth acc)
       ;; Accounts deeper than required get moved to the requested depth

src/report/business-reports/customer-summary.scm

@@ -52,11 +52,15 @@
 (define opthelp-incomeaccounts
   (N_ "The income accounts where the sales and income was recorded."))
 ;(define optname-account-ar (N_ "A/R Account"))
+;; The line break in the next expressions will suppress above comment as translator comments.
 
-(define pagename-expenseaccounts (N_ "Expense Accounts"))
+(define pagename-expenseaccounts
+        (N_ "Expense Accounts"))
 (define optname-expenseaccounts (N_ "Expense Accounts"))
 ;(define optname-account-ap (N_ "A/P Account"))
-(define opthelp-expenseaccounts (N_ "The expense accounts where the expenses are recorded which are subtracted from the sales to give the profit."))
+;; The line break in the next expressions will suppress above comment as translator comments.
+(define opthelp-expenseaccounts
+        (N_ "The expense accounts where the expenses are recorded which are subtracted from the sales to give the profit."))
 
 (define optname-show-column-expense (N_ "Show Expense Column"))
 (define opthelp-show-column-expense (N_ "Show the column with the expenses per customer."))
@@ -79,7 +83,10 @@
 ;(define optname-show-txn-table (N_ "(Experimental) Show Transaction Table"))
 ;(define opthelp-show-txn-table (N_ "Show the table with all transactions. If false, only show the total amount per customer."))
 
-(define optname-show-zero-lines (N_ "Show Lines with All Zeros"))
+;; The line break in the next expression will suppress above comments as translator comments.
+
+(define optname-show-zero-lines
+         (N_ "Show Lines with All Zeros"))
 (define opthelp-show-zero-lines (N_ "Show the table lines with customers which did not have any transactions in the reporting period, hence would show all zeros in the columns."))
 (define optname-show-inactive (N_ "Show Inactive Customers"))
 (define opthelp-show-inactive (N_ "Include customers that have been marked inactive."))
@@ -835,8 +842,9 @@
                 (total-sales (gnc-numeric-zero))
                 (total-expense (gnc-numeric-zero))
                 (heading-list
-                 ;; Translators: "Markup" is profit amount divided by sales amount
-                 (list (_ "Customer") (_ "Profit") (_ "Markup") (_ "Sales"))))
+                 (list (_ "Customer") (_ "Profit")
+                  ;; Translators: "Markup" is profit amount divided by sales amount
+                  (_ "Markup") (_ "Sales"))))
 
             ;; helper for sorting an owner list
             (define (owner-name<? a b)

src/report/business-reports/fancy-invoice.scm

@@ -888,6 +888,9 @@
 		  (set! date-table (make-date-table))
 		  ;; oli-custom - moved invoice number here
 		  (gnc:html-table-append-row!
+                  ;; Translators: %s below is "Invoice" or "Bill" or even the
+                  ;; custom title from the options. The next column contains
+                  ;; the number of the document.
 		   date-table (list (sprintf #f (_ "%s #") title) (gncInvoiceGetID invoice)))
                   ;; Translators: The first %s below is "Invoice" or
                   ;; "Bill" or even the custom title from the
@@ -899,8 +902,9 @@
 		  date-table)
 		(gnc:make-html-text
 		  ;; oli-custom - FIXME: I have a feeling I broke a
-		 ;; translation by not using string-expand for  
-		  (string-append title "<br>" (_ "Invoice in progress..."))))))
+          ;; translation by not using string-expand for &nbsp;
+		  (string-append title "<br>"
+            (_ "Invoice in progress..."))))))
 
 	  (gnc:html-table-append-row!
 	  	helper-table

src/report/business-reports/owner-report.scm

@@ -70,20 +70,23 @@
   (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (N_ "Customer"))
         ((eqv? owner-type GNC-OWNER-EMPLOYEE) (N_ "Employee"))
         ;; FALL THROUGH
-        (else (N_ "Company")))) 
+        (else
+          (N_ "Company")))) 
 
 ;; Error strings in case there is no (valid) selection (translated)
 (define (invalid-selection-title-string owner-type)
   (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "No valid customer selected."))
         ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "No valid employee selected."))
         ;; FALL THROUGH
-        (else (_ "No valid company selected."))))
+        (else
+          (_ "No valid company selected."))))
 
 (define (invalid-selection-string owner-type)
   (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "This report requires a customer to be selected."))
         ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "This report requires a employee to be selected."))
         ;; FALL THROUGH
-        (else (_ "This report requires a company to be selected."))))
+        (else
+          (_ "This report requires a company to be selected."))))
 
 ;; Html formatted error message documents
 (define (gnc:html-make-no-owner-warning
@@ -108,7 +111,8 @@
   (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "Customer"))
         ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "Employee"))
         ;; FALL THROUGH
-        (else (_ "Vendor")))) 
+        (else
+          (_ "Vendor")))) 
 
 (define-macro (addto! alist element)
   `(set! ,alist (cons ,element ,alist)))

src/report/report-system/report.scm

@@ -142,7 +142,9 @@
 		;; FIXME: We should pass the top-level window
 		;; instead of the '() to gnc-error-dialog, but I
 		;; have no idea where to get it from.
-		(gnc-error-dialog '() (string-append (_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: ") report-guid))
+		(gnc-error-dialog '() (string-append
+          (_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: ")
+          report-guid))
 		)))
 	(begin
 	  (if (gnc:report-template-name report-rec)

src/report/standard-reports/budget-barchart.scm

@@ -39,7 +39,8 @@
 (use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
 (load-from-path "html-jqplot") ;; for jqplot-escape-string
 
-(define reportname (N_ "Budget Barchart"))
+(define reportname
+  (N_ "Budget Barchart"))
 
 (define optname-accounts (N_ "Accounts"))
 (define optname-budget (N_ "Budget"))

src/report/standard-reports/budget-flow.scm

@@ -35,7 +35,8 @@
 (gnc:module-load "gnucash/report/report-system" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
-(define reportname (N_ "Budget Flow"))
+(define reportname
+  (N_ "Budget Flow"))
 
 ;; define all option's names so that they are properly defined
 ;; in *one* place.

src/report/standard-reports/budget.scm

@@ -43,7 +43,8 @@
 ;;(define optname-from-date (N_ "Start Date"))
 ;;(define optname-to-date (N_ "End Date"))
 
-(define optname-display-depth (N_ "Account Display Depth"))
+(define optname-display-depth
+  (N_ "Account Display Depth"))
 (define optname-show-subaccounts (N_ "Always show sub-accounts"))
 (define optname-accounts (N_ "Account"))
 

src/report/standard-reports/price-scatter.scm

@@ -45,8 +45,10 @@
 (define optname-invert (N_ "Invert prices"))
 
 ;;      (optname-accounts (N_ "Accounts"))
+;; The line break in the next expression will suppress above comment as translator comment.
 
-(define optname-inc-exp (N_ "Show Income/Expense"))
+(define optname-inc-exp
+  (N_ "Show Income/Expense"))
 (define optname-show-profit (N_ "Show Net Profit"))
 
 (define optname-sep-bars (N_ "Show Asset & Liability bars"))