Skip to content

Commit

Permalink
Replace ... with … in all translatable strings.
Browse files Browse the repository at this point in the history
Also a few other places like translator comments and report options.

Replaces #1033.
  • Loading branch information
jralls committed Dec 23, 2022
1 parent ff6d3d8 commit ab13b01
Show file tree
Hide file tree
Showing 67 changed files with 197 additions and 195 deletions.
2 changes: 1 addition & 1 deletion doc/tip_of_the_day.list.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ registers after midnight, to get the new date as default for new \
transactions. It is not necessary to restart GnuCash.")

N_( "To search through all your transactions, start a search (Edit->\
Find...) from the main accounts hierarchy page. To limit your search \
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, \
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-search/dialog-search.c
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ type_label_to_new_button(const gchar* type_label)
else
{
PWARN("No translatable new-button label found for search type \"%s\", please add one into dialog-search.c!", type_label);
return C_("Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,...)!", "New item");
return C_("Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,)!", "New item");
}
}

Expand Down
6 changes: 3 additions & 3 deletions gnucash/gnome-utils/assistant-xml-encoding.c
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ gxi_parse_file (GncXmlImportData *data)
}

xaccLogDisable ();
gxi_update_progress_bar (_("Reading file..."), 0.0);
gxi_update_progress_bar (_("Reading file"), 0.0);
qof_session_load (session, gxi_update_progress_bar);
gxi_update_progress_bar (NULL, -1.0);
xaccLogEnable ();
Expand All @@ -1114,7 +1114,7 @@ gxi_parse_file (GncXmlImportData *data)
book = qof_session_get_book (session);
backend = qof_book_get_backend (book);

gxi_update_progress_bar (_("Parsing file..."), 0.0);
gxi_update_progress_bar (_("Parsing file"), 0.0);
success = gnc_xml2_parse_with_subst (backend, book, data->subst);
gxi_update_progress_bar (NULL, -1.0);

Expand Down Expand Up @@ -1146,7 +1146,7 @@ gxi_save_file (GncXmlImportData *data)
QofBackendError io_err;
g_return_val_if_fail (data && data->session, FALSE);

gxi_update_progress_bar (_("Writing file..."), 0.0);
gxi_update_progress_bar (_("Writing file"), 0.0);
qof_session_save (data->session, gxi_update_progress_bar);
gxi_update_progress_bar (NULL, -1.0);

Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/dialog-account.c
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ gnc_account_window_set_name (AccountWindow *aw)
char *prefix = g_strdup_printf (format,
g_strv_length (aw->next_name) + 1);

title = g_strconcat (prefix, " - ", fullname, " ...", NULL);
title = g_strconcat (prefix, " - ", fullname, " ", NULL);
g_free (prefix);
}
else
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/dialog-commodity.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ 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 ...
like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM
See http://en.wikipedia.org/wiki/ISIN and
https://en.wikipedia.org/wiki/National_numbering_agency for hints. */
cusip ? _("\nExchange code (ISIN, CUSIP or similar): ") : "",
Expand Down
4 changes: 2 additions & 2 deletions gnucash/gnome-utils/dialog-file-access.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ gnc_ui_file_access (GtkWindow *parent, int type)
switch ( type )
{
case FILE_ACCESS_OPEN:
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Open..."));
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Open"));
button_label = _("_Open");
fileChooserAction = GTK_FILE_CHOOSER_ACTION_OPEN;
settings_section = GNC_PREFS_GROUP_OPEN_SAVE;
break;

case FILE_ACCESS_SAVE_AS:
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Save As..."));
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Save As"));
button_label = _("_Save As");
fileChooserAction = GTK_FILE_CHOOSER_ACTION_SAVE;
settings_section = GNC_PREFS_GROUP_OPEN_SAVE;
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-account-sel.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ gnc_account_sel_set_new_account_ability (GNCAccountSel *gas,
}

/* create the button. */
gas->newAccountButton = gtk_button_new_with_label (_("New..."));
gas->newAccountButton = gtk_button_new_with_label (_("New"));
g_signal_connect (gas->newAccountButton,
"clicked",
G_CALLBACK(gas_new_account_click),
Expand Down
12 changes: 6 additions & 6 deletions gnucash/gnome-utils/gnc-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ gnc_post_file_open (GtkWindow *parent, const char * filename, gboolean is_readon
path, username, password );

xaccLogDisable();
gnc_window_show_progress(_("Loading user data..."), 0.0);
gnc_window_show_progress(_("Loading user data"), 0.0);
qof_session_load (new_session, gnc_window_show_progress);
gnc_window_show_progress(NULL, -1.0);
xaccLogEnable();
Expand All @@ -988,7 +988,7 @@ gnc_post_file_open (GtkWindow *parent, const char * filename, gboolean is_readon
if (gnc_xml_convert_single_file (newfile))
{
/* try to load once again */
gnc_window_show_progress(_("Loading user data..."), 0.0);
gnc_window_show_progress(_("Loading user data"), 0.0);
qof_session_load (new_session, gnc_window_show_progress);
gnc_window_show_progress(NULL, -1.0);
xaccLogEnable();
Expand All @@ -1004,7 +1004,7 @@ gnc_post_file_open (GtkWindow *parent, const char * filename, gboolean is_readon
/* Attempt to update the database if it's too old */
if ( !uh_oh && io_err == ERR_SQL_DB_TOO_OLD )
{
gnc_window_show_progress(_("Re-saving user data..."), 0.0);
gnc_window_show_progress(_("Re-saving user data"), 0.0);
qof_session_safe_save(new_session, gnc_window_show_progress);
io_err = qof_session_get_error(new_session);
uh_oh = show_session_error(parent, io_err, newfile, GNC_FILE_DIALOG_SAVE);
Expand Down Expand Up @@ -1364,7 +1364,7 @@ gnc_file_do_export(GtkWindow *parent, const char * filename)

/* use the current session to save to file */
gnc_set_busy_cursor (NULL, TRUE);
gnc_window_show_progress(_("Exporting file..."), 0.0);
gnc_window_show_progress(_("Exporting file"), 0.0);
ok = qof_session_export (new_session, current_session,
gnc_window_show_progress);
gnc_window_show_progress(NULL, -1.0);
Expand Down Expand Up @@ -1424,7 +1424,7 @@ gnc_file_save (GtkWindow *parent)
/* use the current session to save to file */
save_in_progress++;
gnc_set_busy_cursor (NULL, TRUE);
gnc_window_show_progress(_("Writing file..."), 0.0);
gnc_window_show_progress(_("Writing file"), 0.0);
qof_session_save (session, gnc_window_show_progress);
gnc_window_show_progress(NULL, -1.0);
gnc_unset_busy_cursor (NULL);
Expand Down Expand Up @@ -1663,7 +1663,7 @@ gnc_file_do_save_as (GtkWindow *parent, const char* filename)


gnc_set_busy_cursor (NULL, TRUE);
gnc_window_show_progress(_("Writing file..."), 0.0);
gnc_window_show_progress(_("Writing file"), 0.0);
qof_session_save (new_session, gnc_window_show_progress);
gnc_window_show_progress(NULL, -1.0);
gnc_unset_busy_cursor (NULL);
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-file.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
* FUNCTION:
* A set of file-handling utilities for GnuCash applications.
* These utilities will "do the right thing" when used in the "File..."
* These utilities will "do the right thing" when used in the "File"
* pulldown menu, for the "New", "Open", "Save", "SaveAs", etc. menu entries.
* In particular, they will verify that old files don't get clobbered,
* they'll put up dialogue boxes to ask the user to confirm their actions,
Expand Down
6 changes: 3 additions & 3 deletions gnucash/gnome-utils/gnc-general-select.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ create_children (GNCGeneralSelect *gsl, GNCGeneralSelectType type)
gtk_widget_show (gsl->entry);

if (type == GNC_GENERAL_SELECT_TYPE_SELECT)
gsl->button = gtk_button_new_with_label (_("Select..."));
gsl->button = gtk_button_new_with_label (_("Select"));
else if (type == GNC_GENERAL_SELECT_TYPE_EDIT)
gsl->button = gtk_button_new_with_label (_("Edit..."));
gsl->button = gtk_button_new_with_label (_("Edit"));
else if (type == GNC_GENERAL_SELECT_TYPE_VIEW)
gsl->button = gtk_button_new_with_label (_("View..."));
gsl->button = gtk_button_new_with_label (_("View"));

gtk_box_pack_start (GTK_BOX (gsl), gsl->button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (gsl->button), "clicked",
Expand Down
10 changes: 5 additions & 5 deletions gnucash/gnome-utils/gnc-main-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,14 @@ static GtkActionEntry gnc_menu_actions [] =
{ "FileImportAction", nullptr, N_("_Import"), nullptr, nullptr, nullptr },
{ "FileExportAction", nullptr, N_("_Export"), nullptr, nullptr, nullptr },
{
"FilePrintAction", "document-print", N_("_Print..."), "<primary>p",
"FilePrintAction", "document-print", N_("_Print"), "<primary>p",
N_("Print the currently active page"), nullptr
},
#ifndef GTK_STOCK_PAGE_SETUP
# define GTK_STOCK_PAGE_SETUP nullptr
#endif
{
"FilePageSetupAction", "document-page-setup", N_("Pa_ge Setup..."), "<primary><shift>p",
"FilePageSetupAction", "document-page-setup", N_("Pa_ge Setup"), "<primary><shift>p",
N_("Specify the page size and orientation for printing"),
G_CALLBACK (gnc_main_window_cmd_page_setup)
},
Expand Down Expand Up @@ -360,11 +360,11 @@ static GtkActionEntry gnc_menu_actions [] =

{ "ViewTabPositionAction", NULL, N_("Tab P_osition"), NULL, NULL, NULL },
{
"ViewSortByAction", nullptr, N_("_Sort By..."), nullptr,
"ViewSortByAction", nullptr, N_("_Sort By"), nullptr,
N_("Select sorting criteria for this page view"), nullptr
},
{
"ViewFilterByAction", nullptr, N_("_Filter By..."), nullptr,
"ViewFilterByAction", nullptr, N_("_Filter By"), nullptr,
N_("Select the account types that should be displayed."), nullptr
},
{
Expand All @@ -377,7 +377,7 @@ static GtkActionEntry gnc_menu_actions [] =

{ "ScrubMenuAction", nullptr, N_("_Check & Repair"), nullptr, nullptr, nullptr },
{
"ActionsForgetWarningsAction", nullptr, N_("Reset _Warnings..."), nullptr,
"ActionsForgetWarningsAction", nullptr, N_("Reset _Warnings"), nullptr,
N_("Reset the state of all warning messages so they will be shown again."),
G_CALLBACK (gnc_main_window_cmd_actions_reset_warnings)
},
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-period-select.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ gnc_period_select_finalize (GObject *object)
* accounting period like "previous month" or "this year".
*
* @param starting_labels If set to TRUE then all the labels will
* refer to the "Start of...". If FALSE, labels will refer to "End
* refer to the "Start of". If FALSE, labels will refer to "End
* of...".
*
* @return A GncPeriodSelect widget.
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-splash.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ gnc_show_splash_screen (void)
presumably it would be better to inhibit size change of the
top level container, but I don't know how to do this */
gtk_label_set_max_width_chars(GTK_LABEL(progress), 34);
markup = g_markup_printf_escaped(MARKUP_STRING, _("Loading..."));
markup = g_markup_printf_escaped(MARKUP_STRING, _("Loading"));
gtk_label_set_markup(GTK_LABEL(progress), markup);
g_free(markup);

Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-tree-view-account.c
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ account_filter_dialog_create(AccountFilterDialog *fd, GncPluginPage *page)
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(GNC_PLUGIN_PAGE(page)->window));
/* Translators: The %s is the name of the plugin page */
title = g_strdup_printf(_("Filter %s by..."),
title = g_strdup_printf(_("Filter %s by"),
gnc_plugin_page_get_page_name(GNC_PLUGIN_PAGE(page)));
gtk_window_set_title(GTK_WINDOW(dialog), title);
g_free(title);
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-tree-view-owner.c
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ owner_filter_dialog_create(OwnerFilterDialog *fd, GncPluginPage *page)
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(GNC_PLUGIN_PAGE(page)->window));
/* Translators: The %s is the name of the plugin page */
title = g_strdup_printf(_("Filter %s by..."),
title = g_strdup_printf(_("Filter %s by"),
gnc_plugin_page_get_page_name(GNC_PLUGIN_PAGE(page)));
gtk_window_set_title(GTK_WINDOW(dialog), title);
g_free(title);
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome/assistant-loan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )

/* Translators: %s is "Taxes",
"Insurance", or similar. */
g_string_printf( str, _("... pay \"%s\"?"),
g_string_printf( str, _(" pay \"%s\"?"),
rouid->optData->name );
rouid->optCb =
GTK_CHECK_BUTTON(
Expand Down
6 changes: 3 additions & 3 deletions gnucash/gnome/business-gnome-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ static GtkWidget * gnc_owner_new (GtkWidget *label, GtkWidget *hbox,
switch (type)
{
case GNCSEARCH_TYPE_SELECT:
text = _("Select...");
text = _("Select");
text_editable = TRUE;
break;
case GNCSEARCH_TYPE_EDIT:
text = _("Edit...");
text = _("Edit");
text_editable = FALSE;
break;
};
Expand Down Expand Up @@ -257,7 +257,7 @@ GtkWidget * gnc_invoice_select_create (GtkWidget *hbox, QofBook *book,
isi->book = book;
isi->label = label;

edit = gnc_general_search_new (GNC_INVOICE_MODULE_NAME, _("Select..."),
edit = gnc_general_search_new (GNC_INVOICE_MODULE_NAME, _("Select"),
TRUE, gnc_invoice_select_search_cb, isi, isi->book);
if (!edit)
{
Expand Down
4 changes: 2 additions & 2 deletions gnucash/gnome/dialog-invoice.c
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ gnc_invoice_update_job_choice (InvoiceWindow *iw)
case MOD_INVOICE:
case DUP_INVOICE:
iw->job_choice =
gnc_general_search_new (GNC_JOB_MODULE_NAME, _("Select..."), TRUE,
gnc_general_search_new (GNC_JOB_MODULE_NAME, _("Select"), TRUE,
gnc_invoice_select_job_cb, iw, iw->book);

gnc_general_search_set_selected (GNC_GENERAL_SEARCH (iw->job_choice),
Expand Down Expand Up @@ -1584,7 +1584,7 @@ gnc_invoice_update_proj_job (InvoiceWindow *iw)
else
{
iw->proj_job_choice =
gnc_general_search_new (GNC_JOB_MODULE_NAME, _("Select..."), TRUE,
gnc_general_search_new (GNC_JOB_MODULE_NAME, _("Select"), TRUE,
gnc_invoice_select_proj_job_cb, iw, iw->book);

gnc_general_search_set_selected (GNC_GENERAL_SEARCH(iw->proj_job_choice),
Expand Down
10 changes: 5 additions & 5 deletions gnucash/gnome/gnc-plugin-basic-commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static GtkActionEntry gnc_plugin_actions [] =
G_CALLBACK (gnc_main_window_cmd_file_new)
},
{
"FileOpenAction", "document-open", N_("_Open..."), "<primary>o",
"FileOpenAction", "document-open", N_("_Open"), "<primary>o",
N_("Open an existing GnuCash file"),
G_CALLBACK (gnc_main_window_cmd_file_open)
},
Expand All @@ -123,7 +123,7 @@ static GtkActionEntry gnc_plugin_actions [] =
G_CALLBACK (gnc_main_window_cmd_file_save)
},
{
"FileSaveAsAction", "document-save-as", N_("Save _As..."), "<shift><primary>s",
"FileSaveAsAction", "document-save-as", N_("Save _As"), "<shift><primary>s",
N_("Save this file with a different name"),
G_CALLBACK (gnc_main_window_cmd_file_save_as)
},
Expand All @@ -142,7 +142,7 @@ static GtkActionEntry gnc_plugin_actions [] =
/* Edit menu */

{
"EditFindTransactionsAction", "edit-find", N_("_Find..."), "<primary>f",
"EditFindTransactionsAction", "edit-find", N_("_Find"), "<primary>f",
N_("Find transactions with a search"),
G_CALLBACK (gnc_main_window_cmd_tools_find_transactions)
},
Expand All @@ -168,12 +168,12 @@ static GtkActionEntry gnc_plugin_actions [] =
G_CALLBACK (gnc_main_window_cmd_actions_scheduled_transaction_editor)
},
{
"ActionsSinceLastRunAction", NULL, N_("Since _Last Run..."), NULL,
"ActionsSinceLastRunAction", NULL, N_("Since _Last Run"), NULL,
N_("Create Scheduled Transactions since the last time run"),
G_CALLBACK (gnc_main_window_cmd_actions_since_last_run)
},
{
"ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment..."), NULL,
"ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment"), NULL,
N_("Setup scheduled transactions for repayment of a loan"),
G_CALLBACK (gnc_main_window_cmd_actions_mortgage_loan)
},
Expand Down

0 comments on commit ab13b01

Please sign in to comment.