Merge upstream/master: translation wave plus generic device

Upstream moved 56 commits ahead of the last merge. Six files conflicted,
all of them files where upstream's French -> English tr() translation wave
touched lines we had also touched with the cable feature. Resolution rule
applied everywhere: take upstream's English source strings, keep our cable
additions.

Resolved:

- sources/ui/xrefpropertieswidget.ui : kept our structure (m_labels_gb
  pulled out of the display group, m_slave_row, the m_font_pb "Police..."
  button of the cable cross-reference) and mechanically applied upstream's
  20 English string replacements on top of it.

- sources/ui/xrefpropertieswidget.cpp : our version plus upstream's 7
  translated combo entries; the tr("Cable") item we add for the cable
  cross-reference type stays.

- sources/autoNum/ui/numparteditorw.cpp : upstream's English part names
  ("number format 1", "Sheet no.", "Plant", "Location", ...) for the
  number-format list, with our comment explaining why type 3 (cable) takes
  the conductor kinds of variable.

- sources/ui/configpage/configpages.cpp : upstream's English tab titles
  (Conductors / Elements / Sheets) plus our Cables tab.

- sources/ui/configpage/projectconfigpages.cpp : upstream's "Sheets" tab
  title plus our Cables tab block (single-rule SelectAutonumW(3)).

- sources/qetdiagrameditor.cpp : union of both sides - upstream's new
  "Add a generic device" action (icon, status tip, data id) and its
  English menu names ("File"/"Edit"/"Project"/"Display"), together with our
  cable action, the Numbering and Lists menus, the cable list actions and
  the CSV export in the Project menu.

Kept French: our own cable tr() source strings stay French for now. That
is the smaller change and the translation pass can follow separately.

Verified: full build 1065/1065, ctest 91/92 (only the pre-existing
headless tst_menubarkeyboard fails: no window manager, so Alt+F and F10
cannot open a menu bar), smoke start exit 124, no conflict marker left in
the tree.

sources/diagramtoolbarsettings.cpp

@@ -61,15 +61,15 @@ QStringList DiagramToolbarSettings::builtInNames()
 QString DiagramToolbarSettings::builtInTitle(const QString &name)
 {
 	if (name == QLatin1String("toolbar"))
-		return QCoreApplication::translate("QETDiagramEditor", "Outils");
+		return QCoreApplication::translate("QETDiagramEditor", "Tools");
 	if (name == QLatin1String("display"))
-		return QCoreApplication::translate("QETDiagramEditor", "Affichage");
+		return QCoreApplication::translate("QETDiagramEditor", "Display");
 	if (name == QLatin1String("diagram"))
-		return QCoreApplication::translate("QETDiagramEditor", "Schéma");
+		return QCoreApplication::translate("QETDiagramEditor", "Diagram");
 	if (name == QLatin1String("adding"))
-		return QCoreApplication::translate("QETDiagramEditor", "Ajouter");
+		return QCoreApplication::translate("QETDiagramEditor", "Add");
 	if (name == QLatin1String("diagram_depth_toolbar"))
-		return QCoreApplication::translate("QETDiagramEditor", "Profondeur", "toolbar title");
+		return QCoreApplication::translate("QETDiagramEditor", "Depth", "toolbar title");
 	return QString();
 }
 
@@ -212,7 +212,8 @@ QStringList DiagramToolbarSettings::defaultIds(const QString &name)
 			QStringLiteral("diagrameditor.add_polyline"),
 			QStringLiteral("diagrameditor.add_path"),
 			QStringLiteral("diagrameditor.add_fillet"),
-			QStringLiteral("diagrameditor.add_terminal_strip")};
+			QStringLiteral("diagrameditor.add_terminal_strip"),
+			QStringLiteral("diagrameditor.add_generic_device")};
 	}
 	if (name == QLatin1String("diagram_depth_toolbar")) {
 		return {QStringLiteral("depth.forward"),
@@ -267,13 +268,13 @@ bool DiagramToolbarSettings::isWidget(const QString &id)
 QString DiagramToolbarSettings::widgetTitle(const QString &id)
 {
 	if (id == QLatin1String("widget:handler_size"))
-		return QCoreApplication::translate("DiagramToolbarSettings", "Taille des poignées");
+		return QCoreApplication::translate("DiagramToolbarSettings", "Handle size");
 	if (id == QLatin1String("widget:text_grid"))
-		return QCoreApplication::translate("DiagramToolbarSettings", "Grille des textes");
+		return QCoreApplication::translate("DiagramToolbarSettings", "Text grid");
 	if (id == QLatin1String("widget:background_color"))
-		return QCoreApplication::translate("DiagramToolbarSettings", "Couleur de fond du folio");
+		return QCoreApplication::translate("DiagramToolbarSettings", "Sheet background color");
 	if (id == QLatin1String("widget:conductor_color"))
-		return QCoreApplication::translate("DiagramToolbarSettings", "Couleur des conducteurs");
+		return QCoreApplication::translate("DiagramToolbarSettings", "Conductor color");
 	return id;
 }