gnucash stable: Bug 798862 - Merge identical strings
John Ralls
jralls at code.gnucash.org
Mon Apr 24 17:46:23 EDT 2023
Updated via https://github.com/Gnucash/gnucash/commit/88dcc08a (commit)
from https://github.com/Gnucash/gnucash/commit/e754660d (commit)
commit 88dcc08ab47d88f90395b39f69dca11ec494ea02
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 24 14:44:24 2023 -0700
Bug 798862 - Merge identical strings
Or nearly identical strings. Also changes "Double line mode" in
register preferences to "Double line view" which is more consistent
with the toggle in the view menu.
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index ca8a94ae98..0dbec224be 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -2223,7 +2223,7 @@ gnc_split_reg_enter( GNCSplitReg *gsr, gboolean next_transaction )
goto_blank = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL_REGISTER,
GNC_PREF_ENTER_MOVES_TO_END);
- /* If we are in single or double line mode and we hit enter
+ /* If we are in single or double line view and we hit enter
* on the blank split, go to the blank split instead of the
* next row. This prevents the cursor from jumping around
* when you are entering transactions. */
diff --git a/gnucash/gtkbuilder/assistant-csv-account-import.glade b/gnucash/gtkbuilder/assistant-csv-account-import.glade
index dcad4f1d8d..1f1ffb11d3 100644
--- a/gnucash/gtkbuilder/assistant-csv-account-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-account-import.glade
@@ -140,7 +140,7 @@ Click on "Next" to proceed or "Cancel" to Abort Import.
<property name="column-spacing">6</property>
<child>
<object class="GtkRadioButton" id="radio_comma">
- <property name="label" translatable="yes">Comma Separated</property>
+ <property name="label" translatable="yes">Comma separated</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -156,7 +156,7 @@ Click on "Next" to proceed or "Cancel" to Abort Import.
</child>
<child>
<object class="GtkRadioButton" id="radio_semi">
- <property name="label" translatable="yes">Semicolon Separated</property>
+ <property name="label" translatable="yes">Semicolon separated</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -172,7 +172,7 @@ Click on "Next" to proceed or "Cancel" to Abort Import.
</child>
<child>
<object class="GtkRadioButton" id="radio_custom">
- <property name="label" translatable="yes">Custom regular Expression</property>
+ <property name="label" translatable="yes">Custom regular expression</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -188,7 +188,7 @@ Click on "Next" to proceed or "Cancel" to Abort Import.
</child>
<child>
<object class="GtkRadioButton" id="radio_colon">
- <property name="label" translatable="yes">Colon Separated</property>
+ <property name="label" translatable="yes">Colon separated</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index 8e2ce7adff..3a97c0d15d 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -969,7 +969,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Show accounts which have the option "Hidden" checked.</property>
+ <property name="tooltip-text" translatable="yes">Show accounts that have been marked hidden.</property>
<property name="halign">start</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 909cb72304..232a9ddc5c 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -1441,8 +1441,8 @@ many months before the current month</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="has-tooltip">True</property>
- <property name="tooltip-markup">If selected, the default book option for new files is set so that the "Num" cell on registers shows/updates the split "action" field and the transaction "num" field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the "Num" cell on registers shows/updates the transaction "num" field.</property>
- <property name="tooltip-text" translatable="yes">If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field.</property>
+ <property name="tooltip-markup">If selected, the default book option for new files is set so that the "Num" cell on registers shows/updates the split "action" field and the transaction "num" field is shown on the second line in double line view (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the "Num" cell on registers shows/updates the transaction "num" field.</property>
+ <property name="tooltip-text" translatable="yes">If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line view (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field.</property>
<property name="halign">start</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
@@ -2846,8 +2846,8 @@ many months before the current month</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="has-tooltip">True</property>
- <property name="tooltip-markup">Show all transactions on one line or in double line mode on two.</property>
- <property name="tooltip-text" translatable="yes">Show all transactions on one line or in double line mode on two.</property>
+ <property name="tooltip-markup">Show all transactions on one line or in double line view on two.</property>
+ <property name="tooltip-text" translatable="yes">Show all transactions on one line or in double line view on two.</property>
<property name="halign">start</property>
<property name="use-underline">True</property>
<property name="active">True</property>
@@ -2865,8 +2865,8 @@ many months before the current month</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="has-tooltip">True</property>
- <property name="tooltip-markup">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line mode on two.</property>
- <property name="tooltip-text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line mode on two.</property>
+ <property name="tooltip-markup">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line view on two.</property>
+ <property name="tooltip-text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line view on two.</property>
<property name="halign">start</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
@@ -2934,13 +2934,13 @@ many months before the current month</property>
</child>
<child>
<object class="GtkCheckButton" id="pref/general.register/double-line-mode">
- <property name="label" translatable="yes">_Double line mode</property>
+ <property name="label" translatable="yes">_Double line view</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="has-tooltip">True</property>
- <property name="tooltip-markup">Show two lines of information for each transaction instead of one. Does not affect expanded transactions.</property>
- <property name="tooltip-text" translatable="yes">Show two lines of information for each transaction instead of one. Does not affect expanded transactions.</property>
+ <property name="tooltip-markup">Show a second line with Action, Notes, and Linked Document fields for each transaction.</property>
+ <property name="tooltip-text" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction.</property>
<property name="halign">start</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
diff --git a/gnucash/ui/gnc-embedded-register-window.ui b/gnucash/ui/gnc-embedded-register-window.ui
index 37a8921bee..8f338d4367 100644
--- a/gnucash/ui/gnc-embedded-register-window.ui
+++ b/gnucash/ui/gnc-embedded-register-window.ui
@@ -80,7 +80,7 @@
<item>
<attribute name="label" translatable="yes">_Double Line</attribute>
<attribute name="action">GncPluginPageRegisterActions.ViewStyleDoubleLineAction</attribute>
- <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction</attribute>
+ <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction.</attribute>
</item>
</section>
</submenu>
diff --git a/gnucash/ui/gnc-plugin-page-register.ui b/gnucash/ui/gnc-plugin-page-register.ui
index 07bd23c566..fcc7a0a828 100644
--- a/gnucash/ui/gnc-plugin-page-register.ui
+++ b/gnucash/ui/gnc-plugin-page-register.ui
@@ -96,7 +96,7 @@
<item>
<attribute name="label" translatable="yes">_Double Line</attribute>
<attribute name="action">GncPluginPageRegisterActions.ViewStyleDoubleLineAction</attribute>
- <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction</attribute>
+ <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction.</attribute>
<attribute name="temp" translatable="no">yes</attribute>
</item>
Summary of changes:
gnucash/gnome/gnc-split-reg.c | 2 +-
gnucash/gtkbuilder/assistant-csv-account-import.glade | 8 ++++----
gnucash/gtkbuilder/dialog-account.glade | 2 +-
gnucash/gtkbuilder/dialog-preferences.glade | 18 +++++++++---------
gnucash/ui/gnc-embedded-register-window.ui | 2 +-
gnucash/ui/gnc-plugin-page-register.ui | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
More information about the gnucash-changes
mailing list