Ease i18n of zone descriptions.

pcbnew/zone.cpp

@@ -852,19 +852,8 @@ bool ZONE::AppendCorner( wxPoint aPosition, int aHoleIdx, bool aAllowDuplication
 
 wxString ZONE::GetSelectMenuText( EDA_UNITS aUnits ) const
 {
-    wxString text;
-
-    // Check whether the selected contour is a hole (contour index > 0)
-    if( m_CornerSelection != nullptr &&  m_CornerSelection->m_contour > 0 )
-        text << wxT( " " ) << _( "(Cutout)" );
-
-    if( GetIsRuleArea() )
-        text << wxT( " " ) << _( "(Rule Area)" );
-    else
-        text << GetNetnameMsg();
-
     wxString layerDesc;
-    int count = 0;
+    int      count = 0;
 
     for( PCB_LAYER_ID layer : m_layerSet.Seq() )
     {
@@ -877,7 +866,21 @@ wxString ZONE::GetSelectMenuText( EDA_UNITS aUnits ) const
     if( count > 1 )
         layerDesc.Printf( _( "%s and %d more" ), layerDesc, count - 1 );
 
-    return wxString::Format( _( "Zone Outline %s on %s" ), text, layerDesc );
+    // Check whether the selected contour is a hole (contour index > 0)
+    if( m_CornerSelection != nullptr &&  m_CornerSelection->m_contour > 0 )
+    {
+        if( GetIsRuleArea() )
+            return wxString::Format( _( "Rule Area Cutout on %s" ), layerDesc  );
+        else
+            return wxString::Format( _( "Zone Cutout on %s" ), layerDesc  );
+    }
+    else
+    {
+        if( GetIsRuleArea() )
+            return wxString::Format( _( "Rule Area on %s" ), layerDesc );
+        else
+            return wxString::Format( _( "Zone %s on %s" ), GetNetnameMsg(), layerDesc );
+    }
 }