Merge branch 'maint'

Author: jralls

gnucash/gnome-utils/dialog-commodity.c

@@ -168,8 +168,8 @@ gnc_ui_select_commodity_modal_full(gnc_commodity * orig_sel,
                         fullname ? fullname : "",
                         /* Translators: Replace here and later CUSIP by the name of your local
                            National Securities Identifying Number
-                           like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM …
-                           See http://en.wikipedia.org/wiki/ISIN and
+                           like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM ...
+                           See https://en.wikipedia.org/wiki/ISIN and
                            https://en.wikipedia.org/wiki/National_numbering_agency for hints. */
                         cusip    ? _("\nExchange code (ISIN, CUSIP or similar): ") : "",
                         cusip    ? cusip : "",

gnucash/gnome/assistant-stock-transaction.cpp

@@ -602,7 +602,9 @@ static void
 add_error (StringVec& errors, const char* format_str, const char* arg)
 {
     gchar *buf = g_strdup_printf (_(format_str),
-                                  g_dpgettext2 (nullptr, "Stock Assistant: Page name", arg));
+                                  g_strcmp0("Cash", arg) ?
+                                  _(arg) :
+                                  g_dpgettext2 (nullptr, "Stock Assistant", arg));
     errors.emplace_back (buf);
     g_free (buf);
 }
@@ -757,7 +759,9 @@ to ensure proper recording."), new_date_str, last_split_date_str);
     else
         check_page (line, debit, credit, info->txn_type->stock_value, info->acct,
                     info->stock_memo_edit, info->stock_value_edit, info->currency,
-                    NC_ ("Stock Assistant: Page name", "stock value"), errors);
+        // Translators: Designates the page in the Stock Assistant for entering
+        // the currency value of a non-currency asset.
+                    N_ ("Stock Value"), errors);
 
 
     if (info->txn_type->stock_amount == FieldMask::DISABLED)
@@ -827,7 +831,9 @@ to ensure proper recording."), new_date_str, last_split_date_str);
         check_page (line, debit, credit, info->txn_type->cash_value,
                     gas_account (info->cash_account), info->cash_memo_edit,
                     info->cash_value, info->currency,
-                    NC_ ("Stock Assistant: Page name", "cash"), errors);
+// Translators: Designates a page in the stock assistant or inserts the value
+// into the non-currency asset split of an investment transaction.
+                    NC_ ("Stock Assistant", "Cash"), errors);
         add_to_summary_table (list, line);
     }
 
@@ -838,7 +844,9 @@ to ensure proper recording."), new_date_str, last_split_date_str);
         check_page (line, debit, credit, info->txn_type->fees_value,
                     capitalize_fees ? info->acct : gas_account (info->fees_account),
                     info->fees_memo_edit, info->fees_value, info->currency,
-                    NC_ ("Stock Assistant: Page name", "fees"), errors);
+// Translators: Designates a page in the stock assistant or inserts the value
+// into the fees split of an investment transaction.
+                    N_ ("Fees"), errors);
         if (!line.value_is_zero)
             add_to_summary_table (list, line);
     }
@@ -848,7 +856,9 @@ to ensure proper recording."), new_date_str, last_split_date_str);
         check_page (line, debit, credit, info->txn_type->dividend_value,
                     gas_account (info->dividend_account),
                     info->dividend_memo_edit, info->dividend_value, info->currency,
-                    NC_ ("Stock Assistant: Page name", "dividend"), errors);
+// Translators: Designates a page in the stock assistant or inserts the value
+// into the income split of an investment dividend transaction.
+                    N_ ("Dividend"), errors);
         add_to_summary_table (list, line);
     }
 
@@ -861,14 +871,16 @@ to ensure proper recording."), new_date_str, last_split_date_str);
         check_page (line, debit, credit, info->txn_type->capgains_value,
                     gas_account (info->capgains_account),
                     info->capgains_memo_edit, info->capgains_value, info->currency,
-                    NC_ ("Stock Assistant: Page name", "capital gains"), errors);
+// Translators: Designates a page in the stock assistant or inserts the value
+// into the capital gain/loss income split of an investment transaction.
+                    N_ ("Capital Gain"), errors);
         add_to_summary_table (list, line);
 
         check_page (line, debit, credit,
                     info->txn_type->capgains_value ^ (FieldMask::ENABLED_CREDIT | FieldMask::ENABLED_DEBIT),
                     info->acct, info->capgains_memo_edit, info->capgains_value,
                     info->currency,
-                    NC_ ("Stock Assistant: Page name", "capital gains"), errors);
+                    N_ ("Capital Gain"), errors);
         add_to_summary_table (list, line);
     }
 
@@ -1024,8 +1036,10 @@ create_split (Transaction *trans, const gchar *action, Account *account,
            gnc_num_dbg_to_string (amount_numeric),
            gnc_num_dbg_to_string (xaccSplitGetValue (split)),
            gnc_num_dbg_to_string (xaccSplitGetAmount (split)));
-    gnc_set_num_action (nullptr, split,
-                        nullptr, g_dpgettext2 (nullptr, "Stock Assistant: Action field", action));
+    auto action_str{ g_strcmp0(action, "Cash") ?
+        _(action) :
+        g_dpgettext2 (nullptr, "Stock Assistant: Action field", action)};
+    gnc_set_num_action (nullptr, split, nullptr, action_str);
 }
 
 static void
@@ -1094,7 +1108,9 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
             stock_value = gnc_numeric_neg (stock_value);
     }
 
-    create_split (trans, NC_ ("Stock Assistant: Action field", "Stock"),
+// Translators: Inserts the value into action field of the non-currency asset split of
+// an investment transaction.
+    create_split (trans, N_ ("Stock"),
                   info->acct, account_commits, info->stock_memo_edit,
                   stock_amount, stock_value);
 
@@ -1104,7 +1120,7 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
         if (info->txn_type->cash_value & FieldMask::ENABLED_CREDIT)
             cash = gnc_numeric_neg (cash);
 
-        create_split (trans, NC_ ("Stock Assistant: Action field", "Cash"),
+        create_split (trans, NC_ ("Stock Assistant:", "Cash"),
                       gas_account (info->cash_account), account_commits,
                       info->cash_memo_edit, cash, cash);
     }
@@ -1117,7 +1133,7 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
             auto capitalize = gtk_toggle_button_get_active
                 (GTK_TOGGLE_BUTTON (info->capitalize_fees_checkbox));
 
-            create_split (trans, NC_ ("Stock Assistant: Action field", "Fees"),
+            create_split (trans, N_ ("Fees"),
                           capitalize ? info->acct : gas_account (info->fees_account),
                           account_commits, info->fees_memo_edit,
                           capitalize ? gnc_numeric_zero () : fees, fees);
@@ -1130,20 +1146,20 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
         if (info->txn_type->dividend_value & FieldMask::ENABLED_CREDIT)
             dividend = gnc_numeric_neg (dividend);
 
-        create_split (trans, NC_ ("Stock Assistant: Action field", "Dividend"),
+        create_split (trans, N_ ("Dividend"),
                       gas_account (info->dividend_account), account_commits,
                       info->dividend_memo_edit, dividend, dividend);
     }
 
     if (info->txn_type->capgains_value != FieldMask::DISABLED)
     {
         auto capgains = gae_amount (info->capgains_value);
-        create_split (trans, NC_ ("Stock Assistant: Action field", "Capital Gain"),
+        create_split (trans, N_ ("Capital Gain"),
                       info->acct, account_commits, info->capgains_memo_edit,
                       gnc_numeric_zero (), capgains);
 
         capgains = gnc_numeric_neg (capgains);
-        create_split (trans, NC_ ("Stock Assistant: Action field", "Capital Gain"),
+        create_split (trans, N_ ("Capital Gain"),
                       gas_account (info->capgains_account), account_commits,
                       info->capgains_memo_edit, capgains, capgains);
     }

gnucash/gnome/dialog-doclink.c

@@ -238,11 +238,16 @@ setup_location_dialog (GtkBuilder *builder, GtkWidget *button_loc, const gchar *
     // update label and set entry text if required
     if (uri)
     {
-        gtk_label_set_text (location_label, _("Amend URL:"));
+        gtk_label_set_text (location_label, _("Amend the URL"));
         gtk_entry_set_text (entry, uri);
     }
     else
-        gtk_label_set_text (location_label, _("Enter URL like http://www.gnucash.org:"));
+        {
+            gchar *enter_uri = g_strdup_printf (_("Enter an URL like \"%s\""),
+                                                PACKAGE_URL);
+            gtk_label_set_text (location_label, enter_uri);
+            g_free (enter_uri);
+        }
 }
 
 static void
@@ -256,7 +261,7 @@ setup_file_dialog (GtkBuilder *builder, const gchar *path_head, const gchar *uri
         GtkWidget *existing_hbox = GTK_WIDGET(gtk_builder_get_object (builder, "existing_hbox"));
         GtkWidget *image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
         gchar     *use_uri = gnc_doclink_get_use_uri (path_head, uri, scheme);
-        gchar     *uri_label = g_strdup_printf ("%s '%s'", _("Existing Document Link is"), display_uri);
+        gchar     *uri_label = g_strdup_printf ("%s \"%s\"", _("Existing Document Link is"), display_uri);
         GtkWidget *label = gtk_label_new (uri_label);
 
         if (g_file_test (display_uri, G_FILE_TEST_EXISTS))

gnucash/gnome/dialog-payment.c

@@ -1624,7 +1624,8 @@ static Split *select_payment_split (GtkWindow *parent, Transaction *txn)
         GList *node;
         GtkWidget *first_rb = NULL;
         int answer = GTK_BUTTONS_OK;
-        const char *message = _("While this transaction has multiple splits that can be considered\nas 'the payment split', GnuCash only knows how to handle one.\n"
+        const char *message = _("While this transaction has multiple splits that can be considered\n"
+                                "as 'the payment split', GnuCash only knows how to handle one.\n"
                                 "Please select one, the others will be discarded.\n\n");
         GtkDialog *dialog = GTK_DIALOG(
                             gtk_dialog_new_with_buttons (_("Warning"),