diff --git a/gnucash/gnome/dialog-assoc.c b/gnucash/gnome/dialog-assoc.c index 84c0d55c5b2..25e12a95abd 100644 --- a/gnucash/gnome/dialog-assoc.c +++ b/gnucash/gnome/dialog-assoc.c @@ -202,7 +202,7 @@ setup_file_dialog (GtkBuilder *builder, GtkFileChooserButton *fcb, 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_assoc_get_use_uri (path_head, uri, scheme); - gchar *uri_label = g_strdup_printf ("%s '%s'", _("Existing Association is"), display_uri); + gchar *uri_label = g_strdup_printf ("%s '%s'", _("Existing Document Link is"), display_uri); label = gtk_label_new (uri_label); @@ -537,7 +537,9 @@ row_selected_bus_cb (GtkTreeView *view, GtkTreePath *path, return; } - ret_uri = gnc_assoc_get_uri_dialog (GTK_WINDOW(assoc_dialog->window), _("Change a Business Association"), uri); +/* Translators: This is the title of a dialog box for linking an external + file or URI with the current bill, invoice, transaction, or voucher. */ + ret_uri = gnc_assoc_get_uri_dialog (GTK_WINDOW(assoc_dialog->window), _("Manage Document Link"), uri); if (ret_uri && g_strcmp0 (uri, ret_uri) != 0) { @@ -585,7 +587,7 @@ row_selected_trans_cb (GtkTreeView *view, GtkTreePath *path, gtk_tree_model_get (assoc_dialog->model, &iter, URI, &uri, ITEM_POINTER, &split, -1); - // Open associated link, subtract 1 to allow for date_int64 + // Open linked document, subtract 1 to allow for date_int64 if (gtk_tree_view_get_column (GTK_TREE_VIEW(assoc_dialog->view), DISPLAY_URI - 1) == col) gnc_assoc_open_uri (GTK_WINDOW(assoc_dialog->window), uri); @@ -628,7 +630,7 @@ row_selected_trans_cb (GtkTreeView *view, GtkTreePath *path, g_free (uri); return; } - ret_uri = gnc_assoc_get_uri_dialog (GTK_WINDOW(assoc_dialog->window), _("Change a Transaction Association"), uri); + ret_uri = gnc_assoc_get_uri_dialog (GTK_WINDOW(assoc_dialog->window), _("Manage Document Link"), uri); if (ret_uri && g_strcmp0 (uri, ret_uri) != 0) { @@ -912,7 +914,9 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog) GObject *desc_item_tree_column = G_OBJECT(gtk_builder_get_object (builder, "desc_item")); GObject *desc_id_tree_column = G_OBJECT(gtk_builder_get_object (builder, "desc_id")); - gtk_window_set_title (GTK_WINDOW(window), _("Transaction Associations")); + /* Translators: This is the label of a dialog box that lists all of the + transaction that have files or URIs linked with them. */ + gtk_window_set_title (GTK_WINDOW(window), _("Transaction Document Links")); gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN(desc_id_tree_column), FALSE); gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN(desc_item_tree_column), _("Description")); @@ -926,10 +930,15 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog) { GtkWidget *help_label = GTK_WIDGET(gtk_builder_get_object (builder, "help_label")); const gchar *item_string = N_( - " To jump to the Business Item, double click on the entry in the id\n" - " column, Association column to open the Association or Available to update"); - - gtk_window_set_title (GTK_WINDOW(assoc_dialog->window), _("Business Associations")); + "\t\tDouble click on the entry in the Id column to jump to the" + "Business Item.\n\t\tDouble click on the entry in the Link column" + "to open the Linked Document.\n\t\tDouble click on the entry in" + "the Available? column to modify the document link."); + + /* Translators: This is the label of a dialog box that lists all of the + invoices, bills, and vouchers that have files or URIs linked with + them. */ + gtk_window_set_title (GTK_WINDOW(assoc_dialog->window), _("Business Document Links")); gtk_label_set_text (GTK_LABEL(help_label), gettext (item_string)); g_signal_connect (assoc_dialog->view, "row-activated", diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c index 95ee269d2d9..c2482837892 100644 --- a/gnucash/gnome/dialog-invoice.c +++ b/gnucash/gnome/dialog-invoice.c @@ -2467,7 +2467,7 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page) if (assoc_uri) { gchar *display_uri = gnc_assoc_get_unescaped_just_uri (assoc_uri); - gtk_button_set_label (GTK_BUTTON(iw->assoc_link_button), _("Open Association:")); + gtk_button_set_label (GTK_BUTTON(iw->assoc_link_button), _("Open Linked Document:")); gtk_link_button_set_uri (GTK_LINK_BUTTON(iw->assoc_link_button), display_uri); gtk_widget_show (GTK_WIDGET (iw->assoc_link_button)); g_free (display_uri); @@ -2680,7 +2680,6 @@ gnc_invoice_update_assoc_for_window (GncInvoice *invoice, const gchar *uri) // update the menu actions uri_action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(iw->page), "BusinessAssociationOpenAction"); gtk_action_set_sensitive (uri_action, FALSE); - uri_action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(iw->page), "BusinessAssociationRemoveAction"); gtk_action_set_sensitive (uri_action, FALSE); gtk_widget_hide (assoc_link_button); diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index b68421c1792..067efb6724a 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -218,20 +218,15 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = G_CALLBACK (gnc_plugin_page_invoice_cmd_new_invoice) }, { - "BusinessAssociationAction", NULL, "_Update Association for Invoice", NULL, - "Update Association for current Invoice", + "BusinessAssociationAction", NULL, "_Manage Document Link...", NULL, + "Manage link of an external document to this item.", G_CALLBACK (gnc_plugin_page_invoice_cmd_associate) }, { - "BusinessAssociationOpenAction", NULL, "_Open Association for Invoice", NULL, - "Open Association for current Invoice", + "BusinessAssociationOpenAction", NULL, "_Open Linked Document", NULL, + "Open the linked document", G_CALLBACK (gnc_plugin_page_invoice_cmd_associate_open) }, - { - "BusinessAssociationRemoveAction", NULL, "_Remove Association from Invoice", NULL, - "Remove Association from Invoice", - G_CALLBACK (gnc_plugin_page_invoice_cmd_associate_remove) - }, { "ToolsProcessPaymentAction", GNC_ICON_INVOICE_PAY, "_Pay Invoice", NULL, "Enter a payment for the owner of this invoice", @@ -306,9 +301,8 @@ static action_toolbar_labels invoice_action_labels[] = {"EditUnpostInvoiceAction", N_("_Unpost Invoice")}, {"BusinessNewInvoiceAction", N_("New _Invoice")}, {"ToolsProcessPaymentAction", N_("_Pay Invoice")}, - {"BusinessAssociationAction", N_("_Update Association for Invoice")}, - {"BusinessAssociationOpenAction", N_("_Open Association for Invoice")}, - {"BusinessAssociationRemoveAction", N_("_Remove Association from Invoice")}, + {"BusinessAssociationAction", N_("_Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("_Open Linked Document")}, {NULL, NULL}, }; @@ -328,9 +322,8 @@ static action_toolbar_labels bill_action_labels[] = {"EditUnpostInvoiceAction", N_("_Unpost Bill")}, {"BusinessNewInvoiceAction", N_("New _Bill")}, {"ToolsProcessPaymentAction", N_("_Pay Bill")}, - {"BusinessAssociationAction", N_("_Update Association for Bill")}, - {"BusinessAssociationOpenAction", N_("_Open Association for Bill")}, - {"BusinessAssociationRemoveAction", N_("_Remove Association from Bill")}, + {"BusinessAssociationAction", N_("_Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("_Open Linked Document")}, {NULL, NULL}, }; @@ -350,9 +343,8 @@ static action_toolbar_labels voucher_action_labels[] = {"EditUnpostInvoiceAction", N_("_Unpost Voucher")}, {"BusinessNewInvoiceAction", N_("New _Voucher")}, {"ToolsProcessPaymentAction", N_("_Pay Voucher")}, - {"BusinessAssociationAction", N_("_Update Association for Voucher")}, - {"BusinessAssociationOpenAction", N_("_Open Association for Voucher")}, - {"BusinessAssociationRemoveAction", N_("_Remove Association from Voucher")}, + {"BusinessAssociationAction", N_("_Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("_Open Linked Document")}, {NULL, NULL}, }; @@ -372,9 +364,8 @@ static action_toolbar_labels creditnote_action_labels[] = {"EditUnpostInvoiceAction", N_("_Unpost Credit Note")}, {"BusinessNewInvoiceAction", N_("New _Credit Note")}, {"ToolsProcessPaymentAction", N_("_Pay Credit Note")}, - {"BusinessAssociationAction", N_("_Update Association for Credit Note")}, - {"BusinessAssociationOpenAction", N_("_Open Association for Credit Note")}, - {"BusinessAssociationRemoveAction", N_("_Remove Association from Credit Note")}, + {"BusinessAssociationAction", N_("_Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("_Open Linked Document")}, {NULL, NULL}, }; @@ -389,9 +380,8 @@ static action_toolbar_labels invoice_action_tooltips[] = { {"BlankEntryAction", N_("Move to the blank entry at the bottom of the invoice")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this invoice") }, {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this invoice") }, - {"BusinessAssociationAction", N_("Update Association for current invoice")}, - {"BusinessAssociationOpenAction", N_("Open Association for current invoice")}, - {"BusinessAssociationRemoveAction", N_("Remove Association from invoice")}, + {"BusinessAssociationAction", N_("Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("Open Linked Document")}, {NULL, NULL}, }; @@ -411,9 +401,8 @@ static action_toolbar_labels bill_action_tooltips[] = { {"BlankEntryAction", N_("Move to the blank entry at the bottom of the bill")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this bill") }, {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this bill") }, - {"BusinessAssociationAction", N_("Update Association for current bill")}, - {"BusinessAssociationOpenAction", N_("Open Association for current bill")}, - {"BusinessAssociationRemoveAction", N_("Remove Association from bill")}, + {"BusinessAssociationAction", N_("Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("Open Linked Document")}, {NULL, NULL}, }; @@ -433,9 +422,8 @@ static action_toolbar_labels voucher_action_tooltips[] = { {"BlankEntryAction", N_("Move to the blank entry at the bottom of the voucher")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this voucher") }, {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this voucher") }, - {"BusinessAssociationAction", N_("Update Association for current voucher")}, - {"BusinessAssociationOpenAction", N_("Open Association for current voucher")}, - {"BusinessAssociationRemoveAction", N_("Remove Association from voucher")}, + {"BusinessAssociationAction", N_("Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("Open Linked Document")}, {NULL, NULL}, }; @@ -455,9 +443,8 @@ static action_toolbar_labels creditnote_action_tooltips[] = { {"BlankEntryAction", N_("Move to the blank entry at the bottom of the credit note")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this credit note") }, {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this credit note") }, - {"BusinessAssociationAction", N_("Update Association for credit note")}, - {"BusinessAssociationOpenAction", N_("Open Association for credit note")}, - {"BusinessAssociationRemoveAction", N_("Remove Association from credit note")}, + {"BusinessAssociationAction", N_("_Manage Document Link")}, + {"BusinessAssociationOpenAction", N_("Open Linked Document")}, {NULL, NULL}, }; @@ -622,7 +609,6 @@ update_assoc_actions (GncPluginPage *plugin_page, gboolean has_uri) uri_action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(plugin_page), "BusinessAssociationOpenAction"); gtk_action_set_sensitive (uri_action, has_uri); - uri_action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(plugin_page), "BusinessAssociationRemoveAction"); gtk_action_set_sensitive (uri_action, has_uri); } @@ -1374,7 +1360,7 @@ gnc_plugin_page_invoice_cmd_associate (GtkAction *action, invoice = gnc_invoice_window_get_invoice (priv->iw); uri = gncInvoiceGetAssociation (invoice); - ret_uri = gnc_assoc_get_uri_dialog (parent, _("Change a Business Association"), uri); + ret_uri = gnc_assoc_get_uri_dialog (parent, _("Manage Document Link"), uri); if (ret_uri && g_strcmp0 (uri, ret_uri) != 0) { diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index b8a25b9a217..3fde5f47bb6 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -292,10 +292,17 @@ static GList* invoices_from_transaction (Transaction* trans); #define PASTE_TRANSACTION_LABEL N_("_Paste Transaction") #define DUPLICATE_TRANSACTION_LABEL N_("Dup_licate Transaction") #define DELETE_TRANSACTION_LABEL N_("_Delete Transaction") -#define ASSOCIATE_TRANSACTION_LABEL N_("Update _Association for Transaction") -#define ASSOCIATE_TRANSACTION_OPEN_LABEL N_("_Open Association for Transaction") -#define ASSOCIATE_TRANSACTION_REMOVE_LABEL N_("Re_move Association from Transaction") -#define JUMP_ASSOCIATED_INVOICE_LABEL N_("Open Associated Invoice") +/* Translators: This is a menu item that opens a dialog for linking an + external file or URL with the bill, invoice, transaction, or voucher or + removing such an link. */ +#define ASSOCIATE_TRANSACTION_LABEL N_("_Manage Document Link...") +/* Translators: This is a menu item that opens an external file or URI that may + be linked to the current bill, invoice, transaction, or voucher using + the operating system's default application for the file or URI mime type. */ +#define ASSOCIATE_TRANSACTION_OPEN_LABEL N_("_Open Linked Document") +/* Translators: This is a menu item that will open the bill, invoice, or voucher + that is posted to the current transaction if there is one. */ +#define JUMP_ASSOCIATED_INVOICE_LABEL N_("Jump to Invoice") #define CUT_SPLIT_LABEL N_("Cu_t Split") #define COPY_SPLIT_LABEL N_("_Copy Split") #define PASTE_SPLIT_LABEL N_("_Paste Split") @@ -306,10 +313,9 @@ static GList* invoices_from_transaction (Transaction* trans); #define PASTE_TRANSACTION_TIP N_("Paste the transaction from the clipboard") #define DUPLICATE_TRANSACTION_TIP N_("Make a copy of the current transaction") #define DELETE_TRANSACTION_TIP N_("Delete the current transaction") -#define ASSOCIATE_TRANSACTION_TIP N_("Update Association for the current transaction") -#define ASSOCIATE_TRANSACTION_OPEN_TIP N_("Open Association for the current transaction") -#define ASSOCIATE_TRANSACTION_REMOVE_TIP N_("Remove the association from the current transaction") -#define JUMP_ASSOCIATED_INVOICE_TIP N_("Open the associated invoice") +#define ASSOCIATE_TRANSACTION_TIP N_("Add, change, or unlink the document linked with the current transaction") +#define ASSOCIATE_TRANSACTION_OPEN_TIP N_("Open the linked document for the current transaction") +#define JUMP_ASSOCIATED_INVOICE_TIP N_("Jump to the linked bill, invoice, or voucher") #define CUT_SPLIT_TIP N_("Cut the selected split into clipboard") #define COPY_SPLIT_TIP N_("Copy the selected split into clipboard") #define PASTE_SPLIT_TIP N_("Paste the split from the clipboard") @@ -422,11 +428,6 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = ASSOCIATE_TRANSACTION_OPEN_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_associate_transaction_open) }, - { - "AssociateTransactionRemoveAction", NULL, ASSOCIATE_TRANSACTION_REMOVE_LABEL, NULL, - ASSOCIATE_TRANSACTION_REMOVE_TIP, - G_CALLBACK (gnc_plugin_page_register_cmd_associate_transaction_remove) - }, { "JumpAssociatedInvoiceAction", NULL, JUMP_ASSOCIATED_INVOICE_LABEL, NULL, JUMP_ASSOCIATED_INVOICE_TIP, @@ -492,8 +493,11 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) }, { - "JumpTransactionAction", GNC_ICON_JUMP_TO, N_ ("_Jump"), NULL, - N_ ("Jump to the corresponding transaction in the other account"), +/* Translators: This is a menu item that will open a register tab for the + account of the first other account in the current transaction's split list + with focus on the current transaction's entry in that register. */ + "JumpTransactionAction", GNC_ICON_JUMP_TO, N_ ("_Jump to the other account"), NULL, + N_ ("Open a new register tab for the other account with focus on this transaction."), G_CALLBACK (gnc_plugin_page_register_cmd_jump) }, { @@ -533,7 +537,7 @@ static GtkToggleActionEntry toggle_entries[] = { { "ViewStyleDoubleLineAction", NULL, N_ ("_Double Line"), NULL, - N_ ("Show a second line with \"Action\", \"Notes\", and \"File Association\" for each transaction."), + N_ ("Show a second line with \"Action\", \"Notes\", and \"Linked Document\" for each transaction."), G_CALLBACK (gnc_plugin_page_register_cmd_style_double_line), FALSE }, @@ -605,14 +609,14 @@ static action_toolbar_labels toolbar_labels[] = { "DeleteTransactionAction", N_ ("Delete") }, { "DuplicateTransactionAction", N_ ("Duplicate") }, { "SplitTransactionAction", N_ ("Split") }, + { "JumpTransactionAction", N_ ("Jump") }, { "ScheduleTransactionAction", N_ ("Schedule") }, { "BlankTransactionAction", N_ ("Blank") }, { "ActionsReconcileAction", N_ ("Reconcile") }, { "ActionsAutoClearAction", N_ ("Auto-clear") }, - { "AssociateTransactionAction", N_ ("Update Association") }, - { "AssociateTransactionOpenAction", N_ ("Open Association") }, - { "AssociateTransactionRemoveAction", N_ ("Remove Association") }, - { "JumpAssociatedInvoiceAction", N_ ("Open Invoice") }, + { "AssociateTransactionAction", N_ ("Manage Document Link") }, + { "AssociateTransactionOpenAction", N_ ("Open Linked Document") }, + { "JumpAssociatedInvoiceAction", N_ ("Invoice") }, { NULL, NULL }, }; @@ -996,7 +1000,6 @@ static const char* readonly_inactive_actions[] = "ScrubAllAction", "ScrubCurrentAction", "AssociateTransactionAction", - "AssociateTransactionRemoveAction", NULL }; @@ -1022,7 +1025,6 @@ static const char* tran_action_labels[] = DELETE_TRANSACTION_LABEL, ASSOCIATE_TRANSACTION_LABEL, ASSOCIATE_TRANSACTION_OPEN_LABEL, - ASSOCIATE_TRANSACTION_REMOVE_LABEL, JUMP_ASSOCIATED_INVOICE_LABEL, NULL }; @@ -1037,7 +1039,6 @@ static const char* tran_action_tips[] = DELETE_TRANSACTION_TIP, ASSOCIATE_TRANSACTION_TIP, ASSOCIATE_TRANSACTION_OPEN_TIP, - ASSOCIATE_TRANSACTION_REMOVE_TIP, JUMP_ASSOCIATED_INVOICE_TIP, NULL }; @@ -1147,10 +1148,6 @@ gnc_plugin_page_register_ui_update (gpointer various, "AssociateTransactionOpenAction"); gtk_action_set_sensitive (GTK_ACTION(action), (uri ? TRUE:FALSE)); - action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE (page), - "AssociateTransactionRemoveAction"); - gtk_action_set_sensitive (GTK_ACTION(action), (uri ? TRUE:FALSE)); - /* Set 'ExecAssociatedInvoice' We can determine an invoice from a txn if either - it is an invoice transaction diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c index 7bd409dccaa..50fcd100201 100644 --- a/gnucash/gnome/gnc-plugin-page-register2.c +++ b/gnucash/gnome/gnc-plugin-page-register2.c @@ -370,8 +370,8 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_exchange_rate) }, { - "JumpTransactionAction", GNC_ICON_JUMP_TO, N_("_Jump"), NULL, - N_("Jump to the corresponding transaction in the other account"), + "JumpTransactionAction", GNC_ICON_JUMP_TO, N_("_Jump to the other account"), NULL, + N_("Open a new register tab for the other account with focus on this transaction."), G_CALLBACK (gnc_plugin_page_register2_cmd_jump) }, { @@ -486,6 +486,7 @@ static action_toolbar_labels toolbar_labels[] = { "DeleteTransactionAction", N_("Delete") }, { "DuplicateTransactionAction", N_("Duplicate") }, { "SplitTransactionAction", N_("Split") }, + { "JumpTransactionAction", N_("Jump") }, { "ScheduleTransactionAction", N_("Schedule") }, { "BlankTransactionAction", N_("Blank") }, { "ActionsReconcileAction", N_("Reconcile") }, diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in index fa923638c74..fd3461e1607 100644 --- a/gnucash/gschemas/org.gnucash.gschema.xml.in +++ b/gnucash/gschemas/org.gnucash.gschema.xml.in @@ -22,8 +22,8 @@ '' - Transaction Associations head path - This is the path head for the Transaction file Associations + Transaction Linked Files head path + This is the path head for the Transaction Linked Files with relative paths true @@ -297,8 +297,8 @@ false - Show a second line with "Action", "Notes", and "File Association" for each transaction. - 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->Double Line" menu item. + Show a second line with "Action", "Notes", and "Linked Documents" for each transaction. + Show a second line with "Action", "Notes", and "Linked Documents" 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->Double Line" menu item. false diff --git a/gnucash/gtkbuilder/dialog-assoc.glade b/gnucash/gtkbuilder/dialog-assoc.glade index ee468fe47b5..d2899d596bd 100644 --- a/gnucash/gtkbuilder/dialog-assoc.glade +++ b/gnucash/gtkbuilder/dialog-assoc.glade @@ -80,8 +80,8 @@ 6 6 - - _File Association + + Linked _File True True False @@ -96,15 +96,15 @@ - - _Location Association + + Linked _Location True True False True True True - file_assoc + linked_file False @@ -267,7 +267,7 @@ ok_button - + False 450 dialog @@ -314,7 +314,7 @@ True False - Change Association path head + Change Linked Document path head @@ -350,7 +350,7 @@ True False start - Existing relative file path associations will be converted to absolute ones by combining them with the existing path head unless box unticked. + Existing relative file path links will be converted to absolute ones by combining them with the existing path head unless box unticked. True @@ -405,7 +405,7 @@ True False start - Existing absolute file path associations will be converted to relative ones by comparing them to the new path head unless box unticked. + Existing absolute file path links will be converted to relative ones by comparing them to the new path head unless box unticked. True @@ -443,7 +443,7 @@ False start 12 - Note: Only Associations that are not read-only will be changed. + Note: Only Document Links that are not read-only will be changed. True @@ -502,7 +502,7 @@ True False - All Associations + All Linked Documents @@ -520,7 +520,7 @@ end - Reload and Locate _Associations + Reload and Locate Linked Documents True True True @@ -548,7 +548,7 @@ - _Locate Associations + _Locate Linked Documentss True True True @@ -654,7 +654,7 @@ True - Association + Linked Document 0.5 True 4 @@ -730,8 +730,7 @@ False 3 3 - To jump to the Transaction, double click on the entry in the Description -column, Association column to open the Association or Available to update + "\t\tDouble click on the entry in the Description column to jump to the Transaction.\n\t\tDouble click on the entry in the Link column to open the Linked Document.\n\t\tDouble click on the entry in the Available? column to modify the document link." False diff --git a/gnucash/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade index 6cb0c115819..541b1016801 100644 --- a/gnucash/gtkbuilder/dialog-invoice.glade +++ b/gnucash/gtkbuilder/dialog-invoice.glade @@ -415,8 +415,8 @@ True False - - Open Association + + Open Document Link True True True diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade index 437534ba886..563dc2adefa 100644 --- a/gnucash/gtkbuilder/dialog-preferences.glade +++ b/gnucash/gtkbuilder/dialog-preferences.glade @@ -1698,7 +1698,7 @@ many months before the current month True False - Path head for Associated Files + Path head for Linked File Relative Paths @@ -1716,7 +1716,7 @@ many months before the current month True False - Path head for Associated Files + Path head for Linked Files Relative Paths True @@ -1782,7 +1782,7 @@ many months before the current month True False start - <b>Associated Files</b> + <b>Linked Files</b> True diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade index 8d4e99b436c..35535e9bb64 100644 --- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade +++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade @@ -1100,7 +1100,7 @@ If 0, all previous days included True False end - Keep Associated Entry + Keep Linked Document Entry 0 diff --git a/gnucash/register/ledger-core/split-register-layout.c b/gnucash/register/ledger-core/split-register-layout.c index d481745b9cd..6d42ee7edf6 100644 --- a/gnucash/register/ledger-core/split-register-layout.c +++ b/gnucash/register/ledger-core/split-register-layout.c @@ -700,7 +700,7 @@ gnc_split_register_layout_add_cells (SplitRegister* reg, gnc_register_add_cell (layout, ASSOC_CELL, ASSOC_CELL_TYPE_NAME, - C_ ("Column header for 'Associate'", "A"), + C_ ("Column header for 'Document Link'", "L"), CELL_ALIGN_CENTER, FALSE, FALSE); diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c index 85fa595860b..1d3d5eba3b4 100644 --- a/gnucash/register/ledger-core/split-register-model.c +++ b/gnucash/register/ledger-core/split-register-model.c @@ -331,7 +331,7 @@ static const char* gnc_split_register_get_associate_label (VirtualLocation virt_loc, gpointer user_data) { - return C_ ("Column header for 'Associate'", "A"); + return C_ ("Column header for 'Document Link'", "L"); } static const char* diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm index 855d2de16b0..86608ced0d8 100644 --- a/gnucash/report/trep-engine.scm +++ b/gnucash/report/trep-engine.scm @@ -948,7 +948,7 @@ be excluded from periodic reporting.") (list (N_ "Use Full Other Account Name") "i" (G_ "Display the full account name?") #f) (list (N_ "Other Account Code") "j" (G_ "Display the other account code?") #f) (list (N_ "Shares") "k" (G_ "Display the number of shares?") #f) - (list (N_ "Association") "l5" (G_ "Display the transaction association") #f) + (list (N_ "Link") "l5" (G_ "Display the transaction linked document") #f) (list (N_ "Price") "l" (G_ "Display the shares price?") #f) ;; note the "Amount" multichoice option in between here (list optname-grid "m5" (G_ "Display a subtotal summary table.") #f) @@ -1074,7 +1074,7 @@ be excluded from periodic reporting.") (opt-val gnc:pagename-display (N_ "Other Account Name")))) (cons 'shares (opt-val gnc:pagename-display (N_ "Shares"))) (cons 'price (opt-val gnc:pagename-display (N_ "Price"))) - (cons 'association (opt-val gnc:pagename-display "Association")) + (cons 'link (opt-val gnc:pagename-display (N_ "Link"))) (cons 'amount-single (eq? amount-setting 'single)) (cons 'amount-double (eq? amount-setting 'double)) (cons 'common-currency (opt-val gnc:pagename-general optname-common-currency)) @@ -1240,7 +1240,7 @@ be excluded from periodic reporting.") "number-cell" (xaccSplitGetAmount split))))) - (add-if (column-uses? 'association) + (add-if (column-uses? 'link) (vector "" (lambda (split transaction-row?) (let ((url (xaccTransGetAssociation @@ -1251,9 +1251,9 @@ be excluded from periodic reporting.") (if opt-use-links? (gnc:html-transaction-association-anchor (xaccSplitGetParent split) - ;; Translators: 'A' is short for Association - (G_ "A")) - (G_ "A")))))))) + ;; Translators: 'L' is short for Linked Document + (G_ "L")) + (G_ "L")))))))) (add-if (column-uses? 'price) (vector (G_ "Price") diff --git a/gnucash/ui/gnc-plugin-basic-commands-ui.xml b/gnucash/ui/gnc-plugin-basic-commands-ui.xml index b48ebedae83..3c898b86b21 100644 --- a/gnucash/ui/gnc-plugin-basic-commands-ui.xml +++ b/gnucash/ui/gnc-plugin-basic-commands-ui.xml @@ -57,7 +57,7 @@ - + diff --git a/gnucash/ui/gnc-plugin-business-ui.xml b/gnucash/ui/gnc-plugin-business-ui.xml index ba735420262..361813f35e5 100644 --- a/gnucash/ui/gnc-plugin-business-ui.xml +++ b/gnucash/ui/gnc-plugin-business-ui.xml @@ -42,7 +42,7 @@ - + diff --git a/gnucash/ui/gnc-plugin-page-invoice-ui.xml b/gnucash/ui/gnc-plugin-page-invoice-ui.xml index d21a29091fe..882d5aba8c0 100644 --- a/gnucash/ui/gnc-plugin-page-invoice-ui.xml +++ b/gnucash/ui/gnc-plugin-page-invoice-ui.xml @@ -46,7 +46,6 @@ - diff --git a/libgnucash/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c index 5b66feb024a..b4624800de4 100644 --- a/libgnucash/app-utils/gnc-ui-util.c +++ b/libgnucash/app-utils/gnc-ui-util.c @@ -908,13 +908,13 @@ gnc_get_association_str (char association_flag) switch (association_flag) { case WASSOC: - return C_("Association flag for 'web'", "w"); + return C_("Document Link flag for 'web'", "w"); case FASSOC: - return C_("Association flag for 'file'", "f"); + return C_("Document Link flag for 'file'", "f"); case ' ': return " "; default: - PERR("Bad association flag"); + PERR("Bad link flag"); return NULL; } }