From 5b22cef9844159eb7135744ba16b2a99dc604fdb Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 13 Dec 2020 13:12:38 +0000
Subject: [PATCH] Associate -> assign in the context of footprint assignments.

Fixes https://gitlab.com/kicad/code/kicad/issues/6708
---
 cvpcb/tools/cvpcb_actions.cpp   | 16 ++++++++--------
 eeschema/tools/backannotate.cpp |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cvpcb/tools/cvpcb_actions.cpp b/cvpcb/tools/cvpcb_actions.cpp
index 58f5884ddb..27a16edf39 100644
--- a/cvpcb/tools/cvpcb_actions.cpp
+++ b/cvpcb/tools/cvpcb_actions.cpp
@@ -89,15 +89,15 @@ TOOL_ACTION CVPCB_ACTIONS::changeFocusLeft( "cvpcb.Control.changeFocusLeft",
 // Actions to navigate the component list
 TOOL_ACTION CVPCB_ACTIONS::gotoNextNA( "cvpcb.Control.GotoNextNA",
         AS_GLOBAL, 0, "",
-        _( "Select next unassociated symbol" ),
-        _( "Select next unassociated symbol" ),
+        _( "Select next unassigned symbol" ),
+        _( "Select next symbol with no footprint assignment" ),
         right_xpm, AF_NONE,
         (void*) CVPCB_MAINFRAME::ITEM_NEXT );
 
 TOOL_ACTION CVPCB_ACTIONS::gotoPreviousNA( "cvpcb.Control.GotoPreviousNA",
         AS_GLOBAL, 0, "",
-        _( "Select previous unassociated symbol" ),
-        _( "Select previous unassociated symbol" ),
+        _( "Select previous unassigned symbol" ),
+        _( "Select previous symbol with no footprint assignment" ),
         left_xpm, AF_NONE,
         (void*) CVPCB_MAINFRAME::ITEM_PREV );
 
@@ -106,14 +106,14 @@ TOOL_ACTION CVPCB_ACTIONS::gotoPreviousNA( "cvpcb.Control.GotoPreviousNA",
 TOOL_ACTION CVPCB_ACTIONS::associate( "cvpcb.Association.Associate",
         AS_GLOBAL,
         WXK_RETURN, "",
-        _( "Associate footprint" ),
-        _( "Associate selected footprint with selected components" ),
+        _( "Assign footprint" ),
+        _( "Assign footprint to selected symbols" ),
         auto_associe_xpm );
 
 TOOL_ACTION CVPCB_ACTIONS::autoAssociate( "cvpcb.Association.AutoAssociate",
         AS_GLOBAL, 0, "",
-        _( "Automatically associate footprints" ),
-        _( "Perform automatic footprint association" ),
+        _( "Automatically assign footprints" ),
+        _( "Perform automatic footprint assignment" ),
         auto_associe_xpm );
 
 TOOL_ACTION CVPCB_ACTIONS::deleteAssoc( "cvpcb.Association.Delete",
diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp
index 357c328842..a781bcfa14 100644
--- a/eeschema/tools/backannotate.cpp
+++ b/eeschema/tools/backannotate.cpp
@@ -158,7 +158,7 @@ void BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload )
 
             if( path == "" )
             {
-                msg.Printf( _( "Footprint '%s' has no associated symbol." ),
+                msg.Printf( _( "Footprint '%s' has no assigned symbol." ),
                             ref );
                 m_reporter.ReportHead( msg, RPT_SEVERITY_WARNING );
                 continue;