Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 799451 - Cannot translate different meanings of string "_Balance" to Chinese. #2042

Merged
merged 1 commit into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gnucash/gnome-utils/gnc-tree-view-account.c
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ gnc_tree_view_account_new_with_root (Account *root, gboolean show_root)
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
sort_by_present_value);

gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), C_("column header", "Balance"), "balance",
gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), _("Balance"), "balance",
SAMPLE_ACCOUNT_VALUE,
GNC_TREE_MODEL_ACCOUNT_COL_BALANCE,
GNC_TREE_MODEL_ACCOUNT_COL_COLOR_BALANCE,
Expand Down Expand Up @@ -1787,7 +1787,7 @@ gtva_update_column_names (GncTreeViewAccount *view)
/* Translators: %s is a currency mnemonic.*/
_("Present (%s)"), mnemonic);
gtva_update_column_name(view->balance_report_column,
/* Translators: %s is a currency mnemonic and this is a column header.*/
/* Translators: %s is a currency mnemonic.*/
_("Balance (%s)"), mnemonic);
gtva_update_column_name(view->cleared_report_column,
/* Translators: %s is a currency mnemonic.*/
Expand Down
20 changes: 9 additions & 11 deletions gnucash/gnome-utils/gnc-tree-view-owner.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,22 +436,20 @@ gnc_tree_view_owner_new (GncOwnerType owner_type)
GNC_TREE_MODEL_OWNER_COL_EMAIL,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
sort_by_string);
gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), C_("column header", "Balance"),
GNC_OWNER_TREE_BALANCE_COL,
gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), _("Balance"), GNC_OWNER_TREE_BALANCE_COL,
SAMPLE_OWNER_VALUE,
GNC_TREE_MODEL_OWNER_COL_BALANCE,
GNC_TREE_MODEL_OWNER_COL_COLOR_BALANCE,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
sort_by_balance_value);

view->balance_report_column =
gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), C_("column header", "Balance"),
GNC_OWNER_TREE_BALANCE_REPORT_COL,
SAMPLE_OWNER_VALUE,
GNC_TREE_MODEL_OWNER_COL_BALANCE_REPORT,
GNC_TREE_MODEL_OWNER_COL_COLOR_BALANCE,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
sort_by_balance_value);
view->balance_report_column
= gnc_tree_view_add_numeric_column(GNC_TREE_VIEW(view), _("Balance"), GNC_OWNER_TREE_BALANCE_REPORT_COL,
SAMPLE_OWNER_VALUE,
GNC_TREE_MODEL_OWNER_COL_BALANCE_REPORT,
GNC_TREE_MODEL_OWNER_COL_COLOR_BALANCE,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
sort_by_balance_value);

view->notes_column
= gnc_tree_view_add_text_column(GNC_TREE_VIEW(view), _("Notes"), GNC_OWNER_TREE_NOTES_COL, NULL,
Expand Down Expand Up @@ -895,7 +893,7 @@ gtvo_update_column_names (GncTreeViewOwner *view)
const gchar *mnemonic = gnc_commodity_get_mnemonic(gnc_default_report_currency());

gtvo_update_column_name(view->balance_report_column,
/* Translators: %s is a currency mnemonic and this is a column header.*/
/* Translators: %s is a currency mnemonic.*/
_("Balance (%s)"), mnemonic);
gnc_tree_view_set_show_column_menu(GNC_TREE_VIEW(view), FALSE);
gnc_tree_view_set_show_column_menu(GNC_TREE_VIEW(view), TRUE);
Expand Down
4 changes: 2 additions & 2 deletions gnucash/gnome/dialog-lot-viewer.c
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ lv_init_lot_view (GNCLotViewer *lv)
gtk_tree_view_append_column(view, column);

renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(C_("column heading", "Balance"), renderer,
column = gtk_tree_view_column_new_with_attributes(_("Balance"), renderer,
"text", LOT_COL_BALN, NULL);
configure_number_columns (column, renderer, LOT_COL_BALN_DOUBLE);
gtk_tree_view_append_column(view, column);
Expand Down Expand Up @@ -1030,7 +1030,7 @@ lv_init_split_view (GNCLotViewer *lv, GtkTreeView *view)
gtk_tree_view_append_column(view, column);

renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(C_("column header", "Balance"), renderer,
column = gtk_tree_view_column_new_with_attributes(_("Balance"), renderer,
"text", SPLIT_COL_BALANCE, NULL);
configure_number_columns (column, renderer, SPLIT_COL_BALANCE_DOUBLE);
gtk_tree_view_append_column(view, column);
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gtkbuilder/dialog-account.glade
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ Clear the entry to have no warning.</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Balance</property>
<property name="label" translatable="yes" context="field label">_Balance</property>
<property name="use-underline">True</property>
<property name="justify">right</property>
</object>
Expand Down
4 changes: 2 additions & 2 deletions gnucash/ui/gnc-reconcile-window.ui
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

<menu id="recwin-popup">
<item>
<attribute name="label" translatable="yes">_Balance</attribute>
<attribute name="label" translatable="yes" context="reconcile menu">_Balance</attribute>
<attribute name="action">recwin.TransBalanceAction</attribute>
</item>
<item>
Expand Down Expand Up @@ -126,7 +126,7 @@
<property name="can-focus">False</property>
<property name="tooltip-text" translatable="yes">Add a new balancing entry to the account</property>
<property name="action-name">recwin.TransBalanceAction</property>
<property name="label" translatable="yes">_Balance</property>
<property name="label" translatable="yes" context="reconcile menu">_Balance</property>
<property name="use-underline">True</property>
<property name="icon-name">document-new</property>
</object>
Expand Down