Merge branch 'maint'

This commit is contained in:
Frank H. Ellenberger 2020-06-11 12:58:40 +02:00
commit d784a2fb51
3 changed files with 7 additions and 7 deletions

View File

@ -540,7 +540,7 @@ static GtkToggleActionEntry toggle_entries[] =
{
{
"ViewStyleDoubleLineAction", NULL, N_ ("_Double Line"), NULL,
N_ ("Show two lines of information for each transaction"),
N_ ("Show a second line with \"Action\", \"Notes\", and \"File Association\" for each transaction."),
G_CALLBACK (gnc_plugin_page_register_cmd_style_double_line), FALSE
},

View File

@ -129,8 +129,8 @@ static gchar *gnc_plugin_page_register2_filter_time2dmy (time64 raw_time);
static gchar *gnc_plugin_page_register2_get_filter (GncPluginPage *plugin_page);
void gnc_plugin_page_register2_set_filter (GncPluginPage *plugin_page, const gchar *filter);
static void gnc_ppr_update_status_query (GncPluginPageRegister2 *page, gboolean refresh_page);
static void gnc_ppr_update_date_query (GncPluginPageRegister2 *page, gboolean refresh_page);
static void gnc_ppr_update_status_query (GncPluginPageRegister2 *page, gboolean refresh_page);
static void gnc_ppr_update_date_query (GncPluginPageRegister2 *page, gboolean refresh_page);
/* Command callbacks */
static void gnc_plugin_page_register2_cmd_print_check (GtkAction *action, GncPluginPageRegister2 *plugin_page);
@ -408,7 +408,7 @@ static GtkToggleActionEntry toggle_entries[] =
{
{
"ViewStyleDoubleLineAction", NULL, N_("_Double Line"), NULL,
N_("Show two lines of information for each transaction"),
N_("Show a second line with \"Action\", \"Notes\", and \"File Association\" for each transaction."),
G_CALLBACK (gnc_plugin_page_register2_cmd_style_double_line), FALSE
},
@ -908,7 +908,7 @@ gnc_plugin_page_register2_ui_update (gpointer various, GncPluginPageRegister2 *p
/* Set 'Void' and 'Unvoid' */
trans = gnc_tree_view_split_reg_get_current_trans (view);
voided = xaccTransHasSplitsInState (trans, VREC);
voided = xaccTransHasSplitsInState (trans, VREC);
action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE (page),
"VoidTransactionAction");

View File

@ -297,8 +297,8 @@
</key>
<key name="double-line-mode" type="b">
<default>false</default>
<summary>Show two lines of information for each transaction</summary>
<description>Show two lines of information for each transaction in a register. This is the default setting for when a register is first opened. The setting can be changed at any time via the "View-&gt;Double Line" menu item.</description>
<summary>Show a second line with "Action", "Notes", and "File Association" for each transaction.</summary>
<description>Show a second line with "Action", "Notes", and "File Association" for each transaction in a register. This is the default setting for when a register is first opened. The setting can be changed at any time via the "View-&gt;Double Line" menu item.</description>
</key>
<key name="show-leaf-account-names" type="b">
<default>false</default>